teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 17:01:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- function separators

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-05 00:35:11 +02:00
parent 5ed2cb67d9
commit 3c1e478325
8 changed files with 516 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1982,7 +1982,7 @@ void SOBJ_AlignFloorToPoint(SECTOR_OBJECT* sop, const DVector3& pos); // morph.
void ScaleSectorObject(SECTOR_OBJECT* sop); // morph.c
void MorphTornado(SECTOR_OBJECT* sop); // morph.c
void MorphFloor(SECTOR_OBJECT* sop); // morph.c
DVector2 ScaleRandomPoint(SECTOR_OBJECT* sop, short k, DAngle ang, const DVector2& pos); // morph.c
DVector2 ScaleRandomPoint(SECTOR_OBJECT* sop, int k, DAngle ang, const DVector2& pos); // morph.c
void CopySectorMatch(int match); // copysect.c

78
source/games/sw/src/jweapon.cpp
View file

@ -1403,11 +1403,11 @@ int InitChemBomb(DSWActor* actor)
return 0;
}
//////////////////////////////////////////////
//---------------------------------------------------------------------------
//
// Inventory Flash Bombs
//
//////////////////////////////////////////////
//---------------------------------------------------------------------------
int PlayerInitFlashBomb(PLAYER* pp)
{
@ -1473,6 +1473,12 @@ int PlayerInitFlashBomb(PLAYER* pp)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int InitFlashBomb(DSWActor* actor)
{
int i;
@ -1529,8 +1535,12 @@ int InitFlashBomb(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
// This is a sneaky function to make actors look blinded by flashbomb while using flaming code
//
//---------------------------------------------------------------------------
void SpawnFlashBombOnActor(DSWActor* actor)
{
if (!actor->hasU()) return;
@ -1601,11 +1611,11 @@ void SpawnFlashBombOnActor(DSWActor* actor)
return;
}
//////////////////////////////////////////////
//---------------------------------------------------------------------------
//
// Inventory Caltrops
//
//////////////////////////////////////////////
//---------------------------------------------------------------------------
int PlayerInitCaltrops(PLAYER* pp)
{
@ -1663,6 +1673,12 @@ int PlayerInitCaltrops(PLAYER* pp)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int InitCaltrops(DSWActor* actor)
{
PlaySound(DIGI_THROW, actor, v3df_dontpan | v3df_doppler);
@ -1693,6 +1709,12 @@ int InitCaltrops(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int InitPhosphorus(DSWActor* actor)
{
PlaySound(DIGI_FIREBALL1, actor, v3df_follow);
@ -1729,6 +1751,12 @@ int InitPhosphorus(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int InitBloodSpray(DSWActor* actor, bool dogib, short velocity)
{
short cnt, vel, rnd;
@ -1831,6 +1859,12 @@ void DoFlagScore(int16_t pal)
}
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
DSWActor* DoFlagRangeTest(DSWActor* actor, double range)
{
unsigned int stat;
@ -1863,6 +1897,12 @@ DSWActor* DoFlagRangeTest(DSWActor* actor, double range)
return nullptr;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int DoCarryFlag(DSWActor* actor)
{
const int FLAG_DETONATE_STATE = 99;
@ -2010,6 +2050,12 @@ int DoCarryFlag(DSWActor* actor)
return false;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int DoCarryFlagNoDet(DSWActor* actor)
{
DSWActor* attached = actor->user.attachActor;
@ -2067,6 +2113,12 @@ int DoCarryFlagNoDet(DSWActor* actor)
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int SetCarryFlag(DSWActor* actor)
{
// stuck
@ -2084,6 +2136,12 @@ int SetCarryFlag(DSWActor* actor)
return false;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int DoFlag(DSWActor* actor)
{
auto hitActor = DoFlagRangeTest(actor, 62.5);
@ -2105,6 +2163,11 @@ int DoFlag(DSWActor* actor)
return false;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int SpawnShell(DSWActor* actor, int ShellNum)
{
@ -2202,6 +2265,11 @@ int SpawnShell(DSWActor* actor, int ShellNum)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
#include "saveable.h"

24
source/games/sw/src/lava.cpp
View file

@ -451,6 +451,12 @@ ACTOR_ACTION_SET LavaActionSet =
nullptr
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int SetupLava(DSWActor* actor)
{
ANIMATOR DoActorDecide;
@ -477,6 +483,12 @@ int SetupLava(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int NullLava(DSWActor* actor)
{
if (actor->user.Flags & (SPR_SLIDING))
@ -488,6 +500,12 @@ int NullLava(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int DoLavaMove(DSWActor* actor)
{
if (actor->user.Flags & (SPR_SLIDING))
@ -504,6 +522,12 @@ int DoLavaMove(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
#include "saveable.h"

331
source/games/sw/src/miscactr.cpp
View file

@ -110,6 +110,12 @@ STATE s_ToiletGirlUzi[16] =
{TOILETGIRL_FIRE_R0 + 1, 0 | SF_QUICK_CALL, InitEnemyUzi, &s_ToiletGirlUzi[0]},
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int SetupToiletGirl(DSWActor* actor)
{
ANIMATOR DoActorDecide;
@ -142,12 +148,18 @@ int SetupToiletGirl(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int DoToiletGirl(DSWActor* actor)
{
bool ICanSee = false;
DoActorPickClosePlayer(actor);
ICanSee = FAFcansee(ActorVectOfMiddle(actor),actor->sector(),ActorVectOfMiddle(actor->user.targetActor),actor->user.targetActor->sector());
ICanSee = FAFcansee(ActorVectOfMiddle(actor), actor->sector(), ActorVectOfMiddle(actor->user.targetActor), actor->user.targetActor->sector());
if (actor->user.FlagOwner != 1)
{
@ -196,6 +208,12 @@ int DoToiletGirl(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int NullToiletGirl(DSWActor* actor)
{
bool ICanSee = false;
@ -226,6 +244,12 @@ int NullToiletGirl(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int ToiletGirlUzi(DSWActor* actor)
{
if (!(actor->user.Flags & SPR_CLIMBING))
@ -241,6 +265,12 @@ int ToiletGirlUzi(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int ToiletGirlPain(DSWActor* actor)
{
NullToiletGirl(actor);
@ -251,7 +281,11 @@ int ToiletGirlPain(DSWActor* actor)
return 0;
}
//////////////////////////////////////////////////////////////////////////////////////////////
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
ANIMATOR NullWashGirl;
@ -333,6 +367,12 @@ STATE s_WashGirlUzi[16] =
{WASHGIRL_FIRE_R0 + 1, 0 | SF_QUICK_CALL, InitEnemyUzi, &s_WashGirlUzi[0]},
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int SetupWashGirl(DSWActor* actor)
{
ANIMATOR DoActorDecide;
@ -364,6 +404,12 @@ int SetupWashGirl(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int DoWashGirl(DSWActor* actor)
{
bool ICanSee = false;
@ -427,6 +473,12 @@ int DoWashGirl(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int NullWashGirl(DSWActor* actor)
{
bool ICanSee = false;
@ -457,6 +509,12 @@ int NullWashGirl(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int WashGirlUzi(DSWActor* actor)
{
if (!(actor->user.Flags & SPR_CLIMBING))
@ -472,6 +530,12 @@ int WashGirlUzi(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int WashGirlPain(DSWActor* actor)
{
NullWashGirl(actor);
@ -483,7 +547,12 @@ int WashGirlPain(DSWActor* actor)
}
//////////////////////////////////////////////////////////////////////////////////////////////
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
ATTRIBUTE TrashCanAttrib =
{
@ -528,6 +597,12 @@ STATE s_TrashCanPain[7] =
{TRASHCAN_PAIN_R0 + 6, TRASHCAN_PAIN_RATE, TrashCanPain, &s_TrashCanPain[0]}
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int SetupTrashCan(DSWActor* actor)
{
ANIMATOR DoActorDecide;
@ -559,6 +634,12 @@ int SetupTrashCan(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int DoTrashCan(DSWActor* actor)
{
// stay on floor unless doing certain things
@ -576,6 +657,12 @@ int DoTrashCan(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int TrashCanPain(DSWActor* actor)
{
if (actor->user.Flags & (SPR_SLIDING))
@ -591,11 +678,12 @@ int TrashCanPain(DSWActor* actor)
}
//////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////
//---------------------------------------------------------------------------
//
// PACHINKO WIN LIGHT
////////////////////////////////////////////////////////////////////
//
//---------------------------------------------------------------------------
ATTRIBUTE PachinkoLightAttrib =
{
{0, 0, 0, 0}, // Speeds
@ -623,6 +711,12 @@ STATE s_PachinkoLightOperate[] =
{PACHINKOLIGHT_R0 - 5, 12, PachinkoLightOperate, &s_PachinkoLightOperate[0]},
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int SetupPachinkoLight(DSWActor* actor)
{
ANIMATOR DoActorDecide;
@ -654,6 +748,12 @@ int SetupPachinkoLight(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int PachinkoLightOperate(DSWActor* actor)
{
if ((actor->user.WaitTics -= ACTORMOVETICS) <= 0)
@ -664,9 +764,11 @@ int PachinkoLightOperate(DSWActor* actor)
return 0;
}
////////////////////////////////////////////////////////////////////
//---------------------------------------------------------------------------
//
// PACHINKO MACHINE #1
////////////////////////////////////////////////////////////////////
//
//---------------------------------------------------------------------------
CVAR(Bool, Pachinko_Win_Cheat, false, 0)
@ -714,6 +816,12 @@ STATE s_Pachinko1Operate[] =
{PACHINKO1_R0 + 22, SF_QUICK_CALL, PachinkoCheckWin, &s_Pachinko1Stand[0]}
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int SetupPachinko1(DSWActor* actor)
{
ANIMATOR DoActorDecide;
@ -742,6 +850,12 @@ int SetupPachinko1(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int PachinkoCheckWin(DSWActor* actor)
{
actor->user.WaitTics = 0; // Can operate it again now
@ -798,6 +912,12 @@ int PachinkoCheckWin(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int Pachinko1Operate(DSWActor* actor)
{
short rnd;
@ -818,9 +938,12 @@ int Pachinko1Operate(DSWActor* actor)
}
////////////////////////////////////////////////////////////////////
//---------------------------------------------------------------------------
//
// PACHINKO MACHINE #2
////////////////////////////////////////////////////////////////////
//
//---------------------------------------------------------------------------
ATTRIBUTE Pachinko2Attrib =
{
@ -866,6 +989,12 @@ STATE s_Pachinko2Operate[] =
{PACHINKO2_R0 + 22, SF_QUICK_CALL, PachinkoCheckWin, &s_Pachinko2Stand[0]}
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int SetupPachinko2(DSWActor* actor)
{
ANIMATOR DoActorDecide;
@ -894,9 +1023,12 @@ int SetupPachinko2(DSWActor* actor)
return 0;
}
////////////////////////////////////////////////////////////////////
//---------------------------------------------------------------------------
//
// PACHINKO MACHINE #3
////////////////////////////////////////////////////////////////////
//
//---------------------------------------------------------------------------
ATTRIBUTE Pachinko3Attrib =
{
@ -942,6 +1074,12 @@ STATE s_Pachinko3Operate[] =
{PACHINKO3_R0 + 22, SF_QUICK_CALL, PachinkoCheckWin, &s_Pachinko3Stand[0]}
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int SetupPachinko3(DSWActor* actor)
{
ANIMATOR DoActorDecide;
@ -971,9 +1109,12 @@ int SetupPachinko3(DSWActor* actor)
}
////////////////////////////////////////////////////////////////////
//---------------------------------------------------------------------------
//
// PACHINKO MACHINE #4
////////////////////////////////////////////////////////////////////
//
//---------------------------------------------------------------------------
ATTRIBUTE Pachinko4Attrib =
{
@ -1019,6 +1160,12 @@ STATE s_Pachinko4Operate[] =
{PACHINKO4_R0 + 22, SF_QUICK_CALL, PachinkoCheckWin, &s_Pachinko4Stand[0]}
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int SetupPachinko4(DSWActor* actor)
{
ANIMATOR DoActorDecide;
@ -1047,9 +1194,11 @@ int SetupPachinko4(DSWActor* actor)
return 0;
}
////////////////////////////////////////////////////////////////////////////////
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
ANIMATOR NullCarGirl;
@ -1124,6 +1273,12 @@ STATE s_CarGirlUzi[16] =
{CARGIRL_FIRE_R0 + 1, 0 | SF_QUICK_CALL, InitEnemyUzi, &s_CarGirlUzi[0]},
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int SetupCarGirl(DSWActor* actor)
{
ANIMATOR DoActorDecide;
@ -1157,6 +1312,12 @@ int SetupCarGirl(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int DoCarGirl(DSWActor* actor)
{
bool ICanSee = false;
@ -1202,6 +1363,12 @@ int DoCarGirl(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int NullCarGirl(DSWActor* actor)
{
bool ICanSee = false;
@ -1239,6 +1406,12 @@ int NullCarGirl(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int CarGirlUzi(DSWActor* actor)
{
if (!(actor->user.Flags & SPR_CLIMBING))
@ -1254,6 +1427,12 @@ int CarGirlUzi(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int CarGirlPain(DSWActor* actor)
{
NullCarGirl(actor);
@ -1264,8 +1443,11 @@ int CarGirlPain(DSWActor* actor)
return 0;
}
////////////////////////////////////////////////////////////////////////////////
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
ANIMATOR NullMechanicGirl;
@ -1327,6 +1509,12 @@ STATE s_MechanicGirlDrill[2] =
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int SetupMechanicGirl(DSWActor* actor)
{
ANIMATOR DoActorDecide;
@ -1359,6 +1547,12 @@ int SetupMechanicGirl(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int DoMechanicGirl(DSWActor* actor)
{
bool ICanSee = false;
@ -1404,6 +1598,12 @@ int DoMechanicGirl(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int NullMechanicGirl(DSWActor* actor)
{
bool ICanSee = false;
@ -1441,6 +1641,12 @@ int NullMechanicGirl(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int MechanicGirlDrill(DSWActor* actor)
{
if (!(actor->user.Flags & SPR_CLIMBING))
@ -1456,6 +1662,12 @@ int MechanicGirlDrill(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int MechanicGirlPain(DSWActor* actor)
{
NullMechanicGirl(actor);
@ -1466,8 +1678,11 @@ int MechanicGirlPain(DSWActor* actor)
return 0;
}
////////////////////////////////////////////////////////////////////////////////
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
ANIMATOR NullSailorGirl;
@ -1529,6 +1744,12 @@ STATE s_SailorGirlThrow[] =
short alreadythrew;
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int SetupSailorGirl(DSWActor* actor)
{
ANIMATOR DoActorDecide;
@ -1562,6 +1783,12 @@ int SetupSailorGirl(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int DoSailorGirl(DSWActor* actor)
{
bool ICanSee = false;
@ -1611,6 +1838,12 @@ int DoSailorGirl(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int NullSailorGirl(DSWActor* actor)
{
bool ICanSee = false;
@ -1653,6 +1886,12 @@ int NullSailorGirl(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int SailorGirlThrow(DSWActor* actor)
{
if (!(actor->user.Flags & SPR_CLIMBING))
@ -1668,6 +1907,12 @@ int SailorGirlThrow(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int SailorGirlPain(DSWActor* actor)
{
NullSailorGirl(actor);
@ -1678,7 +1923,11 @@ int SailorGirlPain(DSWActor* actor)
return 0;
}
////////////////////////////////////////////////////////////////////////////////
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
ANIMATOR NullPruneGirl;
@ -1725,6 +1974,12 @@ STATE s_PruneGirlPain[2] =
{PRUNEGIRL_PAIN_R0 + 0, 0|SF_QUICK_CALL, InitActorDecide, &s_PruneGirlPain[0]}
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int SetupPruneGirl(DSWActor* actor)
{
ANIMATOR DoActorDecide;
@ -1757,6 +2012,12 @@ int SetupPruneGirl(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int DoPruneGirl(DSWActor* actor)
{
bool ICanSee = false;
@ -1818,6 +2079,12 @@ int DoPruneGirl(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int NullPruneGirl(DSWActor* actor)
{
bool ICanSee = false;
@ -1854,6 +2121,12 @@ int NullPruneGirl(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int PruneGirlUzi(DSWActor* actor)
{
if (!(actor->user.Flags & SPR_CLIMBING))
@ -1869,6 +2142,12 @@ int PruneGirlUzi(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int PruneGirlPain(DSWActor* actor)
{
NullPruneGirl(actor);
@ -1879,6 +2158,12 @@ int PruneGirlPain(DSWActor* actor)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
#include "saveable.h"

51
source/games/sw/src/morph.cpp
View file

@ -39,6 +39,12 @@ BEGIN_SW_NS
void ScaleSectorObject(SECTOR_OBJECT*);
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
short DoSectorObjectSetScale(short match)
{
SECTOR_OBJECT* sop;
@ -111,6 +117,12 @@ short DoSectorObjectSetScale(short match)
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
short DoSOevent(short match, short state)
{
SECTOR_OBJECT* sop;
@ -180,9 +192,11 @@ short DoSOevent(short match, short state)
}
//---------------------------------------------------------------------------
//
// SCALING - PreAnimator
//
//---------------------------------------------------------------------------
void ScaleSectorObject(SECTOR_OBJECT* sop)
{
@ -251,7 +265,13 @@ void ScaleSectorObject(SECTOR_OBJECT* sop)
}
}
DVector2 ScaleRandomPoint(SECTOR_OBJECT* sop, short k, DAngle ang, const DVector2& pos)
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
DVector2 ScaleRandomPoint(SECTOR_OBJECT* sop, int k, DAngle ang, const DVector2& pos)
{
sop->scale_point_dist[k] += sop->scale_point_speed[k];
if (sop->scale_point_dist[k] > sop->scale_point_dist_max)
@ -288,9 +308,11 @@ DVector2 ScaleRandomPoint(SECTOR_OBJECT* sop, short k, DAngle ang, const DVector
return ret;
}
//---------------------------------------------------------------------------
//
// Morph point - move point around
//
//---------------------------------------------------------------------------
void MorphTornado(SECTOR_OBJECT* sop)
{
@ -356,7 +378,12 @@ void MorphTornado(SECTOR_OBJECT* sop)
}
}
//---------------------------------------------------------------------------
//
// moves center point around and aligns slope
//
//---------------------------------------------------------------------------
void MorphFloor(SECTOR_OBJECT* sop)
{
sectortype* *sectp;
@ -425,6 +452,12 @@ void MorphFloor(SECTOR_OBJECT* sop)
}
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
void SOBJ_AlignFloorToPoint(SECTOR_OBJECT* sop, const DVector3& pos)
{
sectortype* *sectp;
@ -440,6 +473,12 @@ void SOBJ_AlignFloorToPoint(SECTOR_OBJECT* sop, const DVector3& pos)
}
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
void SOBJ_AlignCeilingToPoint(SECTOR_OBJECT* sop, const DVector3& pos)
{
sectortype* *sectp;
@ -455,7 +494,12 @@ void SOBJ_AlignCeilingToPoint(SECTOR_OBJECT* sop, const DVector3& pos)
}
}
//---------------------------------------------------------------------------
//
// moves center point around and aligns slope
//
//---------------------------------------------------------------------------
void SpikeFloor(SECTOR_OBJECT* sop)
{
// z direction
@ -488,6 +532,11 @@ void SpikeFloor(SECTOR_OBJECT* sop)
SOBJ_AlignFloorToPoint(sop, pos);
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
#include "saveable.h"

30
source/games/sw/src/osdcmds.cpp
View file

@ -48,6 +48,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
BEGIN_SW_NS
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
void GameInterface::WarpToCoords(double x, double y, double z, DAngle ang, int horz)
{
Player->pos = DVector3(x,y,z);
@ -65,6 +71,12 @@ void GameInterface::WarpToCoords(double x, double y, double z, DAngle ang, int h
}
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
static int osdcmd_mirror(CCmdFuncPtr parm)
{
char base[80];
@ -95,6 +107,12 @@ static int osdcmd_mirror(CCmdFuncPtr parm)
return CCMD_OK;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
void GameInterface::ToggleThirdPerson()
{
if (gamestate != GS_LEVEL) return;
@ -111,6 +129,12 @@ void GameInterface::ToggleThirdPerson()
}
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
void GameInterface::SwitchCoopView()
{
if (gamestate != GS_LEVEL) return;
@ -137,6 +161,12 @@ void GameInterface::SwitchCoopView()
}
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int32_t registerosdcommands(void)
{
C_RegisterFunction("mirror_debug", "mirror [mirrornum]: print mirror debug info", osdcmd_mirror);

24
source/games/sw/src/saveable.cpp
View file

@ -77,6 +77,12 @@ void Saveable_Init(void)
MODULE(sector)
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int Saveable_FindCodeSym(void *ptr, savedcodesym *sym)
{
unsigned m,i;
@ -102,6 +108,12 @@ int Saveable_FindCodeSym(void *ptr, savedcodesym *sym)
return -1;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int Saveable_FindDataSym(void *ptr, saveddatasym *sym)
{
unsigned m,i;
@ -132,6 +144,12 @@ int Saveable_FindDataSym(void *ptr, saveddatasym *sym)
return -1;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int Saveable_RestoreCodeSym(savedcodesym *sym, void **ptr)
{
if (sym->name.IsEmpty())
@ -157,6 +175,12 @@ int Saveable_RestoreCodeSym(savedcodesym *sym, void **ptr)
return -1;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int Saveable_RestoreDataSym(saveddatasym *sym, void **ptr)
{
if (sym->name.IsEmpty())

7
source/games/sw/src/scrip2.cpp
View file

@ -393,7 +393,12 @@ static struct
{ "WPN_HOTHEAD_RING", WPN_RING, WM_DAMAGE },
};
// FIXME: yes, we are leaking memory here at the end of the program by not freeing anything
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
void LoadCustomInfoFromScript(const char *filename)
{
FScanner sc;