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

Fix CON commands leaving useless extra values in the bytecode. They were only valid outside of executable blocks so it was never noticed.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7277 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2018-12-15 01:39:14 +00:00
parent c287866954
commit ef91435120
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
source/duke3d/src/gamedef.cpp
View file

@ -4148,11 +4148,15 @@ setvarvar:
C_GetNextValue(LABEL_DEFINE); C_GetNextValue(LABEL_DEFINE);
j = g_scriptPtr[-1]; j = g_scriptPtr[-1];
g_scriptPtr--;
C_GetNextValue(LABEL_DEFINE); C_GetNextValue(LABEL_DEFINE);
y = g_scriptPtr[-1]; y = g_scriptPtr[-1];
g_scriptPtr--;
C_GetNextValue(LABEL_DEFINE); C_GetNextValue(LABEL_DEFINE);
z = g_scriptPtr[-1]; z = g_scriptPtr[-1];
g_scriptPtr--;
if (EDUKE32_PREDICT_FALSE((unsigned)j >= MAXTILES)) if (EDUKE32_PREDICT_FALSE((unsigned)j >= MAXTILES))
{ {
@ -4177,6 +4181,7 @@ setvarvar:
C_GetNextValue(LABEL_DEFINE); C_GetNextValue(LABEL_DEFINE);
j = g_scriptPtr[-1]; j = g_scriptPtr[-1];
g_scriptPtr--;
if (EDUKE32_PREDICT_FALSE((unsigned)j >= MAXTILES)) if (EDUKE32_PREDICT_FALSE((unsigned)j >= MAXTILES))
{ {
@ -4202,8 +4207,11 @@ setvarvar:
C_GetNextValue(LABEL_DEFINE); C_GetNextValue(LABEL_DEFINE);
i = g_scriptPtr[-1]; i = g_scriptPtr[-1];
g_scriptPtr--;
C_GetNextValue(LABEL_DEFINE); C_GetNextValue(LABEL_DEFINE);
j = g_scriptPtr[-1]; j = g_scriptPtr[-1];
g_scriptPtr--;
if (EDUKE32_PREDICT_FALSE((unsigned)i >= MAXTILES || (unsigned)j >= MAXTILES)) if (EDUKE32_PREDICT_FALSE((unsigned)i >= MAXTILES || (unsigned)j >= MAXTILES))
{ {
@ -4222,16 +4230,18 @@ setvarvar:
if (!g_scriptActorOffset && g_processingState == 0) if (!g_scriptActorOffset && g_processingState == 0)
{ {
g_scriptPtr--; g_scriptPtr--;
auto tmpscrptr = g_scriptPtr;
C_GetNextValue(LABEL_DEFINE); C_GetNextValue(LABEL_DEFINE);
g_scriptPtr--; j = g_scriptPtr[-1];
j = *g_scriptPtr;
int32_t flags = 0; int32_t flags = 0;
do do
C_BitOrNextValue(&flags); C_BitOrNextValue(&flags);
while (C_GetKeyword() == -1); while (C_GetKeyword() == -1);
g_scriptPtr = tmpscrptr;
if (EDUKE32_PREDICT_FALSE((unsigned)j >= MAXTILES)) if (EDUKE32_PREDICT_FALSE((unsigned)j >= MAXTILES))
{ {
C_ReportError(ERROR_EXCEEDSMAXTILES); C_ReportError(ERROR_EXCEEDSMAXTILES);
@ -4240,10 +4250,8 @@ setvarvar:
} }
g_tile[j].flags = flags; g_tile[j].flags = flags;
continue;
} }
C_GetNextVar(); else C_GetNextVar();
continue; continue;
case CON_PRECACHE: case CON_PRECACHE: