zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-24 10:40:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Minor internal CON changes.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5245 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2015-05-26 00:48:17 +00:00
parent eaa58d2071
commit a1b4d05c48
3 changed files with 91 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
polymer/eduke32/source/gamedef.c
View file

@ -3582,7 +3582,7 @@ static int32_t C_ParseCommand(int32_t loop)
initprintf("%s:%d: warning: tried to set cstat 32767, using 32768 instead.\n",g_szScriptFileName,g_lineNumber);
g_numCompilerWarnings++;
}
else if (EDUKE32_PREDICT_FALSE((*(g_scriptPtr-1) & 32) && (*(g_scriptPtr-1) & 16)))
else if (EDUKE32_PREDICT_FALSE((*(g_scriptPtr-1) & 48) == 48))
{
i = *(g_scriptPtr-1);
*(g_scriptPtr-1) ^= 48;
@ -3643,32 +3643,31 @@ static int32_t C_ParseCommand(int32_t loop)
continue;
case CON_ELSE:
if (EDUKE32_PREDICT_FALSE(!g_checkingIfElse))
{
g_scriptPtr--;
tempscrptr = g_scriptPtr;
g_numCompilerWarnings++;
C_ReportError(-1);
initprintf("%s:%d: warning: found `else' with no `if'.\n",g_szScriptFileName,g_lineNumber);
if (C_GetKeyword() == CON_LEFTBRACE)
if (EDUKE32_PREDICT_FALSE(!g_checkingIfElse))
{
C_GetNextKeyword();
g_numBraces++;
g_scriptPtr--;
tempscrptr = g_scriptPtr;
g_numCompilerWarnings++;
C_ReportError(-1);
C_ParseCommand(1);
initprintf("%s:%d: warning: found `else' with no `if'.\n", g_szScriptFileName, g_lineNumber);
if (C_GetKeyword() == CON_LEFTBRACE)
{
C_GetNextKeyword();
g_numBraces++;
C_ParseCommand(1);
}
else C_ParseCommand(0);
g_scriptPtr = tempscrptr;
continue;
}
else C_ParseCommand(0);
g_scriptPtr = tempscrptr;
continue;
}
{
intptr_t offset;
intptr_t lastScriptPtr = g_scriptPtr - &script[0] - 1;
intptr_t const lastScriptPtr = g_scriptPtr - script - 1;
g_ifElseAborted = 0;
g_checkingIfElse--;
@ -3676,20 +3675,21 @@ static int32_t C_ParseCommand(int32_t loop)
if (C_CheckMalformedBranch(lastScriptPtr))
continue;
tempscrptr = g_scriptPtr;
offset = (unsigned)(tempscrptr-script);
intptr_t const offset = (unsigned) (g_scriptPtr-script);
g_scriptPtr++; //Leave a spot for the fail location
C_ParseCommand(0);
if (C_CheckEmptyBranch(tw, lastScriptPtr))
continue;
tempscrptr = (intptr_t *)script+offset;
tempscrptr = (intptr_t *) script+offset;
*tempscrptr = (intptr_t) g_scriptPtr;
bitptr[(tempscrptr-script)>>3] |= (BITPTR_POINTER<<((tempscrptr-script)&7));
continue;
}
continue;
case CON_SETSECTOR:
case CON_GETSECTOR:

122
polymer/eduke32/source/gameexec.c
View file

@ -3247,7 +3247,6 @@ nullquote:
}
case CON_MOVESPRITE:
case CON_SETSPRITE:
insptr++;
{
int const spritenum = Gv_GetVarX(*insptr++);
@ -3255,17 +3254,6 @@ nullquote:
Gv_GetManyVars(3, (int32_t *)&vect);
if (tw == CON_SETSPRITE)
{
if (EDUKE32_PREDICT_FALSE((unsigned)spritenum >= MAXSPRITES))
{
CON_ERRPRINTF("invalid sprite ID %d\n", spritenum);
continue;
}
setsprite(spritenum, &vect);
continue;
}
int const cliptype = Gv_GetVarX(*insptr++);
if (EDUKE32_PREDICT_FALSE((unsigned)spritenum >= MAXSPRITES))
@ -3279,6 +3267,23 @@ nullquote:
continue;
}
case CON_SETSPRITE:
insptr++;
{
int const spritenum = Gv_GetVarX(*insptr++);
vec3_t vect;
Gv_GetManyVars(3, (int32_t *)&vect);
if (EDUKE32_PREDICT_FALSE((unsigned)spritenum >= MAXSPRITES))
{
CON_ERRPRINTF("invalid sprite ID %d\n", spritenum);
continue;
}
setsprite(spritenum, &vect);
continue;
}
case CON_GETFLORZOFSLOPE:
case CON_GETCEILZOFSLOPE:
insptr++;
@ -3294,29 +3299,35 @@ nullquote:
continue;
}
if (tw == CON_GETFLORZOFSLOPE)
{
Gv_SetVarX(*insptr++, getflorzofslope(sectnum, vect.x, vect.y));
continue;
}
Gv_SetVarX(*insptr++, (tw == CON_GETFLORZOFSLOPE) ? getflorzofslope(sectnum, vect.x, vect.y) :
getceilzofslope(sectnum, vect.x, vect.y));
Gv_SetVarX(*insptr++, getceilzofslope(sectnum, vect.x, vect.y));
continue;
}
case CON_UPDATESECTOR:
case CON_UPDATESECTORZ:
insptr++;
{
vec3_t vect = { 0, 0, 0 };
Gv_GetManyVars(tw == CON_UPDATESECTORZ ? 3 : 2, (int32_t *)&vect);
vec2_t vect = { 0, 0 };
Gv_GetManyVars(2, (int32_t *) &vect);
int const var=*insptr++;
int16_t w = sprite[vm.g_i].sectnum;
if (tw == CON_UPDATESECTOR)
updatesector(vect.x, vect.y, &w);
else
updatesectorz(vect.x, vect.y, vect.z, &w);
updatesector(vect.x, vect.y, &w);
Gv_SetVarX(var, w);
continue;
}
case CON_UPDATESECTORZ:
insptr++;
{
vec3_t vect ={ 0, 0, 0 };
Gv_GetManyVars(3, (int32_t *) &vect);
int const var=*insptr++;
int16_t w = sprite[vm.g_i].sectnum;
updatesectorz(vect.x, vect.y, vect.z, &w);
Gv_SetVarX(var, w);
continue;
@ -3565,43 +3576,29 @@ nullquote:
case CON_IFP:
{
int const l = *(++insptr);
int32_t j = 0;
int j = 0;
int const s = sprite[ps->i].xvel;
int const bits = g_player[vm.g_p].sync->bits;
if ((l&8) && ps->on_ground && TEST_SYNC_KEY(g_player[vm.g_p].sync->bits, SK_CROUCH))
if (((l & pducking) && ps->on_ground && TEST_SYNC_KEY(bits, SK_CROUCH)) ||
((l & pfalling) && ps->jumping_counter == 0 && !ps->on_ground && ps->vel.z > 2048) ||
((l & pjumping) && ps->jumping_counter > 348) ||
((l & pstanding) && s >= 0 && s < 8) ||
((l & pwalking) && s >= 8 && !TEST_SYNC_KEY(bits, SK_RUN)) ||
((l & prunning) && s >= 8 && TEST_SYNC_KEY(bits, SK_RUN)) ||
((l & phigher) && ps->pos.z < (vm.g_sp->z - (48 << 8))) ||
((l & pwalkingback) && s <= -8 && !TEST_SYNC_KEY(bits, SK_RUN)) ||
((l & prunningback) && s <= -8 && TEST_SYNC_KEY(bits, SK_RUN)) ||
((l & pkicking) && (ps->quick_kick > 0 || (PWEAPON(vm.g_p, ps->curr_weapon, WorksLike) == KNEE_WEAPON &&
ps->kickback_pic > 0))) ||
((l & pshrunk) && sprite[ps->i].xrepeat < 32) ||
((l & pjetpack) && ps->jetpack_on) ||
((l & ponsteroids) && ps->inv_amount[GET_STEROIDS] > 0 && ps->inv_amount[GET_STEROIDS] < 400) ||
((l & ponground) && ps->on_ground) ||
((l & palive) && sprite[ps->i].xrepeat > 32 && sprite[ps->i].extra > 0 && ps->timebeforeexit == 0) ||
((l & pdead) && sprite[ps->i].extra <= 0))
j = 1;
else if ((l&16) && ps->jumping_counter == 0 && !ps->on_ground &&
ps->vel.z > 2048)
j = 1;
else if ((l&32) && ps->jumping_counter > 348)
j = 1;
else if ((l&1) && s >= 0 && s < 8)
j = 1;
else if ((l&2) && s >= 8 && !TEST_SYNC_KEY(g_player[vm.g_p].sync->bits, SK_RUN))
j = 1;
else if ((l&4) && s >= 8 && TEST_SYNC_KEY(g_player[vm.g_p].sync->bits, SK_RUN))
j = 1;
else if ((l&64) && ps->pos.z < (vm.g_sp->z-(48<<8)))
j = 1;
else if ((l&128) && s <= -8 && !TEST_SYNC_KEY(g_player[vm.g_p].sync->bits, SK_RUN))
j = 1;
else if ((l&256) && s <= -8 && TEST_SYNC_KEY(g_player[vm.g_p].sync->bits, SK_RUN))
j = 1;
else if ((l&512) && (ps->quick_kick > 0 || (PWEAPON(vm.g_p, ps->curr_weapon, WorksLike) == KNEE_WEAPON && ps->kickback_pic > 0)))
j = 1;
else if ((l&1024) && sprite[ps->i].xrepeat < 32)
j = 1;
else if ((l&2048) && ps->jetpack_on)
j = 1;
else if ((l&4096) && ps->inv_amount[GET_STEROIDS] > 0 && ps->inv_amount[GET_STEROIDS] < 400)
j = 1;
else if ((l&8192) && ps->on_ground)
j = 1;
else if ((l&16384) && sprite[ps->i].xrepeat > 32 && sprite[ps->i].extra > 0 && ps->timebeforeexit == 0)
j = 1;
else if ((l&32768) && sprite[ps->i].extra <= 0)
j = 1;
else if ((l&65536L))
else if ((l & pfacing))
{
if (vm.g_sp->picnum == APLAYER && (g_netServer || ud.multimode > 1))
j = G_GetAngleDelta(g_player[otherp].ps->ang, getangle(ps->pos.x - g_player[otherp].ps->pos.x,
@ -3609,12 +3606,9 @@ nullquote:
else
j = G_GetAngleDelta(ps->ang, getangle(vm.g_sp->x - ps->pos.x, vm.g_sp->y - ps->pos.y));
if (j > -128 && j < 128)
j = 1;
else
j = 0;
j = (j > -128 && j < 128);
}
VM_CONDITIONAL((intptr_t) j);
VM_CONDITIONAL(j);
}
continue;

12
polymer/eduke32/source/gamevars.c
View file

@ -630,17 +630,17 @@ int32_t __fastcall Gv_GetVar(int32_t id, int32_t iActor, int32_t iPlayer)
int rv, f;
f = aGameVars[id].dwFlags & (GAMEVAR_USER_MASK | GAMEVAR_PTR_MASK);
if (!f) rv = aGameVars[id].val.lValue;
if (f == GAMEVAR_PERACTOR)
{
if (EDUKE32_PREDICT_FALSE((unsigned) iActor >= MAXSPRITES)) goto badsprite;
rv = aGameVars[id].val.plValues[iActor];
}
else if (!f) rv = aGameVars[id].val.lValue;
else if (f == GAMEVAR_PERPLAYER)
{
if (EDUKE32_PREDICT_FALSE((unsigned) iPlayer >= MAXPLAYERS)) goto badplayer;
rv = aGameVars[id].val.plValues[iPlayer];
}
else if (f == GAMEVAR_PERACTOR)
{
if (EDUKE32_PREDICT_FALSE((unsigned) iActor >= MAXSPRITES)) goto badsprite;
rv = aGameVars[id].val.plValues[iActor];
}
else switch (f)
{
case GAMEVAR_INTPTR: rv = *(int32_t *)aGameVars[id].val.lValue; break;