projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20100401-1-src
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index c3c14af2e682f984e3034b7a011c12c363f24e59..6d0b9501bb136d832991a1902ec20fd07ddc0e78 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-39,7
+39,7
@@
#define CONFIG_TOKEN_GLOBAL_BUSY "global.busy"
#define DEBUG_PRINT_INIT_TIMESTAMPS TRUE
#define CONFIG_TOKEN_GLOBAL_BUSY "global.busy"
#define DEBUG_PRINT_INIT_TIMESTAMPS TRUE
-#define DEBUG_PRINT_INIT_TIMESTAMPS_DEPTH 1
+#define DEBUG_PRINT_INIT_TIMESTAMPS_DEPTH 1
0
static struct FontBitmapInfo font_initial[NUM_INITIAL_FONTS];
static struct FontBitmapInfo font_initial[NUM_INITIAL_FONTS];
@@
-329,7
+329,7
@@
void SetBitmaps_EM(Bitmap **em_bitmap)
}
#endif
}
#endif
-#if
1
+#if
0
/* !!! FIX THIS (CHANGE TO USING NORMAL ELEMENT GRAPHIC DEFINITIONS) !!! */
void SetBitmaps_SP(Bitmap **sp_bitmap)
{
/* !!! FIX THIS (CHANGE TO USING NORMAL ELEMENT GRAPHIC DEFINITIONS) !!! */
void SetBitmaps_SP(Bitmap **sp_bitmap)
{
@@
-1306,6
+1306,8
@@
static void set_graphic_parameters_ext(int graphic, int *parameter,
g->align = ALIGN_CENTER; /* default for title screens */
g->valign = VALIGN_MIDDLE; /* default for title screens */
g->sort_priority = 0; /* default for title screens */
g->align = ALIGN_CENTER; /* default for title screens */
g->valign = VALIGN_MIDDLE; /* default for title screens */
g->sort_priority = 0; /* default for title screens */
+ g->class = 0;
+ g->style = STYLE_DEFAULT;
g->bitmap = src_bitmap;
g->bitmap = src_bitmap;
@@
-1506,6
+1508,11
@@
static void set_graphic_parameters_ext(int graphic, int *parameter,
g->valign = parameter[GFX_ARG_VALIGN];
if (parameter[GFX_ARG_SORT_PRIORITY] != ARG_UNDEFINED_VALUE)
g->sort_priority = parameter[GFX_ARG_SORT_PRIORITY];
g->valign = parameter[GFX_ARG_VALIGN];
if (parameter[GFX_ARG_SORT_PRIORITY] != ARG_UNDEFINED_VALUE)
g->sort_priority = parameter[GFX_ARG_SORT_PRIORITY];
+
+ if (parameter[GFX_ARG_CLASS] != ARG_UNDEFINED_VALUE)
+ g->class = parameter[GFX_ARG_CLASS];
+ if (parameter[GFX_ARG_STYLE] != ARG_UNDEFINED_VALUE)
+ g->style = parameter[GFX_ARG_STYLE];
}
static void set_graphic_parameters(int graphic)
}
static void set_graphic_parameters(int graphic)
@@
-2837,8
+2844,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,
@@
-4182,6
+4193,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,
@@
-5192,15
+5204,13
@@
void Execute_Command(char *command)
str_ptr++;
}
}
str_ptr++;
}
}
- else if (strPrefix(command, "convert ") ||
- strPrefix(command, "convert_special_1 "))
+ else if (strPrefix(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;
global.convert_level_nr = -1;
char *str_ptr = strchr(str_copy, ' ');
global.convert_leveldir = str_copy;
global.convert_level_nr = -1;
- global.convert_mode_special_1 = strPrefix(command, "convert_special_1 ");
if (str_ptr != NULL) /* level number follows */
{
if (str_ptr != NULL) /* level number follows */
{
@@
-6161,8
+6171,14
@@
void OpenAll()
game_status = GAME_MODE_LOADING;
game_status = GAME_MODE_LOADING;
+#if 1
+ InitCounter();
+#endif
+
InitGlobal(); /* initialize some global variables */
InitGlobal(); /* initialize some global variables */
+ print_timestamp_time("[init global stuff]");
+
if (options.execute_command)
Execute_Command(options.execute_command);
if (options.execute_command)
Execute_Command(options.execute_command);
@@
-6185,25
+6201,29
@@
void OpenAll()
InitArtworkConfig(); /* needed before forking sound child process */
InitMixer();
InitArtworkConfig(); /* needed before forking sound child process */
InitMixer();
+#if 0
InitCounter();
InitCounter();
+#endif
InitRND(NEW_RANDOMIZE);
InitSimpleRandom(NEW_RANDOMIZE);
InitJoysticks();
InitRND(NEW_RANDOMIZE);
InitSimpleRandom(NEW_RANDOMIZE);
InitJoysticks();
- print_timestamp_time("[
pre-video
]");
+ print_timestamp_time("[
init setup/config stuff
]");
InitVideoDisplay();
InitVideoBuffer(WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH, setup.fullscreen);
InitEventFilter(FilterMouseMotionEvents);
InitVideoDisplay();
InitVideoBuffer(WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH, setup.fullscreen);
InitEventFilter(FilterMouseMotionEvents);
+ print_timestamp_time("[init video stuff]");
+
InitElementPropertiesStatic();
InitElementPropertiesEngine(GAME_VERSION_ACTUAL);
InitElementPropertiesGfxElement();
InitElementPropertiesStatic();
InitElementPropertiesEngine(GAME_VERSION_ACTUAL);
InitElementPropertiesGfxElement();
- print_timestamp_time("[
post-video
]");
+ print_timestamp_time("[
init element properties stuff
]");
InitGfx();
InitGfx();