Rename Gv_GetArrayCountFromFile() to Gv_GetArrayCountForAllocSize()

git-svn-id: https://svn.eduke32.com/eduke32@7654 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2019-05-19 03:54:44 +00:00 committed by Christoph Oelckers
parent 52dde4ef32
commit e69fb3934e
3 changed files with 3 additions and 3 deletions

View file

@ -5545,7 +5545,7 @@ badindex:
dispatch(); dispatch();
size_t const filelength = kfilelength(kFile); size_t const filelength = kfilelength(kFile);
size_t const numElements = Gv_GetArrayCountFromFile(arrayNum, filelength); size_t const numElements = Gv_GetArrayCountForAllocSize(arrayNum, filelength);
if (numElements > 0) if (numElements > 0)
{ {

View file

@ -575,7 +575,7 @@ size_t __fastcall Gv_GetArrayAllocSize(int const arrayIdx)
return Gv_GetArrayAllocSizeForCount(arrayIdx, aGameArrays[arrayIdx].size); return Gv_GetArrayAllocSizeForCount(arrayIdx, aGameArrays[arrayIdx].size);
} }
size_t __fastcall Gv_GetArrayCountFromFile(int const arrayIdx, size_t const filelength) size_t __fastcall Gv_GetArrayCountForAllocSize(int const arrayIdx, size_t const filelength)
{ {
if (aGameArrays[arrayIdx].flags & GAMEARRAY_BITMAP) if (aGameArrays[arrayIdx].flags & GAMEARRAY_BITMAP)
return filelength << 3; return filelength << 3;

View file

@ -119,7 +119,7 @@ extern int32_t g_gameArrayCount;
unsigned __fastcall Gv_GetArrayElementSize(int const arrayIdx); unsigned __fastcall Gv_GetArrayElementSize(int const arrayIdx);
size_t __fastcall Gv_GetArrayAllocSizeForCount(int const arrayIdx, size_t const count); size_t __fastcall Gv_GetArrayAllocSizeForCount(int const arrayIdx, size_t const count);
size_t __fastcall Gv_GetArrayAllocSize(int const arrayIdx); size_t __fastcall Gv_GetArrayAllocSize(int const arrayIdx);
size_t __fastcall Gv_GetArrayCountFromFile(int const arrayIdx, size_t const filelength); size_t __fastcall Gv_GetArrayCountForAllocSize(int const arrayIdx, size_t const filelength);
int __fastcall Gv_GetArrayValue(int const id, int index); int __fastcall Gv_GetArrayValue(int const id, int index);
int __fastcall Gv_GetVar(int gameVar, int spriteNum, int playerNum); int __fastcall Gv_GetVar(int gameVar, int spriteNum, int playerNum);
void __fastcall Gv_SetVar(int const gameVar, int const newValue, int const spriteNum, int const playerNum); void __fastcall Gv_SetVar(int const gameVar, int const newValue, int const spriteNum, int const playerNum);