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

- put all Blood game code into a namespace.

Browse source
This commit is contained in:
Christoph Oelckers 2019-09-22 08:39:22 +02:00
parent 2dc051f7cf
commit 0d98e7f256
147 changed files with 622 additions and 303 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
platform/Windows/nblood.vcxproj
View file

@ -243,7 +243,6 @@
<ClCompile Include="..\..\source\blood\src\view.cpp" />
<ClCompile Include="..\..\source\blood\src\warp.cpp" />
<ClCompile Include="..\..\source\blood\src\weapon.cpp" />
<ClCompile Include="..\..\source\blood\src\winbits.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="audiolib.vcxproj">

3
platform/Windows/nblood.vcxproj.filters
View file

@ -21,9 +21,6 @@
<ClCompile Include="..\..\source\blood\src\levels.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\source\blood\src\winbits.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\source\blood\src\startwin.game.cpp">
<Filter>Source Files</Filter>
</ClCompile>

4
source/blood/src/_functio.h
View file

@ -31,6 +31,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "_control.h"
#include "control.h"
BEGIN_BLD_NS
#ifndef function_private_h_
#define function_private_h_
// KEEPINSYNC lunatic/con_lang.lua
@ -368,3 +370,5 @@ static const char * joystickdigitaldefaults[MAXJOYDIGITAL] =
#endif
#endif
END_BLD_NS

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

@ -78,6 +78,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "warp.h"
#include "weapon.h"
BEGIN_BLD_NS
VECTORDATA gVectorData[] = {
// Tine
{
@ -7950,3 +7952,4 @@ bool ceilIsTooLow(spritetype* pSprite) {
return false;
}
END_BLD_NS

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

@ -28,6 +28,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "fx.h"
#include "gameutil.h"
BEGIN_BLD_NS
enum DAMAGE_TYPE {
DAMAGE_TYPE_0 = 0,
DAMAGE_TYPE_1, // Flame
@ -284,4 +286,6 @@ extern short gSightSpritesList[kMaxSuperXSprites];
extern short gPhysSpritesList[kMaxSuperXSprites];
extern short gProxySpritesCount;
extern short gSightSpritesCount;
extern short gPhysSpritesCount;
extern short gPhysSpritesCount;
END_BLD_NS

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

@ -66,6 +66,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "trig.h"
#include "triggers.h"
BEGIN_BLD_NS
int cumulDamage[kMaxXSprites];
int gDudeSlope[kMaxXSprites];
DUDEEXTRA gDudeExtra[kMaxXSprites];
@ -1808,3 +1810,4 @@ void AILoadSaveConstruct(void)
myLoadSave = new AILoadSave();
}
END_BLD_NS

5
source/blood/src/ai.h
View file

@ -27,6 +27,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "actor.h"
#include "db.h"
BEGIN_BLD_NS
struct AISTATE {
int stateType; // By NoOne: current type of state. Basically required for kGDXDudeTargetChanger, but can be used for something else.
int at0; // seq
@ -103,3 +106,5 @@ void aiInitSprite(spritetype *pSprite);
// By NoOne: this function required for kGDXDudeTargetChanger
void aiSetGenIdleState(spritetype* pSprite, XSPRITE* pXSprite);
END_BLD_NS

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

@ -39,6 +39,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "seq.h"
#include "trig.h"
BEGIN_BLD_NS
static void BiteSeqCallback(int, int);
static void thinkTarget(spritetype *, XSPRITE *);
static void thinkSearch(spritetype *, XSPRITE *);
@ -438,3 +440,5 @@ void MoveToCeil(spritetype *pSprite, XSPRITE *pXSprite)
else
aiSetTarget(pXSprite, x, y, sector[nSector].ceilingz);
}
END_BLD_NS

4
source/blood/src/aibat.h
View file

@ -23,6 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#pragma once
#include "ai.h"
BEGIN_BLD_NS
extern AISTATE batIdle;
extern AISTATE batFlyIdle;
extern AISTATE batChase;
@ -41,3 +43,5 @@ extern AISTATE batDodgeUpLeft;
extern AISTATE batDodgeDown;
extern AISTATE batDodgeDownRight;
extern AISTATE batDodgeDownLeft;
END_BLD_NS

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

@ -41,6 +41,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "sfx.h"
#include "trig.h"
BEGIN_BLD_NS
static void SlashSeqCallback(int, int);
static void StompSeqCallback(int, int);
static void MorphToBeast(spritetype *, XSPRITE *);
@ -582,3 +584,5 @@ static void sub_62D7C(spritetype *pSprite, XSPRITE *pXSprite)
yvel[nSprite] = dmulscale30(t1, nSin, -t2, nCos);
zvel[nSprite] = dz;
}
END_BLD_NS

4
source/blood/src/aibeast.h
View file

@ -23,6 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#pragma once
#include "ai.h"
BEGIN_BLD_NS
extern AISTATE beastIdle;
extern AISTATE beastChase;
extern AISTATE beastDodge;
@ -44,3 +46,5 @@ extern AISTATE beastMorphFromCultist;
extern AISTATE beast138FB4;
extern AISTATE beast138FD0;
extern AISTATE beast138FEC;
END_BLD_NS

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

@ -40,6 +40,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "sfx.h"
#include "trig.h"
BEGIN_BLD_NS
static void BiteSeqCallback(int, int);
static void thinkTarget(spritetype *, XSPRITE *);
static void thinkSearch(spritetype *, XSPRITE *);
@ -443,3 +445,5 @@ void MoveToCeil(spritetype *pSprite, XSPRITE *pXSprite)
else
aiSetTarget(pXSprite, x, y, sector[nSector].ceilingz);
}
END_BLD_NS

3
source/blood/src/aiboneel.h
View file

@ -23,6 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#pragma once
#include "ai.h"
BEGIN_BLD_NS
extern AISTATE eelIdle;
extern AISTATE eelFlyIdle;
extern AISTATE eelChase;
@ -42,3 +44,4 @@ extern AISTATE eelDodgeDown;
extern AISTATE eelDodgeDownRight;
extern AISTATE eelDodgeDownLeft;
END_BLD_NS

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

