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

- Amalgamate ksgn and sgn into Sgn in cmdlib.h, and remove pragmas.h.

Browse source
This commit is contained in:
Mitchell Richters 2021-01-04 23:35:33 +11:00
parent b36bea7c69
commit 5124c0daec
52 changed files with 42 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/blood/src/actor.cpp
View file

@ -27,7 +27,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "build.h"
#include "automap.h"
#include "pragmas.h"
#include "mmulti.h"
#include "savegamehelp.h"

1
source/blood/src/ai.cpp
View file

@ -24,7 +24,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "ns.h" // Must come before everything else!
#include "build.h"
#include "pragmas.h"
#include "savegamehelp.h"
#include "mmulti.h"

1
source/blood/src/aibat.cpp
View file

@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "compat.h"
#include "build.h"
#include "pragmas.h"
#include "mmulti.h"
#include "blood.h"

1
source/blood/src/aibeast.cpp
View file

@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "compat.h"
#include "build.h"
#include "pragmas.h"
#include "mmulti.h"
#include "blood.h"

1
source/blood/src/aiboneel.cpp
View file

@ -24,7 +24,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "ns.h" // Must come before everything else!
#include "build.h"
#include "pragmas.h"
#include "mmulti.h"
#include "blood.h"

1
source/blood/src/aiburn.cpp
View file

@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "compat.h"
#include "build.h"
#include "pragmas.h"
#include "mmulti.h"
#include "blood.h"

1
source/blood/src/aicaleb.cpp
View file

@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "compat.h"
#include "build.h"
#include "pragmas.h"
#include "mmulti.h"
#include "blood.h"

1
source/blood/src/aicerber.cpp
View file

@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "compat.h"
#include "build.h"
#include "pragmas.h"
#include "mmulti.h"
#include "blood.h"

1
source/blood/src/aicult.cpp
View file

@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "compat.h"
#include "build.h"
#include "pragmas.h"
#include "mmulti.h"
#include "blood.h"

1
source/blood/src/aigarg.cpp
View file

@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "compat.h"
#include "build.h"
#include "pragmas.h"
#include "mmulti.h"
#include "blood.h"

1
source/blood/src/aighost.cpp
View file

@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "compat.h"
#include "build.h"
#include "pragmas.h"
#include "mmulti.h"
#include "blood.h"

1
source/blood/src/aigilbst.cpp
View file

@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "compat.h"
#include "build.h"
#include "pragmas.h"
#include "mmulti.h"
#include "blood.h"

1
source/blood/src/aihand.cpp
View file

@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "compat.h"
#include "build.h"
#include "pragmas.h"
#include "mmulti.h"
#include "blood.h"

1
source/blood/src/aihound.cpp
View file

@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "compat.h"
#include "build.h"
#include "pragmas.h"
#include "mmulti.h"
#include "blood.h"

1
source/blood/src/aiinnoc.cpp
View file

@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "compat.h"
#include "build.h"
#include "pragmas.h"
#include "mmulti.h"
#include "blood.h"

1
source/blood/src/aipod.cpp
View file

@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "compat.h"
#include "build.h"
#include "pragmas.h"
#include "mmulti.h"
#include "blood.h"

1
source/blood/src/airat.cpp
View file

@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "compat.h"
#include "build.h"
#include "pragmas.h"
#include "mmulti.h"
#include "blood.h"

1
source/blood/src/aispid.cpp
View file

@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "compat.h"
#include "build.h"
#include "pragmas.h"
#include "mmulti.h"
#include "blood.h"

1
source/blood/src/aitchern.cpp
View file

@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "compat.h"
#include "build.h"
#include "pragmas.h"
#include "mmulti.h"
#include "blood.h"

1
source/blood/src/aiunicult.cpp
View file

@ -26,7 +26,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "compat.h"
#include "build.h"
#include "pragmas.h"
#include "mmulti.h"
#include "raze_sound.h"

1
source/blood/src/aizomba.cpp
View file

@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "compat.h"
#include "build.h"
#include "pragmas.h"
#include "mmulti.h"
#include "blood.h"

1
source/blood/src/aizombf.cpp
View file

