mirror of
https://github.com/DrBeef/Raze.git
synced 2025-01-18 15:11:51 +00:00
C-CON: Add quick access for the remaining structures without it.
git-svn-id: https://svn.eduke32.com/eduke32@5088 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266
parent
5c8a2e3ea6
commit
49c85f644d
3 changed files with 197 additions and 10 deletions
|
|
@ -1643,8 +1643,26 @@ static void C_GetNextVarType(int32_t type)
|
|||
|
||||
bitptr[(g_scriptPtr-script)>>3] &= ~(BITPTR_POINTER<<((g_scriptPtr-script)&7));
|
||||
*g_scriptPtr++=(i|f);
|
||||
C_GetNextVarType(0);
|
||||
C_SkipComments();
|
||||
|
||||
if ((f & (MAXGAMEVARS<<3)) && i - g_iStructVarIDs == STRUCT_USERDEF)
|
||||
{
|
||||
// userdef doesn't really have an array index
|
||||
while (*textptr != ']')
|
||||
{
|
||||
if (*textptr == 0xa)
|
||||
break;
|
||||
if (!*textptr)
|
||||
break;
|
||||
|
||||
textptr++;
|
||||
}
|
||||
*g_scriptPtr++ = g_iThisActorID; // help out the VM by inserting a dummy index
|
||||
}
|
||||
else
|
||||
{
|
||||
C_GetNextVarType(0);
|
||||
C_SkipComments();
|
||||
}
|
||||
|
||||
if (EDUKE32_PREDICT_FALSE(*textptr != ']'))
|
||||
{
|
||||
|
|
@ -1701,8 +1719,22 @@ static void C_GetNextVarType(int32_t type)
|
|||
lLabelID=C_GetLabelNameOffset(&playerH,Bstrtolower(label+(g_numLabels<<6)));
|
||||
break;
|
||||
case STRUCT_ACTORVAR:
|
||||
case STRUCT_PLAYERVAR:
|
||||
lLabelID=GetDefID(label+(g_numLabels<<6));
|
||||
break;
|
||||
case STRUCT_TSPR:
|
||||
lLabelID=C_GetLabelNameOffset(&tspriteH,Bstrtolower(label+(g_numLabels<<6)));
|
||||
break;
|
||||
case STRUCT_PROJECTILE:
|
||||
case STRUCT_THISPROJECTILE:
|
||||
lLabelID=C_GetLabelNameOffset(&projectileH,Bstrtolower(label+(g_numLabels<<6)));
|
||||
break;
|
||||
case STRUCT_USERDEF:
|
||||
lLabelID=C_GetLabelNameOffset(&userdefH,Bstrtolower(label+(g_numLabels<<6)));
|
||||
break;
|
||||
case STRUCT_INPUT:
|
||||
lLabelID=C_GetLabelNameOffset(&inputH,Bstrtolower(label+(g_numLabels<<6)));
|
||||
break;
|
||||
}
|
||||
|
||||
//printf("LabelID is %d\n",lLabelID);
|
||||
|
|
@ -1748,8 +1780,22 @@ static void C_GetNextVarType(int32_t type)
|
|||
}
|
||||
break;
|
||||
case STRUCT_ACTORVAR:
|
||||
case STRUCT_PLAYERVAR:
|
||||
*g_scriptPtr++=lLabelID;
|
||||
break;
|
||||
case STRUCT_TSPR:
|
||||
*g_scriptPtr++=TsprLabels[lLabelID].lId;
|
||||
break;
|
||||
case STRUCT_PROJECTILE:
|
||||
case STRUCT_THISPROJECTILE:
|
||||
*g_scriptPtr++=ProjectileLabels[lLabelID].lId;
|
||||
break;
|
||||
case STRUCT_USERDEF:
|
||||
*g_scriptPtr++=UserdefsLabels[lLabelID].lId;
|
||||
break;
|
||||
case STRUCT_INPUT:
|
||||
*g_scriptPtr++=InputLabels[lLabelID].lId;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -63,6 +63,12 @@ enum QuickStructureAccess_t {
|
|||
STRUCT_WALL,
|
||||
STRUCT_PLAYER,
|
||||
STRUCT_ACTORVAR,
|
||||
STRUCT_PLAYERVAR,
|
||||
STRUCT_TSPR,
|
||||
STRUCT_PROJECTILE,
|
||||
STRUCT_THISPROJECTILE,
|
||||
STRUCT_USERDEF,
|
||||
STRUCT_INPUT,
|
||||
NUMQUICKSTRUCTS,
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -604,7 +604,7 @@ int32_t __fastcall Gv_GetVar(int32_t id, int32_t iActor, int32_t iPlayer)
|
|||
|
||||
int negateResult = !!(id & (MAXGAMEVARS << 1));
|
||||
|
||||
if (EDUKE32_PREDICT_FALSE(id >= g_gameVarCount && !negateResult))
|
||||
if (EDUKE32_PREDICT_FALSE((id & ~(MAXGAMEVARS << 1)) >= g_gameVarCount))
|
||||
goto nastyhacks;
|
||||
|
||||
id &= (MAXGAMEVARS - 1);
|
||||
|
|
@ -650,8 +650,8 @@ nastyhacks:
|
|||
}
|
||||
else if (id&(MAXGAMEVARS<<3)) // struct shortcut vars
|
||||
{
|
||||
int indexvar = *insptr;
|
||||
int32_t index=Gv_GetVar(*insptr++, iActor, iPlayer);
|
||||
int indexvar = *insptr++;
|
||||
int32_t index = Gv_GetVar(indexvar, iActor, iPlayer);
|
||||
|
||||
switch ((id&(MAXGAMEVARS-1)) - g_iStructVarIDs)
|
||||
{
|
||||
|
|
@ -659,7 +659,6 @@ nastyhacks:
|
|||
{
|
||||
int const label = *insptr++;
|
||||
|
||||
/*OSD_Printf("%d %d %d\n",__LINE__,index,label);*/
|
||||
indexvar = (EDUKE32_PREDICT_FALSE(ActorLabels[label].flags & LABEL_HASPARM2)) ?
|
||||
Gv_GetVar(*insptr++, iActor, iPlayer) : 0;
|
||||
|
||||
|
|
@ -669,7 +668,47 @@ nastyhacks:
|
|||
goto badsprite;
|
||||
}
|
||||
|
||||
rv = VM_GetSprite(index, label, indexvar) ^ -negateResult;
|
||||
rv = VM_GetSprite(index, label, indexvar);
|
||||
break;
|
||||
}
|
||||
case STRUCT_TSPR:
|
||||
{
|
||||
int const label = *insptr++;
|
||||
|
||||
if (EDUKE32_PREDICT_FALSE((unsigned) index >= MAXSPRITES))
|
||||
{
|
||||
iActor = index;
|
||||
goto badsprite;
|
||||
}
|
||||
|
||||
rv = VM_GetTsprite(index, label);
|
||||
break;
|
||||
}
|
||||
case STRUCT_THISPROJECTILE:
|
||||
{
|
||||
int const label = *insptr++;
|
||||
|
||||
if (EDUKE32_PREDICT_FALSE((unsigned) index >= MAXSPRITES))
|
||||
{
|
||||
iActor = index;
|
||||
goto badsprite;
|
||||
}
|
||||
|
||||
rv = VM_GetActiveProjectile(index, label);
|
||||
break;
|
||||
}
|
||||
|
||||
case STRUCT_PROJECTILE:
|
||||
{
|
||||
int const label = *insptr++;
|
||||
|
||||
if (EDUKE32_PREDICT_FALSE((unsigned) index >= MAXTILES))
|
||||
{
|
||||
iActor = index;
|
||||
goto badtile;
|
||||
}
|
||||
|
||||
rv = VM_GetProjectile(index, label);
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -691,8 +730,24 @@ nastyhacks:
|
|||
rv = VM_GetPlayer(index, label, indexvar);
|
||||
break;
|
||||
}
|
||||
case STRUCT_INPUT:
|
||||
{
|
||||
int const label = *insptr++;
|
||||
|
||||
if (indexvar == g_iThisActorID) index = vm.g_p;
|
||||
|
||||
if (EDUKE32_PREDICT_FALSE((unsigned) index >= MAXPLAYERS))
|
||||
{
|
||||
iPlayer = index;
|
||||
goto badplayer;
|
||||
}
|
||||
|
||||
rv = VM_GetPlayerInput(index, label);
|
||||
break;
|
||||
}
|
||||
|
||||
case STRUCT_ACTORVAR:
|
||||
case STRUCT_PLAYERVAR:
|
||||
rv = Gv_GetVar(*insptr++, index, iPlayer);
|
||||
break;
|
||||
|
||||
|
|
@ -717,6 +772,10 @@ nastyhacks:
|
|||
rv = VM_GetWall(index, *insptr++);
|
||||
break;
|
||||
|
||||
case STRUCT_USERDEF:
|
||||
rv = VM_GetUserdef(*insptr++);
|
||||
break;
|
||||
|
||||
default:
|
||||
EDUKE32_UNREACHABLE_SECTION(return -1);
|
||||
}
|
||||
|
|
@ -748,6 +807,10 @@ badsector:
|
|||
badwall:
|
||||
CON_ERRPRINTF("Gv_GetVar(): invalid wall ID %d\n", iPlayer);
|
||||
return -1;
|
||||
|
||||
badtile:
|
||||
CON_ERRPRINTF("Gv_GetVar(): invalid tile ID %d\n", iActor);
|
||||
return -1;
|
||||
}
|
||||
|
||||
void __fastcall Gv_SetVar(int32_t const id, int32_t const lValue, int32_t const iActor, int32_t const iPlayer)
|
||||
|
|
@ -797,6 +860,7 @@ enum {
|
|||
GVX_BADSECTOR,
|
||||
GVX_BADWALL,
|
||||
GVX_BADINDEX,
|
||||
GVX_BADTILE,
|
||||
};
|
||||
|
||||
static const char *gvxerrs[] = {
|
||||
|
|
@ -806,6 +870,7 @@ static const char *gvxerrs[] = {
|
|||
"Gv_GetVarX(): invalid sector ID",
|
||||
"Gv_GetVarX(): invalid wall ID",
|
||||
"Gv_GetVarX(): invalid array index",
|
||||
"Gv_GetVarX(): invalid tile ID",
|
||||
};
|
||||
|
||||
int32_t __fastcall Gv_GetSpecialVarX(int32_t id)
|
||||
|
|
@ -837,8 +902,8 @@ int32_t __fastcall Gv_GetSpecialVarX(int32_t id)
|
|||
}
|
||||
else if (id & (MAXGAMEVARS << 3)) // struct shortcut vars
|
||||
{
|
||||
int indexvar = *insptr;
|
||||
int index = Gv_GetVarX(*insptr++);
|
||||
int indexvar = *insptr++;
|
||||
int index = Gv_GetVarX(indexvar);
|
||||
|
||||
switch ((id & (MAXGAMEVARS - 1)) - g_iStructVarIDs)
|
||||
{
|
||||
|
|
@ -846,7 +911,6 @@ int32_t __fastcall Gv_GetSpecialVarX(int32_t id)
|
|||
{
|
||||
int const label = *insptr++;
|
||||
|
||||
/*OSD_Printf("%d %d %d\n",__LINE__,index,label);*/
|
||||
indexvar = (EDUKE32_PREDICT_FALSE(ActorLabels[label].flags & LABEL_HASPARM2)) ?
|
||||
Gv_GetVarX(*insptr++) : 0;
|
||||
|
||||
|
|
@ -860,6 +924,49 @@ int32_t __fastcall Gv_GetSpecialVarX(int32_t id)
|
|||
rv = VM_GetSprite(index, label, indexvar);
|
||||
break;
|
||||
}
|
||||
case STRUCT_TSPR:
|
||||
{
|
||||
int const label = *insptr++;
|
||||
|
||||
if (EDUKE32_PREDICT_FALSE((unsigned) index >= MAXSPRITES))
|
||||
{
|
||||
id = index;
|
||||
CON_ERRPRINTF("%s %d\n", gvxerrs[GVX_BADSPRITE], id);
|
||||
return -1;
|
||||
}
|
||||
|
||||
rv = VM_GetTsprite(index, label);
|
||||
break;
|
||||
}
|
||||
case STRUCT_THISPROJECTILE:
|
||||
{
|
||||
int const label = *insptr++;
|
||||
|
||||
if (EDUKE32_PREDICT_FALSE((unsigned) index >= MAXSPRITES))
|
||||
{
|
||||
id = index;
|
||||
CON_ERRPRINTF("%s %d\n", gvxerrs[GVX_BADSPRITE], id);
|
||||
return -1;
|
||||
}
|
||||
|
||||
rv = VM_GetActiveProjectile(index, label);
|
||||
break;
|
||||
}
|
||||
|
||||
case STRUCT_PROJECTILE:
|
||||
{
|
||||
int const label = *insptr++;
|
||||
|
||||
if (EDUKE32_PREDICT_FALSE((unsigned) index >= MAXTILES))
|
||||
{
|
||||
id = index;
|
||||
CON_ERRPRINTF("%s %d\n", gvxerrs[GVX_BADTILE], id);
|
||||
return -1;
|
||||
}
|
||||
|
||||
rv = VM_GetProjectile(index, label);
|
||||
break;
|
||||
}
|
||||
|
||||
case STRUCT_PLAYER:
|
||||
{
|
||||
|
|
@ -881,8 +988,26 @@ int32_t __fastcall Gv_GetSpecialVarX(int32_t id)
|
|||
rv = VM_GetPlayer(index, label, indexvar);
|
||||
break;
|
||||
}
|
||||
case STRUCT_INPUT:
|
||||
{
|
||||
int const label = *insptr++;
|
||||
|
||||
if (indexvar == g_iThisActorID)
|
||||
index = vm.g_p;
|
||||
|
||||
if (EDUKE32_PREDICT_FALSE((unsigned) index >= MAXPLAYERS))
|
||||
{
|
||||
id = index;
|
||||
CON_ERRPRINTF("%s %d\n", gvxerrs[GVX_BADPLAYER], id);
|
||||
return -1;
|
||||
}
|
||||
|
||||
rv = VM_GetPlayerInput(index, label);
|
||||
break;
|
||||
}
|
||||
|
||||
case STRUCT_ACTORVAR:
|
||||
case STRUCT_PLAYERVAR:
|
||||
rv = Gv_GetVar(*insptr++, index, vm.g_p);
|
||||
break;
|
||||
|
||||
|
|
@ -911,6 +1036,10 @@ int32_t __fastcall Gv_GetSpecialVarX(int32_t id)
|
|||
rv = VM_GetWall(index, *insptr++);
|
||||
break;
|
||||
|
||||
case STRUCT_USERDEF:
|
||||
rv = VM_GetUserdef(*insptr++);
|
||||
break;
|
||||
|
||||
default: EDUKE32_UNREACHABLE_SECTION(return -1);
|
||||
}
|
||||
}
|
||||
|
|
@ -1469,6 +1598,12 @@ static void Gv_AddSystemVars(void)
|
|||
Gv_NewVar("wall", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL);
|
||||
Gv_NewVar("player", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL);
|
||||
Gv_NewVar("actorvar", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL);
|
||||
Gv_NewVar("playervar", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL);
|
||||
Gv_NewVar("tspr", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL);
|
||||
Gv_NewVar("projectile", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL);
|
||||
Gv_NewVar("thisprojectile", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL);
|
||||
Gv_NewVar("userdef", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL);
|
||||
Gv_NewVar("input", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL);
|
||||
|
||||
Gv_NewVar("myconnectindex", (intptr_t)&myconnectindex, GAMEVAR_READONLY | GAMEVAR_INTPTR | GAMEVAR_SYSTEM);
|
||||
Gv_NewVar("screenpeek", (intptr_t)&screenpeek, GAMEVAR_READONLY | GAMEVAR_INTPTR | GAMEVAR_SYSTEM);
|
||||
|
|
|
|||
Loading…
Reference in a new issue