@ -41,6 +41,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "sfx.h"
#include "trig.h"
BEGIN_BLD_NS
static void BurnSeqCallback(int, int);
static void thinkSearch(spritetype*, XSPRITE*);
static void thinkGoto(spritetype*, XSPRITE*);
@ -268,3 +270,5 @@ static void thinkChase(spritetype *pSprite, XSPRITE *pXSprite)
}
pXSprite->target = -1;
}
END_BLD_NS

3
source/blood/src/aiburn.h
View file

@ -23,6 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#pragma once
#include "ai.h"
BEGIN_BLD_NS
extern AISTATE cultistBurnIdle;
extern AISTATE cultistBurnChase;
extern AISTATE cultistBurnGoto;
@ -54,3 +56,4 @@ extern AISTATE GDXGenDudeBurnGoto;
extern AISTATE GDXGenDudeBurnSearch;
extern AISTATE GDXGenDudeBurnAttack;
END_BLD_NS

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

@ -41,6 +41,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "sfx.h"
#include "trig.h"
BEGIN_BLD_NS
static void SeqAttackCallback(int, int);
static void thinkSearch(spritetype *, XSPRITE *);
static void thinkGoto(spritetype *, XSPRITE *);
@ -424,3 +426,5 @@ static void sub_661E0(spritetype *pSprite, XSPRITE *pXSprite)
yvel[nSprite] = dmulscale30(t1, nSin, -t2, nCos);
zvel[nSprite] = dz;
}
END_BLD_NS

4
source/blood/src/aicaleb.h
View file

@ -23,6 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#pragma once
#include "ai.h"
BEGIN_BLD_NS
extern AISTATE tinycalebIdle;
extern AISTATE tinycalebChase;
extern AISTATE tinycalebDodge;
@ -41,3 +43,5 @@ extern AISTATE tinycalebSwimRecoil;
extern AISTATE tinycaleb139660;
extern AISTATE tinycaleb13967C;
extern AISTATE tinycaleb139698;
END_BLD_NS

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

@ -41,6 +41,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "sfx.h"
#include "trig.h"
BEGIN_BLD_NS
static void BiteSeqCallback(int, int);
static void BurnSeqCallback(int, int);
static void BurnSeqCallback2(int, int);
@ -490,3 +492,5 @@ static void thinkChase(spritetype *pSprite, XSPRITE *pXSprite)
}
pXSprite->target = -1;
}
END_BLD_NS

4
source/blood/src/aicerber.h
View file

@ -23,6 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#pragma once
#include "ai.h"
BEGIN_BLD_NS
extern AISTATE cerberusIdle;
extern AISTATE cerberusSearch;
extern AISTATE cerberusChase;
@ -42,3 +44,5 @@ extern AISTATE cerberus2Burn;
extern AISTATE cerberus4Burn;
extern AISTATE cerberus139890;
extern AISTATE cerberus1398AC;
END_BLD_NS

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

@ -42,6 +42,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "sfx.h"
#include "trig.h"
BEGIN_BLD_NS
static void TommySeqCallback(int, int);
static void TeslaSeqCallback(int, int);
static void ShotSeqCallback(int, int);
@ -660,3 +662,5 @@ static void thinkChase(spritetype *pSprite, XSPRITE *pXSprite)
}
pXSprite->target = -1;
}
END_BLD_NS

4
source/blood/src/aicult.h
View file

@ -23,6 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#pragma once
#include "ai.h"
BEGIN_BLD_NS
extern AISTATE cultistIdle;
extern AISTATE cultistProneIdle;
extern AISTATE fanaticProneIdle;
@ -61,3 +63,5 @@ extern AISTATE cultistSSwimFire;
extern AISTATE cultistTSwimFire;
extern AISTATE cultistTsSwimFire;
extern AISTATE cultistSwimRecoil;
END_BLD_NS

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

@ -42,6 +42,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "sfx.h"
#include "trig.h"
BEGIN_BLD_NS
static void SlashFSeqCallback(int, int);
static void ThrowFSeqCallback(int, int);
static void BlastSSeqCallback(int, int);
@ -705,3 +707,5 @@ static void MoveFly(spritetype *pSprite, XSPRITE *pXSprite)
}
klabs(zvel[nSprite]);
}
END_BLD_NS

4
source/blood/src/aigarg.h
View file

@ -23,6 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#pragma once
#include "ai.h"
BEGIN_BLD_NS
extern AISTATE gargoyleFIdle;
extern AISTATE gargoyleStatueIdle;
extern AISTATE gargoyleFChase;
@ -48,3 +50,5 @@ extern AISTATE gargoyleFDodgeDownRight;
extern AISTATE gargoyleFDodgeDownLeft;
extern AISTATE statueFBreakSEQ;
extern AISTATE statueSBreakSEQ;
END_BLD_NS

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

@ -42,6 +42,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "sfx.h"
#include "trig.h"
BEGIN_BLD_NS
static void SlashSeqCallback(int, int);
static void ThrowSeqCallback(int, int);
static void BlastSeqCallback(int, int);
@ -588,3 +590,5 @@ static void MoveFly(spritetype *pSprite, XSPRITE *pXSprite)
break;
}
}
END_BLD_NS

4
source/blood/src/aighost.h
View file

@ -22,6 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//-------------------------------------------------------------------------
#pragma once
BEGIN_BLD_NS
extern AISTATE ghostIdle;
extern AISTATE ghostChase;
extern AISTATE ghostGoto;
@ -40,3 +42,5 @@ extern AISTATE ghostDodgeUpLeft;
extern AISTATE ghostDodgeDown;
extern AISTATE ghostDodgeDownRight;
extern AISTATE ghostDodgeDownLeft;
END_BLD_NS

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