@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "compat.h"
#include "build.h"
#include "pragmas.h"
#include "mmulti.h"
#include "blood.h"

1
source/blood/src/animatesprite.cpp
View file

@ -27,7 +27,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "compat.h"
#include "build.h"
#include "pragmas.h"
#include "mmulti.h"
#include "v_font.h"

1
source/blood/src/common_game.h
View file

@ -24,7 +24,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "build.h"
#include <assert.h>
#include "pragmas.h"
#include "misc.h"
#include "printf.h"
#include "v_text.h"

1
source/blood/src/gib.cpp
View file

@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "compat.h"
#include "build.h"
#include "pragmas.h"
#include "blood.h"

1
source/blood/src/hudsprites.cpp
View file

@ -27,7 +27,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "compat.h"
#include "build.h"
#include "pragmas.h"
#include "mmulti.h"
#include "v_font.h"

1
source/blood/src/prediction.cpp
View file

@ -27,7 +27,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "compat.h"
#include "build.h"
#include "pragmas.h"
#include "mmulti.h"
#include "v_font.h"

1
source/blood/src/sbar.cpp
View file

@ -27,7 +27,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "compat.h"
#include "build.h"
#include "pragmas.h"
#include "mmulti.h"
#include "v_font.h"

1
source/blood/src/sectorfx.cpp
View file

@ -24,7 +24,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "compat.h"
#include "build.h"
#include "pragmas.h"
#include "blood.h"
#include "interpolate.h"

1
source/blood/src/trig.cpp
View file

@ -23,7 +23,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
//-------------------------------------------------------------------------
#include "build.h"
#include "pragmas.h"
#include "blood.h"
BEGIN_BLD_NS

9
source/blood/src/view.cpp
View file

