projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20091020-2-src
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index 6b7cc72e6d8fbe8529e758d281f82d843cfa551b..058590d94734c4966a9bac9b92febfaf4aea5f61 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;
@@
-3153,10
+3161,16
@@
void InitElementPropertiesStatic()
EL_SOKOBAN_FIELD_EMPTY,
EL_EXIT_OPEN,
EL_EM_EXIT_OPEN,
EL_SOKOBAN_FIELD_EMPTY,
EL_EXIT_OPEN,
EL_EM_EXIT_OPEN,
+#if 1
+ EL_EM_EXIT_OPENING,
+#endif
EL_SP_EXIT_OPEN,
EL_SP_EXIT_OPENING,
EL_STEEL_EXIT_OPEN,
EL_EM_STEEL_EXIT_OPEN,
EL_SP_EXIT_OPEN,
EL_SP_EXIT_OPENING,
EL_STEEL_EXIT_OPEN,
EL_EM_STEEL_EXIT_OPEN,
+#if 1
+ EL_EM_STEEL_EXIT_OPENING,
+#endif
EL_GATE_1,
EL_GATE_2,
EL_GATE_3,
EL_GATE_1,
EL_GATE_2,
EL_GATE_3,
@@
-5494,6
+5508,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();
@@
-6184,6
+6199,7
@@
void OpenAll()
InitElementPropertiesStatic();
InitElementPropertiesEngine(GAME_VERSION_ACTUAL);
InitElementPropertiesStatic();
InitElementPropertiesEngine(GAME_VERSION_ACTUAL);
+ InitElementPropertiesGfxElement();
print_timestamp_time("[post-video]");
print_timestamp_time("[post-video]");
@@
-6215,6
+6231,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();
@@
-6262,6
+6282,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)