@ -42,6 +42,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "sfx.h"
#include "trig.h"
BEGIN_BLD_NS
static void GillBiteSeqCallback(int, int);
static void thinkSearch(spritetype *, XSPRITE *);
static void thinkGoto(spritetype *, XSPRITE *);
@ -416,3 +418,5 @@ static void sub_6D03C(spritetype *pSprite, XSPRITE *pXSprite)
yvel[nSprite] = dmulscale30(t1, nSin, -t2, nCos);
zvel[nSprite] = dz;
}
END_BLD_NS

3
source/blood/src/aigilbst.h
View file

@ -23,6 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#pragma once
#include "ai.h"
BEGIN_BLD_NS
extern AISTATE gillBeastIdle;
extern AISTATE gillBeastChase;
extern AISTATE gillBeastDodge;
@ -41,3 +43,4 @@ extern AISTATE gillBeast13A138;
extern AISTATE gillBeast13A154;
extern AISTATE gillBeast13A170;
END_BLD_NS

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

@ -42,6 +42,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "sfx.h"
#include "trig.h"
BEGIN_BLD_NS
static void HandJumpSeqCallback(int, int);
static void thinkSearch(spritetype *, XSPRITE *);
static void thinkGoto(spritetype *, XSPRITE *);
@ -139,3 +141,5 @@ static void thinkChase(spritetype *pSprite, XSPRITE *pXSprite)
aiNewState(pSprite, pXSprite, &handGoto);
pXSprite->target = -1;
}
END_BLD_NS

6
source/blood/src/aihand.h
View file

@ -23,10 +23,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#pragma once
#include "ai.h"
BEGIN_BLD_NS
extern AISTATE handIdle;
extern AISTATE hand13A3B4;
extern AISTATE handSearch;
extern AISTATE handChase;
extern AISTATE handRecoil;
extern AISTATE handGoto;
extern AISTATE handJump;
extern AISTATE handJump;
END_BLD_NS

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

@ -42,6 +42,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "sfx.h"
#include "trig.h"
BEGIN_BLD_NS
static void BiteSeqCallback(int, int);
static void BurnSeqCallback(int, int);
static void thinkSearch(spritetype *, XSPRITE *);
@ -161,3 +163,5 @@ static void thinkChase(spritetype *pSprite, XSPRITE *pXSprite)
aiNewState(pSprite, pXSprite, &houndGoto);
pXSprite->target = -1;
}
END_BLD_NS

4
source/blood/src/aihound.h
View file

@ -23,6 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#pragma once
#include "ai.h"
BEGIN_BLD_NS
extern AISTATE houndIdle;
extern AISTATE houndSearch;
extern AISTATE houndChase;
@ -31,3 +33,5 @@ extern AISTATE houndTeslaRecoil;
extern AISTATE houndGoto;
extern AISTATE houndBite;
extern AISTATE houndBurn;
END_BLD_NS

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

@ -42,6 +42,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "sfx.h"
#include "trig.h"
BEGIN_BLD_NS
static void thinkSearch(spritetype *, XSPRITE *);
static void thinkGoto(spritetype *, XSPRITE *);
static void thinkChase(spritetype *, XSPRITE *);
@ -120,3 +122,5 @@ static void thinkChase(spritetype *pSprite, XSPRITE *pXSprite)
pXSprite->target = -1;
}
END_BLD_NS

6
source/blood/src/aiinnoc.h
View file

@ -23,9 +23,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#pragma once
#include "ai.h"
BEGIN_BLD_NS
extern AISTATE innocentIdle;
extern AISTATE innocentSearch;
extern AISTATE innocentChase;
extern AISTATE innocentRecoil;
extern AISTATE innocentTeslaRecoil;
extern AISTATE innocentGoto;
extern AISTATE innocentGoto;
END_BLD_NS

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

@ -42,6 +42,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "sfx.h"
#include "trig.h"
BEGIN_BLD_NS
static void sub_6FF08(int, int);
static void sub_6FF54(int, int);
static void sub_6FFA0(int, int);
@ -283,3 +285,5 @@ static void sub_704D8(spritetype *pSprite, XSPRITE *pXSprite)
}
pXSprite->target = -1;
}
END_BLD_NS

4
source/blood/src/aipod.h
View file

@ -23,6 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#pragma once
#include "ai.h"
BEGIN_BLD_NS
extern AISTATE podIdle;
extern AISTATE pod13A600;
extern AISTATE podSearch;
@ -39,3 +41,5 @@ extern AISTATE tentacleSearch;
extern AISTATE tentacle13A750;
extern AISTATE tentacleRecoil;
extern AISTATE tentacleChase;
END_BLD_NS

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

@ -42,6 +42,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "sfx.h"
#include "trig.h"
BEGIN_BLD_NS
static void BiteSeqCallback(int, int);
static void thinkSearch(spritetype *, XSPRITE *);
static void thinkGoto(spritetype *, XSPRITE *);
@ -136,3 +138,5 @@ static void thinkChase(spritetype *pSprite, XSPRITE *pXSprite)
aiNewState(pSprite, pXSprite, &ratGoto);
pXSprite->target = -1;
}
END_BLD_NS

6
source/blood/src/airat.h
View file

@ -23,10 +23,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#pragma once
#include "ai.h"
BEGIN_BLD_NS
extern AISTATE ratIdle;
extern AISTATE ratSearch;
extern AISTATE ratChase;
extern AISTATE ratDodge;
extern AISTATE ratRecoil;
extern AISTATE ratGoto;
extern AISTATE ratBit;
extern AISTATE ratBit;
END_BLD_NS

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

@ -43,6 +43,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "sfx.h"
#include "trig.h"
BEGIN_BLD_NS
static void SpidBiteSeqCallback(int, int);
static void SpidJumpSeqCallback(int, int);
static void sub_71370(int, int);
@ -291,3 +293,5 @@ static void thinkChase(spritetype *pSprite, XSPRITE *pXSprite)
aiNewState(pSprite, pXSprite, &spidGoto);
pXSprite->target = -1;
}
END_BLD_NS

4
source/blood/src/aispid.h
View file

