diff --git a/source/core/gamecontrol.h b/source/core/gamecontrol.h index ffa9436dc..ddb84d6c6 100644 --- a/source/core/gamecontrol.h +++ b/source/core/gamecontrol.h @@ -197,6 +197,11 @@ inline bool isShareware() } inline bool isDukeLike() +{ + return g_gameType & (GAMEFLAG_NAM | GAMEFLAG_NAPALM | GAMEFLAG_WW2GI | GAMEFLAG_DUKE); +} + +inline bool isDukeEngine() { return g_gameType & (GAMEFLAG_NAM | GAMEFLAG_NAPALM | GAMEFLAG_WW2GI | GAMEFLAG_DUKE | GAMEFLAG_RRALL); } diff --git a/source/core/initfs.cpp b/source/core/initfs.cpp index b6c90d107..e8173853a 100644 --- a/source/core/initfs.cpp +++ b/source/core/initfs.cpp @@ -402,7 +402,8 @@ void InitFileSystem(TArray& groups) lfi.dotFilter = LumpFilter; - if (g_gameType & (GAMEFLAG_DUKE | GAMEFLAG_NAM | GAMEFLAG_NAPALM | GAMEFLAG_WW2GI | GAMEFLAG_RRALL)) lfi.gameTypeFilter.Push("DukeEngine"); + if (isDukeEngine()) lfi.gameTypeFilter.Push("DukeEngine"); + if (isDukeLike()) lfi.gameTypeFilter.Push("DukeLike"); lfi.postprocessFunc = [&]() { diff --git a/source/core/maploader.cpp b/source/core/maploader.cpp index 76373c49a..59c8b8074 100644 --- a/source/core/maploader.cpp +++ b/source/core/maploader.cpp @@ -869,7 +869,7 @@ void MarkMap() { GC::Mark(sect.firstEntry); GC::Mark(sect.lastEntry); - if (isDukeLike()) GC::Mark(sect.hitagactor); + if (isDukeEngine()) GC::Mark(sect.hitagactor); else if (isBlood()) { GC::Mark(sect.upperLink); diff --git a/source/core/savegamehelp.cpp b/source/core/savegamehelp.cpp index 675ce1f17..b2400824f 100644 --- a/source/core/savegamehelp.cpp +++ b/source/core/savegamehelp.cpp @@ -103,7 +103,7 @@ static void SerializeGlobals(FSerializer& arc) static void SerializeSession(FSerializer& arc) { // In Duke we now have reliable sound names. - if (isDukeLike()) arc.SetUniqueSoundNames(); + if (isDukeEngine()) arc.SetUniqueSoundNames(); arc.ReadObjects(false); SerializeMap(arc); @@ -489,7 +489,7 @@ FSerializer &Serialize(FSerializer &arc, const char *key, sectortype &c, sectort ("exflags", c.exflags, def->exflags); // Save the extensions only when playing their respective games. - if (isDukeLike()) + if (isDukeEngine()) { arc("keyinfo", c.keyinfo, def->keyinfo) ("shadedsector", c.shadedsector, def->shadedsector) diff --git a/wadsrc/static/filter/duke/sndinfo.txt b/wadsrc/static/filter/dukelike/sndinfo.txt similarity index 100% rename from wadsrc/static/filter/duke/sndinfo.txt rename to wadsrc/static/filter/dukelike/sndinfo.txt diff --git a/wadsrc/static/filter/redneck/sndinfo.txt b/wadsrc/static/filter/redneck/sndinfo.txt index 74ce8e4b7..4d3457f2c 100644 --- a/wadsrc/static/filter/redneck/sndinfo.txt +++ b/wadsrc/static/filter/redneck/sndinfo.txt @@ -199,13 +199,13 @@ $conreserve BIKEJMPL 190 $conreserve BIKELAND 191 $conreserve JACKJMP1 192 $conreserve JACKJMP2 193 -$conreserve FIRE_CRACKLE =194 -$conreserve BONUS_SPEECH1 =195 -$conreserve BONUS_SPEECH2 =196 -$conreserve BONUS_SPEECH3 =197 +$conreserve FIRE_CRACKLE 194 +$conreserve BONUS_SPEECH1 195 +$conreserve BONUS_SPEECH2 196 +$conreserve BONUS_SPEECH3 197 $conreserve E2L4 198 -$conreserve BONUS_SPEECH4 =199 -$conreserve PLAYER_LAND_HURT =200 +$conreserve BONUS_SPEECH4 199 +$conreserve PLAYER_LAND_HURT 200 $conreserve JACKATK2 201 $conreserve JACKPAIN 202 $conreserve LN_BITCH 203 @@ -216,7 +216,7 @@ $conreserve LN_PAIN4 207 $conreserve LN_SLOW 208 $conreserve LN_PAIN4A 209 $conreserve JUG 210 -$conreserve PLAYER_LONGTERM_PAIN =211 +$conreserve PLAYER_LONGTERM_PAIN 211 $conreserve MONITOR 212 $conreserve JACKATK1 213 $conreserve BIKEUP 214