OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

GZDoom 4.5.0 compat fixes.

Browse source
This commit is contained in:
Mari the Deer 2021-03-21 12:01:11 +01:00
commit d0287b7ade
4 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
language.version
View file

@ -1,3 +1,3 @@
[default]
SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r392 \cu(Sun 21 Mar 03:35:14 CET 2021)\c-";
SWWM_SHORTVER="\cw0.9.11b-pre r392 \cu(2021-03-21 03:35:14)\c-";
SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r392 \cu(Sun 21 Mar 12:01:11 CET 2021)\c-";
SWWM_SHORTVER="\cw0.9.11b-pre r392 \cu(2021-03-21 12:01:11)\c-";

4
zmapinfo.txt
View file

@ -28,7 +28,7 @@ GameInfo
MenuFontColor_Highlight = "Sapphire"
MenuFontColor_Selection = "Sapphire"
MenuSliderColor = "Green"
MenuSliderBackColor = "DarkGray"
//MenuSliderBackColor = "DarkGray"
MenuBackButton = "graphics/swwmback.png"
MessageBoxClass = "SWWMMessageBox"
PauseSign = "graphics/swwmpause.png"
@ -143,7 +143,7 @@ Skill lunatic
SpawnFilter = nightmare
SpawnMulti
TotalInfighting
InstantReaction
//InstantReaction
NoPain
ACSReturn = 4
Name = "$SWWM_SKLUNATIC"

2
zscript/handler/swwm_handler_worldthings.zsc
View file

@ -183,7 +183,7 @@ extend Class SWWMHandler
private bool SuppressMultiItem( WorldEvent e )
{
// quick checks
if ( !G_SkillPropertyInt(SKILLP_SpawnMulti) || multiplayer || (dmflags2&(1<<29)) ) // wow there's no dmflags constants defined in zscript???
if ( !G_SkillPropertyInt(SKILLP_SpawnMulti) || multiplayer || sv_alwaysspawnmulti )
return false;
// is it coop inventory? suppress it
if ( (e.Thing.spawnflags&(MTF_COOPERATIVE|MTF_DEATHMATCH)) && !(e.Thing.spawnflags&MTF_SINGLE) && (e.Thing is 'Inventory') )

5
zscript/swwm_common.zsc
View file

@ -20,6 +20,11 @@ enum ESWWMGZChannels
const FallbackTag = "AWESOME IT'S PENIS"; // used on tag processing, please don't mind the actual string used)
const MaxBouncePerTic = 40; // maximum simultaneous bounces in one tic for a lightweight actor before we consider it's stuck
// fixup for 4.5 compat, will be removed once a new version lands
// SKILLP_SpawnMulti is not defined in zscript, so it has to be declared here
// (somehow this hackaround doesn't break anything in devbuilds)
const SKILLP_SpawnMulti = SKILLP_PlayerRespawn+1;
// Future planning, will be filled out with AI stuff and whatnot someday
Class SWWMMonster : Actor abstract
{