projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replaced 'file_identifier' tag by informal file header comment
[rocksndiamonds.git]
/
src
/
files.c
diff --git
a/src/files.c
b/src/files.c
index d79e5f55ca3587531794809b82adad7e8f155b85..e17322d6d114396d7f51ab1bf1e3e20ed59d0f60 100644
(file)
--- a/
src/files.c
+++ b/
src/files.c
@@
-8437,7
+8437,6
@@
void LoadSetup()
{
char *player_name_new;
{
char *player_name_new;
- checkSetupFileHashIdentifier(setup_file_hash, filename,getCookie("SETUP"));
decodeSetupFileHash(setup_file_hash);
freeSetupFileHash(setup_file_hash);
decodeSetupFileHash(setup_file_hash);
freeSetupFileHash(setup_file_hash);
@@
-8474,7
+8473,6
@@
void LoadSetup_EditorCascade()
if (setup_file_hash)
{
if (setup_file_hash)
{
- checkSetupFileHashIdentifier(setup_file_hash, filename,getCookie("SETUP"));
decodeSetupFileHash_EditorCascade(setup_file_hash);
freeSetupFileHash(setup_file_hash);
decodeSetupFileHash_EditorCascade(setup_file_hash);
freeSetupFileHash(setup_file_hash);
@@
-8497,9
+8495,7
@@
void SaveSetup()
return;
}
return;
}
- fprintf(file, "%s\n", getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER,
- getCookie("SETUP")));
- fprintf(file, "\n");
+ fprintFileHeader(file, SETUP_FILENAME);
/* global setup */
si = setup;
/* global setup */
si = setup;
@@
-8572,12
+8568,9
@@
void SaveSetup_EditorCascade()
return;
}
return;
}
- fprintf(file, "%s\n", getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER,
- getCookie("SETUP")));
- fprintf(file, "\n");
+ fprintFileHeader(file, EDITORCASCADE_FILENAME);
seci = setup.editor_cascade;
seci = setup.editor_cascade;
- fprintf(file, "\n");
for (i = 0; i < NUM_EDITOR_CASCADE_SETUP_TOKENS; i++)
fprintf(file, "%s\n", getSetupLine(editor_cascade_setup_tokens, "", i));
for (i = 0; i < NUM_EDITOR_CASCADE_SETUP_TOKENS; i++)
fprintf(file, "%s\n", getSetupLine(editor_cascade_setup_tokens, "", i));
@@
-9772,24
+9765,27
@@
void CreateLevelSketchImages()
/* create and save images for custom and group elements (raw BMP format) */
/* ------------------------------------------------------------------------- */
/* create and save images for custom and group elements (raw BMP format) */
/* ------------------------------------------------------------------------- */
-void CreateCustomElementImages()
+void CreateCustomElementImages(
char *directory
)
{
#if defined(TARGET_SDL)
{
#if defined(TARGET_SDL)
- char *filename = "graphics.classic/RocksCE.bmp";
- Bitmap *bitmap;
+ char *src_basename = "RocksCE-template.ilbm";
+ char *dst_basename = "RocksCE.bmp";
+ char *src_filename = getPath2(directory, src_basename);
+ char *dst_filename = getPath2(directory, dst_basename);
Bitmap *src_bitmap;
Bitmap *src_bitmap;
-
int dummy_graphic = IMG_CUSTOM_99
;
+
Bitmap *bitmap
;
int yoffset_ce = 0;
int yoffset_ge = (TILEY * NUM_CUSTOM_ELEMENTS / 16);
int yoffset_ce = 0;
int yoffset_ge = (TILEY * NUM_CUSTOM_ELEMENTS / 16);
- int src_x, src_y;
int i;
int i;
+ SDLInitVideoDisplay();
+
+ src_bitmap = LoadImage(src_filename);
+
bitmap = CreateBitmap(TILEX * 16 * 2,
TILEY * (NUM_CUSTOM_ELEMENTS + NUM_GROUP_ELEMENTS) / 16,
DEFAULT_DEPTH);
bitmap = CreateBitmap(TILEX * 16 * 2,
TILEY * (NUM_CUSTOM_ELEMENTS + NUM_GROUP_ELEMENTS) / 16,
DEFAULT_DEPTH);
- getFixedGraphicSource(dummy_graphic, 0, &src_bitmap, &src_x, &src_y);
-
for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++)
{
int x = i % 16;
for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++)
{
int x = i % 16;
@@
-9855,8
+9851,8
@@
void CreateCustomElementImages()
}
}
}
}
- if (SDL_SaveBMP(bitmap->surface, filename) != 0)
- Error(ERR_EXIT, "cannot save CE graphics file '%s'", filename);
+ if (SDL_SaveBMP(bitmap->surface,
dst_
filename) != 0)
+ Error(ERR_EXIT, "cannot save CE graphics file '%s'",
dst_
filename);
FreeBitmap(bitmap);
FreeBitmap(bitmap);