zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-31 04:20:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

- merged 5 more headers into misc.h.

Browse source 
These small header files are really counterproductive, file count has already gone down from 143 to 106.
This commit is contained in:
Christoph Oelckers 2020-07-26 00:07:59 +02:00
parent b2f794bde5
commit 4e3ad09d70
52 changed files with 84 additions and 299 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -50,13 +50,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "player.h"
#include "seq.h"
#include "sound.h"
#include "tile.h"
#include "trig.h"
#include "triggers.h"
#include "view.h"
#include "warp.h"
#include "weapon.h"
#include "nnexts.h"
#include "player.h"
#include "misc.h"
BEGIN_BLD_NS

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

@ -44,7 +44,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "player.h"
#include "seq.h"
#include "sound.h"
#include "trig.h"
#include "triggers.h"
#include "view.h"
#include "nnexts.h"

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

@ -36,7 +36,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "dude.h"
#include "player.h"
#include "seq.h"
#include "trig.h"
BEGIN_BLD_NS

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

@ -38,7 +38,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "player.h"
#include "seq.h"
#include "sound.h"
#include "trig.h"
BEGIN_BLD_NS

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

@ -37,7 +37,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "player.h"
#include "seq.h"
#include "sound.h"
#include "trig.h"
BEGIN_BLD_NS

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

@ -39,7 +39,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "player.h"
#include "seq.h"
#include "sound.h"
#include "trig.h"
#include "nnexts.h"
BEGIN_BLD_NS

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

@ -38,7 +38,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "player.h"
#include "seq.h"
#include "sound.h"
#include "trig.h"
BEGIN_BLD_NS

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

@ -38,7 +38,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "player.h"
#include "seq.h"
#include "sound.h"
#include "trig.h"
BEGIN_BLD_NS

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

@ -40,7 +40,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "player.h"
#include "seq.h"
#include "sound.h"
#include "trig.h"
BEGIN_BLD_NS

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

@ -40,7 +40,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "player.h"
#include "seq.h"
#include "sound.h"
#include "trig.h"
#include "nnexts.h"
BEGIN_BLD_NS

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

@ -40,7 +40,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "player.h"
#include "seq.h"
#include "sound.h"
#include "trig.h"
#include "nnexts.h"
BEGIN_BLD_NS

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

@ -39,7 +39,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "player.h"
#include "seq.h"
#include "sound.h"
#include "trig.h"
BEGIN_BLD_NS

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

@ -39,7 +39,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "player.h"
#include "seq.h"
#include "sound.h"
#include "trig.h"
BEGIN_BLD_NS

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

@ -40,7 +40,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "player.h"
#include "seq.h"
#include "sound.h"
#include "trig.h"
#include "nnexts.h"
BEGIN_BLD_NS

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

@ -39,7 +39,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "player.h"
#include "seq.h"
#include "sound.h"
#include "trig.h"
BEGIN_BLD_NS

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

@ -41,7 +41,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "player.h"
#include "seq.h"
#include "sound.h"
#include "trig.h"
BEGIN_BLD_NS

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

@ -39,7 +39,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "player.h"
#include "seq.h"
#include "sound.h"
#include "trig.h"
BEGIN_BLD_NS

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

@ -40,7 +40,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "player.h"
#include "seq.h"
#include "sound.h"
#include "trig.h"
BEGIN_BLD_NS

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

@ -40,7 +40,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "player.h"
#include "seq.h"
#include "sound.h"
#include "trig.h"
BEGIN_BLD_NS

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

@ -46,11 +46,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "player.h"
#include "seq.h"
#include "sound.h"
#include "trig.h"
#include "triggers.h"
#include "endgame.h"
#include "view.h"
#include "tile.h"
#include "raze_sound.h"
#include "gib.h"

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

@ -40,7 +40,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "player.h"
#include "seq.h"
#include "sound.h"
#include "trig.h"
BEGIN_BLD_NS

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

@ -39,7 +39,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "player.h"
#include "seq.h"
#include "sound.h"
#include "trig.h"
BEGIN_BLD_NS

2
source/blood/src/barf.cpp
View file

@ -36,8 +36,6 @@ BEGIN_BLD_NS
#define DICT_LOAD 0
#define DICT_LOCK 0
static Resource gBarfRes;
#define kMaxCmdLineDefines 5
#define kMaxDefines 1000
#define kMaxParseLevels 5

7
source/blood/src/blood.cpp
View file

