mirror of
https://github.com/ZDoom/Raze.git
synced 2024-11-16 01:11:44 +00:00
C-CON: Add userdef members "globalflags" and "globalgameflags", which control the values specified by the def commands of the same name.
git-svn-id: https://svn.eduke32.com/eduke32@5248 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
d2ed954c20
commit
ad94a8399c
3 changed files with 8 additions and 0 deletions
|
@ -1164,6 +1164,8 @@ const memberlabel_t UserdefsLabels[]=
|
|||
{ "musictoggle", USERDEFS_MUSICTOGGLE, 0, 0 },
|
||||
{ "gametypeflags", USERDEFS_GAMETYPEFLAGS, 0, 0 },
|
||||
{ "m_gametypeflags", USERDEFS_M_GAMETYPEFLAGS, 0, 0 },
|
||||
{ "globalflags", USERDEFS_GLOBALFLAGS, 0, 0 },
|
||||
{ "globalgameflags", USERDEFS_GLOBALGAMEFLAGS, 0, 0 },
|
||||
{ "", -1, 0, 0 } // END OF LIST
|
||||
};
|
||||
|
||||
|
|
|
@ -470,6 +470,8 @@ enum UserdefsLabel_t
|
|||
USERDEFS_USEMODELS,
|
||||
USERDEFS_GAMETYPEFLAGS,
|
||||
USERDEFS_M_GAMETYPEFLAGS,
|
||||
USERDEFS_GLOBALFLAGS,
|
||||
USERDEFS_GLOBALGAMEFLAGS,
|
||||
USERDEFS_END
|
||||
};
|
||||
|
||||
|
|
|
@ -168,6 +168,8 @@ int32_t __fastcall VM_GetUserdef(register int32_t lLabelID)
|
|||
break;
|
||||
case USERDEFS_GAMETYPEFLAGS: lLabelID = GametypeFlags[ud.coop]; break;
|
||||
case USERDEFS_M_GAMETYPEFLAGS: lLabelID = GametypeFlags[ud.m_coop]; break;
|
||||
case USERDEFS_GLOBALFLAGS: lLabelID = globalflags; break;
|
||||
case USERDEFS_GLOBALGAMEFLAGS: lLabelID = duke3d_globalflags; break;
|
||||
default: lLabelID = -1; break;
|
||||
}
|
||||
|
||||
|
@ -282,6 +284,8 @@ void __fastcall VM_SetUserdef(register int32_t const lLabelID, register int32_t
|
|||
case USERDEFS_RUNKEY_MODE: ud.runkey_mode = iSet; break;
|
||||
case USERDEFS_M_ORIGIN_X: ud.m_origin.x = iSet; break;
|
||||
case USERDEFS_M_ORIGIN_Y: ud.m_origin.y = iSet; break;
|
||||
case USERDEFS_GLOBALFLAGS: globalflags = iSet; break;
|
||||
case USERDEFS_GLOBALGAMEFLAGS: duke3d_globalflags = iSet; break;
|
||||
default: break;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue