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

Cleanups

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5853 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2016-09-06 04:25:32 +00:00
parent 4a6676dd87
commit b3273dbebf
2 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
polymer/eduke32/source/gameexec.c
View file

@ -355,7 +355,7 @@ int32_t A_GetFurthestAngle(int spriteNum, int angDiv)
return furthest_angle&2047; return furthest_angle&2047;
} }
int32_t A_FurthestVisiblePoint(int32_t spriteNum, uspritetype * const pSprite, int32_t *dax, int32_t *day) int A_FurthestVisiblePoint(int spriteNum, uspritetype * const ts, int32_t *dax, int32_t *day)
{ {
if (AC_COUNT(actor[spriteNum].t_data)&63) if (AC_COUNT(actor[spriteNum].t_data)&63)
return -1; return -1;
@ -366,17 +366,17 @@ int32_t A_FurthestVisiblePoint(int32_t spriteNum, uspritetype * const pSprite, i
int const angincs = 128; int const angincs = 128;
// ((!g_netServer && ud.multimode < 2) && ud.player_skill < 3) ? 2048 / 2 : tabledivide32_noinline(2048, 1 + (krand() & 1)); // ((!g_netServer && ud.multimode < 2) && ud.player_skill < 3) ? 2048 / 2 : tabledivide32_noinline(2048, 1 + (krand() & 1));
for (bssize_t j = pSprite->ang; j < (2048 + pSprite->ang); j += (angincs /*-(krand()&511)*/)) for (bssize_t j = ts->ang; j < (2048 + ts->ang); j += (angincs /*-(krand()&511)*/))
{ {
pSprite->z -= ZOFFSET2; ts->z -= ZOFFSET2;
hitscan((const vec3_t *)pSprite, pSprite->sectnum, sintable[(j + 512) & 2047], sintable[j & 2047], hitscan((const vec3_t *)ts, ts->sectnum, sintable[(j + 512) & 2047], sintable[j & 2047],
16384 - (krand() & 32767), &hit, CLIPMASK1); 16384 - (krand() & 32767), &hit, CLIPMASK1);
pSprite->z += ZOFFSET2; ts->z += ZOFFSET2;
if (hit.sect < 0) if (hit.sect < 0)
continue; continue;
int const d = FindDistance2D(hit.pos.x - pSprite->x, hit.pos.y - pSprite->y); int const d = FindDistance2D(hit.pos.x - ts->x, hit.pos.y - ts->y);
int const da = FindDistance2D(hit.pos.x - pnSprite->x, hit.pos.y - pnSprite->y); int const da = FindDistance2D(hit.pos.x - pnSprite->x, hit.pos.y - pnSprite->y);
if (d < da) if (d < da)
@ -394,10 +394,10 @@ int32_t A_FurthestVisiblePoint(int32_t spriteNum, uspritetype * const pSprite, i
return -1; return -1;
} }
static void VM_GetZRange(int32_t spriteNum, int32_t *ceilhit, int32_t *florhit, int wallDist) static void VM_GetZRange(int spriteNum, int32_t *ceilhit, int32_t *florhit, int wallDist)
{ {
uspritetype *const pSprite = (uspritetype *)&sprite[spriteNum]; uspritetype *const pSprite = (uspritetype *)&sprite[spriteNum];
int const ocstat = pSprite->cstat; int const ocstat = pSprite->cstat;
pSprite->cstat = 0; pSprite->cstat = 0;
pSprite->z -= ZOFFSET; pSprite->z -= ZOFFSET;
@ -411,7 +411,7 @@ static void VM_GetZRange(int32_t spriteNum, int32_t *ceilhit, int32_t *florhit,
pSprite->cstat = ocstat; pSprite->cstat = ocstat;
} }
void A_GetZLimits(int32_t spriteNum) void A_GetZLimits(int spriteNum)
{ {
spritetype *const pSprite = &sprite[spriteNum]; spritetype *const pSprite = &sprite[spriteNum];
int32_t ceilhit, florhit; int32_t ceilhit, florhit;
@ -540,23 +540,23 @@ GAMEEXEC_STATIC void VM_AlterAng(int32_t moveFlags)
int angDiff; int angDiff;
int goalAng; int goalAng;
int const spriteAngle = vm.pSprite->ang; int const spriteAngle = vm.pSprite->ang;
int32_t holoDukeSprite = vm.pPlayer->holoduke_on; int holoDukeSprite = vm.pPlayer->holoduke_on;
// NOTE: looks like 'owner' is set to target sprite ID... // NOTE: looks like 'owner' is set to target sprite ID...
if (holoDukeSprite >= 0 && vm.pSprite->owner
cansee(sprite[holoDukeSprite].x, sprite[holoDukeSprite].y, sprite[holoDukeSprite].z, = (holoDukeSprite >= 0 && cansee(sprite[holoDukeSprite].x, sprite[holoDukeSprite].y, sprite[holoDukeSprite].z,
sprite[holoDukeSprite].sectnum, vm.pSprite->x, vm.pSprite->y, vm.pSprite->z, vm.pSprite->sectnum)) sprite[holoDukeSprite].sectnum, vm.pSprite->x, vm.pSprite->y, vm.pSprite->z, vm.pSprite->sectnum))
vm.pSprite->owner = holoDukeSprite; ? holoDukeSprite
else vm.pSprite->owner = vm.pPlayer->i; : vm.pPlayer->i;
goalAng = (sprite[vm.pSprite->owner].picnum == APLAYER) goalAng = (sprite[vm.pSprite->owner].picnum == APLAYER)
? getangle(actor[vm.spriteNum].lastvx - vm.pSprite->x, actor[vm.spriteNum].lastvy - vm.pSprite->y) ? getangle(actor[vm.spriteNum].lastvx - vm.pSprite->x, actor[vm.spriteNum].lastvy - vm.pSprite->y)
: getangle(sprite[vm.pSprite->owner].x - vm.pSprite->x, sprite[vm.pSprite->owner].y - vm.pSprite->y); : getangle(sprite[vm.pSprite->owner].x - vm.pSprite->x, sprite[vm.pSprite->owner].y - vm.pSprite->y);
if (vm.pSprite->xvel && vm.pSprite->picnum != DRONE) if (vm.pSprite->xvel && vm.pSprite->picnum != DRONE)
{ {
angDiff = G_GetAngleDelta(spriteAngle,goalAng); angDiff = G_GetAngleDelta(spriteAngle, goalAng);
if (elapsedTics < 2) if (elapsedTics < 2)
{ {
@ -5807,7 +5807,7 @@ void VM_UpdateAnim(int spriteNum, int32_t *pData)
} }
// NORECURSE // NORECURSE
void A_Execute(int spriteNum, int playerNum, int32_t playerDist) void A_Execute(int spriteNum, int playerNum, int playerDist)
{ {
vmstate_t tempvm = { vmstate_t tempvm = {
spriteNum, playerNum, playerDist, 0, &sprite[spriteNum], &actor[spriteNum].t_data[0], g_player[playerNum].ps spriteNum, playerNum, playerDist, 0, &sprite[spriteNum], &actor[spriteNum].t_data[0], g_player[playerNum].ps

10
polymer/eduke32/source/gameexec.h
View file

@ -47,12 +47,12 @@ extern int32_t g_currentEventExec;
void A_LoadActor(int32_t spriteNum); void A_LoadActor(int32_t spriteNum);
#endif #endif
void A_Execute(int spriteNum, int playerNum, int32_t playerDist); void A_Execute(int spriteNum, int playerNum, int playerDist);
void A_Fall(int spriteNum); void A_Fall(int spriteNum);
int32_t A_FurthestVisiblePoint(int32_t spriteNum,uspritetype * const ts,int32_t *dax,int32_t *day); int A_FurthestVisiblePoint(int spriteNum, uspritetype * const ts,int32_t *dax,int32_t *day);
int32_t A_GetFurthestAngle(int spriteNum,int angDiv); int32_t A_GetFurthestAngle(int spriteNum, int angDiv);
void A_GetZLimits(int32_t spriteNum); void A_GetZLimits(int spriteNum);
int G_GetAngleDelta(int a,int na); int G_GetAngleDelta(int a, int na);
void G_RestoreMapState(); void G_RestoreMapState();
void G_SaveMapState(); void G_SaveMapState();