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

Fix some int/int32_t mismatches. DONT_BUILD.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6362 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2017-07-15 21:56:21 +00:00
parent f01c9205e9
commit 494c778feb
3 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/build/src/xxhash.c
View file

@ -396,7 +396,7 @@ FORCE_INLINE XXH_errorcode XXH32_update_endian (XXH32_state_t* state, const void
if (state->memsize) { /* some data left from previous update */ if (state->memsize) { /* some data left from previous update */
XXH_memcpy((BYTE*)(state->mem32) + state->memsize, input, 16-state->memsize); XXH_memcpy((BYTE*)(state->mem32) + state->memsize, input, 16-state->memsize);
{ const U32* p32 = state->mem32; { const unsigned* p32 = state->mem32;
state->v1 = XXH32_round(state->v1, XXH_readLE32(p32, endian)); p32++; state->v1 = XXH32_round(state->v1, XXH_readLE32(p32, endian)); p32++;
state->v2 = XXH32_round(state->v2, XXH_readLE32(p32, endian)); p32++; state->v2 = XXH32_round(state->v2, XXH_readLE32(p32, endian)); p32++;
state->v3 = XXH32_round(state->v3, XXH_readLE32(p32, endian)); p32++; state->v3 = XXH32_round(state->v3, XXH_readLE32(p32, endian)); p32++;

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

@ -3082,7 +3082,7 @@ DO_DEFSTATE:
C_GetNextValue(LABEL_DEFINE); C_GetNextValue(LABEL_DEFINE);
char const * const arrayName = label+(g_labelCnt<<6); char const * const arrayName = label+(g_labelCnt<<6);
int arrayFlags = 0; int32_t arrayFlags = 0;
while (C_GetKeyword() == -1) while (C_GetKeyword() == -1)
C_BitOrNextValue(&arrayFlags); C_BitOrNextValue(&arrayFlags);

36
source/duke3d/src/global.cpp
View file

@ -55,26 +55,26 @@ int32_t g_gametypeFlags[MAXGAMETYPES] =
2+/*4+*/8+16+16384+65536+131072 2+/*4+*/8+16+16384+65536+131072
}; };
int g_actorRespawnTime = 768; int32_t g_actorRespawnTime = 768;
int g_bouncemineRadius = 2500; int32_t g_bouncemineRadius = 2500;
int g_deleteQueueSize = 64; int32_t g_deleteQueueSize = 64;
int g_itemRespawnTime = 768; int32_t g_itemRespawnTime = 768;
int g_lastSaveSlot = -1; int32_t g_lastSaveSlot = -1;
int32_t g_requestedSaveSlot = -1; int32_t g_requestedSaveSlot = -1;
int g_morterRadius = 2500; int32_t g_morterRadius = 2500;
int g_numFreezeBounces = 3; int32_t g_numFreezeBounces = 3;
int g_gametypeCnt = 5; int32_t g_gametypeCnt = 5;
int g_volumeCnt = 3; int32_t g_volumeCnt = 3;
int g_pipebombRadius = 2500; int32_t g_pipebombRadius = 2500;
int g_playerFriction = 0xCFD0; int32_t g_playerFriction = 0xCFD0;
int g_rpgRadius = 1780; int32_t g_rpgRadius = 1780;
int g_scriptSize = 1048576; int32_t g_scriptSize = 1048576;
int g_seenineRadius = 2048; int32_t g_seenineRadius = 2048;
int g_shrinkerRadius = 650; int32_t g_shrinkerRadius = 650;
int g_spriteGravity = 176; int32_t g_spriteGravity = 176;
int g_timerTicsPerSecond = TICRATE; int32_t g_timerTicsPerSecond = TICRATE;
int g_tripbombRadius = 3880; int32_t g_tripbombRadius = 3880;
int16_t g_blimpSpawnItems[15] = int16_t g_blimpSpawnItems[15] =
{ {