reHLDS/ReGameDLL_CS
2
0
Fork 0
mirror of https://github.com/s1lentq/ReGameDLL_CS.git synced 2024-12-28 15:45:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

pm_shared.cpp: minor refactoring

Browse Source
This commit is contained in:
s1lent 2019-09-04 20:04:57 +07:00
parent 8591bbd13d
commit 5e235a9851
No known key found for this signature in database
GPG Key ID: 0FE401DC73916B5C
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
regamedll/pm_shared/pm_shared.cpp
View File

@ -259,12 +259,12 @@ void PM_PlayStepSound(int step, float fvol)
case STEP_SLOSH: case STEP_SLOSH:
switch (irand) switch (irand)
{ {
// right foot // right foot
case 0: pmove->PM_PlaySound(CHAN_BODY, "player/pl_slosh1.wav", fvol, ATTN_NORM, 0, PITCH_NORM); break; case 0: pmove->PM_PlaySound(CHAN_BODY, "player/pl_slosh1.wav", fvol, ATTN_NORM, 0, PITCH_NORM); break;
case 1: pmove->PM_PlaySound(CHAN_BODY, "player/pl_slosh3.wav", fvol, ATTN_NORM, 0, PITCH_NORM); break; case 1: pmove->PM_PlaySound(CHAN_BODY, "player/pl_slosh3.wav", fvol, ATTN_NORM, 0, PITCH_NORM); break;
// left foot // left foot
case 2: pmove->PM_PlaySound(CHAN_BODY, "player/pl_slosh2.wav", fvol, ATTN_NORM, 0, PITCH_NORM); break; case 2: pmove->PM_PlaySound(CHAN_BODY, "player/pl_slosh2.wav", fvol, ATTN_NORM, 0, PITCH_NORM); break;
case 3: pmove->PM_PlaySound(CHAN_BODY, "player/pl_slosh4.wav", fvol, ATTN_NORM, 0, PITCH_NORM); break; case 3: pmove->PM_PlaySound(CHAN_BODY, "player/pl_slosh4.wav", fvol, ATTN_NORM, 0, PITCH_NORM); break;
} }
break; break;
case STEP_WADE: case STEP_WADE:
@ -1480,12 +1480,9 @@ void PM_CategorizePosition()
int PM_GetRandomStuckOffsets(int nIndex, int server, vec_t *offset) int PM_GetRandomStuckOffsets(int nIndex, int server, vec_t *offset)
{ {
// Last time we did a full // Last time we did a full
int idx; int idx = rgStuckLast[nIndex][server]++;
idx = rgStuckLast[nIndex][server]++; VectorCopy(rgv3tStuckTable[idx % ARRAYSIZE(rgv3tStuckTable)], offset);
return (idx % ARRAYSIZE(rgv3tStuckTable));
VectorCopy(rgv3tStuckTable[idx % 54], offset);
return (idx % 54);
} }
void PM_ResetStuckOffsets(int nIndex, int server) void PM_ResetStuckOffsets(int nIndex, int server)
@ -1542,7 +1539,7 @@ qboolean PM_CheckStuck()
nReps++; nReps++;
} }
while (nReps < 54); while (nReps < ARRAYSIZE(rgv3tStuckTable));
} }
} }
@ -1571,7 +1568,7 @@ qboolean PM_CheckStuck()
{ {
PM_ResetStuckOffsets(pmove->player_index, pmove->server); PM_ResetStuckOffsets(pmove->player_index, pmove->server);
if (i >= 27) if (i >= (ARRAYSIZE(rgv3tStuckTable) / 2))
{ {
VectorCopy(test, pmove->origin); VectorCopy(test, pmove->origin);
} }
@ -1772,7 +1769,7 @@ void PM_FixPlayerCrouchStuck(int direction)
int i; int i;
vec3_t test; vec3_t test;
hitent = pmove->PM_TestPlayerPosition (pmove->origin, nullptr); hitent = pmove->PM_TestPlayerPosition(pmove->origin, nullptr);
if (hitent == -1) if (hitent == -1)
{ {