zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 01:11:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

CON: Add "swaparrays" command, which performs a pointer-swap on arrays of the same storage class.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6902 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2018-05-23 05:58:21 +00:00
parent 2a9c846a49
commit 48f86ce594
4 changed files with 54 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -499,6 +499,7 @@ static tokenmap_t const vm_keywords[] =
{ "subvar", CON_SUBVAR },
{ "subvarvar", CON_SUBVARVAR },
{ "switch", CON_SWITCH },
{ "swaparrays", CON_SWAPARRAYS },
{ "swaptrackslot", CON_SWAPTRACKSLOT },
{ "time", CON_TIME },
{ "tip", CON_TIP },
@ -4473,8 +4474,9 @@ DO_DEFSTATE:
if (aGameArrays[i].flags & (GAMEARRAY_READONLY|GAMEARRAY_SYSTEM))
{
g_errorCnt++;
C_ReportError(-1);
initprintf("can't resize system array `%s'.", label+(g_labelCnt<<6));
initprintf("%s:%d: error: can't resize system array `%s'.\n", g_scriptFileName, g_lineNumber, label+(g_labelCnt<<6));
return 1;
}
@ -4482,6 +4484,43 @@ DO_DEFSTATE:
C_GetNextVarType(0);
continue;
case CON_SWAPARRAYS:
i = C_GetNextGameArrayName();
if (EDUKE32_PREDICT_FALSE(i < 0))
return 1;
if (aGameArrays[i].flags & (GAMEARRAY_READONLY|GAMEARRAY_SYSTEM|GAMEARRAY_VARSIZE))
{
g_errorCnt++;
C_ReportError(-1);
initprintf("%s:%d: error: can't swap system array `%s'.\n", g_scriptFileName, g_lineNumber, label+(g_labelCnt<<6));
return 1;
}
C_SkipComments();
tw = C_GetNextGameArrayName();
if (EDUKE32_PREDICT_FALSE(tw < 0))
return 1;
if (aGameArrays[tw].flags & (GAMEARRAY_READONLY|GAMEARRAY_SYSTEM|GAMEARRAY_VARSIZE))
{
g_errorCnt++;
C_ReportError(-1);
initprintf("%s:%d: error: can't swap system array `%s'.\n", g_scriptFileName, g_lineNumber, label+(g_labelCnt<<6));
return 1;
}
if ((aGameArrays[i].flags & GAMEARRAY_STORAGE_MASK) != (aGameArrays[tw].flags & GAMEARRAY_STORAGE_MASK))
{
g_errorCnt++;
C_ReportError(-1);
initprintf("%s:%d: error: can't swap arrays of different storage classes.\n", g_scriptFileName, g_lineNumber);
return 1;
}
continue;
case CON_SMAXAMMO:
case CON_ADDWEAPONVAR:
case CON_ACTIVATEBYSECTOR:

1
source/duke3d/src/gamedef.h
View file

@ -1252,6 +1252,7 @@ enum ScriptKeywords_t
CON_SPAWNWALLGLASS, // 431
CON_SPAWNWALLSTAINEDGLASS, // 432
CON_SPAWNCEILINGGLASS, // 433
CON_SWAPARRAYS, // 434
CON_END
};
// KEEPINSYNC with the keyword list in lunatic/con_lang.lua

12
source/duke3d/src/gameexec.cpp
View file

@ -5132,6 +5132,18 @@ GAMEEXEC_STATIC void VM_Execute(native_t loop)
continue;
}
case CON_SWAPARRAYS:
insptr++;
{
uint32_t const array1 = *insptr++;
uint32_t const array2 = *insptr++;
swap(&aGameArrays[array1].size, &aGameArrays[array2].size);
swap(&aGameArrays[array1].pValues, &aGameArrays[array2].pValues);
continue;
}
case CON_RANDVAR:
insptr++;
Gv_SetVarX(*insptr, mulscale16(krand(), *(insptr + 1) + 1));

1
source/duke3d/src/gamevars.h
View file

@ -79,6 +79,7 @@ enum GamearrayFlags_t
GAMEARRAY_WARN = 0x00200000,
GAMEARRAY_SIZE_MASK = GAMEARRAY_INT8 | GAMEARRAY_INT16 | GAMEARRAY_BITMAP,
GAMEARRAY_STORAGE_MASK = GAMEARRAY_INT8 | GAMEARRAY_INT16 | GAMEARRAY_BITMAP | GAMEARRAY_STRIDE2,
GAMEARRAY_TYPE_MASK = GAMEARRAY_UNSIGNED | GAMEARRAY_INT8 | GAMEARRAY_INT16 | GAMEARRAY_BITMAP,
};