@ -51,12 +51,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "sectorfx.h"
#include "seq.h"
#include "sound.h"
#include "tile.h"
#include "trig.h"
#include "triggers.h"
#include "view.h"
#include "warp.h"
#include "weapon.h"
#include "misc.h"
#include "gameconfigfile.h"
#include "gamecontrol.h"
#include "m_argv.h"
@ -64,7 +61,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "menu.h"
#include "raze_sound.h"
#include "nnexts.h"
#include"secrets.h"
#include "secrets.h"
BEGIN_BLD_NS

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

@ -41,7 +41,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "player.h"
#include "seq.h"
#include "sound.h"
#include "trig.h"
#include "triggers.h"
#include "view.h"
#include "nnexts.h"

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

@ -35,7 +35,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "globals.h"
#include "screen.h"
#include "sound.h"
#include "tile.h"
#include "view.h"
// we load this in to get default button and key assignments

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

@ -31,7 +31,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "blood.h"
#include "globals.h"
#include "misc.h"
#include "tile.h"
BEGIN_BLD_NS

2
source/blood/src/fx.cpp
View file

@ -36,8 +36,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "gameutil.h"
#include "levels.h"
#include "seq.h"
#include "tile.h"
#include "trig.h"
#include "view.h"
BEGIN_BLD_NS

2
source/blood/src/gameutil.cpp
View file

@ -34,8 +34,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "db.h"
#include "gameutil.h"
#include "globals.h"
#include "tile.h"
#include "trig.h"
BEGIN_BLD_NS

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

@ -37,8 +37,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "gib.h"
#include "levels.h"
#include "sound.h"
#include "tile.h"
#include "trig.h"
BEGIN_BLD_NS

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

@ -27,7 +27,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "common_game.h"
#include "levels.h"
#include "map2d.h"
#include "trig.h"
#include "view.h"
#include "v_2ddrawer.h"

2
source/blood/src/mirrors.cpp
View file

@ -30,9 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "gameutil.h"
#include "loadsave.h"
#include "player.h"
#include "trig.h"
#include "view.h"
#include "warp.h"
BEGIN_BLD_NS

81
source/blood/src/misc.h
View file

@ -25,10 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "common.h"
#include "filesystem.h"
using Resource = FileSystem;
// Map NBlood's resource system to our own.
using DICTNODE = FResourceLump;
BEGIN_BLD_NS
void *ResReadLine(char *buffer, unsigned int nBytes, void **pRes);
@ -52,4 +48,81 @@ void qloadpalette();
int32_t qgetpalookup(int32_t a1, int32_t a2);
void HookReplaceFunctions();
struct QAV;
struct PLAYER;
extern QAV* weaponQAV[];
void WeaponInit(void);
void WeaponDraw(PLAYER *pPlayer, int a2, int a3, int a4, int a5);
void WeaponRaise(PLAYER *pPlayer);
void WeaponLower(PLAYER *pPlayer);
char WeaponUpgrade(PLAYER *pPlayer, char newWeapon);
void WeaponProcess(PLAYER *pPlayer);
void WeaponUpdateState(PLAYER* pPlayer);
void sub_51340(spritetype *pMissile, int a2);
void StartQAV(PLAYER* pPlayer, int nWeaponQAV, int a3 = -1, char a4 = 0);
void WeaponPrecache(void);
struct ZONE {
int x, y, z;
short sectnum, ang;
};
extern ZONE gStartZone[8];
void warpInit(void);
int CheckLink(spritetype *pSprite);
int CheckLink(int *x, int *y, int *z, int *nSector);
extern int costable[2048];
int GetOctant(int x, int y);
void RotateVector(int *dx, int *dy, int nAngle);
void RotatePoint(int *x, int *y, int nAngle, int ox, int oy);
void trigInit();
inline int Sin(int ang)
{
return costable[(ang - 512) & 2047];
}
inline int Cos(int ang)
{
return costable[ang & 2047];
}
enum SurfaceType {
kSurfNone = 0,
kSurfStone,
kSurfMetal,
kSurfWood,
kSurfFlesh,
kSurfWater,
kSurfDirt,
kSurfClay,
kSurfSnow,
kSurfIce,
kSurfLeaves,
kSurfCloth,
kSurfPlant,
kSurfGoo,
kSurfLava,
kSurfMax
};
extern char surfType[MAXTILES];
extern signed char tileShade[MAXTILES];
extern short voxelIndex[MAXTILES];
extern int nPrecacheCount;
extern char precachehightile[2][(MAXTILES+7)>>3];
int tileInit(char a1, const char *a2);
void tileProcessGLVoxels(void);
const uint8_t * tileLoadTile(int nTile);
uint8_t * tileAllocTile(int nTile, int x, int y);
void tilePreloadTile(int nTile);
void tilePrecacheTile(int nTile, int nType = 1);
char tileGetSurfType(int hit);
END_BLD_NS

5
source/blood/src/nnexts.cpp
View file

@ -33,16 +33,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifdef NOONE_EXTENSIONS
#include <random>
#include "loadsave.h"
#include "player.h"
#include "aiunicult.h"
#include "triggers.h"
#include "sectorfx.h"
#include "globals.h"
#include "endgame.h"
#include "weapon.h"
#include "misc.h"
#include "mmulti.h"
#include "view.h"
#include "tile.h"
#include "trig.h"
#include "sound.h"
#include "seq.h"
#include "ai.h"

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

@ -37,7 +37,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "actor.h"
#include "dude.h"
#include "player.h"
#include "warp.h"
BEGIN_BLD_NS

4
source/blood/src/player.cpp
View file

@ -44,12 +44,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "player.h"
#include "seq.h"
#include "sound.h"
#include "tile.h"
#include "triggers.h"
#include "trig.h"
#include "view.h"
#include "warp.h"
#include "weapon.h"
#include "common_game.h"
#include "messages.h"
#include "nnexts.h"

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

@ -26,7 +26,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "compat.h"
#include "common_game.h"
#include "qav.h"
#include "tile.h"
#include "sound.h"
BEGIN_BLD_NS

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

@ -27,7 +27,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "m_crc32.h"
#include "globals.h"
#include "tile.h"
#include "screen.h"
BEGIN_BLD_NS

33
source/blood/src/replace.h
View file

@ -1,33 +0,0 @@
//-------------------------------------------------------------------------
/*
Copyright (C) 2010-2019 EDuke32 developers and contributors
Copyright (C) 2019 Nuke.YKT
This file is part of NBlood.
NBlood 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.
*/
//-------------------------------------------------------------------------
#pragma once
#include "compat.h"
BEGIN_BLD_NS
int qanimateoffs(int a1, int a2);
void qloadpalette();
int32_t qgetpalookup(int32_t a1, int32_t a2);
void HookReplaceFunctions();
END_BLD_NS

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

@ -31,7 +31,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "db.h"
#include "gameutil.h"
#include "globals.h"
#include "trig.h"
#include "sectorfx.h"
BEGIN_BLD_NS

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

@ -36,7 +36,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "seq.h"
#include "gameutil.h"
#include "actor.h"
#include "tile.h"
#include "view.h"
#include "raze_sound.h"

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

@ -31,7 +31,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "gameutil.h"
#include "player.h"
#include "sound.h"
#include "trig.h"
#include "raze_sound.h"
BEGIN_BLD_NS

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

@ -33,7 +33,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "blood.h"
#include "config.h"
#include "globals.h"
#include "tile.h"
#include "view.h"
BEGIN_BLD_NS

66
source/blood/src/tile.h
View file

@ -1,66 +0,0 @@
//-------------------------------------------------------------------------
/*
Copyright (C) 2010-2019 EDuke32 developers and contributors
Copyright (C) 2019 Nuke.YKT
This file is part of NBlood.
NBlood 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.
*/
//-------------------------------------------------------------------------
#pragma once
#include "build.h"
#include "common_game.h"
#include "blood.h"
BEGIN_BLD_NS
enum SurfaceType {
kSurfNone = 0,
kSurfStone,
kSurfMetal,
kSurfWood,
kSurfFlesh,
kSurfWater,
kSurfDirt,
kSurfClay,
kSurfSnow,
kSurfIce,
kSurfLeaves,
kSurfCloth,
kSurfPlant,
kSurfGoo,
kSurfLava,
kSurfMax
};
extern char surfType[kMaxTiles];
extern signed char tileShade[kMaxTiles];
extern short voxelIndex[kMaxTiles];
extern int nPrecacheCount;
extern char precachehightile[2][(MAXTILES+7)>>3];
int tileInit(char a1, const char *a2);
#ifdef USE_OPENGL
void tileProcessGLVoxels(void);
#endif
const uint8_t * tileLoadTile(int nTile);
uint8_t * tileAllocTile(int nTile, int x, int y);
void tilePreloadTile(int nTile);
void tilePrecacheTile(int nTile, int nType = 1);
char tileGetSurfType(int hit);
END_BLD_NS

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