@ -23,6 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#pragma once
#include "ai.h"
BEGIN_BLD_NS
extern AISTATE spidIdle;
extern AISTATE spidChase;
extern AISTATE spidDodge;
@ -31,3 +33,5 @@ extern AISTATE spidSearch;
extern AISTATE spidBite;
extern AISTATE spidJump;
extern AISTATE spid13A92C;
END_BLD_NS

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

@ -42,6 +42,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "sfx.h"
#include "trig.h"
BEGIN_BLD_NS
static void sub_71A90(int, int);
static void sub_71BD4(int, int);
static void sub_720AC(int, int);
@ -358,3 +360,5 @@ static void sub_72934(spritetype *pSprite, XSPRITE *pXSprite)
aiNewState(pSprite, pXSprite, &tcherno13A9B8);
pXSprite->target = -1;
}
END_BLD_NS

4
source/blood/src/aitchern.h
View file

@ -23,6 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#pragma once
#include "ai.h"
BEGIN_BLD_NS
extern AISTATE tchernobogIdle;
extern AISTATE tchernobogSearch;
extern AISTATE tchernobogChase;
@ -32,3 +34,5 @@ extern AISTATE tcherno13A9D4;
extern AISTATE tcherno13A9F0;
extern AISTATE tcherno13AA0C;
extern AISTATE tcherno13AA28;
END_BLD_NS

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

@ -47,6 +47,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "triggers.h"
#include "endgame.h"
BEGIN_BLD_NS
static void GDXCultistAttack1(int, int);
static void punchCallback(int, int);
static void ThrowCallback1(int, int);
@ -1168,3 +1170,5 @@ int getSeqStartId(XSPRITE* pXSprite) {
return seqStartId;
}
//////////
END_BLD_NS

6
source/blood/src/aiunicult.h
View file

@ -25,6 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "ai.h"
#include "eventq.h"
BEGIN_BLD_NS
#define kMaxGenDudeSndMode 11
#define kDefaultAnimationBase 11520
@ -88,4 +90,6 @@ bool canDuck(spritetype* pSprite);
bool CDCanMove(spritetype* pSprite);
bool inDodge(AISTATE* aiState);
bool inIdle(AISTATE* aiState);
int getSeqStartId(XSPRITE* pXSprite);
int getSeqStartId(XSPRITE* pXSprite);
END_BLD_NS

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

@ -42,6 +42,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "sfx.h"
#include "trig.h"
BEGIN_BLD_NS
static void HackSeqCallback(int, int);
static void StandSeqCallback(int, int);
static void thinkSearch(spritetype *, XSPRITE *);
@ -282,3 +284,5 @@ static void entryEStand(spritetype *pSprite, XSPRITE *pXSprite)
sfxPlay3DSound(pSprite, 1100, -1, 0);
pSprite->ang = getangle(pXSprite->targetX-pSprite->x, pXSprite->targetY-pSprite->y);
}
END_BLD_NS

4
source/blood/src/aizomba.h
View file

@ -23,6 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#pragma once
#include "ai.h"
BEGIN_BLD_NS
extern AISTATE zombieAIdle;
extern AISTATE zombieAChase;
extern AISTATE zombieAPonder;
@ -40,3 +42,5 @@ extern AISTATE zombie2Idle;
extern AISTATE zombie2Search;
extern AISTATE zombieSIdle;
extern AISTATE zombie13AC2C;
END_BLD_NS

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

@ -42,6 +42,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "sfx.h"
#include "trig.h"
BEGIN_BLD_NS
static void HackSeqCallback(int, int);
static void PukeSeqCallback(int, int);
static void ThrowSeqCallback(int, int);
@ -231,3 +233,5 @@ static void thinkChase(spritetype *pSprite, XSPRITE *pXSprite)
aiNewState(pSprite, pXSprite, &zombieFSearch);
pXSprite->target = -1;
}
END_BLD_NS

4
source/blood/src/aizombf.h
View file

@ -23,6 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#pragma once
#include "ai.h"
BEGIN_BLD_NS
extern AISTATE zombieFIdle;
extern AISTATE zombieFChase;
extern AISTATE zombieFGoto;
@ -33,3 +35,5 @@ extern AISTATE zombieFThrow;
extern AISTATE zombieFSearch;
extern AISTATE zombieFRecoil;
extern AISTATE zombieFTeslaRecoil;
END_BLD_NS

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

@ -33,6 +33,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "resource.h"
#include "sound.h"
BEGIN_BLD_NS
#define kMaxAmbChannel 64
struct AMB_CHANNEL
@ -159,3 +161,5 @@ void ambInit(void)
}
}
}
END_BLD_NS

6
source/blood/src/asound.h
View file

@ -22,6 +22,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//-------------------------------------------------------------------------
#pragma once
BEGIN_BLD_NS
void ambProcess(void);
void ambKillAll(void);
void ambInit(void);
void ambInit(void);
END_BLD_NS

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

@ -33,6 +33,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "globals.h"
#include "sound.h"
BEGIN_BLD_NS
static Resource gBarfRes;
#define kMaxCmdLineDefines 5
@ -952,3 +954,4 @@ void sub_11DF0(char* pzScriptDir, char *filePath, char flags, int ID)
gSysRes.AddExternalResource(zFilename, zType, ID, flags, zFilePath);
}
END_BLD_NS

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

@ -79,6 +79,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# endif
#endif /* _WIN32 */
BEGIN_BLD_NS
extern const char* G_DefaultDefFile(void);
extern const char* G_DefFile(void);
@ -2555,3 +2558,5 @@ GameInterface Interface = {
G_DefaultDefFile,
G_DefFile
};
END_BLD_NS

6
source/blood/src/blood.h
View file

