Mercurial > mm7
comparison DecorationList.cpp @ 2274:90f56da08d76
small cleaning
author | Ritor1 |
---|---|
date | Fri, 14 Mar 2014 09:32:25 +0600 |
parents | aff7a7b072b7 |
children | 8193a64c7461 |
comparison
equal
deleted
inserted
replaced
2257:8878fba164fd | 2274:90f56da08d76 |
---|---|
45 unsigned int v4; // esi@3 | 45 unsigned int v4; // esi@3 |
46 void *v5; // eax@10 | 46 void *v5; // eax@10 |
47 FILE *v6; // ST18_4@12 | 47 FILE *v6; // ST18_4@12 |
48 char *i; // eax@12 | 48 char *i; // eax@12 |
49 unsigned __int16 v8; // ax@16 | 49 unsigned __int16 v8; // ax@16 |
50 const char *v9; // ST20_4@16 | 50 //const char *v9; // ST20_4@16 |
51 const char *v10; // ST18_4@16 | 51 //const char *v10; // ST18_4@16 |
52 __int16 v11; // ax@16 | 52 //__int16 v11; // ax@16 |
53 const char *v12; // ST14_4@16 | 53 //const char *v12; // ST14_4@16 |
54 unsigned __int16 v13; // ax@16 | 54 //unsigned __int16 v13; // ax@16 |
55 const char *v14; // ST10_4@16 | 55 const char *v14; // ST10_4@16 |
56 __int16 v15; // ax@16 | 56 //__int16 v15; // ax@16 |
57 const char *v16; // ST0C_4@16 | 57 const char *v16; // ST0C_4@16 |
58 unsigned __int8 v17; // al@16 | 58 unsigned __int8 v17; // al@16 |
59 const char *v18; // ST08_4@16 | 59 const char *v18; // ST08_4@16 |
60 unsigned __int8 v19; // al@16 | 60 unsigned __int8 v19; // al@16 |
61 const char *v20; // ST04_4@16 | 61 const char *v20; // ST04_4@16 |
118 memcpy(&v42, frame_table_txt_parser(&Buf, &v38), sizeof(v42)); | 118 memcpy(&v42, frame_table_txt_parser(&Buf, &v38), sizeof(v42)); |
119 if ( v42.uPropCount && *v42.pProperties[0] != 47 && v42.uPropCount >= 3 ) | 119 if ( v42.uPropCount && *v42.pProperties[0] != 47 && v42.uPropCount >= 3 ) |
120 { | 120 { |
121 strcpy(v2->pDecorations[v2->uNumDecorations].pName, v42.pProperties[1]); | 121 strcpy(v2->pDecorations[v2->uNumDecorations].pName, v42.pProperties[1]); |
122 v8 = pSpriteFrameTable->FastFindSprite(v2->pDecorations[v2->uNumDecorations].pName); | 122 v8 = pSpriteFrameTable->FastFindSprite(v2->pDecorations[v2->uNumDecorations].pName); |
123 v9 = v42.pProperties[2]; | 123 //v9 = v42.pProperties[2]; |
124 v2->pDecorations[v2->uNumDecorations].uSpriteID = v8; | 124 v2->pDecorations[v2->uNumDecorations].uSpriteID = v8; |
125 strcpy(v2->pDecorations[v2->uNumDecorations].field_20, v9); | 125 strcpy(v2->pDecorations[v2->uNumDecorations].field_20, v42.pProperties[2]); |
126 v10 = v42.pProperties[3]; | 126 //v10 = v42.pProperties[3]; |
127 v2->pDecorations[v2->uNumDecorations].uType = 0; | 127 v2->pDecorations[v2->uNumDecorations].uType = 0; |
128 v11 = atoi(v10); | 128 //v11 = atoi(v42.pProperties[3]); |
129 v12 = v42.pProperties[4]; | 129 //v12 = v42.pProperties[4]; |
130 v2->pDecorations[v2->uNumDecorations].uRadius = v11; | 130 v2->pDecorations[v2->uNumDecorations].uRadius = atoi(v42.pProperties[3]); |
131 v13 = atoi(v12); | 131 //v13 = atoi(v42.pProperties[4]); |
132 v14 = v42.pProperties[5]; | 132 //v14 = v42.pProperties[5]; |
133 v2->pDecorations[v2->uNumDecorations].uDecorationHeight = v13; | 133 v2->pDecorations[v2->uNumDecorations].uDecorationHeight = atoi(v42.pProperties[4]); |
134 v15 = atoi(v14); | 134 //v15 = atoi(v42.pProperties[5]); |
135 v16 = v42.pProperties[6]; | 135 //v16 = v42.pProperties[6]; |
136 v2->pDecorations[v2->uNumDecorations].uLightRadius = v15; | 136 v2->pDecorations[v2->uNumDecorations].uLightRadius = atoi(v42.pProperties[5]); |
137 v17 = atoi(v16); | 137 //v17 = atoi(v42.pProperties[6]); |
138 v18 = v42.pProperties[7]; | 138 //v18 = v42.pProperties[7]; |
139 v2->pDecorations[v2->uNumDecorations].uColoredLightRed = v17; | 139 v2->pDecorations[v2->uNumDecorations].uColoredLightRed = atoi(v42.pProperties[6]); |
140 v19 = atoi(v18); | 140 //v19 = atoi(v42.pProperties[7]); |
141 v20 = v42.pProperties[8]; | 141 //v20 = v42.pProperties[8]; |
142 v2->pDecorations[v2->uNumDecorations].uColoredLightGreen = v19; | 142 v2->pDecorations[v2->uNumDecorations].uColoredLightGreen = atoi(v42.pProperties[7]); |
143 v21 = atoi(v20); | 143 //v21 = atoi(v42.pProperties[8]); |
144 v22 = v42.pProperties[9]; | 144 //v22 = v42.pProperties[9]; |
145 v2->pDecorations[v2->uNumDecorations].uColoredLightBlue = v21; | 145 v2->pDecorations[v2->uNumDecorations].uColoredLightBlue = atoi(v42.pProperties[8]); |
146 v2->pDecorations[v2->uNumDecorations].uSoundID = atoi(v22); | 146 v2->pDecorations[v2->uNumDecorations].uSoundID = atoi(v42.pProperties[9]); |
147 v25 = __OFSUB__(v42.uPropCount, 10); | 147 v25 = __OFSUB__(v42.uPropCount, 10); |
148 v23 = v42.uPropCount == 10; | 148 v23 = v42.uPropCount == 10; |
149 v24 = v42.uPropCount - 10 < 0; | 149 v24 = v42.uPropCount - 10 < 0; |
150 v2->pDecorations[v2->uNumDecorations].uFlags = 0; | 150 v2->pDecorations[v2->uNumDecorations].uFlags = 0; |
151 if ( !((unsigned __int8)(v24 ^ v25) | v23) ) | 151 if ( !((unsigned __int8)(v24 ^ v25) | v23) ) |