From: Holger Schemel Date: Fri, 7 Jun 2002 19:02:28 +0000 (+0200) Subject: rnd-20020607-1-src X-Git-Tag: 2.1.0^2~8 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=192bb88f2e18aeec39614040d52e7d9fabebdb99;p=rocksndiamonds.git rnd-20020607-1-src --- diff --git a/src/files.c b/src/files.c index 4de97c6c..b3557c18 100644 --- a/src/files.c +++ b/src/files.c @@ -444,6 +444,10 @@ void LoadLevel(int level_nr) /* player was faster than monsters in (pre-)1.0 levels */ level.double_speed = TRUE; } + + /* Default behaviour for EM style gems was "slippery" only in 2.0.1 */ + if (level.game_version == VERSION_IDENT(2,0,1)) + level.em_slippery_gems = TRUE; } else { diff --git a/src/game.c b/src/game.c index 020cdc89..8157320c 100644 --- a/src/game.c +++ b/src/game.c @@ -837,6 +837,7 @@ void InitGame() { static int ep_em_slippery_wall[] = { + EL_BETON, /* dummy entry; may be overwritten with EL_MAUERND */ EL_BETON, EL_MAUERWERK, EL_MAUER_LEBT, @@ -851,10 +852,23 @@ void InitGame() sizeof(ep_em_slippery_wall) / sizeof(int); #endif +#if 1 + printf("level %d: level version == %06d\n", level_nr, level.game_version); + printf(" tape version == %06d\n", tape.game_version); + printf(" => game.version == %06d\n", game.version); + /* printf("level %d: game.version == %06d\n", level_nr, level.game_version); printf(" file_version == %06d\n", level.file_version); */ +#endif + + if (game.version > VERSION_IDENT(2,0,1)) + ep_em_slippery_wall[0] = EL_MAUERND; + else + ep_em_slippery_wall[0] = EL_BETON; /* dummy entry */ + + Elementeigenschaften2[EL_MAUERND] &= ~EP_BIT_EM_SLIPPERY_WALL; for (i=0; ifilename = getStringCopy(directory_name); + checkSetupFileListIdentifier(setup_file_list, getCookie("LEVELINFO")); /* set all structure fields according to the token/value pairs */ @@ -1465,8 +1467,6 @@ static boolean LoadLevelInfoFromLevelConf(TreeInfo **node_first, if (leveldir_new->name_sorting == NULL) leveldir_new->name_sorting = getStringCopy(leveldir_new->name); - leveldir_new->filename = getStringCopy(directory_name); - if (node_parent == NULL) /* top level group */ { leveldir_new->basepath = level_directory; diff --git a/src/main.h b/src/main.h index a4d392c6..52f9e850 100644 --- a/src/main.h +++ b/src/main.h @@ -1624,8 +1624,8 @@ extern struct SoundEffectInfo sound_effects[]; #define SETUP 8 #define PROGRAM_VERSION_MAJOR 2 -#define PROGRAM_VERSION_MINOR 0 -#define PROGRAM_VERSION_PATCH 2 +#define PROGRAM_VERSION_MINOR 1 +#define PROGRAM_VERSION_PATCH 0 #define PROGRAM_VERSION_STRING "2.1.0" #define PROGRAM_TITLE_STRING "Rocks'n'Diamonds" diff --git a/src/timestamp.h b/src/timestamp.h index 0b27fae4..a5e8de3f 100644 --- a/src/timestamp.h +++ b/src/timestamp.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "[2002-06-01 00:23]" +#define COMPILE_DATE_STRING "[2002-06-07 21:01]"