@ -26,6 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "resource.h"
#include "db.h"
BEGIN_BLD_NS
struct INIDESCRIPTION {
const char *pzName;
const char *pzFilename;
@ -81,4 +83,6 @@ bool DemoRecordStatus(void);
bool VanillaMode(void);
bool fileExistsRFF(int id, const char* ext);
int sndTryPlaySpecialMusic(int nMusic);
void sndPlaySpecialMusicOrNothing(int nMusic);
void sndPlaySpecialMusicOrNothing(int nMusic);
END_BLD_NS

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

@ -46,6 +46,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "triggers.h"
#include "view.h"
BEGIN_BLD_NS
void makeMissileBlocking(int nSprite) // 23
{
dassert(nSprite >= 0 && nSprite < kMaxSprites);
@ -792,3 +794,5 @@ void(*gCallback[kCallbackMax])(int) =
UniMissileBurst,
makeMissileBlocking,
};
END_BLD_NS

5
source/blood/src/callback.h
View file

@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//-------------------------------------------------------------------------
#pragma once
BEGIN_BLD_NS
enum CALLBACK_ID {
CALLBACK_ID_NONE = -1,
@ -52,4 +53,6 @@ enum CALLBACK_ID {
kCallbackMax
};
extern void (*gCallback[kCallbackMax])(int);
extern void (*gCallback[kCallbackMax])(int);
END_BLD_NS

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

@ -34,6 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "qav.h"
#include "resource.h"
BEGIN_BLD_NS
void CChoke::sub_83F54(char *a1, int _x, int _y, void (*a2)(PLAYER*))
{
@ -136,4 +137,6 @@ void sub_84230(PLAYER *pPlayer)
pPlayer->at36a = ClipHigh(pPlayer->at36a+t*4, 128);
}
CChoke gChoke;
CChoke gChoke;
END_BLD_NS

4
source/blood/src/choke.h
View file

@ -27,6 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "qav.h"
#include "resource.h"
BEGIN_BLD_NS
class CChoke
{
public:
@ -59,3 +61,5 @@ public:
void sub_84230(PLAYER*);
extern CChoke gChoke;
END_BLD_NS

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

@ -49,6 +49,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "common.h"
#include "common_game.h"
BEGIN_BLD_NS
// g_grpNamePtr can ONLY point to a malloc'd block (length BMAX_PATH)
char *g_grpNamePtr = NULL;
@ -774,3 +776,4 @@ success:
#endif
END_BLD_NS

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

@ -29,6 +29,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "misc.h"
#include "network.h"
BEGIN_BLD_NS
extern int g_useCwd;
#ifndef APPNAME
@ -511,6 +513,12 @@ inline char TestBitString(char *pArray, int nIndex)
return pArray[nIndex>>3] & (1<<(nIndex&7));
}
// This is to override the namepace prioritization without altering the actual calls.
inline int scale(int a, int b, int c)
{
return ::scale(a, b, c);
}
inline int scale(int a1, int a2, int a3, int a4, int a5)
{
return a4 + (a5-a4) * (a1-a2) / (a3-a2);
@ -692,3 +700,5 @@ public:
void G_AddGroup(const char* buffer);
void G_AddPath(const char* buffer);
END_BLD_NS

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

@ -51,6 +51,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define __SETUP__ // JBF 20031211
#include "_functio.h"
BEGIN_BLD_NS
hashtable_t h_gamefuncs = { NUMGAMEFUNCTIONS<<1, NULL };
int32_t MouseDeadZone, MouseBias;
@ -1017,63 +1020,5 @@ void CONFIG_WriteSetup(uint32_t flags)
Bfflush(NULL);
}
#if 0
static const char *CONFIG_GetMapEntryName(char m[], char const * const mapname)
{
strcpy(m, mapname);
char *p = strrchr(m, '/');
if (!p) p = strrchr(m, '\\');
if (p) Bmemmove(m, p, Bstrlen(p)+1);
for (p=m; *p; p++) *p = tolower(*p);
// cheap hack because SCRIPT_GetNumber doesn't like the slashes
p = m;
while (*p == '/') p++;
return p;
}
static void CONFIG_GetMD4EntryName(char m[], uint8_t const * const md4)
{
sprintf(m, "MD4_%08x%08x%08x%08x",
B_BIG32(B_UNBUF32(&md4[0])), B_BIG32(B_UNBUF32(&md4[4])),
B_BIG32(B_UNBUF32(&md4[8])), B_BIG32(B_UNBUF32(&md4[12])));
}
int32_t CONFIG_GetMapBestTime(char const * const mapname, uint8_t const * const mapmd4)
{
if (!setupread || scripthandle < 0)
return -1;
char m[37];
CONFIG_GetMD4EntryName(m, mapmd4);
int32_t t = -1;
if (SCRIPT_GetNumber(scripthandle, "MapTimes", m, &t))
{
// fall back to map filenames
char m2[BMAX_PATH];
auto p = CONFIG_GetMapEntryName(m2, mapname);
SCRIPT_GetNumber(scripthandle, "MapTimes", p, &t);
}
return t;
}
int CONFIG_SetMapBestTime(uint8_t const * const mapmd4, int32_t tm)
{
if (scripthandle < 0 && (scripthandle = SCRIPT_Init(SetupFilename)) < 0)
return -1;
char m[37];
CONFIG_GetMD4EntryName(m, mapmd4);
SCRIPT_PutNumber(scripthandle, "MapTimes", m, tm, FALSE, FALSE);
return 0;
}
#endif
END_BLD_NS

4
source/blood/src/config.h
View file

@ -30,6 +30,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "_control.h"
#include "hash.h"
BEGIN_BLD_NS
#define MAXRIDECULE 10
#define MAXRIDECULELENGTH 40
#define MAXPLAYERNAME 16
@ -116,4 +118,6 @@ const char *CONFIG_AnalogNumToName(int32_t func);
void CONFIG_MapKey(int which, kb_scancode key1, kb_scancode oldkey1, kb_scancode key2, kb_scancode oldkey2);
END_BLD_NS
#endif

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

@ -39,6 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "map2d.h"
#include "view.h"
BEGIN_BLD_NS
int32_t ctrlCheckAllInput(void)
{
@ -487,3 +488,5 @@ void ctrlGetInput(void)
gInput.q16turn = turn;
gInput.strafe = strafe;
}
END_BLD_NS

3
source/blood/src/controls.h
View file

@ -22,6 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//-------------------------------------------------------------------------
#pragma once
BEGIN_BLD_NS
#pragma pack(push, 1)
union BUTTONFLAGS
@ -110,3 +112,4 @@ void ctrlClearAllInput(void);
void ctrlInit();
void ctrlGetInput();
END_BLD_NS

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

@ -38,6 +38,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "sound.h"
#include "view.h"
BEGIN_BLD_NS
char exitCredits = 0;
char Wait(int nTicks)
@ -286,3 +288,5 @@ void credPlaySmk(const char *_pzSMK, const char *_pzWAV, int nWav)
Bfree(pzSMK_);
Bfree(pzWAV_);
}
END_BLD_NS

6
source/blood/src/credits.h
View file

@ -22,6 +22,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//-------------------------------------------------------------------------
#pragma once
BEGIN_BLD_NS
void credLogosDos(void);
void credReset(void);
void credPlaySmk(const char *pzSMK, const char *pzWAV, int nWAV);
void credPlaySmk(const char *pzSMK, const char *pzWAV, int nWAV);
END_BLD_NS

15
source/blood/src/db.cpp
View file

@ -33,6 +33,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "db.h"
#include "iob.h"
BEGIN_BLD_NS
unsigned short gStatCount[kMaxStatus + 1];
XSPRITE xsprite[kMaxXSprites];
@ -1633,16 +1635,7 @@ int dbSaveMap(const char *pPath, int nX, int nY, int nZ, short nAngle, short nSe
Bclose(nHandle);
Bfree(pData);
return 0;
#if 0
char *pExt = strchr(sMapExt, '.');
if (pExt)
{
*pExt = 0;
}
gSysRes.AddExternalResource(sMapExt, "MAP", nSize);
DICTNODE *hMap = gSysRes.Lookup(sMapExt, "MAP");
dassert(hMap != NULL);
#endif
}
int32_t qloadboard(const char* filename, char flags, vec3_t* dapos, int16_t* daang, int16_t* dacursectnum)
@ -1657,3 +1650,5 @@ int32_t qsaveboard(const char* filename, const vec3_t* dapos, int16_t daang, int
byte_1A76C6 = byte_1A76C8 = byte_1A76C7 = 1;
return dbSaveMap(filename, dapos->x, dapos->y, dapos->z, daang, dacursectnum);
}
END_BLD_NS

4
source/blood/src/db.h
View file

@ -22,6 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//-------------------------------------------------------------------------
#pragma once
BEGIN_BLD_NS
#define kMaxXSprites 2048
#define kMaxXWalls 512
#define kMaxXSectors 512
@ -336,3 +338,5 @@ void dbInit(void);
void PropagateMarkerReferences(void);
unsigned int dbReadMapCRC(const char *pPath);
int dbLoadMap(const char *pPath, int *pX, int *pY, int *pZ, short *pAngle, short *pSector, unsigned int *pCRC);
END_BLD_NS

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

@ -48,6 +48,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "screen.h"
#include "view.h"
BEGIN_BLD_NS
int nBuild = 0;
void ReadGameOptionsLegacy(GAMEOPTIONS &gameOptions, GAMEOPTIONSLEGACY &gameOptionsLegacy)
@ -627,3 +629,5 @@ void CDemo::ReadInput(int nCount)
}
}
}
END_BLD_NS

