projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20100220-1-src
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index 9dab9371e449ca0d78369721134f346fe34443cc..0d7dfe9359ded8e89ef18cc74ac6d7584785af8e 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-329,6
+329,14
@@
void SetBitmaps_EM(Bitmap **em_bitmap)
}
#endif
}
#endif
+#if 1
+/* !!! FIX THIS (CHANGE TO USING NORMAL ELEMENT GRAPHIC DEFINITIONS) !!! */
+void SetBitmaps_SP(Bitmap **sp_bitmap)
+{
+ *sp_bitmap = graphic_info[IMG_SP_OBJECTS].bitmap;
+}
+#endif
+
static int getFontBitmapID(int font_nr)
{
int special = -1;
static int getFontBitmapID(int font_nr)
{
int special = -1;
@@
-2829,8
+2837,12
@@
void InitElementPropertiesStatic()
EL_SIGN_FRANKIE,
EL_STEEL_EXIT_CLOSED,
EL_STEEL_EXIT_OPEN,
EL_SIGN_FRANKIE,
EL_STEEL_EXIT_CLOSED,
EL_STEEL_EXIT_OPEN,
+ EL_STEEL_EXIT_OPENING,
+ EL_STEEL_EXIT_CLOSING,
EL_EM_STEEL_EXIT_CLOSED,
EL_EM_STEEL_EXIT_OPEN,
EL_EM_STEEL_EXIT_CLOSED,
EL_EM_STEEL_EXIT_OPEN,
+ EL_EM_STEEL_EXIT_OPENING,
+ EL_EM_STEEL_EXIT_CLOSING,
EL_DC_STEELWALL_1_LEFT,
EL_DC_STEELWALL_1_RIGHT,
EL_DC_STEELWALL_1_TOP,
EL_DC_STEELWALL_1_LEFT,
EL_DC_STEELWALL_1_RIGHT,
EL_DC_STEELWALL_1_TOP,
@@
-4174,6
+4186,7
@@
void InitElementPropertiesStatic()
EL_PLAYER_2,
EL_PLAYER_3,
EL_PLAYER_4,
EL_PLAYER_2,
EL_PLAYER_3,
EL_PLAYER_4,
+ EL_SOKOBAN_FIELD_PLAYER,
EL_SP_MURPHY,
EL_YAMYAM,
EL_YAMYAM_LEFT,
EL_SP_MURPHY,
EL_YAMYAM,
EL_YAMYAM_LEFT,
@@
-5124,7
+5137,7
@@
void Execute_Command(char *command)
exit(0);
}
exit(0);
}
- else if (str
ncmp(command, "dump level ", 11) == 0
)
+ else if (str
Prefix(command, "dump level ")
)
{
char *filename = &command[11];
{
char *filename = &command[11];
@@
-5136,7
+5149,7
@@
void Execute_Command(char *command)
exit(0);
}
exit(0);
}
- else if (str
ncmp(command, "dump tape ", 10) == 0
)
+ else if (str
Prefix(command, "dump tape ")
)
{
char *filename = &command[10];
{
char *filename = &command[10];
@@
-5148,7
+5161,7
@@
void Execute_Command(char *command)
exit(0);
}
exit(0);
}
- else if (str
ncmp(command, "autoplay ", 9) == 0
)
+ else if (str
Prefix(command, "autoplay ")
)
{
char *str_ptr = getStringCopy(&command[9]); /* read command parameters */
{
char *str_ptr = getStringCopy(&command[9]); /* read command parameters */
@@
-5184,9
+5197,9
@@
void Execute_Command(char *command)
str_ptr++;
}
}
str_ptr++;
}
}
- else if (str
ncmp(command, "convert ", 8) == 0
)
+ else if (str
Prefix(command, "convert ")
)
{
{
- char *str_copy = getStringCopy(
&command[8]
);
+ char *str_copy = getStringCopy(
strchr(command, ' ') + 1
);
char *str_ptr = strchr(str_copy, ' ');
global.convert_leveldir = str_copy;
char *str_ptr = strchr(str_copy, ' ');
global.convert_leveldir = str_copy;
@@
-5198,7
+5211,7
@@
void Execute_Command(char *command)
global.convert_level_nr = atoi(str_ptr); /* get level_nr value */
}
}
global.convert_level_nr = atoi(str_ptr); /* get level_nr value */
}
}
- else if (str
ncmp(command, "create images ", 14) == 0
)
+ else if (str
Prefix(command, "create images ")
)
{
#if defined(TARGET_SDL)
global.create_images_dir = getStringCopy(&command[14]);
{
#if defined(TARGET_SDL)
global.create_images_dir = getStringCopy(&command[14]);
@@
-5500,6
+5513,7
@@
void InitGfx()
bitmap_db_field);
InitGfxDoor1Info(DX, DY, DXSIZE, DYSIZE);
InitGfxDoor2Info(VX, VY, VXSIZE, VYSIZE);
bitmap_db_field);
InitGfxDoor1Info(DX, DY, DXSIZE, DYSIZE);
InitGfxDoor2Info(VX, VY, VXSIZE, VYSIZE);
+ InitGfxWindowInfo(WIN_XSIZE, WIN_YSIZE);
InitGfxScrollbufferInfo(FXSIZE, FYSIZE);
InitGfxCustomArtworkInfo();
InitGfxScrollbufferInfo(FXSIZE, FYSIZE);
InitGfxCustomArtworkInfo();
@@
-6190,6
+6204,7
@@
void OpenAll()
InitElementPropertiesStatic();
InitElementPropertiesEngine(GAME_VERSION_ACTUAL);
InitElementPropertiesStatic();
InitElementPropertiesEngine(GAME_VERSION_ACTUAL);
+ InitElementPropertiesGfxElement();
print_timestamp_time("[post-video]");
print_timestamp_time("[post-video]");
@@
-6221,6
+6236,10
@@
void OpenAll()
em_open_all();
#endif
em_open_all();
#endif
+#if 1
+ sp_open_all();
+#endif
+
if (global.autoplay_leveldir)
{
AutoPlayTape();
if (global.autoplay_leveldir)
{
AutoPlayTape();
@@
-6268,6
+6287,10
@@
void CloseAllAndExit(int exit_value)
em_close_all();
#endif
em_close_all();
#endif
+#if 1
+ sp_close_all();
+#endif
+
FreeAllImages();
#if defined(TARGET_SDL)
FreeAllImages();
#if defined(TARGET_SDL)