|
Line
Link Here
|
| 0 |
-- src/grafx.c |
0 |
++ src/grafx.c |
|
Lines 216-227
Link Here
|
| 216 |
SDL_VideoQuit(); |
216 |
SDL_VideoQuit(); |
| 217 |
} |
217 |
} |
| 218 |
|
218 |
|
| 219 |
typedef struct _Pic { |
|
|
| 220 |
short int w; |
| 221 |
short int h; |
| 222 |
char *data; |
| 223 |
} Pic; |
| 224 |
|
| 225 |
int ReadPics(const char *filename, void **pics, int maxPics, |
219 |
int ReadPics(const char *filename, void **pics, int maxPics, |
| 226 |
color * palette) |
220 |
color * palette) |
| 227 |
{ |
221 |
{ |
|
Lines 241-252
Link Here
|
| 241 |
fread(&size, sizeof(size), 1, f); |
235 |
fread(&size, sizeof(size), 1, f); |
| 242 |
swap16(&size); |
236 |
swap16(&size); |
| 243 |
if (size) { |
237 |
if (size) { |
| 244 |
Pic *p = sys_mem_alloc(size); |
238 |
unsigned char *p = sys_mem_alloc(size); |
| 245 |
|
239 |
|
| 246 |
f_read16(f, &p->w, 2); |
240 |
f_read16(f, &p[0], 2); // w |
| 247 |
f_read16(f, &p->h, 2); |
241 |
f_read16(f, &p[2], 2); // h |
| 248 |
|
242 |
|
| 249 |
f_read(f, &p->data, size - 4); |
243 |
f_read(f, &p[4], size - 4); // data |
| 250 |
|
244 |
|
| 251 |
pics[i] = p; |
245 |
pics[i] = p; |
| 252 |
|
246 |
|
|
Lines 278-288
Link Here
|
| 278 |
fread(&size, sizeof(size), 1, f); |
272 |
fread(&size, sizeof(size), 1, f); |
| 279 |
swap16(&size); |
273 |
swap16(&size); |
| 280 |
if (size) { |
274 |
if (size) { |
| 281 |
Pic *p = sys_mem_alloc(size); |
275 |
unsigned char *p = sys_mem_alloc(size); |
| 282 |
|
276 |
|
| 283 |
f_read16(f, &p->w, 2); |
277 |
f_read16(f, &p[0], 2); // w |
| 284 |
f_read16(f, &p->h, 2); |
278 |
f_read16(f, &p[2], 2); // h |
| 285 |
f_read(f, &p->data, size - 4); |
279 |
f_read(f, &p[4], size - 4); // data |
| 286 |
|
280 |
|
| 287 |
pics[i] = p; |
281 |
pics[i] = p; |
| 288 |
|
282 |
|