4
source/blood/src/demo.h
View file

@ -25,6 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "controls.h"
#include "levels.h"
BEGIN_BLD_NS
#define kInputBufferSize 1024
#pragma pack(push, 1)
@ -108,3 +110,5 @@ public:
};
extern CDemo gDemo;
END_BLD_NS

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

@ -28,6 +28,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "blood.h"
#include "dude.h"
BEGIN_BLD_NS
DUDEINFO dudeInfo[kDudeMax-kDudeBase] =
{
{
@ -1728,3 +1730,5 @@ DUDEINFO gPlayerTemplate[4] =
0
},
};
END_BLD_NS

7
source/blood/src/dude.h
View file

@ -22,6 +22,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//-------------------------------------------------------------------------
#pragma once
#include "blood.h"
BEGIN_BLD_NS
// By NoOne: renamed dude struct
struct DUDEINFO {
short seqStartID; // seq
@ -53,4 +56,6 @@ struct DUDEINFO {
};
extern DUDEINFO dudeInfo[kDudeMax-kDudeBase];
extern DUDEINFO gPlayerTemplate[4];
extern DUDEINFO gPlayerTemplate[4];
END_BLD_NS

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

@ -40,6 +40,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "view.h"
#include "messages.h"
BEGIN_BLD_NS
CEndGameMgr::CEndGameMgr()
{
at0 = 0;
@ -279,3 +281,5 @@ void EndGameLoadSaveConstruct(void)
{
myLoadSave = new EndGameLoadSave();
}
END_BLD_NS

4
source/blood/src/endgame.h
View file

@ -24,6 +24,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "build.h"
#include "common_game.h"
BEGIN_BLD_NS
class CEndGameMgr {
public:
char at0;
@ -60,3 +62,5 @@ public:
extern CEndGameMgr gEndGameMgr;
extern CSecretMgr gSecretMgr;
extern CKillMgr gKillMgr;
END_BLD_NS

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

@ -37,6 +37,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "pqueue.h"
#include "triggers.h"
BEGIN_BLD_NS
class EventQueue
{
public:
@ -605,3 +607,5 @@ void EventQLoadSaveConstruct(void)
{
myLoadSave = new EventQLoadSave();
}
END_BLD_NS

7
source/blood/src/eventq.h
View file

@ -22,6 +22,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//-------------------------------------------------------------------------
#pragma once
#include "callback.h"
BEGIN_BLD_NS
#define kMaxChannels 4096
struct RXBUCKET
@ -64,4 +67,6 @@ void evPost(int nIndex, int nType, unsigned int nDelta, COMMAND_ID command);
void evPost(int nIndex, int nType, unsigned int nDelta, CALLBACK_ID a4);
void evProcess(unsigned int nTime);
void evKill(int a1, int a2);
void evKill(int a1, int a2, CALLBACK_ID a3);
void evKill(int a1, int a2, CALLBACK_ID a3);
END_BLD_NS

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

@ -34,6 +34,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "misc.h"
#include "tile.h"
BEGIN_BLD_NS
int fireSize = 128;
int gDamping = 6;
@ -125,3 +127,5 @@ void CellularFrame(char *pFrame, int sizeX, int sizeY)
pPtr1++;
}
}
END_BLD_NS

6
source/blood/src/fire.h
View file

@ -22,5 +22,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//-------------------------------------------------------------------------
#pragma once
BEGIN_BLD_NS
void FireInit(void);
void FireProcess(void);
void FireProcess(void);
END_BLD_NS

6
source/blood/src/function.h
View file

@ -32,6 +32,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef function_public_h_
#define function_public_h_
BEGIN_BLD_NS
#define NUMGAMEFUNCTIONS 55
#define MAXGAMEFUNCLEN 32
@ -97,4 +99,8 @@ enum GameFunction_t
gamefunc_RemoteBombs,
gamefunc_Show_Console,
};
END_BLD_NS
#endif

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

@ -39,6 +39,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "trig.h"
#include "view.h"
BEGIN_BLD_NS
CFX gFX;
struct FXDATA {
@ -348,3 +350,5 @@ void sub_74A18(spritetype *pSprite, int z, int a3, int a4)
zvel[pShell->index] = zvel[pSprite->index]-(0x20000+(Random2(20)<<18)/120);
}
}
END_BLD_NS

