teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-03-24 18:12:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

- eliminated AngleDiff.

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-11 00:18:09 +02:00
parent e3e11300ac
commit e2a6353182
12 changed files with 19 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/CMakeLists.txt
View file

@ -902,7 +902,6 @@ set( NOT_COMPILED_SOURCE_FILES
games/exhumed/src/spider.cpp
games/exhumed/src/status.cpp
games/exhumed/src/switch.cpp
games/exhumed/src/trigdat.cpp
games/exhumed/src/view.cpp
games/exhumed/src/wasp.cpp

1
source/games/exhumed/all.cpp
View file

@ -43,7 +43,6 @@
#include "src/spider.cpp"
#include "src/status.cpp"
#include "src/switch.cpp"
#include "src/trigdat.cpp"
#include "src/view.cpp"
#include "src/wasp.cpp"
// This includes the VM so it is last

4
source/games/exhumed/src/anubis.cpp
View file

@ -177,8 +177,8 @@ void AIAnubis::Tick(RunListEvent* ev)
{
if (move.actor() == pTarget)
{
auto nAngDiff = AngleDiff(ap->spr.angle, VecToAngle(pTarget->spr.pos - ap->spr.pos));
if (nAngDiff < 64)
auto nAngDiff = absangle(ap->spr.angle, VecToAngle(pTarget->spr.pos - ap->spr.pos));
if (nAngDiff < DAngle22_5 / 2)
{
ap->nAction = 2;
ap->nFrame = 0;

10
source/games/exhumed/src/engine.h
View file

@ -121,15 +121,5 @@ DAngle RandomAngle9();
DAngle RandomAngle();
double RandomFloat(double range);
// record
// save
// trigdat
int AngleDiff(DAngle a, DAngle b);
int AngleDelta(int a, int b, int c);
END_PS_NS

4
source/games/exhumed/src/lavadude.cpp
View file

@ -305,8 +305,8 @@ void AILavaDude::Tick(RunListEvent* ev)
{
if (coll.actor() == pTarget)
{
auto nAngDiff = AngleDiff(pActor->spr.angle, VecToAngle(pTarget->spr.pos - pActor->spr.pos));
if (nAngDiff < 64)
auto nAngDiff = absangle(pActor->spr.angle, VecToAngle(pTarget->spr.pos - pActor->spr.pos));
if (nAngDiff < DAngle22_5 / 2)
{
pActor->nAction = 2;
pActor->nFrame = 0;

8
source/games/exhumed/src/lion.cpp
View file

@ -302,8 +302,8 @@ void AILion::Tick(RunListEvent* ev)
}
else
{
auto nAngDiff = AngleDiff(pActor->spr.angle, VecToAngle(pTarget->spr.pos - pActor->spr.pos));
if (nAngDiff < 64)
auto nAngDiff = absangle(pActor->spr.angle, VecToAngle(pTarget->spr.pos - pActor->spr.pos));
if (nAngDiff < DAngle22_5 / 2)
{
pActor->nAction = 3;
}
@ -427,8 +427,8 @@ void AILion::Tick(RunListEvent* ev)
{
if (nMov.actor() == pTarget)
{
auto nAngDiff = AngleDiff(pActor->spr.angle, VecToAngle(pTarget->spr.pos - pActor->spr.pos));
if (nAngDiff < 64)
auto nAngDiff = absangle(pActor->spr.angle, VecToAngle(pTarget->spr.pos - pActor->spr.pos));
if (nAngDiff < DAngle22_5 / 2)
{
pActor->nAction = 3;
pActor->nFrame = 0;

4
source/games/exhumed/src/mummy.cpp
View file

@ -266,8 +266,8 @@ void AIMummy::Tick(RunListEvent* ev)
{
if (nMov.actor() == pTarget)
{
auto nAngDiff = AngleDiff(pActor->spr.angle, VecToAngle(pTarget->spr.pos - pActor->spr.pos));
if (nAngDiff < 64)
auto nAngDiff = absangle(pActor->spr.angle, VecToAngle(pTarget->spr.pos - pActor->spr.pos));
if (nAngDiff < DAngle22_5 / 2)
{
pActor->nAction = 2;
pActor->nFrame = 0;

8
source/games/exhumed/src/player.cpp
View file

@ -738,13 +738,9 @@ bool CheckMovingBlocks(int nPlayer, Collision& nMove, DVector3& spr_pos, sectort
{
if ((sect->hitag == 45) && bTouchFloor)
{
int nDiff = AngleDiff(nNormal, pPlayerActor->spr.angle + DAngle180);
auto nDiff = absangle(nNormal, pPlayerActor->spr.angle + DAngle180);
if (nDiff < 0) {
nDiff = -nDiff;
}
if (nDiff <= 256)
if (nDiff <= DAngle45)
{
PlayerList[nPlayer].pPlayerPushSect = sect;

4
source/games/exhumed/src/scorp.cpp
View file

@ -244,8 +244,8 @@ void AIScorp::Tick(RunListEvent* ev)
{
if (pTarget == nMov.actor())
{
auto nAngDiff = AngleDiff(pActor->spr.angle, VecToAngle(pTarget->spr.pos - pActor->spr.pos));
if (nAngDiff < 64)
auto nAngDiff = absangle(pActor->spr.angle, VecToAngle(pTarget->spr.pos - pActor->spr.pos));
if (nAngDiff < DAngle22_5 / 2)
{
pActor->nAction = 2;
pActor->nFrame = 0;

6
source/games/exhumed/src/set.cpp
View file

@ -424,9 +424,9 @@ void AISet::Tick(RunListEvent* ev)
{
if (pTarget == nMov.actor())
{
auto nAngDiff = AngleDiff(pActor->spr.angle, VecToAngle(pTarget->spr.pos - pActor->spr.pos));
if (nAngDiff < 64)
{
auto nAngDiff = absangle(pActor->spr.angle, VecToAngle(pTarget->spr.pos - pActor->spr.pos));
if (nAngDiff < DAngle22_5 / 2)
{
pActor->nAction = 4;
pActor->nFrame = 0;
}

4
source/games/exhumed/src/spider.cpp
View file

@ -305,8 +305,8 @@ void AISpider::Tick(RunListEvent* ev)
{
if (nMov.actor() == pTarget)
{
auto nAngDiff = AngleDiff(spp->spr.angle, VecToAngle(pTarget->spr.pos - spp->spr.pos));
if (nAngDiff < 64)
auto nAngDiff = absangle(spp->spr.angle, VecToAngle(pTarget->spr.pos - spp->spr.pos));
if (nAngDiff < DAngle22_5 / 2)
{
spp->nAction = 2;
spp->nFrame = 0;

65
source/games/exhumed/src/trigdat.cpp
View file

@ -1,65 +0,0 @@
//-------------------------------------------------------------------------
/*
Copyright (C) 2010-2019 EDuke32 developers and contributors
Copyright (C) 2019 sirlemonhead, Nuke.YKT
This file is part of PCExhumed.
PCExhumed is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License version 2
as published by the Free Software Foundation.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
//-------------------------------------------------------------------------
#include "ns.h"
#include "engine.h"
#ifndef __WATCOMC__
#include <cstdlib>
#include <cmath>
#else
#include <stdlib.h>
#endif
BEGIN_PS_NS
// 100% done
int AngleDiff(DAngle a, DAngle b)
{
int diff = (b - a).Normalized360().Buildang();
if (diff > 1024) {
diff = 2048 - diff;
}
return diff;
}
int AngleDelta(int a, int b, int c)
{
int diff = b - a;
if (diff >= 0)
{
if (diff > 1024) {
diff = -(2048 - diff);
}
}
else if (diff < -1024)
{
diff += 2048;
}
if (abs(diff) > c)
{
if (diff < 0) {
return -diff;
}
diff = c;
}
return diff;
}
END_PS_NS