diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 9837f6f15..83c59e364 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,4 +1,7 @@ -February 17, 2009 +February 20, 2009 (Changes by Graf Zahl) +- fixed: level_info_t::mapbg was not initialized + +February 17, 2009 - Fixed: Player names and chat macros that end with incomplete \c escapes now have those escapes stripped before printing so that they do not merge with subsequent text. @@ -59,6 +62,8 @@ February 9, 2009 - Added middle mouse button selection pasting for X systems. February 8, 2009 (Changes by Graf Zahl) +- Fixed parsing of 'cluster' keyword when format is not yet known. +- Moved CheckCompatibility call so that it is done after setting LEVEL_HEXENFORMAT. - Fixed parsing for MustConfirm key in skill parser. - Converted internal MAPINFOs to new syntax. - Added a range parameter to SNDINFO's $limit. diff --git a/src/g_mapinfo.cpp b/src/g_mapinfo.cpp index 254546c40..13fe03b09 100644 --- a/src/g_mapinfo.cpp +++ b/src/g_mapinfo.cpp @@ -217,6 +217,7 @@ void P_RemoveDefereds (void) void level_info_t::Reset() { mapname[0] = 0; + mapbg[0] = 0; levelnum = 0; pname[0] = 0; nextmap[0] = 0; diff --git a/wadsrc/static/actors/strife/strifestuff.txt b/wadsrc/static/actors/strife/strifestuff.txt index 16deecb03..5d280be2b 100644 --- a/wadsrc/static/actors/strife/strifestuff.txt +++ b/wadsrc/static/actors/strife/strifestuff.txt @@ -169,14 +169,14 @@ ACTOR WoodenBarrel 82 // Strife's explosive barrel ------------------------------------------------ -ACTOR ExplosiveBarrel2 : ExplosiveBarrel 94 +ACTOR ExplosiveBarrel2 94 { Game Strife Health 30 Radius 10 Height 32 ConversationID 204, -1, -1 - //+SOLID +SHOOTABLE +NOBLOOD + +SOLID +SHOOTABLE +NOBLOOD +OLDRADIUSDMG +INCOMBAT States { @@ -187,8 +187,7 @@ ACTOR ExplosiveBarrel2 : ExplosiveBarrel 94 BART B 2 Bright A_Scream BART CD 2 Bright BART E 2 Bright A_NoBlocking - BART F 0 Bright A_AlertMonsters - BART F 2 Bright A_Explode(64, 64) + BART F 2 Bright A_Explode(64, 64, 1, 1) BART GHIJ 2 Bright BART K 3 Bright BART L -1