5
source/blood/src/fx.h
View file

@ -24,6 +24,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "build.h"
#include "common_game.h"
BEGIN_BLD_NS
enum FX_ID {
FX_NONE = -1,
FX_0 = 0,
@ -100,3 +103,5 @@ void sub_74818(spritetype *pSprite, int z, int a3, int a4);
void sub_74A18(spritetype *pSprite, int z, int a3, int a4);
extern CFX gFX;
END_BLD_NS

4
source/blood/src/gamedefs.h
View file

@ -32,6 +32,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef gamedefs_public_h_
#define gamedefs_public_h_
BEGIN_BLD_NS
// config file name
#define SETUPFILENAME APPBASENAME ".cfg"
@ -62,5 +64,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define DEFAULTJOYSTICKANALOGUESATURATE 9500
#endif
END_BLD_NS
#endif

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

@ -38,6 +38,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "resource.h"
#include "view.h"
BEGIN_BLD_NS
CMenuTextMgr gMenuTextMgr;
CGameMenuMgr gGameMenuMgr;
@ -3005,4 +3007,6 @@ bool CGameMenuItemPassword::Event(CGameMenuEvent &event)
}
}
return CGameMenuItem::Event(event);
}
}
END_BLD_NS

4
source/blood/src/gamemenu.h
View file

@ -29,6 +29,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "resource.h"
#include "qav.h"
BEGIN_BLD_NS
#define M_MOUSETIMEOUT 210
#define kMaxGameMenuItems 128
@ -488,3 +490,5 @@ public:
extern CMenuTextMgr gMenuTextMgr;
extern CGameMenuMgr gGameMenuMgr;
END_BLD_NS

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

@ -36,6 +36,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "tile.h"
#include "trig.h"
BEGIN_BLD_NS
POINT2D baseWall[kMaxWalls];
POINT3D baseSprite[kMaxSprites];
int baseFloor[kMaxSectors];
@ -905,3 +907,5 @@ int GetClosestSpriteSectors(int nSector, int x, int y, int nDist, short *pSector
}
return n;
}
END_BLD_NS

4
source/blood/src/gameutil.h
View file

@ -24,6 +24,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "build.h"
#include "common_game.h"
BEGIN_BLD_NS
struct HITINFO {
short hitsect;
short hitwall;
@ -66,3 +68,5 @@ int GetDistToLine(int x1, int y1, int x2, int y2, int x3, int y3);
unsigned int ClipMove(int *x, int *y, int *z, int *nSector, int xv, int yv, int wd, int cd, int fd, unsigned int nMask);
int GetClosestSectors(int nSector, int x, int y, int nDist, short *pSectors, char *pSectBit);
int GetClosestSpriteSectors(int nSector, int x, int y, int nDist, short *pSectors, char *pSectBit, short *a8);
END_BLD_NS

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

@ -28,6 +28,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "compat.h"
#include "getopt.h"
BEGIN_BLD_NS
int margc;
char const * const *margv;
@ -93,3 +95,5 @@ int GetOptions(SWITCH *switches)
}
return vd;
}
END_BLD_NS

5
source/blood/src/getopt.h
View file

@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//-------------------------------------------------------------------------
#pragma once
BEGIN_BLD_NS
extern int margc;
extern char const * const *margv;
@ -34,4 +35,6 @@ struct SWITCH {
const char *name;
int at4, at8;
};
int GetOptions(SWITCH *switches);
int GetOptions(SWITCH *switches);
END_BLD_NS

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

@ -39,6 +39,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "sfx.h"
#include "trig.h"
BEGIN_BLD_NS
struct GIBFX
{
FX_ID at0;
@ -510,3 +512,5 @@ void GibWall(int nWall, GIBTYPE nGibType, CGibVelocity *pVel)
GibFX(nWall, pGibFX, ceilZ, wx, wy, wz, pVel);
}
}
END_BLD_NS

3
source/blood/src/gib.h
View file

@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//-------------------------------------------------------------------------
#pragma once
BEGIN_BLD_NS
enum GIBTYPE {
GIBTYPE_0 = 0,
@ -73,3 +74,5 @@ public:
void GibSprite(spritetype *pSprite, GIBTYPE nGibType, CGibPosition *pPos, CGibVelocity *pVel);
//void GibFX(int nWall, GIBFX * pGFX, int a3, int a4, int a5, int a6, CGibVelocity * pVel);
void GibWall(int nWall, GIBTYPE nGibType, CGibVelocity *pVel);
END_BLD_NS

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

@ -31,6 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "globals.h"
#include "resource.h"
BEGIN_BLD_NS
ud_setup_t gSetup;
bool bVanilla = false;
@ -93,4 +94,6 @@ const char *GetVersionString(void)
sprintf(gVersionString, "%d.%02d", EXEVERSION / 100, EXEVERSION % 100);
}
return gVersionString;
}
}
END_BLD_NS

