Skip to content

Commit

Permalink
Added flags to SetPlayerProperty.
Browse files Browse the repository at this point in the history
Added all of the missing player cheats to the SetPlayerProperty special.
  • Loading branch information
inkoalawetrust authored and madame-rachelle committed Jan 14, 2023
1 parent 6f4a29b commit 458142e
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 18 deletions.
62 changes: 44 additions & 18 deletions src/playsim/p_lnspec.cpp
Expand Up @@ -2914,7 +2914,14 @@ enum
PROP_UNUSED1,
PROP_UNUSED2,
PROP_SPEED,

PROP_BUDDHA,
PROP_BUDDHA2,
PROP_FRIGHTENING,
PROP_NOCLIP,
PROP_NOCLIP2,
PROP_GODMODE,
PROP_GODMODE2,
};

FUNC(LS_SetPlayerProperty)
Expand Down Expand Up @@ -3035,24 +3042,43 @@ FUNC(LS_SetPlayerProperty)
// Set or clear a flag
switch (arg2)
{
case PROP_BUDDHA:
mask = CF_BUDDHA;
break;
case PROP_FROZEN:
mask = CF_FROZEN;
break;
case PROP_NOTARGET:
mask = CF_NOTARGET;
break;
case PROP_INSTANTWEAPONSWITCH:
mask = CF_INSTANTWEAPSWITCH;
break;
case PROP_FLY:
//mask = CF_FLY;
break;
case PROP_TOTALLYFROZEN:
mask = CF_TOTALLYFROZEN;
break;
case PROP_BUDDHA:
mask = CF_BUDDHA;
break;
case PROP_BUDDHA2:
mask = CF_BUDDHA2;
break;
case PROP_FROZEN:
mask = CF_FROZEN;
break;
case PROP_NOTARGET:
mask = CF_NOTARGET;
break;
case PROP_INSTANTWEAPONSWITCH:
mask = CF_INSTANTWEAPSWITCH;
break;
//CF_FLY has special handling
case PROP_FLY:
//mask = CF_FLY;
break;
case PROP_TOTALLYFROZEN:
mask = CF_TOTALLYFROZEN;
break;
case PROP_FRIGHTENING:
mask = CF_FRIGHTENING;
break;
case PROP_NOCLIP:
mask = CF_NOCLIP;
break;
case PROP_NOCLIP2:
mask = CF_NOCLIP|CF_NOCLIP2; //Both must be on.
break;
case PROP_GODMODE:
mask = CF_GODMODE;
break;
case PROP_GODMODE2:
mask = CF_GODMODE2;
break;
}

if (arg0 == 0)
Expand Down
6 changes: 6 additions & 0 deletions wadsrc/static/zscript/constants.zs
Expand Up @@ -435,6 +435,12 @@ enum EPlayerProperties
PROP_FLIGHT = 12, // (Deprecated)
PROP_SPEED = 15, // (Deprecated)
PROP_BUDDHA = 16,
PROP_BUDDHA2 = 17,
PROP_FRIGHTENING = 18,
PROP_NOCLIP = 19,
PROP_NOCLIP2 = 20,
PROP_GODMODE = 21,
PROP_GODMODE2 = 22,
}

// Line_SetBlocking
Expand Down

0 comments on commit 458142e

Please sign in to comment.