zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-27 01:10:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Introduce GAMEARRAY_SIZE_MASK.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6392 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2017-07-28 08:27:31 +00:00
parent b01b25bc93
commit 6e7daf6d1b
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4408,7 +4408,7 @@ finish_qsprintf:
numBytes = Gv_GetArrayAllocSize(arrayNum); numBytes = Gv_GetArrayAllocSize(arrayNum);
switch (aGameArrays[arrayNum].flags & GAMEARRAY_TYPE_MASK) switch (aGameArrays[arrayNum].flags & GAMEARRAY_SIZE_MASK)
{ {
case 0: case 0:
#ifdef BITNESS64 #ifdef BITNESS64
@ -4462,7 +4462,7 @@ finish_qsprintf:
continue; continue;
} }
switch (aGameArrays[arrayNum].flags & GAMEARRAY_TYPE_MASK) switch (aGameArrays[arrayNum].flags & GAMEARRAY_SIZE_MASK)
{ {
case 0: case 0:
#ifdef BITNESS64 #ifdef BITNESS64
@ -4563,7 +4563,7 @@ finish_qsprintf:
int const destInc = 1 << (int)!!(EDUKE32_PREDICT_FALSE(aGameArrays[destArray].flags & GAMEARRAY_STRIDE2)); int const destInc = 1 << (int)!!(EDUKE32_PREDICT_FALSE(aGameArrays[destArray].flags & GAMEARRAY_STRIDE2));
// matching array types and no STRIDE2 flag // matching array types and no STRIDE2 flag
if ((aGameArrays[srcArray].flags & GAMEARRAY_TYPE_MASK) == (aGameArrays[destArray].flags & GAMEARRAY_TYPE_MASK) && (srcInc & destInc) == 1) if ((aGameArrays[srcArray].flags & GAMEARRAY_SIZE_MASK) == (aGameArrays[destArray].flags & GAMEARRAY_SIZE_MASK) && (srcInc & destInc) == 1)
{ {
Bmemcpy(aGameArrays[destArray].pValues + destArrayIndex, aGameArrays[srcArray].pValues + srcArrayIndex, Bmemcpy(aGameArrays[destArray].pValues + destArrayIndex, aGameArrays[srcArray].pValues + srcArrayIndex,
numElements * Gv_GetArrayElementSize(srcArray)); numElements * Gv_GetArrayElementSize(srcArray));

9
source/duke3d/src/gamevars.cpp
View file

@ -382,13 +382,11 @@ unsigned __fastcall Gv_GetArrayElementSize(int const arrayIdx)
{ {
int typeSize = 0; int typeSize = 0;
switch (aGameArrays[arrayIdx].flags & GAMEARRAY_TYPE_MASK) switch (aGameArrays[arrayIdx].flags & GAMEARRAY_SIZE_MASK)
{ {
case 0: typeSize = sizeof(uintptr_t); break; case 0: typeSize = sizeof(uintptr_t); break;
case GAMEARRAY_INT8: case GAMEARRAY_INT8: typeSize = sizeof(uint8_t); break;
case GAMEARRAY_UINT8: typeSize = sizeof(uint8_t); break; case GAMEARRAY_INT16: typeSize = sizeof(uint16_t); break;
case GAMEARRAY_INT16:
case GAMEARRAY_UINT16: typeSize = sizeof(uint16_t); break;
} }
return typeSize; return typeSize;
@ -602,6 +600,7 @@ int __fastcall Gv_GetArrayValue(int const id, int index)
switch (aGameArrays[id].flags & GAMEARRAY_TYPE_MASK) switch (aGameArrays[id].flags & GAMEARRAY_TYPE_MASK)
{ {
case 0: returnValue = (aGameArrays[id].pValues)[index]; break; case 0: returnValue = (aGameArrays[id].pValues)[index]; break;
case GAMEARRAY_INT16: returnValue = ((int16_t *)aGameArrays[id].pValues)[index]; break; case GAMEARRAY_INT16: returnValue = ((int16_t *)aGameArrays[id].pValues)[index]; break;
case GAMEARRAY_INT8: returnValue = ((int8_t *)aGameArrays[id].pValues)[index]; break; case GAMEARRAY_INT8: returnValue = ((int8_t *)aGameArrays[id].pValues)[index]; break;

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

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