6
source/blood/src/globals.h
View file

@ -25,6 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "build.h"
#include "resource.h"
BEGIN_BLD_NS
typedef struct {
int32_t usejoystick;
int32_t usemouse;
@ -46,4 +48,6 @@ extern int gGamma;
extern bool bVanilla;
extern Resource gSysRes;
const char *GetVersionString(void);
const char *GetVersionString(void);
END_BLD_NS

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

@ -33,6 +33,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "inifile.h"
#include "misc.h"
BEGIN_BLD_NS
IniFile::IniFile(const char *fileName)
{
@ -465,3 +467,6 @@ IniFile::~IniFile()
free(anotherNode);
}
}
END_BLD_NS

7
source/blood/src/inifile.h
View file

@ -22,6 +22,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//-------------------------------------------------------------------------
// Note: This module is based on the sirlemonhead's work
#pragma once
BEGIN_BLD_NS
struct FNODE
{
FNODE *next;
@ -65,4 +68,6 @@ private:
void LoadRes(void *);
void Load();
};
};
END_BLD_NS

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

@ -28,6 +28,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "common_game.h"
#include "iob.h"
BEGIN_BLD_NS
IOBuffer::IOBuffer(int _nRemain, char *_pBuffer)
{
nRemain = _nRemain;
@ -74,3 +76,5 @@ void IOBuffer::Skip(int nSize)
ThrowError("Skip overflow");
}
}
END_BLD_NS

6
source/blood/src/iob.h
View file

@ -22,6 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//-------------------------------------------------------------------------
#pragma once
BEGIN_BLD_NS
class IOBuffer
{
public:
@ -31,4 +33,6 @@ public:
void Read(void *, int);
void Write(void *, int);
void Skip(int);
};
};
END_BLD_NS

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

@ -43,6 +43,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "sfx.h"
#include "view.h"
BEGIN_BLD_NS
GAMEOPTIONS gGameOptions;
GAMEOPTIONS gSingleGameOptions = {
@ -443,3 +445,4 @@ void LevelsLoadSaveConstruct(void)
myLoadSave = new LevelsLoadSave();
}
END_BLD_NS

5
source/blood/src/levels.h
View file

@ -24,6 +24,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "common_game.h"
#include "inifile.h"
BEGIN_BLD_NS
#define kMaxMessages 32
#define kMaxEpisodes 7
#define kMaxLevels 16
@ -139,3 +142,5 @@ void levelRestart(void);
int levelGetMusicIdx(const char *str);
bool levelTryPlayMusic(int nEpisode, int nlevel, bool bSetLevelSong = false);
void levelTryPlayMusicOrNothing(int nEpisode, int nLevel);
END_BLD_NS

34
source/blood/src/loadsave.cpp
View file

@ -46,6 +46,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "sound.h"
#include "view.h"
BEGIN_BLD_NS
GAMEOPTIONS gSaveGameOptions[10];
char *gSaveGamePic[10];
unsigned int gSavedOffset = 0;
@ -466,22 +468,22 @@ void UpdateSavedInfo(int nSlot)
static MyLoadSave *myLoadSave;
void ActorLoadSaveConstruct(void);
void AILoadSaveConstruct(void);
void EndGameLoadSaveConstruct(void);
void EventQLoadSaveConstruct(void);
void LevelsLoadSaveConstruct(void);
void MessagesLoadSaveConstruct(void);
void MirrorLoadSaveConstruct(void);
void PlayerLoadSaveConstruct(void);
void SeqLoadSaveConstruct(void);
void TriggersLoadSaveConstruct(void);
void ViewLoadSaveConstruct(void);
void WarpLoadSaveConstruct(void);
void WeaponLoadSaveConstruct(void);
void LoadSaveSetup(void)
{
void ActorLoadSaveConstruct(void);
void AILoadSaveConstruct(void);
void EndGameLoadSaveConstruct(void);
void EventQLoadSaveConstruct(void);
void LevelsLoadSaveConstruct(void);
void MessagesLoadSaveConstruct(void);
void MirrorLoadSaveConstruct(void);
void PlayerLoadSaveConstruct(void);
void SeqLoadSaveConstruct(void);
void TriggersLoadSaveConstruct(void);
void ViewLoadSaveConstruct(void);
void WarpLoadSaveConstruct(void);
void WeaponLoadSaveConstruct(void);
myLoadSave = new MyLoadSave();
ActorLoadSaveConstruct();
@ -497,4 +499,6 @@ void LoadSaveSetup(void)
ViewLoadSaveConstruct();
WarpLoadSaveConstruct();
WeaponLoadSaveConstruct();
}
}
END_BLD_NS

4
source/blood/src/loadsave.h
View file

@ -24,6 +24,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <stdio.h>
#include "levels.h"
BEGIN_BLD_NS
class LoadSave {
public:
static LoadSave head;
@ -57,3 +59,5 @@ extern char *gSaveGamePic[10];
void UpdateSavedInfo(int nSlot);
void LoadSavedInfo(void);
void LoadSaveSetup(void);
END_BLD_NS

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

@ -30,6 +30,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "trig.h"
#include "view.h"
BEGIN_BLD_NS
void sub_2541C(int x, int y, int z, short a)
{
int tmpydim = (xdim * 5) / 8;
@ -253,3 +255,6 @@ void CViewMap::FollowMode(char mode)
}
CViewMap gViewMap;
END_BLD_NS

5
source/blood/src/map2d.h
View file

@ -23,6 +23,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#pragma once
#include "common_game.h"
#include "db.h"
BEGIN_BLD_NS
class CViewMap {
public:
char bActive;
@ -39,3 +42,5 @@ public:
};
extern CViewMap gViewMap;
END_BLD_NS

Some files were not shown because too many files have changed in this diff Show more