X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=7e4b1727863b3c5ffd3b1cd59a9da024e5fdae19;hb=720b0a62c8af0585e9517ed7a98ea336304c02e4;hp=c614643e8d2bd8adf1e10c6bdd181f61d423f076;hpb=c9bb6e0a6eecbf84320be79b121bd957a938a08c;p=rocksndiamonds.git diff --git a/src/init.c b/src/init.c index c614643e..7e4b1727 100644 --- a/src/init.c +++ b/src/init.c @@ -645,7 +645,7 @@ static void set_graphic_parameters(int graphic, char **parameter_raw) anim_frames_per_col = src_bitmap->height / graphic_info[graphic].height; } - /* correct x or y offset dependant of vertical or horizontal frame order */ + /* correct x or y offset dependent of vertical or horizontal frame order */ if (parameter[GFX_ARG_VERTICAL]) /* frames are ordered vertically */ { graphic_info[graphic].offset_y = @@ -1526,6 +1526,9 @@ void InitElementPropertiesStatic() EL_GATE_2_GRAY, EL_GATE_3_GRAY, EL_GATE_4_GRAY, + EL_PENGUIN, + EL_PIG, + EL_DRAGON, -1 }; @@ -2243,7 +2246,9 @@ void InitElementPropertiesStatic() EL_DYNABOMB_INCREASE_NUMBER, EL_DYNABOMB_INCREASE_SIZE, EL_DYNABOMB_INCREASE_POWER, +#if 0 EL_SOKOBAN_OBJECT, +#endif EL_SOKOBAN_FIELD_EMPTY, EL_SOKOBAN_FIELD_FULL, EL_WALL_EMERALD_RED, @@ -2273,7 +2278,9 @@ void InitElementPropertiesStatic() EL_SP_PORT_VERTICAL, EL_SP_PORT_ANY, EL_SP_DISK_RED, +#if 0 EL_SP_DISK_YELLOW, +#endif EL_SP_CHIP_SINGLE, EL_SP_CHIP_LEFT, EL_SP_CHIP_RIGHT, @@ -2514,7 +2521,7 @@ void InitElementPropertiesEngine(int engine_version) InitElementPropertiesStatic(); #endif - /* set all special, combined or engine dependant element properties */ + /* set all special, combined or engine dependent element properties */ for (i=0; i < MAX_NUM_ELEMENTS; i++) { #if 0 @@ -2659,6 +2666,7 @@ void InitElementPropertiesEngine(int engine_version) engine_version > VERSION_IDENT(2,0,1))); } +#if 0 /* dynamically adjust element properties according to game engine version */ #if 0 if (engine_version < RELEASE_IDENT(2,2,0,7)) @@ -2672,6 +2680,7 @@ void InitElementPropertiesEngine(int engine_version) element_info[element].push_delay_random = 8; } } +#endif } static void InitGlobal() @@ -3124,7 +3133,7 @@ void ReloadCustomArtwork() /* custom level artwork configured in level series configuration file always overrides custom level artwork stored in level series directory - and (level independant) custom artwork configured in setup menue */ + and (level independent) custom artwork configured in setup menue */ if (leveldir_current->graphics_set != NULL) gfx_new_identifier = leveldir_current->graphics_set; if (leveldir_current->sounds_set != NULL) @@ -3289,7 +3298,7 @@ void CloseAllAndExit(int exit_value) FreeTileClipmasks(); CloseVideoDisplay(); - ClosePlatformDependantStuff(); + ClosePlatformDependentStuff(); exit(exit_value); }