projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed using same (little endian) pixel format everywhere
[rocksndiamonds.git]
/
src
/
files.c
diff --git
a/src/files.c
b/src/files.c
index e86364db9f077fd4b678703a0394069b25e58c24..5e95fb80f0cd908e4aeaa08800cd14b2c7738dd3 100644
(file)
--- a/
src/files.c
+++ b/
src/files.c
@@
-60,7
+60,6
@@
#define TAPE_CHUNK_VERS_SIZE 8 // size of file version chunk
#define TAPE_CHUNK_HEAD_SIZE 20 // size of tape file header
#define TAPE_CHUNK_VERS_SIZE 8 // size of file version chunk
#define TAPE_CHUNK_HEAD_SIZE 20 // size of tape file header
-#define TAPE_CHUNK_HEAD_UNUSED 1 // unused tape header bytes
#define TAPE_CHUNK_SCRN_SIZE 2 // size of screen size chunk
#define SCORE_CHUNK_VERS_SIZE 8 // size of file version chunk
#define TAPE_CHUNK_SCRN_SIZE 2 // size of screen size chunk
#define SCORE_CHUNK_VERS_SIZE 8 // size of file version chunk
@@
-3606,6
+3605,8
@@
static void LoadLevelFromFileInfo_RND(struct LevelInfo *level,
{
Warn("wrong size (%d) of chunk '%s' in level file '%s'",
chunk_size, chunk_name, filename);
{
Warn("wrong size (%d) of chunk '%s' in level file '%s'",
chunk_size, chunk_name, filename);
+
+ break;
}
}
}
}
}
}
@@
-7885,6
+7886,7
@@
static void setTapeInfoToDefaults(void)
tape.level_nr = level_nr;
tape.counter = 0;
tape.changed = FALSE;
tape.level_nr = level_nr;
tape.counter = 0;
tape.changed = FALSE;
+ tape.solved = FALSE;
tape.recording = FALSE;
tape.playing = FALSE;
tape.recording = FALSE;
tape.playing = FALSE;
@@
-7971,8
+7973,7
@@
static int LoadTape_HEAD(File *file, int chunk_size, struct TapeInfo *tape)
setTapeActionFlags(tape, getFile8Bit(file));
tape->property_bits = getFile8Bit(file);
setTapeActionFlags(tape, getFile8Bit(file));
tape->property_bits = getFile8Bit(file);
-
- ReadUnusedBytesFromFile(file, TAPE_CHUNK_HEAD_UNUSED);
+ tape->solved = getFile8Bit(file);
engine_version = getFileVersion(file);
if (engine_version > 0)
engine_version = getFileVersion(file);
if (engine_version > 0)
@@
-8417,9
+8418,7
@@
static void SaveTape_HEAD(FILE *file, struct TapeInfo *tape)
putFile8Bit(file, getTapeActionValue(tape));
putFile8Bit(file, tape->property_bits);
putFile8Bit(file, getTapeActionValue(tape));
putFile8Bit(file, tape->property_bits);
-
- // unused bytes not at the end here for 4-byte alignment of engine_version
- WriteUnusedBytesToFile(file, TAPE_CHUNK_HEAD_UNUSED);
+ putFile8Bit(file, tape->solved);
putFileVersion(file, tape->engine_version);
}
putFileVersion(file, tape->engine_version);
}
@@
-8601,6
+8600,10
@@
void DumpTape(struct TapeInfo *tape)
tape->engine_version);
Print("Level series identifier: '%s'\n", tape->level_identifier);
tape->engine_version);
Print("Level series identifier: '%s'\n", tape->level_identifier);
+ Print("Solution tape: %s\n",
+ tape->solved ? "yes" :
+ tape->game_version < VERSION_IDENT(4,3,2,3) ? "unknown" : "no");
+
Print("Special tape properties: ");
if (tape->property_bits == TAPE_PROPERTY_NONE)
Print("[none]");
Print("Special tape properties: ");
if (tape->property_bits == TAPE_PROPERTY_NONE)
Print("[none]");
@@
-13486,7
+13489,7
@@
void CreateCollectElementImages(void)
SDL_MapRGB(dst_bitmap->surface->format, 0x00, 0x00, 0x00));
dst_bitmap->surface =
SDL_MapRGB(dst_bitmap->surface->format, 0x00, 0x00, 0x00));
dst_bitmap->surface =
- SDL_ConvertSurfaceFormat(dst_bitmap->surface, SDL_PIXELFORMAT_
RGBA32
, 0);
+ SDL_ConvertSurfaceFormat(dst_bitmap->surface, SDL_PIXELFORMAT_
ARGB8888
, 0);
for (i = 0; i < MAX_NUM_ELEMENTS; i++)
{
for (i = 0; i < MAX_NUM_ELEMENTS; i++)
{
@@
-13513,7
+13516,7
@@
void CreateCollectElementImages(void)
SDL_MapRGB(tmp_bitmap->surface->format, 0x00, 0x00, 0x00));
tmp_bitmap->surface =
SDL_MapRGB(tmp_bitmap->surface->format, 0x00, 0x00, 0x00));
tmp_bitmap->surface =
- SDL_ConvertSurfaceFormat(tmp_bitmap->surface, SDL_PIXELFORMAT_
RGBA32
, 0);
+ SDL_ConvertSurfaceFormat(tmp_bitmap->surface, SDL_PIXELFORMAT_
ARGB8888
, 0);
tmp_bitmap->surface_masked = tmp_bitmap->surface;
tmp_bitmap->surface_masked = tmp_bitmap->surface;
@@
-13556,7
+13559,9
@@
void CreateCollectElementImages(void)
Info("Converting image file from BMP to PNG ...");
Info("Converting image file from BMP to PNG ...");
- system(cmd_convert);
+ if (system(cmd_convert) != 0)
+ Fail("converting image file failed");
+
unlink(filename_bmp);
Info("Done.");
unlink(filename_bmp);
Info("Done.");