annotate Texture.cpp @ 2444:c59a8fddb5e8

Слияние
author Ritor1
date Wed, 23 Jul 2014 17:36:56 +0600
parents f4af3b203f65
children 0f17a30149ec
rev   line source
2415
f4af3b203f65 LOD.cpp cleaned and search memory corrupt
Ritor1
parents: 2378
diff changeset
1 #define _CRTDBG_MAP_ALLOC
f4af3b203f65 LOD.cpp cleaned and search memory corrupt
Ritor1
parents: 2378
diff changeset
2 #include <stdlib.h>
f4af3b203f65 LOD.cpp cleaned and search memory corrupt
Ritor1
parents: 2378
diff changeset
3 #include <crtdbg.h>
f4af3b203f65 LOD.cpp cleaned and search memory corrupt
Ritor1
parents: 2378
diff changeset
4
2253
aff7a7b072b7 adding _CRT_SECURE_NO_WARNINGS to get rid of a few hundrer annoying warnings + adding count parameter to swprintf
Grumpy7
parents: 2153
diff changeset
5 #define _CRT_SECURE_NO_WARNINGS
0
Ritor1
parents:
diff changeset
6 #include <stdlib.h>
Ritor1
parents:
diff changeset
7
Ritor1
parents:
diff changeset
8 #include "Texture.h"
Ritor1
parents:
diff changeset
9 #include "FrameTableInc.h"
Ritor1
parents:
diff changeset
10 #include "LOD.h"
Ritor1
parents:
diff changeset
11 #include "PaletteManager.h"
Ritor1
parents:
diff changeset
12 #include "Render.h"
2336
d6887ee81068 header file include cleanup
Grumpy7
parents: 2335
diff changeset
13 #include "ErrorHandling.h"
2352
8a49cf25fb88 Moving zlib wrappers to separate headers
Grumpy7
parents: 2336
diff changeset
14 #include "ZlibWrapper.h"
0
Ritor1
parents:
diff changeset
15
Ritor1
parents:
diff changeset
16 #include "mm7_data.h"
Ritor1
parents:
diff changeset
17
Ritor1
parents:
diff changeset
18
Ritor1
parents:
diff changeset
19
Ritor1
parents:
diff changeset
20
Ritor1
parents:
diff changeset
21
Ritor1
parents:
diff changeset
22
Ritor1
parents:
diff changeset
23
Ritor1
parents:
diff changeset
24
Ritor1
parents:
diff changeset
25
Ritor1
parents:
diff changeset
26
Ritor1
parents:
diff changeset
27 struct TextureFrameTable *pTextureFrameTable;
Ritor1
parents:
diff changeset
28
Ritor1
parents:
diff changeset
29
Ritor1
parents:
diff changeset
30
Ritor1
parents:
diff changeset
31
Ritor1
parents:
diff changeset
32
1207
96a81634669e arrays to std::arrays phase 3 - finishing global arrays
Grumpy7
parents: 1205
diff changeset
33 std::array<Texture *, 2> pTexture_LloydBeacons;
0
Ritor1
parents:
diff changeset
34 Texture *pTexture_50635C;
1453
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1409
diff changeset
35 Texture *pTex_book_button8_off;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1409
diff changeset
36 Texture *pTex_book_button8_on;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1409
diff changeset
37 Texture *pTex_book_button7_off;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1409
diff changeset
38 Texture *pTex_book_button7_on;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1409
diff changeset
39 Texture *pTex_book_button6_off;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1409
diff changeset
40 Texture *pTex_book_button6_on;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1409
diff changeset
41 Texture *pTex_book_button5_off;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1409
diff changeset
42 Texture *pTex_book_button5_on;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1409
diff changeset
43 Texture *pTex_book_button4_off;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1409
diff changeset
44 Texture *pTex_book_button4_on;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1409
diff changeset
45 Texture *pTex_book_button3_off;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1409
diff changeset
46 Texture *pTex_book_button3_on;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1409
diff changeset
47 Texture *pTex_book_button2_off;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1409
diff changeset
48 Texture *pTex_book_button1_off;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1409
diff changeset
49 Texture *pTex_book_button2_on;
dfc9484ed94c GetDayPart and Journal_Draw
Ritor1
parents: 1409
diff changeset
50 Texture *pTex_book_button1_on;
1207
96a81634669e arrays to std::arrays phase 3 - finishing global arrays
Grumpy7
parents: 1205
diff changeset
51 std::array<Texture *, 6> pTexture_TownPortalIcons; // [0]Harmonale, [1]Pierpont, [2]Nighon, [3]Evenmorn Island, [4]Celestia, [5]The Pit
1402
a519a6a412d0 CloseSpellBook and close SpellBookPage
Ritor1
parents: 1306
diff changeset
52 std::array<Texture *, 12> SBPageCSpellsTextureList;
a519a6a412d0 CloseSpellBook and close SpellBookPage
Ritor1
parents: 1306
diff changeset
53 std::array<Texture *, 12> SBPageSSpellsTextureList;
a519a6a412d0 CloseSpellBook and close SpellBookPage
Ritor1
parents: 1306
diff changeset
54 Texture *pSBQuickSpellBtnTextr;
a519a6a412d0 CloseSpellBook and close SpellBookPage
Ritor1
parents: 1306
diff changeset
55 Texture *pSpellBookClickCloseBtnTextr;
a519a6a412d0 CloseSpellBook and close SpellBookPage
Ritor1
parents: 1306
diff changeset
56 Texture *pSBClickQuickSpellBtnTextr;
a519a6a412d0 CloseSpellBook and close SpellBookPage
Ritor1
parents: 1306
diff changeset
57 Texture *pSpellBookCloseBtnTextr;
1207
96a81634669e arrays to std::arrays phase 3 - finishing global arrays
Grumpy7
parents: 1205
diff changeset
58 std::array<std::array<Texture *, 2>, 9> pTextures_tabs;
0
Ritor1
parents:
diff changeset
59 Texture *pTexture_mapbordr; // idb
Ritor1
parents:
diff changeset
60 Texture *pTexture_pagemask; // idb
1207
96a81634669e arrays to std::arrays phase 3 - finishing global arrays
Grumpy7
parents: 1205
diff changeset
61 std::array<Texture *, 9> pSpellBookPagesTextr;
688
c0bfb386b15f some ui cleanup
Gloval
parents: 369
diff changeset
62 Texture *pSpellBookPagesTextr_9;
c0bfb386b15f some ui cleanup
Gloval
parents: 369
diff changeset
63 Texture *pSpellBookPagesTextr_10;
c0bfb386b15f some ui cleanup
Gloval
parents: 369
diff changeset
64 Texture *pSpellBookPagesTextr_11;
c0bfb386b15f some ui cleanup
Gloval
parents: 369
diff changeset
65 Texture *pSpellBookPagesTextr_12;
c0bfb386b15f some ui cleanup
Gloval
parents: 369
diff changeset
66 Texture *pSpellBookPagesTextr_13;
0
Ritor1
parents:
diff changeset
67 Texture *pTexture_AutonotesBook;
Ritor1
parents:
diff changeset
68 Texture *pTexture_CurrentBook;
Ritor1
parents:
diff changeset
69 Texture *pTex_moon_new;
Ritor1
parents:
diff changeset
70 Texture *pTex_moon_4;
Ritor1
parents:
diff changeset
71 Texture *pTex_moon_2;
Ritor1
parents:
diff changeset
72 Texture *pTex_moon_2_2;
Ritor1
parents:
diff changeset
73 Texture *pTex_moon_ful;
Ritor1
parents:
diff changeset
74
Ritor1
parents:
diff changeset
75
Ritor1
parents:
diff changeset
76
Ritor1
parents:
diff changeset
77 RGBTexture stru_506E40; // weak
Ritor1
parents:
diff changeset
78 RGBTexture pTexture_PCX;
Ritor1
parents:
diff changeset
79
Ritor1
parents:
diff changeset
80
Ritor1
parents:
diff changeset
81 int uTextureID_RestUI_restb4; // weak
Ritor1
parents:
diff changeset
82 int uTextureID_RestUI_restexit; // weak
Ritor1
parents:
diff changeset
83 int uTextureID_RestUI_restb3; // weak
Ritor1
parents:
diff changeset
84 int uTextureID_RestUI_restb1; // weak
Ritor1
parents:
diff changeset
85 int uTextureID_RestUI_restb2; // weak
Ritor1
parents:
diff changeset
86 int uTextureID_RestUI_restmain; // weak
Ritor1
parents:
diff changeset
87 unsigned int uTextureID_Leather;
Ritor1
parents:
diff changeset
88 int uTextureID_ar_dn_dn; // weak
Ritor1
parents:
diff changeset
89 int uTextureID_ar_dn_up; // weak
Ritor1
parents:
diff changeset
90 int uTextureID_ar_up_dn; // weak
Ritor1
parents:
diff changeset
91 int uTextureID_ar_up_up; // weak
Ritor1
parents:
diff changeset
92
Ritor1
parents:
diff changeset
93
Ritor1
parents:
diff changeset
94 int uTextureID_507698; // weak
Ritor1
parents:
diff changeset
95 int uTextureID_50769C; // weak
Ritor1
parents:
diff changeset
96 int uTextureID_5076A0; // weak
Ritor1
parents:
diff changeset
97 int uTextureID_5076A4; // weak
Ritor1
parents:
diff changeset
98 int uTextureID_5076A8; // weak
Ritor1
parents:
diff changeset
99 int uTextureID_5076AC; // weak
Ritor1
parents:
diff changeset
100 int uTextureID_5076B0; // weak
Ritor1
parents:
diff changeset
101 int uTextureID_5076B4; // weak
Ritor1
parents:
diff changeset
102 int uTextureID_Parchment; // weak
Ritor1
parents:
diff changeset
103 unsigned int uTextureID_mhp_yel;
Ritor1
parents:
diff changeset
104 unsigned int uTextureID_mhp_red;
Ritor1
parents:
diff changeset
105 unsigned int uTextureID_mhp_grn;
Ritor1
parents:
diff changeset
106 unsigned int uTextureID_mhp_capr;
Ritor1
parents:
diff changeset
107 unsigned int uTextureID_mhp_capl;
Ritor1
parents:
diff changeset
108 unsigned int uTextureID_mhp_bd;
Ritor1
parents:
diff changeset
109 unsigned int uTextureID_BUTTDESC2;
Ritor1
parents:
diff changeset
110 unsigned int uTextureID_x_x_u;
Ritor1
parents:
diff changeset
111 unsigned int uTextureID_BUTTMAKE2;
Ritor1
parents:
diff changeset
112 unsigned int uTextureID_BUTTMAKE;
Ritor1
parents:
diff changeset
113 unsigned int uTextureID_BUTTYES2;
Ritor1
parents:
diff changeset
114 unsigned int uTextureID_x_ok_u;
1207
96a81634669e arrays to std::arrays phase 3 - finishing global arrays
Grumpy7
parents: 1205
diff changeset
115 std::array<Texture *, 22> pPlayerPortraits;
96a81634669e arrays to std::arrays phase 3 - finishing global arrays
Grumpy7
parents: 1205
diff changeset
116 std::array<Texture *, 9> pTexture_IC_KNIGHT;
0
Ritor1
parents:
diff changeset
117 Texture *pTexture_MAKESKY;
Ritor1
parents:
diff changeset
118 Texture *pTexture_MAKETOP;
1207
96a81634669e arrays to std::arrays phase 3 - finishing global arrays
Grumpy7
parents: 1205
diff changeset
119 std::array<Texture *, 20> pTextures_arrowr;
96a81634669e arrays to std::arrays phase 3 - finishing global arrays
Grumpy7
parents: 1205
diff changeset
120 std::array<Texture *, 20> pTextures_arrowl;
0
Ritor1
parents:
diff changeset
121 Texture *pTexture_presleft;
Ritor1
parents:
diff changeset
122 Texture *pTexture_pressrigh;
Ritor1
parents:
diff changeset
123 Texture *pTexture_buttminu;
Ritor1
parents:
diff changeset
124 Texture *pTexture_buttplus;
362
38bfbee60146 Menu options
Ritor1
parents: 319
diff changeset
125 unsigned int uTextureID_Quit1; // weak
38bfbee60146 Menu options
Ritor1
parents: 319
diff changeset
126 unsigned int uTextureID_Resume1; // weak
38bfbee60146 Menu options
Ritor1
parents: 319
diff changeset
127 unsigned int uTextureID_Controls1; // weak
38bfbee60146 Menu options
Ritor1
parents: 319
diff changeset
128 unsigned int uTextureID_Save1; // weak
38bfbee60146 Menu options
Ritor1
parents: 319
diff changeset
129 unsigned int uTextureID_Load1; // weak
38bfbee60146 Menu options
Ritor1
parents: 319
diff changeset
130 unsigned int uTextureID_New1; // weak
38bfbee60146 Menu options
Ritor1
parents: 319
diff changeset
131 unsigned int uTextureID_Options; // weak
0
Ritor1
parents:
diff changeset
132
Ritor1
parents:
diff changeset
133
Ritor1
parents:
diff changeset
134 unsigned int uTextureID_ib_td5_A;
1667
c586fa9e4cbb MainMenuUI_Credits_Loop() cleaning(continue)
Ritor1
parents: 1632
diff changeset
135 unsigned int uTextureID_ib_td4_A;
c586fa9e4cbb MainMenuUI_Credits_Loop() cleaning(continue)
Ritor1
parents: 1632
diff changeset
136 unsigned int uTextureID_ib_td3_A;
c586fa9e4cbb MainMenuUI_Credits_Loop() cleaning(continue)
Ritor1
parents: 1632
diff changeset
137 unsigned int uTextureID_ib_td2_A;
0
Ritor1
parents:
diff changeset
138 unsigned int uTextureID_ib_td1_A;
984
d982fffb8b96 CharacterUI_InventoryTab_Draw cleaned.
Nomad
parents: 973
diff changeset
139 int uTextureID_CharacterUI_InventoryBackground; // weak
0
Ritor1
parents:
diff changeset
140 int uTextureID_50795C; // weak
Ritor1
parents:
diff changeset
141
Ritor1
parents:
diff changeset
142
319
5a66be213cff Actor::Die
Nomad
parents: 135
diff changeset
143 unsigned int uTextureID_Btn_GameSettings;
0
Ritor1
parents:
diff changeset
144
Ritor1
parents:
diff changeset
145
319
5a66be213cff Actor::Die
Nomad
parents: 135
diff changeset
146 unsigned int uTextureID_Btn_Rest;
5a66be213cff Actor::Die
Nomad
parents: 135
diff changeset
147 unsigned int uTextureID_Btn_CastSpell;
5a66be213cff Actor::Die
Nomad
parents: 135
diff changeset
148 unsigned int uTextureID_Btn_ZoomIn;
5a66be213cff Actor::Die
Nomad
parents: 135
diff changeset
149 unsigned int uTextureID_Btn_ZoomOut;
0
Ritor1
parents:
diff changeset
150 unsigned int uTextureID_FONTPAL;
319
5a66be213cff Actor::Die
Nomad
parents: 135
diff changeset
151 unsigned int uTextureID_Btn_NPCRight;
5a66be213cff Actor::Die
Nomad
parents: 135
diff changeset
152 unsigned int uTextureID_Btn_NPCLeft;
1207
96a81634669e arrays to std::arrays phase 3 - finishing global arrays
Grumpy7
parents: 1205
diff changeset
153 std::array<unsigned int, 8> pTextureIDs_pMapDirs;
0
Ritor1
parents:
diff changeset
154
Ritor1
parents:
diff changeset
155
Ritor1
parents:
diff changeset
156 unsigned int uTextureID_BarRed;
Ritor1
parents:
diff changeset
157 unsigned int uTextureID_BarYellow;
Ritor1
parents:
diff changeset
158 unsigned int uTextureID_BarGreen;
Ritor1
parents:
diff changeset
159 unsigned int uTextureID_BarBlue;
Ritor1
parents:
diff changeset
160
Ritor1
parents:
diff changeset
161
Ritor1
parents:
diff changeset
162 unsigned int uTextureID_right_panel; // weak
Ritor1
parents:
diff changeset
163
Ritor1
parents:
diff changeset
164
Ritor1
parents:
diff changeset
165 RGBTexture *pTexture_StatusBar = new RGBTexture;
Ritor1
parents:
diff changeset
166 RGBTexture *pTexture_LeftFrame = new RGBTexture;
Ritor1
parents:
diff changeset
167 RGBTexture *pTexture_TopFrame = new RGBTexture;
Ritor1
parents:
diff changeset
168 RGBTexture *pTexture_BottomFrame = new RGBTexture;
Ritor1
parents:
diff changeset
169 RGBTexture *pTexture_RightFrame = new RGBTexture;
Ritor1
parents:
diff changeset
170
Ritor1
parents:
diff changeset
171
910
Ritor1
parents: 712
diff changeset
172 unsigned int uTextureID_right_panel_loop;
0
Ritor1
parents:
diff changeset
173
Ritor1
parents:
diff changeset
174
Ritor1
parents:
diff changeset
175 Texture *pTexture_Leather;
Ritor1
parents:
diff changeset
176 Texture *pTexture_RestUI_CurrentSkyFrame; // idb
Ritor1
parents:
diff changeset
177 Texture *pTexture_RestUI_CurrentHourglassFrame; // idb
Ritor1
parents:
diff changeset
178
Ritor1
parents:
diff changeset
179
1207
96a81634669e arrays to std::arrays phase 3 - finishing global arrays
Grumpy7
parents: 1205
diff changeset
180 std::array<unsigned int, 5> uTextureID_Optkb;
0
Ritor1
parents:
diff changeset
181
1676
483cc7f0d86c GameMenuUI_DrawKeyBindings() and GameMenuUI_DrawVideoOptions() cleared
Ritor1
parents: 1667
diff changeset
182 unsigned int optvid_base_texture_id;
1677
a699ecd7aeb3 PlayerCreationUI_Draw()
Ritor1
parents: 1676
diff changeset
183 unsigned int bloodsplats_texture_id;
a699ecd7aeb3 PlayerCreationUI_Draw()
Ritor1
parents: 1676
diff changeset
184 unsigned int us_colored_lights_texture_id;
a699ecd7aeb3 PlayerCreationUI_Draw()
Ritor1
parents: 1676
diff changeset
185 unsigned int tinting_texture_id;
0
Ritor1
parents:
diff changeset
186 unsigned int uTextureID_507C20; // weak
Ritor1
parents:
diff changeset
187 unsigned int uTextureID_507C24; // weak
1207
96a81634669e arrays to std::arrays phase 3 - finishing global arrays
Grumpy7
parents: 1205
diff changeset
188 std::array<unsigned int, 10> pTextureIDs_GammaPositions;
1677
a699ecd7aeb3 PlayerCreationUI_Draw()
Ritor1
parents: 1676
diff changeset
189 unsigned int not_available_bloodsplats_texture_id;
a699ecd7aeb3 PlayerCreationUI_Draw()
Ritor1
parents: 1676
diff changeset
190 unsigned int not_available_us_colored_lights_texture_id;
a699ecd7aeb3 PlayerCreationUI_Draw()
Ritor1
parents: 1676
diff changeset
191 unsigned int not_available_tinting_texture_id;
0
Ritor1
parents:
diff changeset
192
Ritor1
parents:
diff changeset
193
910
Ritor1
parents: 712
diff changeset
194 unsigned int uTextureID_detaliz_close_button; // weak
0
Ritor1
parents:
diff changeset
195 unsigned int uTextureID_MAGNIF_B; // weak
Ritor1
parents:
diff changeset
196 unsigned int uTextureID_BACKDOLL; // weak
Ritor1
parents:
diff changeset
197 unsigned int uTextureID_BACKHAND; // weak
Ritor1
parents:
diff changeset
198
1262
0aeac0b9ca30 included header cleanup
Grumpy7
parents: 1207
diff changeset
199 stru355 stru_4E82A4 = {0x20, 0x41, 0, 0x20, 0xFF0000, 0xFF00, 0xFF, 0xFF000000};
0aeac0b9ca30 included header cleanup
Grumpy7
parents: 1207
diff changeset
200 stru355 stru_4EFCBC = {0x20, 0x41, 0, 0x10, 0x7C00, 0x3E0, 0x1F, 0x8000};
0
Ritor1
parents:
diff changeset
201
Ritor1
parents:
diff changeset
202 Texture pTex_F7CE30;
Ritor1
parents:
diff changeset
203
Ritor1
parents:
diff changeset
204
Ritor1
parents:
diff changeset
205 RGBTexture stru_5773C4; // idb
Ritor1
parents:
diff changeset
206
Ritor1
parents:
diff changeset
207
Ritor1
parents:
diff changeset
208
Ritor1
parents:
diff changeset
209
Ritor1
parents:
diff changeset
210
Ritor1
parents:
diff changeset
211
Ritor1
parents:
diff changeset
212
Ritor1
parents:
diff changeset
213
Ritor1
parents:
diff changeset
214
Ritor1
parents:
diff changeset
215
Ritor1
parents:
diff changeset
216
Ritor1
parents:
diff changeset
217 /* 245 */
Ritor1
parents:
diff changeset
218 #pragma pack(push, 1)
Ritor1
parents:
diff changeset
219 struct PCXHeader1
Ritor1
parents:
diff changeset
220 {
Ritor1
parents:
diff changeset
221 char magic;
Ritor1
parents:
diff changeset
222 char version;
Ritor1
parents:
diff changeset
223 char encoding;
Ritor1
parents:
diff changeset
224 char bpp;
Ritor1
parents:
diff changeset
225 __int16 left;
Ritor1
parents:
diff changeset
226 __int16 up;
Ritor1
parents:
diff changeset
227 __int16 right;
Ritor1
parents:
diff changeset
228 __int16 bottom;
Ritor1
parents:
diff changeset
229 __int16 hres;
Ritor1
parents:
diff changeset
230 __int16 vres;
Ritor1
parents:
diff changeset
231 };
Ritor1
parents:
diff changeset
232 #pragma pack(pop)
Ritor1
parents:
diff changeset
233
Ritor1
parents:
diff changeset
234 /* 246 */
Ritor1
parents:
diff changeset
235 #pragma pack(push, 1)
Ritor1
parents:
diff changeset
236 struct PCXHeader2
Ritor1
parents:
diff changeset
237 {
Ritor1
parents:
diff changeset
238 char reserved;
Ritor1
parents:
diff changeset
239 char planes;
Ritor1
parents:
diff changeset
240 __int16 pitch;
Ritor1
parents:
diff changeset
241 __int16 palette_info;
Ritor1
parents:
diff changeset
242 };
Ritor1
parents:
diff changeset
243 #pragma pack(pop)
Ritor1
parents:
diff changeset
244
Ritor1
parents:
diff changeset
245
Ritor1
parents:
diff changeset
246
Ritor1
parents:
diff changeset
247
Ritor1
parents:
diff changeset
248
Ritor1
parents:
diff changeset
249
Ritor1
parents:
diff changeset
250
Ritor1
parents:
diff changeset
251
Ritor1
parents:
diff changeset
252
Ritor1
parents:
diff changeset
253 //----- (0044E054) --------------------------------------------------------
Ritor1
parents:
diff changeset
254 void TextureFrameTable::ToFile()
Ritor1
parents:
diff changeset
255 {
Ritor1
parents:
diff changeset
256 TextureFrameTable *v1; // esi@1
Ritor1
parents:
diff changeset
257 FILE *v2; // eax@1
Ritor1
parents:
diff changeset
258 FILE *v3; // edi@1
Ritor1
parents:
diff changeset
259
Ritor1
parents:
diff changeset
260 v1 = this;
Ritor1
parents:
diff changeset
261 v2 = fopen("data\\dtft.bin", "wb");
Ritor1
parents:
diff changeset
262 v3 = v2;
Ritor1
parents:
diff changeset
263 if ( !v2 )
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1477
diff changeset
264 Error("Unable to save dtft.bin!");
0
Ritor1
parents:
diff changeset
265 fwrite(v1, 4u, 1u, v2);
711
a5e587c8e30e some cleaning
Gloval
parents: 688
diff changeset
266 fwrite(v1->pTextures, 0x14u, v1->sNumTextures, v3);
0
Ritor1
parents:
diff changeset
267 fclose(v3);
Ritor1
parents:
diff changeset
268 }
Ritor1
parents:
diff changeset
269
Ritor1
parents:
diff changeset
270 //----- (0044E0A0) --------------------------------------------------------
1477
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1453
diff changeset
271 void TextureFrameTable::FromFile(void *data_mm6, void *data_mm7, void *data_mm8)
0
Ritor1
parents:
diff changeset
272 {
1477
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1453
diff changeset
273 uint num_mm6_frames = data_mm6 ? *(int *)data_mm6 : 0,
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1453
diff changeset
274 num_mm7_frames = data_mm7 ? *(int *)data_mm7 : 0,
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1453
diff changeset
275 num_mm8_frames = data_mm8 ? *(int *)data_mm8 : 0;
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1453
diff changeset
276
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1453
diff changeset
277 sNumTextures = num_mm6_frames + num_mm7_frames + num_mm8_frames;
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1477
diff changeset
278 Assert(sNumTextures);
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1477
diff changeset
279 Assert(!num_mm8_frames);
1477
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1453
diff changeset
280
1583
75fafd8ced59 Allocator (CMemory) bye-bye
Nomad
parents: 1545
diff changeset
281 pTextures = (TextureFrame *)malloc(sNumTextures * sizeof(TextureFrame));
1477
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1453
diff changeset
282
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1453
diff changeset
283 memcpy(pTextures, (char *)data_mm7 + 4, num_mm7_frames * sizeof(TextureFrame));
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1453
diff changeset
284 memcpy(pTextures + num_mm7_frames, (char *)data_mm6 + 4, num_mm6_frames * sizeof(TextureFrame));
7ef4b64f6329 * LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Nomad
parents: 1453
diff changeset
285 memcpy(pTextures + num_mm6_frames + num_mm7_frames, (char *)data_mm8 + 4, num_mm8_frames * sizeof(TextureFrame));
0
Ritor1
parents:
diff changeset
286 }
Ritor1
parents:
diff changeset
287
Ritor1
parents:
diff changeset
288 //----- (0044E0ED) --------------------------------------------------------
711
a5e587c8e30e some cleaning
Gloval
parents: 688
diff changeset
289 void TextureFrameTable::LoadAnimationSequenceAndPalettes( signed int uIconID )
2378
48dbf99c0f7f spawn_light_elemental cleaned
Ritor1
parents: 2369
diff changeset
290 {
48dbf99c0f7f spawn_light_elemental cleaned
Ritor1
parents: 2369
diff changeset
291 //TextureFrameTable *v3; // ebx@1
0
Ritor1
parents:
diff changeset
292 unsigned int i; // edi@3
Ritor1
parents:
diff changeset
293
2378
48dbf99c0f7f spawn_light_elemental cleaned
Ritor1
parents: 2369
diff changeset
294 //v3 = this;
711
a5e587c8e30e some cleaning
Gloval
parents: 688
diff changeset
295 if ( (uIconID <= this->sNumTextures) && uIconID >= 0 )
0
Ritor1
parents:
diff changeset
296 {
Ritor1
parents:
diff changeset
297 for ( i = uIconID; ; ++i )
Ritor1
parents:
diff changeset
298 {
2378
48dbf99c0f7f spawn_light_elemental cleaned
Ritor1
parents: 2369
diff changeset
299 this->pTextures[i].uTextureID = pBitmaps_LOD->LoadTexture(this->pTextures[i].pTextureName, TEXTURE_DEFAULT);
973
ec7568e13b24 Minor code cleaning.
Nomad
parents: 948
diff changeset
300
2378
48dbf99c0f7f spawn_light_elemental cleaned
Ritor1
parents: 2369
diff changeset
301 if (this->pTextures[i].uTextureID != -1)
48dbf99c0f7f spawn_light_elemental cleaned
Ritor1
parents: 2369
diff changeset
302 pBitmaps_LOD->pTextures[this->pTextures[i].uTextureID].palette_id2 = pPaletteManager->LoadPalette(pBitmaps_LOD->pTextures[this->pTextures[i].uTextureID].palette_id1);
711
a5e587c8e30e some cleaning
Gloval
parents: 688
diff changeset
303 //result = (unsigned int)v3->pTextures;
a5e587c8e30e some cleaning
Gloval
parents: 688
diff changeset
304 //if ( !(*(char *)(result + i * 20 + 18) & 1) )
2378
48dbf99c0f7f spawn_light_elemental cleaned
Ritor1
parents: 2369
diff changeset
305 if( this->pTextures[i].uFlags & 1)
0
Ritor1
parents:
diff changeset
306 break;
Ritor1
parents:
diff changeset
307 }
Ritor1
parents:
diff changeset
308 }
711
a5e587c8e30e some cleaning
Gloval
parents: 688
diff changeset
309 return;
0
Ritor1
parents:
diff changeset
310 }
Ritor1
parents:
diff changeset
311
Ritor1
parents:
diff changeset
312 //----- (0044E163) --------------------------------------------------------
Ritor1
parents:
diff changeset
313 unsigned int TextureFrameTable::FindTextureByName(const char *Str2)
Ritor1
parents:
diff changeset
314 {
Ritor1
parents:
diff changeset
315 TextureFrameTable *v2; // esi@1
Ritor1
parents:
diff changeset
316 int v3; // ebx@1
Ritor1
parents:
diff changeset
317 unsigned int uID; // edi@1
Ritor1
parents:
diff changeset
318 unsigned int result; // eax@4
Ritor1
parents:
diff changeset
319
Ritor1
parents:
diff changeset
320 v2 = this;
Ritor1
parents:
diff changeset
321 v3 = 0;
Ritor1
parents:
diff changeset
322 uID = 0;
711
a5e587c8e30e some cleaning
Gloval
parents: 688
diff changeset
323 if ( (signed int)this->sNumTextures <= 0 )
0
Ritor1
parents:
diff changeset
324 {
Ritor1
parents:
diff changeset
325 LABEL_4:
Ritor1
parents:
diff changeset
326 result = -1;
Ritor1
parents:
diff changeset
327 }
Ritor1
parents:
diff changeset
328 else
Ritor1
parents:
diff changeset
329 {
1104
5d5c78088274 strcmpi to stricmp conversion
Grumpy7
parents: 1093
diff changeset
330 while ( _stricmp(v2->pTextures[v3].pTextureName, Str2) )
0
Ritor1
parents:
diff changeset
331 {
Ritor1
parents:
diff changeset
332 ++uID;
Ritor1
parents:
diff changeset
333 ++v3;
711
a5e587c8e30e some cleaning
Gloval
parents: 688
diff changeset
334 if ( (signed int)uID >= (signed int)v2->sNumTextures )
0
Ritor1
parents:
diff changeset
335 goto LABEL_4;
Ritor1
parents:
diff changeset
336 }
Ritor1
parents:
diff changeset
337 result = uID;
Ritor1
parents:
diff changeset
338 }
Ritor1
parents:
diff changeset
339 return result;
Ritor1
parents:
diff changeset
340 }
Ritor1
parents:
diff changeset
341
Ritor1
parents:
diff changeset
342 //----- (0044E19A) --------------------------------------------------------
1632
69ab7593e7af Out of bounds (id 65536) texture fixed.
Nomad
parents: 1583
diff changeset
343 int TextureFrameTable::GetFrameTexture(int uFrameID, signed int a3)
0
Ritor1
parents:
diff changeset
344 {
Ritor1
parents:
diff changeset
345 int v3; // esi@1
Ritor1
parents:
diff changeset
346 TextureFrame *v4; // edi@1
Ritor1
parents:
diff changeset
347 TextureFrame *v5; // ecx@1
Ritor1
parents:
diff changeset
348 __int16 v6; // dx@2
Ritor1
parents:
diff changeset
349 int v7; // edx@3
Ritor1
parents:
diff changeset
350 char *i; // eax@3
Ritor1
parents:
diff changeset
351 int v9; // ecx@5
Ritor1
parents:
diff changeset
352 unsigned int result; // eax@6
Ritor1
parents:
diff changeset
353
Ritor1
parents:
diff changeset
354 v3 = uFrameID;
Ritor1
parents:
diff changeset
355 v4 = this->pTextures;
Ritor1
parents:
diff changeset
356 v5 = &v4[uFrameID];
Ritor1
parents:
diff changeset
357 if ( v5->uFlags & 1 && (v6 = v5->uAnimLength) != 0 )
Ritor1
parents:
diff changeset
358 {
Ritor1
parents:
diff changeset
359 v7 = (a3 >> 3) % v6;
Ritor1
parents:
diff changeset
360 for ( i = (char *)&v5->uAnimTime; ; i += 20 )
Ritor1
parents:
diff changeset
361 {
Ritor1
parents:
diff changeset
362 v9 = *(short *)i;
Ritor1
parents:
diff changeset
363 if ( v7 <= v9 )
Ritor1
parents:
diff changeset
364 break;
Ritor1
parents:
diff changeset
365 v7 -= v9;
Ritor1
parents:
diff changeset
366 ++v3;
Ritor1
parents:
diff changeset
367 }
Ritor1
parents:
diff changeset
368 result = v4[v3].uTextureID;
Ritor1
parents:
diff changeset
369 }
Ritor1
parents:
diff changeset
370 else
Ritor1
parents:
diff changeset
371 {
Ritor1
parents:
diff changeset
372 result = v5->uTextureID;
Ritor1
parents:
diff changeset
373 }
Ritor1
parents:
diff changeset
374 return result;
Ritor1
parents:
diff changeset
375 }
Ritor1
parents:
diff changeset
376
Ritor1
parents:
diff changeset
377
Ritor1
parents:
diff changeset
378
Ritor1
parents:
diff changeset
379
Ritor1
parents:
diff changeset
380
Ritor1
parents:
diff changeset
381
Ritor1
parents:
diff changeset
382 //----- (0040F806) --------------------------------------------------------
Ritor1
parents:
diff changeset
383 void *Texture::UnzipPalette()
Ritor1
parents:
diff changeset
384 {
Ritor1
parents:
diff changeset
385 Texture *v1; // esi@1
1093
c59ac5ea63f5 * stru154::GetFacePlane mistake fixed
zipi
parents: 984
diff changeset
386
0
Ritor1
parents:
diff changeset
387 void *v2; // edi@1
Ritor1
parents:
diff changeset
388 Texture *pSource; // [sp+0h] [bp-4h]@1
Ritor1
parents:
diff changeset
389
Ritor1
parents:
diff changeset
390 pSource = this;
Ritor1
parents:
diff changeset
391 v1 = this;
Ritor1
parents:
diff changeset
392 v2 = malloc(this->uDecompressedSize);
710
735dab8d3c9a Town portal screen + misc gui const replacements
Nomad
parents: 688
diff changeset
393 zlib::MemUnzip(v2, (unsigned int *)&pSource, v1->pLevelOfDetail0_prolly_alpha_mask, v1->uTextureSize);
0
Ritor1
parents:
diff changeset
394 return v2;
Ritor1
parents:
diff changeset
395 }
Ritor1
parents:
diff changeset
396
Ritor1
parents:
diff changeset
397 //----- (0040F77C) --------------------------------------------------------
Ritor1
parents:
diff changeset
398 void Texture::Release()
Ritor1
parents:
diff changeset
399 {
Ritor1
parents:
diff changeset
400 if (this)
Ritor1
parents:
diff changeset
401 {
Ritor1
parents:
diff changeset
402 pName[0] = 0;
Ritor1
parents:
diff changeset
403
Ritor1
parents:
diff changeset
404 if (pBits & 0x0400)
Ritor1
parents:
diff changeset
405 {
1093
c59ac5ea63f5 * stru154::GetFacePlane mistake fixed
zipi
parents: 984
diff changeset
406 __debugbreak();
c59ac5ea63f5 * stru154::GetFacePlane mistake fixed
zipi
parents: 984
diff changeset
407 }
c59ac5ea63f5 * stru154::GetFacePlane mistake fixed
zipi
parents: 984
diff changeset
408
1583
75fafd8ced59 Allocator (CMemory) bye-bye
Nomad
parents: 1545
diff changeset
409 free(pLevelOfDetail0_prolly_alpha_mask);
75fafd8ced59 Allocator (CMemory) bye-bye
Nomad
parents: 1545
diff changeset
410 free(pPalette16);
75fafd8ced59 Allocator (CMemory) bye-bye
Nomad
parents: 1545
diff changeset
411 free(pPalette24);
1093
c59ac5ea63f5 * stru154::GetFacePlane mistake fixed
zipi
parents: 984
diff changeset
412
0
Ritor1
parents:
diff changeset
413
710
735dab8d3c9a Town portal screen + misc gui const replacements
Nomad
parents: 688
diff changeset
414 pLevelOfDetail0_prolly_alpha_mask = nullptr;
0
Ritor1
parents:
diff changeset
415 pLevelOfDetail1 = nullptr;
Ritor1
parents:
diff changeset
416 pLevelOfDetail2 = nullptr;
Ritor1
parents:
diff changeset
417 pLevelOfDetail3 = nullptr;
Ritor1
parents:
diff changeset
418
Ritor1
parents:
diff changeset
419 pPalette16 = nullptr;
Ritor1
parents:
diff changeset
420 pPalette24 = nullptr;
Ritor1
parents:
diff changeset
421
Ritor1
parents:
diff changeset
422 uSizeOfMaxLevelOfDetail = 0;
Ritor1
parents:
diff changeset
423 uTextureSize = 0;
Ritor1
parents:
diff changeset
424 uTextureHeight = 0;
Ritor1
parents:
diff changeset
425 uTextureWidth = 0;
Ritor1
parents:
diff changeset
426 uHeightLn2 = 0;
Ritor1
parents:
diff changeset
427 uWidthLn2 = 0;
Ritor1
parents:
diff changeset
428 palette_id1 = 0;
Ritor1
parents:
diff changeset
429 palette_id2 = 0;
Ritor1
parents:
diff changeset
430 pBits &= 0xFFFF0000;
Ritor1
parents:
diff changeset
431 }
Ritor1
parents:
diff changeset
432 }
Ritor1
parents:
diff changeset
433
Ritor1
parents:
diff changeset
434 //----- (0040F5F5) --------------------------------------------------------
Ritor1
parents:
diff changeset
435 int RGBTexture::Reload(const char *pContainer)
Ritor1
parents:
diff changeset
436 {
2129
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
437 //RGBTexture *v2; // esi@1
0
Ritor1
parents:
diff changeset
438 FILE *v3; // eax@3
Ritor1
parents:
diff changeset
439 FILE *v4; // edi@3
Ritor1
parents:
diff changeset
440 void *v5; // ebx@7
Ritor1
parents:
diff changeset
441 signed int result; // eax@11
Ritor1
parents:
diff changeset
442 unsigned int v7; // ecx@12
Ritor1
parents:
diff changeset
443 unsigned __int16 *v8; // ST20_4@14
Ritor1
parents:
diff changeset
444 int v9; // eax@14
Ritor1
parents:
diff changeset
445 char color_map[48]; // [sp+8h] [bp-98h]@9
Ritor1
parents:
diff changeset
446 Texture DstBuf; // [sp+38h] [bp-68h]@1
Ritor1
parents:
diff changeset
447 PCXHeader1 header1; // [sp+80h] [bp-20h]@9
Ritor1
parents:
diff changeset
448 PCXHeader2 header2; // [sp+90h] [bp-10h]@9
Ritor1
parents:
diff changeset
449 FILE *File; // [sp+98h] [bp-8h]@3
Ritor1
parents:
diff changeset
450 size_t Count; // [sp+9Ch] [bp-4h]@6
Ritor1
parents:
diff changeset
451 void *uSourceLena; // [sp+A8h] [bp+8h]@7
Ritor1
parents:
diff changeset
452
2129
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
453 // v2 = this;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
454 if ( !this->pPixels )
0
Ritor1
parents:
diff changeset
455 return 2;
Ritor1
parents:
diff changeset
456 v3 = pIcons_LOD->FindContainer(pContainer, 0);
Ritor1
parents:
diff changeset
457 v4 = v3;
Ritor1
parents:
diff changeset
458 File = v3;
Ritor1
parents:
diff changeset
459 if ( !v3 )
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1477
diff changeset
460 Error("Unable to load %s", pContainer);
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1477
diff changeset
461
2129
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
462 fread(&DstBuf, 1, 0x30, v3);
0
Ritor1
parents:
diff changeset
463 Count = DstBuf.uTextureSize;
Ritor1
parents:
diff changeset
464 if ( DstBuf.uDecompressedSize )
Ritor1
parents:
diff changeset
465 {
Ritor1
parents:
diff changeset
466 v5 = malloc(DstBuf.uDecompressedSize);
1583
75fafd8ced59 Allocator (CMemory) bye-bye
Nomad
parents: 1545
diff changeset
467 uSourceLena = malloc(DstBuf.uTextureSize);
2129
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
468 fread(uSourceLena, 1, Count, File);
0
Ritor1
parents:
diff changeset
469 zlib::MemUnzip(v5, &DstBuf.uDecompressedSize, uSourceLena, DstBuf.uTextureSize);
Ritor1
parents:
diff changeset
470 DstBuf.uTextureSize = DstBuf.uDecompressedSize;
1583
75fafd8ced59 Allocator (CMemory) bye-bye
Nomad
parents: 1545
diff changeset
471 free(uSourceLena);
0
Ritor1
parents:
diff changeset
472 }
Ritor1
parents:
diff changeset
473 else
Ritor1
parents:
diff changeset
474 {
Ritor1
parents:
diff changeset
475 v5 = malloc(DstBuf.uTextureSize);
2129
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
476 fread(v5, 1, Count, v4);
0
Ritor1
parents:
diff changeset
477 }
Ritor1
parents:
diff changeset
478 memcpy(&header1, v5, 0x10u);
2129
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
479 memcpy(color_map, (char *)v5 + 16, 0x30);
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
480 memcpy(&header2, (char *)v5 + 64, 6);
0
Ritor1
parents:
diff changeset
481 if ( header1.bpp != 8 )
Ritor1
parents:
diff changeset
482 return 3;
Ritor1
parents:
diff changeset
483 v7 = (signed __int16)(header1.right - header1.left + 1);
2129
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
484 if ( (signed int)(v7 * (signed __int16)(header1.bottom - header1.up + 1)) <= (signed int)this->uNumPixels )
0
Ritor1
parents:
diff changeset
485 {
2129
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
486 this->uWidth = header1.right - header1.left + 1;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
487 v8 = this->pPixels;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
488 v9 = v7 * this->uHeight;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
489 this->uNumPixels = v9;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
490 this->uHeight = v9;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
491 this->DecodePCX((char *)v5, v8, v7);
0
Ritor1
parents:
diff changeset
492 free(v5);
Ritor1
parents:
diff changeset
493 result = 0;
Ritor1
parents:
diff changeset
494 }
Ritor1
parents:
diff changeset
495 else
Ritor1
parents:
diff changeset
496 {
Ritor1
parents:
diff changeset
497 result = -1;
Ritor1
parents:
diff changeset
498 }
Ritor1
parents:
diff changeset
499 return result;
Ritor1
parents:
diff changeset
500 }
Ritor1
parents:
diff changeset
501
Ritor1
parents:
diff changeset
502 //----- (0040F5BE) --------------------------------------------------------
Ritor1
parents:
diff changeset
503 Texture::Texture()
Ritor1
parents:
diff changeset
504 {
Ritor1
parents:
diff changeset
505 pName[0] = 0;
Ritor1
parents:
diff changeset
506 uSizeOfMaxLevelOfDetail = 0;
Ritor1
parents:
diff changeset
507 uTextureSize = 0;
Ritor1
parents:
diff changeset
508 uTextureHeight = 0;
Ritor1
parents:
diff changeset
509 uTextureWidth = 0;
Ritor1
parents:
diff changeset
510 uHeightLn2 = 0;
Ritor1
parents:
diff changeset
511 uWidthLn2 = 0;
Ritor1
parents:
diff changeset
512 palette_id1 = 0;
Ritor1
parents:
diff changeset
513 palette_id2 = 0;
2369
bddcaf5d5db2 removing non-nullptr conditions before frees, chaning 0 and NULL assignmnets to pointers to nullptr assignments
Grumpy7
parents: 2353
diff changeset
514 pLevelOfDetail0_prolly_alpha_mask = nullptr;
bddcaf5d5db2 removing non-nullptr conditions before frees, chaning 0 and NULL assignmnets to pointers to nullptr assignments
Grumpy7
parents: 2353
diff changeset
515 pLevelOfDetail3 = nullptr;
bddcaf5d5db2 removing non-nullptr conditions before frees, chaning 0 and NULL assignmnets to pointers to nullptr assignments
Grumpy7
parents: 2353
diff changeset
516 pLevelOfDetail2 = nullptr;
bddcaf5d5db2 removing non-nullptr conditions before frees, chaning 0 and NULL assignmnets to pointers to nullptr assignments
Grumpy7
parents: 2353
diff changeset
517 pLevelOfDetail1 = nullptr;
bddcaf5d5db2 removing non-nullptr conditions before frees, chaning 0 and NULL assignmnets to pointers to nullptr assignments
Grumpy7
parents: 2353
diff changeset
518 pPalette16 = nullptr;
bddcaf5d5db2 removing non-nullptr conditions before frees, chaning 0 and NULL assignmnets to pointers to nullptr assignments
Grumpy7
parents: 2353
diff changeset
519 pPalette24 = nullptr;
0
Ritor1
parents:
diff changeset
520 }
Ritor1
parents:
diff changeset
521
Ritor1
parents:
diff changeset
522 //----- (0040F414) --------------------------------------------------------
Ritor1
parents:
diff changeset
523 int RGBTexture::Load(const char *pContainer, int mode)
Ritor1
parents:
diff changeset
524 {
2278
0cd17b0d36c2 MMT_MainMenu
Ritor1
parents: 2253
diff changeset
525 FILE *file; // eax@1
0
Ritor1
parents:
diff changeset
526 void *v6; // ebx@5
Ritor1
parents:
diff changeset
527 char color_map[48]; // [sp+Ch] [bp-98h]@7
Ritor1
parents:
diff changeset
528 Texture DstBuf; // [sp+3Ch] [bp-68h]@1
Ritor1
parents:
diff changeset
529 PCXHeader1 header1; // [sp+84h] [bp-20h]@7
Ritor1
parents:
diff changeset
530 PCXHeader2 header2; // [sp+94h] [bp-10h]@7
Ritor1
parents:
diff changeset
531 size_t Count; // [sp+A0h] [bp-4h]@4
Ritor1
parents:
diff changeset
532 char *Str1a; // [sp+ACh] [bp+8h]@5
Ritor1
parents:
diff changeset
533
2278
0cd17b0d36c2 MMT_MainMenu
Ritor1
parents: 2253
diff changeset
534 file = pIcons_LOD->FindContainer(pContainer, 0);
0cd17b0d36c2 MMT_MainMenu
Ritor1
parents: 2253
diff changeset
535 if ( !file )
2279
a01d3cf9ff83 mm7 game sound
Ritor1
parents: 2278
diff changeset
536 Error("Unable to load %s", pContainer);
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1477
diff changeset
537
2278
0cd17b0d36c2 MMT_MainMenu
Ritor1
parents: 2253
diff changeset
538 fread(&DstBuf, 1, 0x30u, file);
0
Ritor1
parents:
diff changeset
539 Count = DstBuf.uTextureSize;
Ritor1
parents:
diff changeset
540 if ( DstBuf.uDecompressedSize )
Ritor1
parents:
diff changeset
541 {
Ritor1
parents:
diff changeset
542 Str1a = (char *)malloc(DstBuf.uDecompressedSize);
1583
75fafd8ced59 Allocator (CMemory) bye-bye
Nomad
parents: 1545
diff changeset
543 v6 = malloc(DstBuf.uTextureSize);
2278
0cd17b0d36c2 MMT_MainMenu
Ritor1
parents: 2253
diff changeset
544 fread(v6, 1, Count, file);
0
Ritor1
parents:
diff changeset
545 zlib::MemUnzip(Str1a, &DstBuf.uDecompressedSize, v6, DstBuf.uTextureSize);
Ritor1
parents:
diff changeset
546 DstBuf.uTextureSize = DstBuf.uDecompressedSize;
1583
75fafd8ced59 Allocator (CMemory) bye-bye
Nomad
parents: 1545
diff changeset
547 free(v6);
0
Ritor1
parents:
diff changeset
548 }
Ritor1
parents:
diff changeset
549 else
Ritor1
parents:
diff changeset
550 {
Ritor1
parents:
diff changeset
551 Str1a = (char *)malloc(DstBuf.uTextureSize);
2278
0cd17b0d36c2 MMT_MainMenu
Ritor1
parents: 2253
diff changeset
552 fread(Str1a, 1, Count, file);
0
Ritor1
parents:
diff changeset
553 }
Ritor1
parents:
diff changeset
554 memcpy(&header1, Str1a, 0x10u);
Ritor1
parents:
diff changeset
555 memcpy(color_map, Str1a + 16, 0x30u);
1835
Ritor1
parents: 1677
diff changeset
556 memcpy(&header2, Str1a + 64, 6);
0
Ritor1
parents:
diff changeset
557 if ( header1.bpp != 8 )
Ritor1
parents:
diff changeset
558 return 3;
1835
Ritor1
parents: 1677
diff changeset
559 this->uWidth = header1.right - header1.left + 1;
Ritor1
parents: 1677
diff changeset
560 this->uHeight = header1.bottom - header1.up + 1;
Ritor1
parents: 1677
diff changeset
561 this->uNumPixels = (signed __int16)this->uWidth * (signed __int16)this->uHeight;
1846
Ritor1
parents: 1835
diff changeset
562 this->pPixels = (unsigned __int16 *)malloc(2 * this->uNumPixels + 4);
1835
Ritor1
parents: 1677
diff changeset
563 if ( this->pPixels )
0
Ritor1
parents:
diff changeset
564 {
Ritor1
parents:
diff changeset
565 if ( mode )
2369
bddcaf5d5db2 removing non-nullptr conditions before frees, chaning 0 and NULL assignmnets to pointers to nullptr assignments
Grumpy7
parents: 2353
diff changeset
566 {
1835
Ritor1
parents: 1677
diff changeset
567 if ( mode != 2 )
Ritor1
parents: 1677
diff changeset
568 {
Ritor1
parents: 1677
diff changeset
569 if ( !this->pPixels )
Ritor1
parents: 1677
diff changeset
570 return 2;
Ritor1
parents: 1677
diff changeset
571 this->DecodePCX(Str1a, this->pPixels, this->uWidth);
Ritor1
parents: 1677
diff changeset
572 free(Str1a);
Ritor1
parents: 1677
diff changeset
573 return 0;
Ritor1
parents: 1677
diff changeset
574 }
Ritor1
parents: 1677
diff changeset
575 this->_allocation_flags |= 1;
Ritor1
parents: 1677
diff changeset
576 this->pPixels = (unsigned __int16 *)malloc(2 * this->uNumPixels + 4);
Ritor1
parents: 1677
diff changeset
577 if ( !this->pPixels )
Ritor1
parents: 1677
diff changeset
578 return 2;
Ritor1
parents: 1677
diff changeset
579 this->DecodePCX(Str1a, this->pPixels, this->uWidth);
Ritor1
parents: 1677
diff changeset
580 free(Str1a);
Ritor1
parents: 1677
diff changeset
581 return 0;
2369
bddcaf5d5db2 removing non-nullptr conditions before frees, chaning 0 and NULL assignmnets to pointers to nullptr assignments
Grumpy7
parents: 2353
diff changeset
582 }
1835
Ritor1
parents: 1677
diff changeset
583 free(this->pPixels);
0
Ritor1
parents:
diff changeset
584 }
Ritor1
parents:
diff changeset
585 if ( !mode )
Ritor1
parents:
diff changeset
586 {
1835
Ritor1
parents: 1677
diff changeset
587 this->pPixels = (unsigned __int16 *)malloc(2 * this->uNumPixels + 4);
Ritor1
parents: 1677
diff changeset
588 if ( !this->pPixels )
Ritor1
parents: 1677
diff changeset
589 return 2;
Ritor1
parents: 1677
diff changeset
590 this->DecodePCX(Str1a, this->pPixels, this->uWidth);
Ritor1
parents: 1677
diff changeset
591 free(Str1a);
Ritor1
parents: 1677
diff changeset
592 return 0;
0
Ritor1
parents:
diff changeset
593 }
Ritor1
parents:
diff changeset
594 if ( mode != 2 )
1835
Ritor1
parents: 1677
diff changeset
595 {
Ritor1
parents: 1677
diff changeset
596 if ( !this->pPixels )
Ritor1
parents: 1677
diff changeset
597 return 2;
Ritor1
parents: 1677
diff changeset
598 this->DecodePCX(Str1a, this->pPixels, this->uWidth);
Ritor1
parents: 1677
diff changeset
599 free(Str1a);
Ritor1
parents: 1677
diff changeset
600 return 0;
Ritor1
parents: 1677
diff changeset
601 }
Ritor1
parents: 1677
diff changeset
602 this->_allocation_flags |= 1;
Ritor1
parents: 1677
diff changeset
603 this->pPixels = (unsigned __int16 *)malloc(2 * this->uNumPixels + 4);
Ritor1
parents: 1677
diff changeset
604 if ( !this->pPixels )
0
Ritor1
parents:
diff changeset
605 return 2;
1835
Ritor1
parents: 1677
diff changeset
606 this->DecodePCX(Str1a, this->pPixels, this->uWidth);
0
Ritor1
parents:
diff changeset
607 free(Str1a);
Ritor1
parents:
diff changeset
608 return 0;
Ritor1
parents:
diff changeset
609 }
Ritor1
parents:
diff changeset
610
Ritor1
parents:
diff changeset
611 //----- (0040F037) --------------------------------------------------------
Ritor1
parents:
diff changeset
612 signed int RGBTexture::DecodePCX(char *pPcx, unsigned __int16 *pOutPixels, unsigned int uNumPixels)
Ritor1
parents:
diff changeset
613 {
2334
ddb803517a48 unused local variables I commented
Ritor1
parents: 2279
diff changeset
614 // signed int result; // eax@2
0
Ritor1
parents:
diff changeset
615 unsigned char test_byte; // edx@3
Ritor1
parents:
diff changeset
616 unsigned int read_offset; // ebx@37
Ritor1
parents:
diff changeset
617 unsigned int row_position; // edi@40
Ritor1
parents:
diff changeset
618 unsigned char value; // cl@63
Ritor1
parents:
diff changeset
619 char count; // [sp+50h] [bp-Ch]@43
Ritor1
parents:
diff changeset
620 unsigned short current_line; // [sp+54h] [bp-8h]@38
Ritor1
parents:
diff changeset
621 unsigned short *dec_position;
Ritor1
parents:
diff changeset
622 unsigned short *temp_dec_position;
Ritor1
parents:
diff changeset
623 PCXHeader1 psx_head1;
Ritor1
parents:
diff changeset
624 PCXHeader2 psx_head2;
2334
ddb803517a48 unused local variables I commented
Ritor1
parents: 2279
diff changeset
625 // short int width, height;
0
Ritor1
parents:
diff changeset
626 BYTE color_map[48]; // Colormap for 16-color images
Ritor1
parents:
diff changeset
627
Ritor1
parents:
diff changeset
628
Ritor1
parents:
diff changeset
629 memcpy(&psx_head1, pPcx , 16);
Ritor1
parents:
diff changeset
630 memcpy(&color_map, pPcx + 16, 48);
Ritor1
parents:
diff changeset
631 memcpy(&psx_head2, pPcx + 64, 6);
Ritor1
parents:
diff changeset
632
Ritor1
parents:
diff changeset
633
Ritor1
parents:
diff changeset
634 if (psx_head1.bpp!=8)
Ritor1
parents:
diff changeset
635 return 3;
Ritor1
parents:
diff changeset
636 uWidth=(short int )(psx_head1.right-psx_head1.left+1); // word @ 000014
Ritor1
parents:
diff changeset
637 uHeight=(short int )(psx_head1.bottom-psx_head1.up+1); // word @ 000016
Ritor1
parents:
diff changeset
638
Ritor1
parents:
diff changeset
639
Ritor1
parents:
diff changeset
640 uNumPixels=uWidth*uHeight; // dword @ 000010
Ritor1
parents:
diff changeset
641
Ritor1
parents:
diff changeset
642 memset(pOutPixels, 0, uNumPixels * sizeof(__int16));
Ritor1
parents:
diff changeset
643 short i=1;
Ritor1
parents:
diff changeset
644 while ( (1<<i) !=uWidth)
Ritor1
parents:
diff changeset
645 {
Ritor1
parents:
diff changeset
646 ++i;
Ritor1
parents:
diff changeset
647 if (i >= 15)
Ritor1
parents:
diff changeset
648 break;
Ritor1
parents:
diff changeset
649 }
Ritor1
parents:
diff changeset
650 field_18=i;
Ritor1
parents:
diff changeset
651 short i_=1;
Ritor1
parents:
diff changeset
652 while ( (1<<i_) !=uHeight)
Ritor1
parents:
diff changeset
653 {
Ritor1
parents:
diff changeset
654 ++i_;
Ritor1
parents:
diff changeset
655 if (i_ >= 15)
Ritor1
parents:
diff changeset
656 break;
Ritor1
parents:
diff changeset
657 }
Ritor1
parents:
diff changeset
658 field_1A=i_;
Ritor1
parents:
diff changeset
659 switch (field_18)
Ritor1
parents:
diff changeset
660 {
Ritor1
parents:
diff changeset
661 case 2: field_1C = 3; break;
Ritor1
parents:
diff changeset
662 case 3: field_1C = 7; break;
Ritor1
parents:
diff changeset
663 case 4: field_1C = 15; break;
Ritor1
parents:
diff changeset
664 case 5: field_1C = 31; break;
Ritor1
parents:
diff changeset
665 case 6: field_1C = 63; break;
Ritor1
parents:
diff changeset
666 case 7: field_1C = 127; break;
Ritor1
parents:
diff changeset
667 case 8: field_1C = 255; break;
Ritor1
parents:
diff changeset
668 case 9: field_1C = 511; break;
Ritor1
parents:
diff changeset
669 case 10: field_1C = 1023; break;
Ritor1
parents:
diff changeset
670 case 11: field_1C = 2047; break;
Ritor1
parents:
diff changeset
671 case 12: field_1C = 4095; break;
Ritor1
parents:
diff changeset
672 }
Ritor1
parents:
diff changeset
673
Ritor1
parents:
diff changeset
674 switch (field_1A)
Ritor1
parents:
diff changeset
675 {
Ritor1
parents:
diff changeset
676 case 2: field_1E = 3; break;
Ritor1
parents:
diff changeset
677 case 3: field_1E = 7; break;
Ritor1
parents:
diff changeset
678 case 4: field_1E = 15; break;
Ritor1
parents:
diff changeset
679 case 5: field_1E = 31; break;
Ritor1
parents:
diff changeset
680 case 6: field_1E = 63; break;
Ritor1
parents:
diff changeset
681 case 7: field_1E = 127; break;
Ritor1
parents:
diff changeset
682 case 8: field_1E = 255; break;
Ritor1
parents:
diff changeset
683 case 9: field_1E = 511; break;
Ritor1
parents:
diff changeset
684 case 10: field_1E = 1023; break;
Ritor1
parents:
diff changeset
685 case 11: field_1E = 2047; break;
Ritor1
parents:
diff changeset
686 case 12: field_1E = 4095; break;
Ritor1
parents:
diff changeset
687 }
Ritor1
parents:
diff changeset
688
2069
259df09dfb50 32bits almost there
Nomad
parents: 1980
diff changeset
689 unsigned int r_mask = 0xF800;
259df09dfb50 32bits almost there
Nomad
parents: 1980
diff changeset
690 unsigned int num_r_bits = 5;
259df09dfb50 32bits almost there
Nomad
parents: 1980
diff changeset
691 unsigned int g_mask = 0x07E0;
259df09dfb50 32bits almost there
Nomad
parents: 1980
diff changeset
692 unsigned int num_g_bits = 6;
259df09dfb50 32bits almost there
Nomad
parents: 1980
diff changeset
693 unsigned int b_mask = 0x001F;
259df09dfb50 32bits almost there
Nomad
parents: 1980
diff changeset
694 unsigned int num_b_bits = 5;
2127
400f3db2e4e5 Screenshot continue
Ritor1
parents: 2069
diff changeset
695 //
400f3db2e4e5 Screenshot continue
Ritor1
parents: 2069
diff changeset
696 // .
0
Ritor1
parents:
diff changeset
697 read_offset = 128;
Ritor1
parents:
diff changeset
698 if (psx_head2.planes != 3)
Ritor1
parents:
diff changeset
699 return 0;
Ritor1
parents:
diff changeset
700 current_line = 0;
Ritor1
parents:
diff changeset
701 if ( uHeight > 0 )
Ritor1
parents:
diff changeset
702 {
Ritor1
parents:
diff changeset
703 dec_position = pOutPixels;
Ritor1
parents:
diff changeset
704 do
Ritor1
parents:
diff changeset
705 {
Ritor1
parents:
diff changeset
706 temp_dec_position = dec_position;
Ritor1
parents:
diff changeset
707 row_position = 0;
Ritor1
parents:
diff changeset
708 //decode red line
Ritor1
parents:
diff changeset
709 if (psx_head2.pitch)
Ritor1
parents:
diff changeset
710 {
Ritor1
parents:
diff changeset
711 do
Ritor1
parents:
diff changeset
712 {
Ritor1
parents:
diff changeset
713 test_byte = pPcx[read_offset];
Ritor1
parents:
diff changeset
714 ++read_offset;
2127
400f3db2e4e5 Screenshot continue
Ritor1
parents: 2069
diff changeset
715 if ((test_byte & 0xC0) == 0xC0)//
0
Ritor1
parents:
diff changeset
716 {
Ritor1
parents:
diff changeset
717 value = pPcx[read_offset];
Ritor1
parents:
diff changeset
718 ++read_offset;
Ritor1
parents:
diff changeset
719
Ritor1
parents:
diff changeset
720 if ((test_byte & 0x3F) > 0)
Ritor1
parents:
diff changeset
721 {
2127
400f3db2e4e5 Screenshot continue
Ritor1
parents: 2069
diff changeset
722 count = test_byte & 0x3F;//
0
Ritor1
parents:
diff changeset
723 do
Ritor1
parents:
diff changeset
724 {
Ritor1
parents:
diff changeset
725 ++row_position;
Ritor1
parents:
diff changeset
726 //*temp_dec_position =0xFF000000;
2127
400f3db2e4e5 Screenshot continue
Ritor1
parents: 2069
diff changeset
727 //*temp_dec_position|=(unsigned long)value<<16;
2069
259df09dfb50 32bits almost there
Nomad
parents: 1980
diff changeset
728 *temp_dec_position |= r_mask & ((unsigned __int8)value << (num_g_bits + num_r_bits + num_b_bits - 8));
2127
400f3db2e4e5 Screenshot continue
Ritor1
parents: 2069
diff changeset
729 temp_dec_position++;
400f3db2e4e5 Screenshot continue
Ritor1
parents: 2069
diff changeset
730 if (row_position == psx_head2.pitch)
400f3db2e4e5 Screenshot continue
Ritor1
parents: 2069
diff changeset
731 break;
0
Ritor1
parents:
diff changeset
732 }
Ritor1
parents:
diff changeset
733 while (count-- != 1);
Ritor1
parents:
diff changeset
734 }
Ritor1
parents:
diff changeset
735 }
Ritor1
parents:
diff changeset
736 else
Ritor1
parents:
diff changeset
737 {
Ritor1
parents:
diff changeset
738 ++row_position;
Ritor1
parents:
diff changeset
739 //*temp_dec_position =0xFF000000;
Ritor1
parents:
diff changeset
740 //*temp_dec_position|= (unsigned long)test_byte<<16;
Ritor1
parents:
diff changeset
741
2069
259df09dfb50 32bits almost there
Nomad
parents: 1980
diff changeset
742 *temp_dec_position |= r_mask & ((unsigned __int8)test_byte << (num_g_bits + num_r_bits + num_b_bits - 8));
0
Ritor1
parents:
diff changeset
743
Ritor1
parents:
diff changeset
744 temp_dec_position++;
Ritor1
parents:
diff changeset
745 }
Ritor1
parents:
diff changeset
746
Ritor1
parents:
diff changeset
747 }
Ritor1
parents:
diff changeset
748 while (row_position < psx_head2.pitch);
Ritor1
parents:
diff changeset
749 }
Ritor1
parents:
diff changeset
750
Ritor1
parents:
diff changeset
751 temp_dec_position = dec_position;
Ritor1
parents:
diff changeset
752 row_position=0;
Ritor1
parents:
diff changeset
753 //decode green line
Ritor1
parents:
diff changeset
754 while (row_position < psx_head2.pitch)
Ritor1
parents:
diff changeset
755 {
Ritor1
parents:
diff changeset
756 test_byte = *(pPcx + read_offset);
Ritor1
parents:
diff changeset
757 ++read_offset;
Ritor1
parents:
diff changeset
758 if ((test_byte & 0xC0) == 0xC0)
Ritor1
parents:
diff changeset
759 {
Ritor1
parents:
diff changeset
760 value = *(pPcx + read_offset);
Ritor1
parents:
diff changeset
761 ++read_offset;
Ritor1
parents:
diff changeset
762 if ((test_byte & 0x3F) > 0)
Ritor1
parents:
diff changeset
763 {
Ritor1
parents:
diff changeset
764 count = test_byte & 0x3F;
Ritor1
parents:
diff changeset
765 do
Ritor1
parents:
diff changeset
766 {
Ritor1
parents:
diff changeset
767 //*temp_dec_position|= (unsigned int)value<<8;
Ritor1
parents:
diff changeset
768 //temp_dec_position++;
Ritor1
parents:
diff changeset
769
2069
259df09dfb50 32bits almost there
Nomad
parents: 1980
diff changeset
770 *temp_dec_position|= g_mask & (unsigned __int16)((unsigned __int8)value << (num_g_bits + num_b_bits - 8));
0
Ritor1
parents:
diff changeset
771
Ritor1
parents:
diff changeset
772 temp_dec_position++;
Ritor1
parents:
diff changeset
773 ++row_position;
Ritor1
parents:
diff changeset
774 if (row_position == psx_head2.pitch)
Ritor1
parents:
diff changeset
775 break;
Ritor1
parents:
diff changeset
776
Ritor1
parents:
diff changeset
777 }
Ritor1
parents:
diff changeset
778 while (count-- != 1);
Ritor1
parents:
diff changeset
779 }
Ritor1
parents:
diff changeset
780 }
Ritor1
parents:
diff changeset
781 else
Ritor1
parents:
diff changeset
782 {
Ritor1
parents:
diff changeset
783 //*temp_dec_position |=(unsigned int) test_byte<<8;
Ritor1
parents:
diff changeset
784 //temp_dec_position++;
Ritor1
parents:
diff changeset
785
2069
259df09dfb50 32bits almost there
Nomad
parents: 1980
diff changeset
786 *temp_dec_position|= g_mask & (unsigned __int16)((unsigned __int8)test_byte << (num_g_bits + num_b_bits - 8));
0
Ritor1
parents:
diff changeset
787 temp_dec_position++;
Ritor1
parents:
diff changeset
788 ++row_position;
Ritor1
parents:
diff changeset
789 }
Ritor1
parents:
diff changeset
790 }
Ritor1
parents:
diff changeset
791
Ritor1
parents:
diff changeset
792 temp_dec_position = dec_position;
Ritor1
parents:
diff changeset
793 row_position=0;
Ritor1
parents:
diff changeset
794 //decode blue line
Ritor1
parents:
diff changeset
795 while (row_position < psx_head2.pitch)
Ritor1
parents:
diff changeset
796 {
Ritor1
parents:
diff changeset
797 test_byte = *(pPcx + read_offset);
Ritor1
parents:
diff changeset
798 read_offset++;
Ritor1
parents:
diff changeset
799 if ((test_byte & 0xC0) == 0xC0)
Ritor1
parents:
diff changeset
800 {
Ritor1
parents:
diff changeset
801 value = *(pPcx + read_offset);
Ritor1
parents:
diff changeset
802 ++read_offset;
Ritor1
parents:
diff changeset
803 if ((test_byte & 0x3F) > 0)
Ritor1
parents:
diff changeset
804 {
Ritor1
parents:
diff changeset
805 count = test_byte & 0x3F;
Ritor1
parents:
diff changeset
806 do
Ritor1
parents:
diff changeset
807 {
Ritor1
parents:
diff changeset
808 //*temp_dec_position|= value;
Ritor1
parents:
diff changeset
809 //temp_dec_position++;
Ritor1
parents:
diff changeset
810
2069
259df09dfb50 32bits almost there
Nomad
parents: 1980
diff changeset
811 *temp_dec_position |= value >> (8 - num_b_bits);
0
Ritor1
parents:
diff changeset
812 temp_dec_position++;
Ritor1
parents:
diff changeset
813
Ritor1
parents:
diff changeset
814 ++row_position;
Ritor1
parents:
diff changeset
815 if (row_position == psx_head2.pitch)
Ritor1
parents:
diff changeset
816 break;
Ritor1
parents:
diff changeset
817 }
Ritor1
parents:
diff changeset
818 while (count-- != 1);
Ritor1
parents:
diff changeset
819 }
Ritor1
parents:
diff changeset
820 }
Ritor1
parents:
diff changeset
821 else
Ritor1
parents:
diff changeset
822 {
Ritor1
parents:
diff changeset
823 //*temp_dec_position|= test_byte;
Ritor1
parents:
diff changeset
824 //temp_dec_position++;
2069
259df09dfb50 32bits almost there
Nomad
parents: 1980
diff changeset
825 *temp_dec_position |= test_byte >> (8 - num_b_bits);
0
Ritor1
parents:
diff changeset
826 temp_dec_position++;
Ritor1
parents:
diff changeset
827
Ritor1
parents:
diff changeset
828 ++row_position;
Ritor1
parents:
diff changeset
829 }
Ritor1
parents:
diff changeset
830
Ritor1
parents:
diff changeset
831 }
Ritor1
parents:
diff changeset
832 ++current_line;
Ritor1
parents:
diff changeset
833 dec_position += uWidth;
Ritor1
parents:
diff changeset
834 }
Ritor1
parents:
diff changeset
835 while (current_line < uHeight);
Ritor1
parents:
diff changeset
836 }
Ritor1
parents:
diff changeset
837 return 0;
Ritor1
parents:
diff changeset
838 /*
Ritor1
parents:
diff changeset
839 RGBTexture *v4; // esi@1
Ritor1
parents:
diff changeset
840 signed int result; // eax@2
Ritor1
parents:
diff changeset
841 unsigned __int16 v6; // ax@3
Ritor1
parents:
diff changeset
842 unsigned __int16 *v7; // ecx@3
Ritor1
parents:
diff changeset
843 unsigned int v8; // edx@3
Ritor1
parents:
diff changeset
844 signed int v9; // ecx@3
Ritor1
parents:
diff changeset
845 signed int v10; // ecx@8
Ritor1
parents:
diff changeset
846 signed int v11; // ebx@37
Ritor1
parents:
diff changeset
847 unsigned __int16 *v12; // eax@40
Ritor1
parents:
diff changeset
848 int v13; // edi@40
Ritor1
parents:
diff changeset
849 int v14; // ebx@41
Ritor1
parents:
diff changeset
850 char v15; // bl@42
Ritor1
parents:
diff changeset
851 unsigned __int16 *v16; // eax@50
Ritor1
parents:
diff changeset
852 int v17; // ebx@51
Ritor1
parents:
diff changeset
853 char v18; // bl@52
Ritor1
parents:
diff changeset
854 unsigned __int16 *v19; // eax@61
Ritor1
parents:
diff changeset
855 unsigned __int8 v20; // dl@62
Ritor1
parents:
diff changeset
856 unsigned __int8 v21; // dl@63
Ritor1
parents:
diff changeset
857 unsigned __int8 v22; // cl@63
Ritor1
parents:
diff changeset
858 char color_map[48]; // [sp+8h] [bp-54h]@1
Ritor1
parents:
diff changeset
859 PCXHeader1 header1; // [sp+38h] [bp-24h]@1
Ritor1
parents:
diff changeset
860 PCXHeader2 header2; // [sp+48h] [bp-14h]@1
Ritor1
parents:
diff changeset
861 unsigned int v26; // [sp+50h] [bp-Ch]@43
Ritor1
parents:
diff changeset
862 int v27; // [sp+54h] [bp-8h]@38
Ritor1
parents:
diff changeset
863 unsigned __int16 *v28; // [sp+58h] [bp-4h]@3
Ritor1
parents:
diff changeset
864 int pOutPixelsa; // [sp+68h] [bp+Ch]@41
Ritor1
parents:
diff changeset
865 int pOutPixelsb; // [sp+68h] [bp+Ch]@51
Ritor1
parents:
diff changeset
866
Ritor1
parents:
diff changeset
867 v4 = this;
Ritor1
parents:
diff changeset
868 memcpy(&header1, pPcx, 0x10u);
Ritor1
parents:
diff changeset
869 memcpy(color_map, pPcx + 16, 0x30u);
Ritor1
parents:
diff changeset
870 memcpy(&header2, pPcx + 64, 6u);
Ritor1
parents:
diff changeset
871 if ( header1.bpp == 8 )
Ritor1
parents:
diff changeset
872 {
Ritor1
parents:
diff changeset
873 v6 = header1.right - header1.left + 1;
Ritor1
parents:
diff changeset
874 LOWORD(v7) = header1.bottom - header1.up + 1;
Ritor1
parents:
diff changeset
875 v4->uWidth = v6;
Ritor1
parents:
diff changeset
876 v4->uHeight = (unsigned __int16)v7;
Ritor1
parents:
diff changeset
877 v7 = (unsigned __int16 *)(signed __int16)v7;
Ritor1
parents:
diff changeset
878 v28 = v7;
Ritor1
parents:
diff changeset
879 v4->uNumPixels = (signed __int16)v7 * (signed __int16)v6;
Ritor1
parents:
diff changeset
880 HIWORD(v8) = 0;
Ritor1
parents:
diff changeset
881 v9 = 1;
Ritor1
parents:
diff changeset
882 while ( 1 << v9 != (signed __int16)v6 )
Ritor1
parents:
diff changeset
883 {
Ritor1
parents:
diff changeset
884 ++v9;
Ritor1
parents:
diff changeset
885 if ( v9 >= 15 )
Ritor1
parents:
diff changeset
886 goto LABEL_8;
Ritor1
parents:
diff changeset
887 }
Ritor1
parents:
diff changeset
888 v4->field_18 = v9;
Ritor1
parents:
diff changeset
889 LABEL_8:
Ritor1
parents:
diff changeset
890 v10 = 1;
Ritor1
parents:
diff changeset
891 while ( (unsigned __int16 *)(1 << v10) != v28 )
Ritor1
parents:
diff changeset
892 {
Ritor1
parents:
diff changeset
893 ++v10;
Ritor1
parents:
diff changeset
894 if ( v10 >= 15 )
Ritor1
parents:
diff changeset
895 goto LABEL_13;
Ritor1
parents:
diff changeset
896 }
Ritor1
parents:
diff changeset
897 v4->field_1A = v10;
Ritor1
parents:
diff changeset
898 LABEL_13:
Ritor1
parents:
diff changeset
899 switch ( v4->field_18 )
Ritor1
parents:
diff changeset
900 {
Ritor1
parents:
diff changeset
901 case 2:
Ritor1
parents:
diff changeset
902 v4->field_1C = 3;
Ritor1
parents:
diff changeset
903 break;
Ritor1
parents:
diff changeset
904 case 3:
Ritor1
parents:
diff changeset
905 v4->field_1C = 7;
Ritor1
parents:
diff changeset
906 break;
Ritor1
parents:
diff changeset
907 case 4:
Ritor1
parents:
diff changeset
908 v4->field_1C = 15;
Ritor1
parents:
diff changeset
909 break;
Ritor1
parents:
diff changeset
910 case 5:
Ritor1
parents:
diff changeset
911 v4->field_1C = 31;
Ritor1
parents:
diff changeset
912 break;
Ritor1
parents:
diff changeset
913 case 6:
Ritor1
parents:
diff changeset
914 v4->field_1C = 63;
Ritor1
parents:
diff changeset
915 break;
Ritor1
parents:
diff changeset
916 case 7:
Ritor1
parents:
diff changeset
917 v4->field_1C = 127;
Ritor1
parents:
diff changeset
918 break;
Ritor1
parents:
diff changeset
919 case 8:
Ritor1
parents:
diff changeset
920 v4->field_1C = 255;
Ritor1
parents:
diff changeset
921 break;
Ritor1
parents:
diff changeset
922 case 9:
Ritor1
parents:
diff changeset
923 v4->field_1C = 511;
Ritor1
parents:
diff changeset
924 break;
Ritor1
parents:
diff changeset
925 case 10:
Ritor1
parents:
diff changeset
926 v4->field_1C = 1023;
Ritor1
parents:
diff changeset
927 break;
Ritor1
parents:
diff changeset
928 case 11:
Ritor1
parents:
diff changeset
929 v4->field_1C = 2047;
Ritor1
parents:
diff changeset
930 break;
Ritor1
parents:
diff changeset
931 case 12:
Ritor1
parents:
diff changeset
932 v4->field_1C = 4095;
Ritor1
parents:
diff changeset
933 break;
Ritor1
parents:
diff changeset
934 default:
Ritor1
parents:
diff changeset
935 break;
Ritor1
parents:
diff changeset
936 }
Ritor1
parents:
diff changeset
937 switch ( v4->field_1A )
Ritor1
parents:
diff changeset
938 {
Ritor1
parents:
diff changeset
939 case 2:
Ritor1
parents:
diff changeset
940 v4->field_1E = 3;
Ritor1
parents:
diff changeset
941 break;
Ritor1
parents:
diff changeset
942 case 3:
Ritor1
parents:
diff changeset
943 v4->field_1E = 7;
Ritor1
parents:
diff changeset
944 break;
Ritor1
parents:
diff changeset
945 case 4:
Ritor1
parents:
diff changeset
946 v4->field_1E = 15;
Ritor1
parents:
diff changeset
947 break;
Ritor1
parents:
diff changeset
948 case 5:
Ritor1
parents:
diff changeset
949 v4->field_1E = 31;
Ritor1
parents:
diff changeset
950 break;
Ritor1
parents:
diff changeset
951 case 6:
Ritor1
parents:
diff changeset
952 v4->field_1E = 63;
Ritor1
parents:
diff changeset
953 break;
Ritor1
parents:
diff changeset
954 case 7:
Ritor1
parents:
diff changeset
955 v4->field_1E = 127;
Ritor1
parents:
diff changeset
956 break;
Ritor1
parents:
diff changeset
957 case 8:
Ritor1
parents:
diff changeset
958 v4->field_1E = 255;
Ritor1
parents:
diff changeset
959 break;
Ritor1
parents:
diff changeset
960 case 9:
Ritor1
parents:
diff changeset
961 v4->field_1E = 511;
Ritor1
parents:
diff changeset
962 break;
Ritor1
parents:
diff changeset
963 case 10:
Ritor1
parents:
diff changeset
964 v4->field_1E = 1023;
Ritor1
parents:
diff changeset
965 break;
Ritor1
parents:
diff changeset
966 case 11:
Ritor1
parents:
diff changeset
967 v4->field_1E = 2047;
Ritor1
parents:
diff changeset
968 break;
Ritor1
parents:
diff changeset
969 case 12:
Ritor1
parents:
diff changeset
970 v4->field_1E = 4095;
Ritor1
parents:
diff changeset
971 break;
Ritor1
parents:
diff changeset
972 default:
Ritor1
parents:
diff changeset
973 break;
Ritor1
parents:
diff changeset
974 }
Ritor1
parents:
diff changeset
975 v11 = 128;
Ritor1
parents:
diff changeset
976 if ( header2.planes == 3 )
Ritor1
parents:
diff changeset
977 {
Ritor1
parents:
diff changeset
978 v27 = 0;
Ritor1
parents:
diff changeset
979 if ( (signed int)v28 > 0 )
Ritor1
parents:
diff changeset
980 {
Ritor1
parents:
diff changeset
981 v28 = pOutPixels;
Ritor1
parents:
diff changeset
982 do
Ritor1
parents:
diff changeset
983 {
Ritor1
parents:
diff changeset
984 v12 = v28;
Ritor1
parents:
diff changeset
985 v13 = 0;
Ritor1
parents:
diff changeset
986 if ( header2.pitch )
Ritor1
parents:
diff changeset
987 {
Ritor1
parents:
diff changeset
988 do
Ritor1
parents:
diff changeset
989 {
Ritor1
parents:
diff changeset
990 LOBYTE(v8) = pPcx[v11];
Ritor1
parents:
diff changeset
991 v14 = v11 + 1;
Ritor1
parents:
diff changeset
992 pOutPixelsa = v14;
Ritor1
parents:
diff changeset
993 if ( (v8 & 0xC0) == -64 )
Ritor1
parents:
diff changeset
994 {
Ritor1
parents:
diff changeset
995 pOutPixelsa = v14 + 1;
Ritor1
parents:
diff changeset
996 v15 = pPcx[v14];
Ritor1
parents:
diff changeset
997 if ( (signed int)(v8 & 0x3F) > 0 )
Ritor1
parents:
diff changeset
998 {
Ritor1
parents:
diff changeset
999 v26 = v8 & 0x3F;
Ritor1
parents:
diff changeset
1000 do
Ritor1
parents:
diff changeset
1001 {
Ritor1
parents:
diff changeset
1002 ++v13;
Ritor1
parents:
diff changeset
1003 *v12 = LOWORD(pRenderer->uTargetRMask) & ((unsigned __int8)v15 << (LOBYTE(pRenderer->uTargetGBits)
Ritor1
parents:
diff changeset
1004 + LOBYTE(pRenderer->uTargetRBits)
Ritor1
parents:
diff changeset
1005 + LOBYTE(pRenderer->uTargetBBits)
Ritor1
parents:
diff changeset
1006 - 8));
Ritor1
parents:
diff changeset
1007 ++v12;
Ritor1
parents:
diff changeset
1008 if ( v13 == (unsigned __int16)header2.pitch )
Ritor1
parents:
diff changeset
1009 v12 = &v12[uNumPixels - (unsigned __int16)header2.pitch - 1];
Ritor1
parents:
diff changeset
1010 --v26;
Ritor1
parents:
diff changeset
1011 }
Ritor1
parents:
diff changeset
1012 while ( v26 );
Ritor1
parents:
diff changeset
1013 }
Ritor1
parents:
diff changeset
1014 }
Ritor1
parents:
diff changeset
1015 else
Ritor1
parents:
diff changeset
1016 {
Ritor1
parents:
diff changeset
1017 LOWORD(v8) = (unsigned __int8)v8;
Ritor1
parents:
diff changeset
1018 v8 = pRenderer->uTargetRMask & (v8 << (LOBYTE(pRenderer->uTargetGBits)
Ritor1
parents:
diff changeset
1019 + LOBYTE(pRenderer->uTargetRBits)
Ritor1
parents:
diff changeset
1020 + LOBYTE(pRenderer->uTargetBBits)
Ritor1
parents:
diff changeset
1021 - 8));
Ritor1
parents:
diff changeset
1022 ++v13;
Ritor1
parents:
diff changeset
1023 *v12 = v8;
Ritor1
parents:
diff changeset
1024 ++v12;
Ritor1
parents:
diff changeset
1025 }
Ritor1
parents:
diff changeset
1026 v11 = pOutPixelsa;
Ritor1
parents:
diff changeset
1027 }
Ritor1
parents:
diff changeset
1028 while ( v13 < (unsigned __int16)header2.pitch );
Ritor1
parents:
diff changeset
1029 }
Ritor1
parents:
diff changeset
1030 v16 = v28;
Ritor1
parents:
diff changeset
1031 while ( v13 < 2 * (unsigned __int16)header2.pitch )
Ritor1
parents:
diff changeset
1032 {
Ritor1
parents:
diff changeset
1033 LOBYTE(v8) = pPcx[v11];
Ritor1
parents:
diff changeset
1034 v17 = v11 + 1;
Ritor1
parents:
diff changeset
1035 pOutPixelsb = v17;
Ritor1
parents:
diff changeset
1036 if ( (v8 & 0xC0) == -64 )
Ritor1
parents:
diff changeset
1037 {
Ritor1
parents:
diff changeset
1038 pOutPixelsb = v17 + 1;
Ritor1
parents:
diff changeset
1039 v18 = pPcx[v17];
Ritor1
parents:
diff changeset
1040 if ( (signed int)(v8 & 0x3F) > 0 )
Ritor1
parents:
diff changeset
1041 {
Ritor1
parents:
diff changeset
1042 v26 = v8 & 0x3F;
Ritor1
parents:
diff changeset
1043 do
Ritor1
parents:
diff changeset
1044 {
Ritor1
parents:
diff changeset
1045 *v16 |= pRenderer->uTargetGMask & (unsigned __int16)((unsigned __int8)v18 << (LOBYTE(pRenderer->uTargetGBits)
Ritor1
parents:
diff changeset
1046 + LOBYTE(pRenderer->uTargetBBits)
Ritor1
parents:
diff changeset
1047 - 8));
Ritor1
parents:
diff changeset
1048 ++v13;
Ritor1
parents:
diff changeset
1049 ++v16;
Ritor1
parents:
diff changeset
1050 if ( v13 == (unsigned __int16)header2.pitch )
Ritor1
parents:
diff changeset
1051 v16 = &v16[uNumPixels - (unsigned __int16)header2.pitch - 1];
Ritor1
parents:
diff changeset
1052 --v26;
Ritor1
parents:
diff changeset
1053 }
Ritor1
parents:
diff changeset
1054 while ( v26 );
Ritor1
parents:
diff changeset
1055 }
Ritor1
parents:
diff changeset
1056 }
Ritor1
parents:
diff changeset
1057 else
Ritor1
parents:
diff changeset
1058 {
Ritor1
parents:
diff changeset
1059 LOWORD(v8) = (unsigned __int8)v8;
Ritor1
parents:
diff changeset
1060 v8 = pRenderer->uTargetGMask & (v8 << (LOBYTE(pRenderer->uTargetGBits) + LOBYTE(pRenderer->uTargetBBits) - 8));
Ritor1
parents:
diff changeset
1061 *v16 |= v8;
Ritor1
parents:
diff changeset
1062 ++v13;
Ritor1
parents:
diff changeset
1063 ++v16;
Ritor1
parents:
diff changeset
1064 }
Ritor1
parents:
diff changeset
1065 v11 = pOutPixelsb;
Ritor1
parents:
diff changeset
1066 }
Ritor1
parents:
diff changeset
1067 v19 = v28;
Ritor1
parents:
diff changeset
1068 while ( v13 < 3 * (unsigned __int16)header2.pitch )
Ritor1
parents:
diff changeset
1069 {
Ritor1
parents:
diff changeset
1070 v20 = pPcx[v11++];
Ritor1
parents:
diff changeset
1071 if ( (v20 & 0xC0) == -64 )
Ritor1
parents:
diff changeset
1072 {
Ritor1
parents:
diff changeset
1073 v21 = v20 & 0x3F;
Ritor1
parents:
diff changeset
1074 v22 = pPcx[v11++];
Ritor1
parents:
diff changeset
1075 if ( (signed int)v21 > 0 )
Ritor1
parents:
diff changeset
1076 {
Ritor1
parents:
diff changeset
1077 v26 = v21;
Ritor1
parents:
diff changeset
1078 do
Ritor1
parents:
diff changeset
1079 {
Ritor1
parents:
diff changeset
1080 *v19 |= v22 >> (8 - LOBYTE(pRenderer->uTargetBBits));
Ritor1
parents:
diff changeset
1081 ++v13;
Ritor1
parents:
diff changeset
1082 ++v19;
Ritor1
parents:
diff changeset
1083 if ( v13 == (unsigned __int16)header2.pitch )
Ritor1
parents:
diff changeset
1084 {
Ritor1
parents:
diff changeset
1085 v8 = uNumPixels - (unsigned __int16)header2.pitch;
Ritor1
parents:
diff changeset
1086 v19 = &v19[uNumPixels - (unsigned __int16)header2.pitch - 1];
Ritor1
parents:
diff changeset
1087 }
Ritor1
parents:
diff changeset
1088 --v26;
Ritor1
parents:
diff changeset
1089 }
Ritor1
parents:
diff changeset
1090 while ( v26 );
Ritor1
parents:
diff changeset
1091 }
Ritor1
parents:
diff changeset
1092 }
Ritor1
parents:
diff changeset
1093 else
Ritor1
parents:
diff changeset
1094 {
Ritor1
parents:
diff changeset
1095 *v19 |= v20 >> (8 - LOBYTE(pRenderer->uTargetBBits));
Ritor1
parents:
diff changeset
1096 ++v13;
Ritor1
parents:
diff changeset
1097 ++v19;
Ritor1
parents:
diff changeset
1098 }
Ritor1
parents:
diff changeset
1099 }
Ritor1
parents:
diff changeset
1100 ++v27;
Ritor1
parents:
diff changeset
1101 v28 += uNumPixels;
Ritor1
parents:
diff changeset
1102 }
Ritor1
parents:
diff changeset
1103 while ( v27 < v4->uHeight );
Ritor1
parents:
diff changeset
1104 }
Ritor1
parents:
diff changeset
1105 }
Ritor1
parents:
diff changeset
1106 result = 0;
Ritor1
parents:
diff changeset
1107 }
Ritor1
parents:
diff changeset
1108 else
Ritor1
parents:
diff changeset
1109 {
Ritor1
parents:
diff changeset
1110 result = 3;
Ritor1
parents:
diff changeset
1111 }
Ritor1
parents:
diff changeset
1112 return result;
Ritor1
parents:
diff changeset
1113 */
Ritor1
parents:
diff changeset
1114 }
Ritor1
parents:
diff changeset
1115
Ritor1
parents:
diff changeset
1116 //----- (0040EAD8) --------------------------------------------------------
Ritor1
parents:
diff changeset
1117 unsigned int RGBTexture::LoadFromFILE(FILE *pFile, unsigned int mode, unsigned int bCloseFile)
Ritor1
parents:
diff changeset
1118 {
2334
ddb803517a48 unused local variables I commented
Ritor1
parents: 2279
diff changeset
1119 // signed int result; // eax@2
ddb803517a48 unused local variables I commented
Ritor1
parents: 2279
diff changeset
1120 // unsigned char test_byte; // edx@3
0
Ritor1
parents:
diff changeset
1121 //unsigned int read_offset; // ebx@37
2334
ddb803517a48 unused local variables I commented
Ritor1
parents: 2279
diff changeset
1122 // unsigned int row_position; // edi@40
ddb803517a48 unused local variables I commented
Ritor1
parents: 2279
diff changeset
1123 // unsigned char value; // cl@63
ddb803517a48 unused local variables I commented
Ritor1
parents: 2279
diff changeset
1124 // char count; // [sp+50h] [bp-Ch]@43
ddb803517a48 unused local variables I commented
Ritor1
parents: 2279
diff changeset
1125 // unsigned short current_line; // [sp+54h] [bp-8h]@38
ddb803517a48 unused local variables I commented
Ritor1
parents: 2279
diff changeset
1126 // unsigned short *dec_position;
ddb803517a48 unused local variables I commented
Ritor1
parents: 2279
diff changeset
1127 // unsigned short *temp_dec_position;
0
Ritor1
parents:
diff changeset
1128 PCXHeader1 psx_head1;
Ritor1
parents:
diff changeset
1129 PCXHeader2 psx_head2;
2334
ddb803517a48 unused local variables I commented
Ritor1
parents: 2279
diff changeset
1130 // short int width, height;
0
Ritor1
parents:
diff changeset
1131 BYTE color_map[48]; // Colormap for 16-color images
Ritor1
parents:
diff changeset
1132
2131
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1133 unsigned int num_r_bits = 5;
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1134 unsigned int num_g_bits = 6;
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1135 unsigned int num_b_bits = 5;
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1136
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1137 unsigned int r_mask = 0xF800;
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1138 unsigned int g_mask = 0x07E0;
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1139 unsigned int b_mask = 0x001F;
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1140
0
Ritor1
parents:
diff changeset
1141 if (!pFile)
Ritor1
parents:
diff changeset
1142 return 1;
Ritor1
parents:
diff changeset
1143
Ritor1
parents:
diff changeset
1144
Ritor1
parents:
diff changeset
1145 fread(&psx_head1, 1, 16, pFile);
Ritor1
parents:
diff changeset
1146 fread(&color_map, 1, 48, pFile);
Ritor1
parents:
diff changeset
1147 fread(&psx_head2, 1, 6, pFile);
Ritor1
parents:
diff changeset
1148
Ritor1
parents:
diff changeset
1149 if (psx_head1.bpp!=8)
Ritor1
parents:
diff changeset
1150 return 3;
Ritor1
parents:
diff changeset
1151 uWidth=(short int )(psx_head1.right-psx_head1.left+1); // word @ 000014
Ritor1
parents:
diff changeset
1152 uHeight=(short int )(psx_head1.bottom-psx_head1.up+1); // word @ 000016
Ritor1
parents:
diff changeset
1153
Ritor1
parents:
diff changeset
1154
Ritor1
parents:
diff changeset
1155 uNumPixels=uWidth*uHeight; // dword @ 000010
Ritor1
parents:
diff changeset
1156
Ritor1
parents:
diff changeset
1157
Ritor1
parents:
diff changeset
1158 if ( mode == 0 )
Ritor1
parents:
diff changeset
1159 {
2369
bddcaf5d5db2 removing non-nullptr conditions before frees, chaning 0 and NULL assignmnets to pointers to nullptr assignments
Grumpy7
parents: 2353
diff changeset
1160 free(pPixels);
1583
75fafd8ced59 Allocator (CMemory) bye-bye
Nomad
parents: 1545
diff changeset
1161 pPixels = (unsigned __int16 *)malloc(2 * uNumPixels + 4);
0
Ritor1
parents:
diff changeset
1162 }
Ritor1
parents:
diff changeset
1163 else
Ritor1
parents:
diff changeset
1164 {
Ritor1
parents:
diff changeset
1165 if ( mode != 1 && mode == 2 )
Ritor1
parents:
diff changeset
1166 {
Ritor1
parents:
diff changeset
1167 pPixels = (unsigned __int16 *)malloc((uNumPixels + 2) * sizeof(unsigned __int16));
1583
75fafd8ced59 Allocator (CMemory) bye-bye
Nomad
parents: 1545
diff changeset
1168 _allocation_flags |= 1;
0
Ritor1
parents:
diff changeset
1169 }
Ritor1
parents:
diff changeset
1170 }
Ritor1
parents:
diff changeset
1171
1980
c1c74df0a33e changing most of auto types to their actual types
Grumpy7
parents: 1846
diff changeset
1172 ushort* pOutPixels = pPixels;
0
Ritor1
parents:
diff changeset
1173
Ritor1
parents:
diff changeset
1174 memset(pOutPixels, 0, uNumPixels * sizeof(__int16));
Ritor1
parents:
diff changeset
1175
Ritor1
parents:
diff changeset
1176 short i=1;
Ritor1
parents:
diff changeset
1177 while ( (1<<i) !=uWidth)
Ritor1
parents:
diff changeset
1178 {
Ritor1
parents:
diff changeset
1179 ++i;
Ritor1
parents:
diff changeset
1180 if (i >= 15)
Ritor1
parents:
diff changeset
1181 break;
Ritor1
parents:
diff changeset
1182 }
Ritor1
parents:
diff changeset
1183 field_18=i;
Ritor1
parents:
diff changeset
1184 short i_=1;
Ritor1
parents:
diff changeset
1185 while ( (1<<i_) !=uHeight)
Ritor1
parents:
diff changeset
1186 {
Ritor1
parents:
diff changeset
1187 ++i_;
Ritor1
parents:
diff changeset
1188 if (i_ >= 15)
Ritor1
parents:
diff changeset
1189 break;
Ritor1
parents:
diff changeset
1190 }
Ritor1
parents:
diff changeset
1191 field_1A=i_;
Ritor1
parents:
diff changeset
1192 switch (field_18)
Ritor1
parents:
diff changeset
1193 {
Ritor1
parents:
diff changeset
1194 case 2: field_1C = 3; break;
Ritor1
parents:
diff changeset
1195 case 3: field_1C = 7; break;
Ritor1
parents:
diff changeset
1196 case 4: field_1C = 15; break;
Ritor1
parents:
diff changeset
1197 case 5: field_1C = 31; break;
Ritor1
parents:
diff changeset
1198 case 6: field_1C = 63; break;
Ritor1
parents:
diff changeset
1199 case 7: field_1C = 127; break;
Ritor1
parents:
diff changeset
1200 case 8: field_1C = 255; break;
Ritor1
parents:
diff changeset
1201 case 9: field_1C = 511; break;
Ritor1
parents:
diff changeset
1202 case 10: field_1C = 1023; break;
Ritor1
parents:
diff changeset
1203 case 11: field_1C = 2047; break;
Ritor1
parents:
diff changeset
1204 case 12: field_1C = 4095; break;
Ritor1
parents:
diff changeset
1205 }
Ritor1
parents:
diff changeset
1206
Ritor1
parents:
diff changeset
1207 switch (field_1A)
Ritor1
parents:
diff changeset
1208 {
Ritor1
parents:
diff changeset
1209 case 2: field_1E = 3; break;
Ritor1
parents:
diff changeset
1210 case 3: field_1E = 7; break;
Ritor1
parents:
diff changeset
1211 case 4: field_1E = 15; break;
Ritor1
parents:
diff changeset
1212 case 5: field_1E = 31; break;
Ritor1
parents:
diff changeset
1213 case 6: field_1E = 63; break;
Ritor1
parents:
diff changeset
1214 case 7: field_1E = 127; break;
Ritor1
parents:
diff changeset
1215 case 8: field_1E = 255; break;
Ritor1
parents:
diff changeset
1216 case 9: field_1E = 511; break;
Ritor1
parents:
diff changeset
1217 case 10: field_1E = 1023; break;
Ritor1
parents:
diff changeset
1218 case 11: field_1E = 2047; break;
Ritor1
parents:
diff changeset
1219 case 12: field_1E = 4095; break;
Ritor1
parents:
diff changeset
1220 }
Ritor1
parents:
diff changeset
1221
Ritor1
parents:
diff changeset
1222 fseek(pFile, 128 - 70, SEEK_CUR);
Ritor1
parents:
diff changeset
1223
Ritor1
parents:
diff changeset
1224
Ritor1
parents:
diff changeset
1225 for (uint y = 0; y < uHeight; ++y)
Ritor1
parents:
diff changeset
1226 {
Ritor1
parents:
diff changeset
1227 unsigned __int16 *pDst = pPixels + y * uWidth;
Ritor1
parents:
diff changeset
1228
Ritor1
parents:
diff changeset
1229 uint x = 0;
Ritor1
parents:
diff changeset
1230 do
Ritor1
parents:
diff changeset
1231 {
Ritor1
parents:
diff changeset
1232 uint ctrl = 0;
Ritor1
parents:
diff changeset
1233 fread(&ctrl, 1, 1, pFile);
Ritor1
parents:
diff changeset
1234 if ((ctrl & 0xC0) == 0xC0)
Ritor1
parents:
diff changeset
1235 {
Ritor1
parents:
diff changeset
1236 uint uNumPixels = ctrl & 0x3F;
Ritor1
parents:
diff changeset
1237 uint clr = 0;
Ritor1
parents:
diff changeset
1238 fread(&clr, 1, 1, pFile);
Ritor1
parents:
diff changeset
1239 for (uint i = 0; i < uNumPixels; ++i)
2131
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1240 pDst[x++] = r_mask & (clr << (num_g_bits + num_r_bits + num_b_bits - 8));
0
Ritor1
parents:
diff changeset
1241 }
Ritor1
parents:
diff changeset
1242 else
Ritor1
parents:
diff changeset
1243 {
2131
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1244 pDst[x++] = r_mask & (ctrl << (num_g_bits + num_r_bits + num_b_bits - 8));
0
Ritor1
parents:
diff changeset
1245 }
Ritor1
parents:
diff changeset
1246 } while (x < psx_head2.pitch);
Ritor1
parents:
diff changeset
1247
Ritor1
parents:
diff changeset
1248 x = 0;
Ritor1
parents:
diff changeset
1249 do
Ritor1
parents:
diff changeset
1250 {
Ritor1
parents:
diff changeset
1251 uint ctrl = 0;
Ritor1
parents:
diff changeset
1252 fread(&ctrl, 1, 1, pFile);
Ritor1
parents:
diff changeset
1253 if ((ctrl & 0xC0) == 0xC0)
Ritor1
parents:
diff changeset
1254 {
Ritor1
parents:
diff changeset
1255 uint uNumPixels = ctrl & 0x3F;
Ritor1
parents:
diff changeset
1256 uint clr = 0;
Ritor1
parents:
diff changeset
1257 fread(&clr, 1, 1, pFile);
Ritor1
parents:
diff changeset
1258 for (uint i = 0; i < uNumPixels; ++i)
2131
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1259 pDst[x++] |= g_mask & (clr << (num_g_bits + num_b_bits - 8));
0
Ritor1
parents:
diff changeset
1260 }
Ritor1
parents:
diff changeset
1261 else
Ritor1
parents:
diff changeset
1262 {
2131
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1263 pDst[x++] |= g_mask & (ctrl << (num_g_bits + num_b_bits - 8));
0
Ritor1
parents:
diff changeset
1264 }
Ritor1
parents:
diff changeset
1265 } while (x < psx_head2.pitch);
Ritor1
parents:
diff changeset
1266
Ritor1
parents:
diff changeset
1267 x = 0;
Ritor1
parents:
diff changeset
1268 do
Ritor1
parents:
diff changeset
1269 {
Ritor1
parents:
diff changeset
1270 uint ctrl = 0;
Ritor1
parents:
diff changeset
1271 fread(&ctrl, 1, 1, pFile);
Ritor1
parents:
diff changeset
1272 if ((ctrl & 0xC0) == 0xC0)
Ritor1
parents:
diff changeset
1273 {
Ritor1
parents:
diff changeset
1274 uint uNumPixels = ctrl & 0x3F;
Ritor1
parents:
diff changeset
1275 uint clr = 0;
Ritor1
parents:
diff changeset
1276 fread(&clr, 1, 1, pFile);
Ritor1
parents:
diff changeset
1277 for (uint i = 0; i < uNumPixels; ++i)
2131
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1278 pDst[x++] |= b_mask & (clr >> (8 - num_b_bits));
0
Ritor1
parents:
diff changeset
1279 }
Ritor1
parents:
diff changeset
1280 else
Ritor1
parents:
diff changeset
1281 {
2131
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1282 pDst[x++] |= b_mask & (ctrl >> (8 - num_b_bits));
0
Ritor1
parents:
diff changeset
1283 }
Ritor1
parents:
diff changeset
1284 } while (x < psx_head2.pitch);
Ritor1
parents:
diff changeset
1285 }
Ritor1
parents:
diff changeset
1286
Ritor1
parents:
diff changeset
1287 if (bCloseFile)
Ritor1
parents:
diff changeset
1288 fclose(pFile);
Ritor1
parents:
diff changeset
1289 return 0;
Ritor1
parents:
diff changeset
1290 }
Ritor1
parents:
diff changeset
1291
Ritor1
parents:
diff changeset
1292 //----- (0040E51F) --------------------------------------------------------
Ritor1
parents:
diff changeset
1293 void RGBTexture::Release()
Ritor1
parents:
diff changeset
1294 {
Ritor1
parents:
diff changeset
1295 this->pName[0] = 0;
2129
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1296 //if ( !(this->_allocation_flags & 1) )
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1297 //free(this->pPixels);
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1298 //else
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1299 free(this->pPixels);
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1300 this->_allocation_flags = 0;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1301 this->pPixels = 0;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1302 this->uNumPixels = 0;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1303 this->uHeight = 0;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1304 this->uWidth = 0;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1305 this->field_1A = 0;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1306 this->field_18 = 0;
0
Ritor1
parents:
diff changeset
1307 }
Ritor1
parents:
diff changeset
1308
Ritor1
parents:
diff changeset
1309 //----- (0040E55E) --------------------------------------------------------
2129
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1310 int RGBTexture::LoadPCXFile(const char *Filename, unsigned int a3)
0
Ritor1
parents:
diff changeset
1311 {
Ritor1
parents:
diff changeset
1312 signed int result; // eax@2
Ritor1
parents:
diff changeset
1313 char *v6; // eax@3
Ritor1
parents:
diff changeset
1314 int v7; // edx@3
Ritor1
parents:
diff changeset
1315 char v8; // cl@4
Ritor1
parents:
diff changeset
1316 signed int v14; // ecx@19
Ritor1
parents:
diff changeset
1317 signed int v15; // ecx@24
2334
ddb803517a48 unused local variables I commented
Ritor1
parents: 2279
diff changeset
1318 // int v16; // eax@57
ddb803517a48 unused local variables I commented
Ritor1
parents: 2279
diff changeset
1319 // unsigned __int16 *v17; // ecx@57
ddb803517a48 unused local variables I commented
Ritor1
parents: 2279
diff changeset
1320 // unsigned __int16 *v18; // edi@57
ddb803517a48 unused local variables I commented
Ritor1
parents: 2279
diff changeset
1321 // signed int x; // eax@59
ddb803517a48 unused local variables I commented
Ritor1
parents: 2279
diff changeset
1322 // unsigned __int16 *v20; // edi@64
ddb803517a48 unused local variables I commented
Ritor1
parents: 2279
diff changeset
1323 // signed int v21; // eax@66
ddb803517a48 unused local variables I commented
Ritor1
parents: 2279
diff changeset
1324 // unsigned __int16 *v22; // edi@71
ddb803517a48 unused local variables I commented
Ritor1
parents: 2279
diff changeset
1325 // signed int v23; // eax@73
ddb803517a48 unused local variables I commented
Ritor1
parents: 2279
diff changeset
1326 // int v24; // eax@78
71
2b90f29892ae ESC menu fixed
zipi
parents: 0
diff changeset
1327 char v25[48]; // [sp+Ch] [bp-54h]@3
2b90f29892ae ESC menu fixed
zipi
parents: 0
diff changeset
1328 PCXHeader1 pcx_header1;
2b90f29892ae ESC menu fixed
zipi
parents: 0
diff changeset
1329 PCXHeader2 pcx_header2;
2129
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1330 int y; // [sp+54h] [bp-Ch]@3
0
Ritor1
parents:
diff changeset
1331 FILE *File; // [sp+5Ch] [bp-4h]@1
Ritor1
parents:
diff changeset
1332
2129
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1333 unsigned int num_r_bits = 5;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1334 unsigned int num_g_bits = 6;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1335 unsigned int num_b_bits = 5;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1336
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1337 unsigned int r_mask = 0xF800;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1338 unsigned int g_mask = 0x07E0;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1339 unsigned int b_mask = 0x001F;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1340
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1341
0
Ritor1
parents:
diff changeset
1342 File = fopen(Filename, "rb");
Ritor1
parents:
diff changeset
1343 if ( !File )
Ritor1
parents:
diff changeset
1344 return 1;
71
2b90f29892ae ESC menu fixed
zipi
parents: 0
diff changeset
1345
2b90f29892ae ESC menu fixed
zipi
parents: 0
diff changeset
1346 fread(&pcx_header1, sizeof(pcx_header1), 1, File);
2b90f29892ae ESC menu fixed
zipi
parents: 0
diff changeset
1347 fread(&v25,48,1,File);
2b90f29892ae ESC menu fixed
zipi
parents: 0
diff changeset
1348 fread(&pcx_header2, 4, 1, File);
2b90f29892ae ESC menu fixed
zipi
parents: 0
diff changeset
1349
0
Ritor1
parents:
diff changeset
1350 v6 = (char *)Filename;
2129
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1351 v7 = (char *)this - Filename;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1352 uint i = 0;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1353 for ( i; i < 15; ++i )
0
Ritor1
parents:
diff changeset
1354 {
Ritor1
parents:
diff changeset
1355 v8 = *v6;
Ritor1
parents:
diff changeset
1356 if ( !*v6 )
Ritor1
parents:
diff changeset
1357 break;
Ritor1
parents:
diff changeset
1358 if ( v8 == 46 )
Ritor1
parents:
diff changeset
1359 break;
Ritor1
parents:
diff changeset
1360 (v6++)[v7] = v8;
Ritor1
parents:
diff changeset
1361 }
2129
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1362 this->pName[i] = 0;
71
2b90f29892ae ESC menu fixed
zipi
parents: 0
diff changeset
1363 if ( pcx_header1.bpp != 8 )
0
Ritor1
parents:
diff changeset
1364 return 3;
2129
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1365 this->uWidth = pcx_header1.right - pcx_header1.left + 1;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1366 this->uHeight = pcx_header1.bottom - pcx_header1.up + 1;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1367 this->uNumPixels = (signed __int16)this->uWidth * (signed __int16)this->uHeight;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1368 if ( !a3 )
0
Ritor1
parents:
diff changeset
1369 {
2369
bddcaf5d5db2 removing non-nullptr conditions before frees, chaning 0 and NULL assignmnets to pointers to nullptr assignments
Grumpy7
parents: 2353
diff changeset
1370 free(this->pPixels);
2129
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1371 this->pPixels = (unsigned __int16 *)malloc(2 * this->uNumPixels + 4);
0
Ritor1
parents:
diff changeset
1372 }
2129
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1373 if ( a3 == 2 )
0
Ritor1
parents:
diff changeset
1374 {
2129
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1375 this->_allocation_flags |= 1;
2131
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1376 this->pPixels = (unsigned __int16 *)malloc((uNumPixels + 2) * sizeof(unsigned __int16));
2129
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1377 }
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1378 if ( this->pPixels )
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1379 {
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1380 for ( v14 = 1; v14 < 15; ++v14 )
0
Ritor1
parents:
diff changeset
1381 {
2129
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1382 if ( 1 << v14 == this->uWidth )
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1383 this->field_18 = v14;
0
Ritor1
parents:
diff changeset
1384 }
2129
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1385 for ( v15 = 1; v15 < 15; ++v15 )
0
Ritor1
parents:
diff changeset
1386 {
2129
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1387 if ( 1 << v15 == this->uHeight )
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1388 this->field_1A = v15;
0
Ritor1
parents:
diff changeset
1389 }
2129
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1390 switch ( this->field_18 )
0
Ritor1
parents:
diff changeset
1391 {
2129
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1392 case 2: this->field_1C = 3; break;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1393 case 3: this->field_1C = 7; break;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1394 case 4: this->field_1C = 15; break;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1395 case 5: this->field_1C = 31; break;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1396 case 6: this->field_1C = 63; break;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1397 case 7: this->field_1C = 127; break;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1398 case 8: this->field_1C = 255; break;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1399 case 9: this->field_1C = 511; break;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1400 case 10: this->field_1C = 1023; break;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1401 case 11: this->field_1C = 2047; break;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1402 case 12: this->field_1C = 4095; break;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1403 default: break;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1404 }
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1405 switch ( this->field_1A )
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1406 {
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1407 case 2: this->field_1E = 3; break;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1408 case 3: this->field_1E = 7; break;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1409 case 4: this->field_1E = 15; break;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1410 case 5: this->field_1E = 31; break;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1411 case 6: this->field_1E = 63; break;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1412 case 7: this->field_1E = 127; break;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1413 case 8: this->field_1E = 255; break;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1414 case 9: this->field_1E = 511; break;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1415 case 10: this->field_1E = 1023; break;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1416 case 11: this->field_1E = 2047; break;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1417 case 12: this->field_1E = 4095; break;
23dbcaa651cc LoadPCXFile
Ritor1
parents: 2127
diff changeset
1418 default: break;
0
Ritor1
parents:
diff changeset
1419 }
Ritor1
parents:
diff changeset
1420 fseek(File, 128, 0);
Ritor1
parents:
diff changeset
1421 ftell(File);
2131
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1422 if ( pcx_header2.planes == 1 )
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1477
diff changeset
1423 Error("24bit PCX Only!");
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1477
diff changeset
1424
71
2b90f29892ae ESC menu fixed
zipi
parents: 0
diff changeset
1425 if ( pcx_header2.planes == 3 )
0
Ritor1
parents:
diff changeset
1426 {
2131
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1427 for ( y = 0; y < this->uHeight; ++y )
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1428 {
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1429 unsigned __int16 *pDst = pPixels + y * uWidth;
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1430 uint x = 0;
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1431 do
0
Ritor1
parents:
diff changeset
1432 {
2131
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1433 uint ctrl = 0;
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1434 fread(&ctrl, 1, 1, File);
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1435 if ( (ctrl & 0xC0) == 0xC0 )
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1436 {
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1437 uint uNumPixels = ctrl & 0x3F;
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1438 uint clr = 0;
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1439 ctrl &= 0x3F;
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1440 fread(&clr, 1, 1, File);
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1441 for ( uint i = 0; i < uNumPixels; ++i )
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1442 pDst[x++] = r_mask & (clr << (num_r_bits + num_g_bits + num_b_bits - 8));
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1443 }
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1444 else
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1445 pDst[x++] = r_mask & (ctrl << (num_g_bits + num_r_bits + num_b_bits - 8));
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1446 }
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1447 while ( x < pcx_header2.pitch );
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1448
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1449 x = 0;
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1450 do
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1451 {
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1452 uint ctrl = 0;
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1453 fread(&ctrl, 1, 1, File);
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1454 if ( (ctrl & 0xC0) == 0xC0 )
0
Ritor1
parents:
diff changeset
1455 {
2131
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1456 uint uNumPixels = ctrl & 0x3F;
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1457 uint clr = 0;
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1458 ctrl &= 0x3F;
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1459 fread(&clr, 1, 1, File);
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1460 for ( uint i = 0; i < uNumPixels; ++i )
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1461 pDst[x++] |= g_mask & (clr << (num_g_bits + num_b_bits - 8));
0
Ritor1
parents:
diff changeset
1462 }
2131
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1463 else
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1464 pDst[x++] |= g_mask & (ctrl << (num_g_bits + num_b_bits - 8));
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1465 }
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1466 while (x < pcx_header2.pitch);
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1467
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1468 x = 0;
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1469 do
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1470 {
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1471 uint ctrl = 0;
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1472 fread(&ctrl, 1, 1, File);
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1473 if ( (ctrl & 0xC0) == 0xC0 )
0
Ritor1
parents:
diff changeset
1474 {
2131
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1475 uint uNumPixels = ctrl & 0x3F;
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1476 uint clr = 0;
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1477 fread(&clr, 1, 1, File);
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1478 for ( uint i = 0; i < uNumPixels; ++i )
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1479 pDst[x++] |= b_mask & (clr >> (8 - num_b_bits));
0
Ritor1
parents:
diff changeset
1480 }
2131
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1481 else
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1482 pDst[x++] |= b_mask & (ctrl >> (8 - num_b_bits));
0
Ritor1
parents:
diff changeset
1483 }
2131
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1484 while (x < pcx_header2.pitch);
651b24553ae9 savegame screenshot fix
Ritor1
parents: 2129
diff changeset
1485 }
0
Ritor1
parents:
diff changeset
1486 }
Ritor1
parents:
diff changeset
1487 fclose(File);
Ritor1
parents:
diff changeset
1488 result = 0;
Ritor1
parents:
diff changeset
1489 }
Ritor1
parents:
diff changeset
1490 else
Ritor1
parents:
diff changeset
1491 {
Ritor1
parents:
diff changeset
1492 result = 2;
Ritor1
parents:
diff changeset
1493 }
Ritor1
parents:
diff changeset
1494 return result;
Ritor1
parents:
diff changeset
1495 }
Ritor1
parents:
diff changeset
1496
Ritor1
parents:
diff changeset
1497 //----- (0040D73D) --------------------------------------------------------
Ritor1
parents:
diff changeset
1498 RGBTexture::RGBTexture()
Ritor1
parents:
diff changeset
1499 {
Ritor1
parents:
diff changeset
1500 pName[0] = 0;
Ritor1
parents:
diff changeset
1501 pPixels = 0;
Ritor1
parents:
diff changeset
1502 uNumPixels = 0;
Ritor1
parents:
diff changeset
1503 uHeight = 0;
Ritor1
parents:
diff changeset
1504 uWidth = 0;
Ritor1
parents:
diff changeset
1505 field_1A = 0;
Ritor1
parents:
diff changeset
1506 field_18 = 0;
1583
75fafd8ced59 Allocator (CMemory) bye-bye
Nomad
parents: 1545
diff changeset
1507 _allocation_flags = 0;
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1508 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1509 //----- (0044E1EC) --------------------------------------------------------
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1510 int TextureFrameTable::FromFileTxt(const char *Args)
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1511 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1512 TextureFrameTable *v2; // ebx@1
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1513 FILE *v3; // eax@1
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1514 int v4; // esi@3
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1515 const void *v5; // ST0C_4@10
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1516 void *v6; // eax@10
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1517 FILE *v7; // ST0C_4@12
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1518 char *i; // eax@12
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1519 signed int v9; // esi@15
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1520 int v10; // eax@17
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1521 int v11; // edx@22
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1522 int v12; // ecx@23
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1523 int v13; // eax@24
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1524 signed int j; // eax@27
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1525 TextureFrame *v15; // edx@28
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1526 int v16; // esi@28
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1527 int k; // ecx@29
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1528 char Buf; // [sp+Ch] [bp-2F8h]@3
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1529 FrameTableTxtLine v20; // [sp+200h] [bp-104h]@4
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1530 int v21; // [sp+27Ch] [bp-88h]@4
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1531 char *Str1; // [sp+280h] [bp-84h]@5
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1532 char *Str; // [sp+284h] [bp-80h]@15
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1533 int v24; // [sp+2F8h] [bp-Ch]@3
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1534 int v25; // [sp+2FCh] [bp-8h]@3
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1535 FILE *File; // [sp+300h] [bp-4h]@1
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1536 int Argsa; // [sp+30Ch] [bp+8h]@28
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1537
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1538 v2 = this;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1539 v3 = fopen(Args, "r");
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1540 File = v3;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1541 if ( !v3 )
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1477
diff changeset
1542 Error("CTextureFrameTable::load - Unable to open file: %s.", Args);
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1477
diff changeset
1543
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1544 v4 = 0;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1545 v24 = 0;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1546 v25 = 1;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1547 if ( fgets(&Buf, 490, v3) )
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1548 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1549 do
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1550 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1551 *strchr(&Buf, 10) = 0;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1552 memcpy(&v21, txt_file_frametable_parser(&Buf, &v20), 0x7Cu);
1409
c9e3b93ec570 Highlighted locations with "using uninitialized variable" warning.
Nomad
parents: 1402
diff changeset
1553 __debugbreak(); // warning C4700: uninitialized local variable 'Str1' used
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1554 if ( v21 && *Str1 != 47 )
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1555 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1556 if ( v21 < 2 )
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1477
diff changeset
1557 Error("CTextureFrameTable::load, too few arguments, %s line %i.", Args, v25);
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1558 ++v24;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1559 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1560 ++v25;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1561 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1562 while ( fgets(&Buf, 490, File) );
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1563 v4 = v24;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1564 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1565 v5 = v2->pTextures;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1566 v2->sNumTextures = v4;
1583
75fafd8ced59 Allocator (CMemory) bye-bye
Nomad
parents: 1545
diff changeset
1567 v6 = malloc(20 * v4);
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1568 v2->pTextures = (TextureFrame *)v6;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1569 if ( !v6 )
1545
c4ab816fcc5e assert, Abortf, AbortWithError -> Assert, Error
Nomad
parents: 1477
diff changeset
1570 Error("CTextureFrameTable::load - Out of Memory!");
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1571 v7 = File;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1572 v2->sNumTextures = 0;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1573 fseek(v7, 0, 0);
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1574 for ( i = fgets(&Buf, 490, File); i; i = fgets(&Buf, 490, File) )
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1575 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1576 *strchr(&Buf, 10) = 0;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1577 memcpy(&v21, txt_file_frametable_parser(&Buf, &v20), 0x7Cu);
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1578 if ( v21 && *Str1 != 47 )
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1579 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1580 strcpy(v2->pTextures[v2->sNumTextures].pTextureName, Str1);
1409
c9e3b93ec570 Highlighted locations with "using uninitialized variable" warning.
Nomad
parents: 1402
diff changeset
1581 __debugbreak(); // warning C4700: uninitialized local variable 'Str' used
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1582 v2->pTextures[v2->sNumTextures].uAnimTime = atoi(Str);
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1583 v9 = 2;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1584 for ( v2->pTextures[v2->sNumTextures].uFlags = 0; v9 < v21; ++v9 )
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1585 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1586 if ( !_stricmp((&Str1)[4 * v9], "New") )
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1587 {
2335
6e3ca612f132 int -> uint
Ritor1
parents: 2334
diff changeset
1588 //v10 = (int)&v2->pTextures[v2->sNumTextures].uFlags;
6e3ca612f132 int -> uint
Ritor1
parents: 2334
diff changeset
1589 v2->pTextures[v2->sNumTextures].uFlags |= 2;
1297
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1590 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1591 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1592 ++v2->sNumTextures;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1593 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1594 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1595 fclose(File);
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1596 v11 = 0;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1597 if ( (signed int)(v2->sNumTextures - 1) > 0 )
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1598 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1599 v12 = 0;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1600 do
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1601 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1602 v13 = (int)&v2->pTextures[v12];
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1603 if ( !(*(char *)(v13 + 38) & 2) )
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1604 *(char *)(v13 + 18) |= 1u;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1605 ++v11;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1606 ++v12;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1607 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1608 while ( v11 < (signed int)(v2->sNumTextures - 1) );
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1609 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1610 for ( j = 0; j < (signed int)v2->sNumTextures; *(short *)(Argsa + 16) = v16 )
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1611 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1612 v15 = v2->pTextures;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1613 Argsa = (int)&v15[j];
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1614 v16 = *(short *)(Argsa + 14);
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1615 if ( *(char *)(Argsa + 18) & 1 )
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1616 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1617 ++j;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1618 for ( k = (int)&v15[j]; *(char *)(k + 18) & 1; k += 20 )
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1619 {
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1620 v16 += *(short *)(k + 14);
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1621 ++j;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1622 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1623 LOWORD(v16) = v15[j].uAnimTime + v16;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1624 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1625 ++j;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1626 }
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1627 return 1;
5450af4f57ef moving files mm7_x ending
Ritor1
parents: 1262
diff changeset
1628 }