@ -27,7 +27,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "compat.h"
#include "build.h"
#include "pragmas.h"
#include "mmulti.h"
#include "v_font.h"
@ -222,8 +221,8 @@ void CalcOtherPosition(spritetype *pSprite, int *pX, int *pY, int *pZ, int *vsec
if (abs(vX)+abs(vY) > abs(dX)+abs(dY))
{
*vsectnum = nHSector;
dX -= ksgn(vX)<<6;
dY -= ksgn(vY)<<6;
dX -= Sgn(vX)<<6;
dY -= Sgn(vY)<<6;
int nDist;
if (abs(vX) > abs(vY))
{
@ -269,8 +268,8 @@ void CalcPosition(spritetype *pSprite, int *pX, int *pY, int *pZ, int *vsectnum,
if (abs(vX)+abs(vY) > abs(dX)+abs(dY))
{
*vsectnum = nHSector;
dX -= ksgn(vX)<<6;
dY -= ksgn(vY)<<6;
dX -= Sgn(vX)<<6;
dY -= Sgn(vY)<<6;
int nDist;
if (abs(vX) > abs(vY))
{

1
source/build/include/build.h
View file

@ -21,7 +21,6 @@ static_assert('\xff' == 255, "Char must be unsigned!");
#include "compat.h"
#include "palette.h"
#include "pragmas.h"
//Make all variables in BUILD.H defined in the ENGINE,
//and externed in GAME

17
source/build/include/pragmas.h
View file

@ -1,17 +0,0 @@
// "Build Engine & Tools" Copyright (c) 1993-1997 Ken Silverman
// Ken Silverman's official web site: "http://www.advsys.net/ken"
// See the included license file "BUILDLIC.TXT" for license info.
//
// This file has been modified from Ken Silverman's original release
// by Jonathon Fowler (jf@jonof.id.au)
// by the EDuke32 team (development@voidpoint.com)
#include "templates.h"
#ifndef pragmas_h_
#define pragmas_h_
static inline constexpr int ksgn(int32_t a) { return (a > 0) - (a < 0); }
inline int sgn(int32_t a) { return (a > 0) - (a < 0); }
#endif // pragmas_h_

2
source/build/src/clip.cpp
View file

@ -351,7 +351,7 @@ static inline void keepaway(int32_t *x, int32_t *y, int32_t w)
{
const int32_t x1 = clipit[w].x1, dx = clipit[w].x2-x1;
const int32_t y1 = clipit[w].y1, dy = clipit[w].y2-y1;
const int32_t ox = ksgn(-dy), oy = ksgn(dx);
const int32_t ox = Sgn(-dy), oy = Sgn(dx);
char first = (abs(dx) <= abs(dy));
do

1
source/build/src/engine.cpp
View file

@ -16,7 +16,6 @@
#include "compat.h"
#include "engine_priv.h"
#include "palette.h"
#include "pragmas.h"
#include "scriptfile.h"
#include "gamecvars.h"
#include "c_console.h"

1
source/build/src/mdsprite.cpp
View file

@ -4,7 +4,6 @@
#include "compat.h"
#include "build.h"
#include "pragmas.h"
#include "engine_priv.h"
#include "polymost.h"
#include "mdsprite.h"

1
source/build/src/voxmodel.cpp
View file

@ -4,7 +4,6 @@
#include "compat.h"
#include "build.h"
#include "pragmas.h"
#include "engine_priv.h"
#include "polymost.h"
#include "mdsprite.h"

2
source/common/utility/cmdlib.h
View file

@ -99,5 +99,7 @@ inline void fillshort(void* buff, size_t count, uint16_t clear)
}
}
template<typename T> inline constexpr T Sgn(const T& val) { return (val > 0) - (val < 0); }
#endif

1
source/core/gamecontrol.h
View file

@ -11,7 +11,6 @@
#include "stats.h"
#include "i_time.h"
#include "palentry.h"
#include "pragmas.h"
extern FString currentGame;
extern FString LumpFilter;

1
source/exhumed/src/engine.h
View file

@ -20,7 +20,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "compat.h"
#include "build.h"
#include "pragmas.h"
BEGIN_PS_NS

36
source/games/duke/src/actors.cpp
View file

@ -1370,7 +1370,7 @@ void movetongue(DDukeActor *actor, int tongue, int jaw)
auto q = EGS(s->sectnum,
s->x + MulScale(k, bcos(s->ang), 9),
s->y + MulScale(k, bsin(s->ang), 9),
s->z + ((k * ksgn(s->zvel)) * abs(s->zvel / 12)), tongue, -40 + (k << 1),
s->z + ((k * Sgn(s->zvel)) * abs(s->zvel / 12)), tongue, -40 + (k << 1),
8, 8, 0, 0, 0, actor, 5);
if (q)
{
@ -1382,7 +1382,7 @@ void movetongue(DDukeActor *actor, int tongue, int jaw)
auto spawned = EGS(s->sectnum,
s->x + MulScale(k, bcos(s->ang), 9),
s->y + MulScale(k, bsin(s->ang), 9),
s->z + ((k * ksgn(s->zvel)) * abs(s->zvel / 12)), jaw, -40,
s->z + ((k * Sgn(s->zvel)) * abs(s->zvel / 12)), jaw, -40,
32, 32, 0, 0, 0, actor, 5);
if (spawned)
{
@ -1743,7 +1743,7 @@ void recon(DDukeActor *actor, int explosion, int firelaser, int attacksnd, int p
{
int l = ps[p].posz - s->z;
if (abs(l) < (48 << 8)) t[0] = 3;
else s->z += sgn(ps[p].posz - s->z) << shift; // The shift here differs between Duke and RR.
else s->z += Sgn(ps[p].posz - s->z) << shift; // The shift here differs between Duke and RR.
}
else
{
@ -3260,7 +3260,7 @@ void handle_se02(DDukeActor *actor)
if (abs(sc->floorheinum - t[5]) < 8)
sc->floorheinum = t[5];
else sc->floorheinum += (sgn(t[5] - sc->floorheinum) << 4);
else sc->floorheinum += (Sgn(t[5] - sc->floorheinum) << 4);
}
int m = MulScale(s->xvel, bcos(s->ang), 14);
@ -3465,7 +3465,7 @@ void handle_se05(DDukeActor* actor, int FIRELASER)
actor->SetOwner(Owner);
if (!Owner) return; // Undefined case - was not checked.
s->zvel = ksgn(Owner->s.z - s->z) << 4;
s->zvel = Sgn(Owner->s.z - s->z) << 4;
}
if (ldist(Owner, actor) < 1024)
@ -3822,23 +3822,23 @@ void handle_se13(DDukeActor* actor)
if (actor->spriteextra)
{
if (abs(t[0] - sc->ceilingz) >= j)
sc->ceilingz += sgn(t[0] - sc->ceilingz) * j;
sc->ceilingz += Sgn(t[0] - sc->ceilingz) * j;
else sc->ceilingz = t[0];
}
else
{
if (abs(t[1] - sc->floorz) >= j)
sc->floorz += sgn(t[1] - sc->floorz) * j;
sc->floorz += Sgn(t[1] - sc->floorz) * j;
else sc->floorz = t[1];
}
}
else
{
if (abs(t[1] - sc->floorz) >= j)
sc->floorz += sgn(t[1] - sc->floorz) * j;
sc->floorz += Sgn(t[1] - sc->floorz) * j;
else sc->floorz = t[1];
if (abs(t[0] - sc->ceilingz) >= j)
sc->ceilingz += sgn(t[0] - sc->ceilingz) * j;
sc->ceilingz += Sgn(t[0] - sc->ceilingz) * j;
sc->ceilingz = t[0];
}
@ -4374,7 +4374,7 @@ void handle_se21(DDukeActor* actor)
if (t[0] == 1) //Decide if the s->sectnum should go up or down
{
s->zvel = ksgn(s->z - *lp) * (s->yvel << 4);
s->zvel = Sgn(s->z - *lp) * (s->yvel << 4);
t[0]++;
}
@ -4676,7 +4676,7 @@ void handle_se32(DDukeActor *actor)
t[2] = 0;
t[0] = 0;
}
else sc->ceilingz += sgn(s->z - sc->ceilingz) * s->yvel;
else sc->ceilingz += Sgn(s->z - sc->ceilingz) * s->yvel;
}
else
{
@ -4687,7 +4687,7 @@ void handle_se32(DDukeActor *actor)
t[2] = 0;
t[0] = 0;
}
else sc->ceilingz += sgn(t[1] - sc->ceilingz) * s->yvel;
else sc->ceilingz += Sgn(t[1] - sc->ceilingz) * s->yvel;
}
return;
}
@ -4701,7 +4701,7 @@ void handle_se32(DDukeActor *actor)
callsound(s->sectnum, actor);
sc->ceilingz = s->z;
}
else sc->ceilingz += sgn(s->z - sc->ceilingz) * s->yvel;
else sc->ceilingz += Sgn(s->z - sc->ceilingz) * s->yvel;
}
else
{
@ -4711,7 +4711,7 @@ void handle_se32(DDukeActor *actor)
t[2] = !t[2];
callsound(s->sectnum, actor);
}
else sc->ceilingz -= sgn(s->z - t[1]) * s->yvel;
else sc->ceilingz -= Sgn(s->z - t[1]) * s->yvel;
}
}
@ -4867,7 +4867,7 @@ void handle_se31(DDukeActor* actor, bool choosedir)
}
else
{
int l = sgn(s->z - sec->floorz) * s->yvel;
int l = Sgn(s->z - sec->floorz) * s->yvel;
sec->floorz += l;
DukeSectIterator it(s->sectnum);
@ -4896,7 +4896,7 @@ void handle_se31(DDukeActor* actor, bool choosedir)
}
else
{
int l = sgn(t[1] - sec->floorz) * s->yvel;
int l = Sgn(t[1] - sec->floorz) * s->yvel;
sec->floorz += l;
DukeSectIterator it(s->sectnum);
@ -4927,7 +4927,7 @@ void handle_se31(DDukeActor* actor, bool choosedir)
}
else
{
int l = sgn(s->z - sec->floorz) * s->yvel;
int l = Sgn(s->z - sec->floorz) * s->yvel;
sec->floorz += l;
DukeSectIterator it(s->sectnum);
@ -4955,7 +4955,7 @@ void handle_se31(DDukeActor* actor, bool choosedir)
}
else
{
int l = sgn(s->z - t[1]) * s->yvel;
int l = Sgn(s->z - t[1]) * s->yvel;
sec->floorz -= l;
DukeSectIterator it(s->sectnum);

6
source/games/duke/src/actors_d.cpp
View file

@ -1829,7 +1829,7 @@ static void weaponcommon_d(DDukeActor* proj)
auto spawned = EGS(s->sectnum,
s->x + MulScale(k, bcos(s->ang), 9),
s->y + MulScale(k, bsin(s->ang), 9),
s->z + ((k * ksgn(s->zvel)) * abs(s->zvel / 24)), FIRELASER, -40 + (k << 2),
s->z + ((k * Sgn(s->zvel)) * abs(s->zvel / 24)), FIRELASER, -40 + (k << 2),
s->xrepeat, s->yrepeat, 0, 0, 0, proj->GetOwner(), 5);
spawned->s.cstat = 128;
@ -3482,7 +3482,7 @@ void handle_se06_d(DDukeActor* actor)
{
if (act2->temp_data[5] == 0)
act2->temp_data[5] = dist(act2, actor);
int x = sgn(dist(act2, actor) - act2->temp_data[5]);
int x = Sgn(dist(act2, actor) - act2->temp_data[5]);
if (act2->s.extra)
x = -x;
s->xvel += x;
@ -3819,7 +3819,7 @@ void move_d(DDukeActor *actor, int playernum, int xvel)
if (ps[playernum].newOwner != nullptr)
goalang = getangle(ps[playernum].oposx - spr->x, ps[playernum].oposy - spr->y);
else goalang = getangle(ps[playernum].posx - spr->x, ps[playernum].posy - spr->y);
angdif = ksgn(getincangle(spr->ang, goalang)) << 5;
angdif = Sgn(getincangle(spr->ang, goalang)) << 5;
if (angdif > -32 && angdif < 0)
{
angdif = 0;

8
source/games/duke/src/actors_r.cpp
View file

@ -1446,7 +1446,7 @@ static void weaponcommon_r(DDukeActor *proj)
auto x = EGS(s->sectnum,
s->x + MulScale(k, bcos(s->ang), 9),
s->y + MulScale(k, bsin(s->ang), 9),
s->z + ((k * ksgn(s->zvel)) * abs(s->zvel / 24)), FIRELASER, -40 + (k << 2),
s->z + ((k * Sgn(s->zvel)) * abs(s->zvel / 24)), FIRELASER, -40 + (k << 2),
s->xrepeat, s->yrepeat, 0, 0, 0, proj->GetOwner(), 5);
x->s.cstat = 128;
@ -3447,7 +3447,7 @@ void handle_se06_r(DDukeActor *actor)
{
if (act2->temp_data[5] == 0)
act2->temp_data[5] = dist(act2, actor);
int x = sgn(dist(act2, actor) - act2->temp_data[5]);
int x = Sgn(dist(act2, actor) - act2->temp_data[5]);
if (act2->s.extra) x = -x;
s->xvel += x;
}
@ -3719,7 +3719,7 @@ void move_r(DDukeActor *actor, int pnum, int xvel)
if (ps[pnum].newOwner != nullptr)
goalang = getangle(ps[pnum].oposx - spr->x, ps[pnum].oposy - spr->y);
else goalang = getangle(ps[pnum].posx - spr->x, ps[pnum].posy - spr->y);
angdif = ksgn(getincangle(spr->ang, goalang)) << 5;
angdif = Sgn(getincangle(spr->ang, goalang)) << 5;
if (angdif > -32 && angdif < 0)
{
angdif = 0;
@ -3735,7 +3735,7 @@ void move_r(DDukeActor *actor, int pnum, int xvel)
if (ps[pnum].newOwner != nullptr)
goalang = (getangle(ps[pnum].oposx - spr->x, ps[pnum].oposy - spr->y) + 1024) & 2047;
else goalang = (getangle(ps[pnum].posx - spr->x, ps[pnum].posy - spr->y) + 1024) & 2047;
angdif = ksgn(getincangle(spr->ang, goalang)) << 5;
angdif = Sgn(getincangle(spr->ang, goalang)) << 5;
if (angdif > -32 && angdif < 0)
{
angdif = 0;

1
source/games/duke/src/duke3d.h
View file

@ -4,7 +4,6 @@
#include "compat.h"
#include "pragmas.h"
#include "polymost.h"
#include "gamecvars.h"

4
source/games/duke/src/gameexec.cpp
View file

@ -1740,14 +1740,14 @@ int ParseState::parse(void)
//if (!isPlutoPak() && *insptr == 0) *insptr = 4;
j = ((*insptr) - g_sp->xrepeat) << 1;
g_sp->xrepeat += ksgn(j);
g_sp->xrepeat += Sgn(j);
insptr++;
if ((g_sp->picnum == TILE_APLAYER && g_sp->yrepeat < 36) || *insptr < g_sp->yrepeat || ((g_sp->yrepeat * (tileHeight(g_sp->picnum) + 8)) << 2) < (g_ac->floorz - g_ac->ceilingz))
{
j = ((*insptr) - g_sp->yrepeat) << 1;
if (abs(j)) g_sp->yrepeat += ksgn(j);
if (abs(j)) g_sp->yrepeat += Sgn(j);
}
insptr++;

4
source/games/duke/src/hudweapon_d.cpp
View file

@ -942,7 +942,7 @@ void displayweapon_d(int snum, double smoothratio)
{
if (*kb < aplWeaponTotalTime[p->curr_weapon][snum])
{
i = sgn(*kb >> 2);
i = Sgn(*kb >> 2);
if (p->ammo_amount[p->curr_weapon] & 1)
{
hud_drawpal(weapon_xoffset + 30 - look_anghalf, looking_arc + 240 - gun_pos, DEVISTATOR, shade, o | 4, pal);
@ -1003,7 +1003,7 @@ void displayweapon_d(int snum, double smoothratio)
{
char cycloidy[] = { 0,4,12,24,12,4,0 };
i = sgn(*kb >> 2);
i = Sgn(*kb >> 2);
if (p->hbomb_hold_delay)
{

4
source/games/duke/src/prediction.cpp
View file

@ -406,8 +406,8 @@ void fakedomovethings(void)
tempang = syn->avel<<1;
if(psectlotag == 2)
myang += (tempang-(tempang>>3))*sgn(doubvel);
else myang += (tempang)*sgn(doubvel);
myang += (tempang-(tempang>>3))*Sgn(doubvel);
else myang += (tempang)*Sgn(doubvel);
myang &= 2047;
}

4
source/games/duke/src/sectors_r.cpp
View file

@ -945,8 +945,8 @@ static void lotsofpopcorn(DDukeActor *actor, short wallnum, short n)
xv = wall[wall[wallnum].point2].x - x1;
yv = wall[wall[wallnum].point2].y - y1;
x1 -= ksgn(yv);
y1 += ksgn(xv);
x1 -= Sgn(yv);
y1 += Sgn(xv);
xv /= j;
yv /= j;

4
source/games/duke/src/spawn.cpp
View file

@ -1146,8 +1146,8 @@ void lotsofglass(DDukeActor *actor, int wallnum, int n)
xv = wall[wall[wallnum].point2].x - x1;
yv = wall[wall[wallnum].point2].y - y1;
x1 -= sgn(yv);
y1 += sgn(xv);
x1 -= Sgn(yv);
y1 += Sgn(xv);
xv /= j;
yv /= j;

1
source/sw/src/draw.cpp
View file

@ -28,7 +28,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#define QUIET
#include "build.h"
#include "automap.h"
#include "pragmas.h"
#include "names2.h"

2
source/sw/src/game.h
View file

@ -42,7 +42,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "mytypes.h"
#include "sounds.h"
#include "pragmas.h"
#include "gamecvars.h"
#include "raze_sound.h"
#include "c_cvars.h"
@ -123,7 +122,6 @@ inline int RANDOM(void)
#define PRINT(line,str) DebugPrint(line,str)
#include "pragmas.h"
//
// Map directions/degrees

1
source/sw/src/interpso.cpp
View file

@ -27,7 +27,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "ns.h"
#include "compat.h"
#include "pragmas.h"
#include "game.h"
#include "interpso.h"