@ -28,7 +28,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "build.h"
#include "pragmas.h"
#include "common_game.h"
#include "trig.h"
BEGIN_BLD_NS

45
source/blood/src/trig.h
View file

@ -1,45 +0,0 @@
//-------------------------------------------------------------------------
/*
Copyright (C) 2010-2019 EDuke32 developers and contributors
Copyright (C) 2019 Nuke.YKT
This file is part of NBlood.
NBlood 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.
*/
//-------------------------------------------------------------------------
#pragma once
BEGIN_BLD_NS
extern int costable[2048];
int GetOctant(int x, int y);
void RotateVector(int *dx, int *dy, int nAngle);
void RotatePoint(int *x, int *y, int nAngle, int ox, int oy);
void trigInit();
inline int Sin(int ang)
{
return costable[(ang - 512) & 2047];
}
inline int Cos(int ang)
{
return costable[ang & 2047];
}
END_BLD_NS

2
source/blood/src/triggers.cpp
View file

@ -47,10 +47,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "qav.h"
#include "sound.h"
#include "triggers.h"
#include "trig.h"
#include "view.h"
#include "messages.h"
#include "weapon.h"
#include "nnexts.h"
BEGIN_BLD_NS

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

@ -47,11 +47,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "player.h"
#include "screen.h"
#include "sectorfx.h"
#include "tile.h"
#include "trig.h"
#include "view.h"
#include "warp.h"
#include "weapon.h"
#include "nnexts.h"
#include "zstring.h"
#include "menu.h"

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

@ -31,7 +31,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "levels.h"
#include "loadsave.h"
#include "view.h"
#include "warp.h"
#include "nnexts.h"
BEGIN_BLD_NS

38
source/blood/src/warp.h
View file

@ -1,38 +0,0 @@
//-------------------------------------------------------------------------
/*
Copyright (C) 2010-2019 EDuke32 developers and contributors
Copyright (C) 2019 Nuke.YKT
This file is part of NBlood.
NBlood 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.
*/
//-------------------------------------------------------------------------
#pragma once
#include "common_game.h"
BEGIN_BLD_NS
struct ZONE {
int x, y, z;
short sectnum, ang;
};
extern ZONE gStartZone[8];
void warpInit(void);
int CheckLink(spritetype *pSprite);
int CheckLink(int *x, int *y, int *z, int *nSector);
END_BLD_NS

3
source/blood/src/weapon.cpp
View file

@ -44,7 +44,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "qav.h"
#include "seq.h"
#include "sound.h"
#include "trig.h"
#include "nnexts.h"
#include "view.h"
@ -268,7 +267,7 @@ void WeaponPlay(PLAYER *pPlayer)
pQAV->Play(nTicks-4, nTicks, pPlayer->qavCallback, pPlayer);
}
void StartQAV(PLAYER *pPlayer, int nWeaponQAV, int a3 = -1, char a4 = 0)
void StartQAV(PLAYER *pPlayer, int nWeaponQAV, int a3, char a4)
{
dassert(nWeaponQAV < kQAVEnd);
pPlayer->weaponQav = nWeaponQAV;

44
source/blood/src/weapon.h
View file

@ -1,44 +0,0 @@
//-------------------------------------------------------------------------
/*
Copyright (C) 2010-2019 EDuke32 developers and contributors
Copyright (C) 2019 Nuke.YKT
This file is part of NBlood.
NBlood 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.
*/
//-------------------------------------------------------------------------
#pragma once
#include "common_game.h"
#include "blood.h"
#include "db.h"
#include "player.h"
#include "qav.h"
BEGIN_BLD_NS
extern QAV* weaponQAV[];
void WeaponInit(void);
void WeaponDraw(PLAYER *pPlayer, int a2, int a3, int a4, int a5);
void WeaponRaise(PLAYER *pPlayer);
void WeaponLower(PLAYER *pPlayer);
char WeaponUpgrade(PLAYER *pPlayer, char newWeapon);
void WeaponProcess(PLAYER *pPlayer);
void WeaponUpdateState(PLAYER* pPlayer);
void sub_51340(spritetype *pMissile, int a2);
void StartQAV(PLAYER* pPlayer, int nWeaponQAV, int a3 = -1, char a4 = 0);
void WeaponPrecache(void);
END_BLD_NS