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

- some initial preparations for exporting SW's actors.

Browse source
This commit is contained in:
Christoph Oelckers 2023-06-01 22:07:47 +02:00
parent d74c2ba52f
commit b31e8dd8b4
19 changed files with 1288 additions and 1092 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/games/sw/src/coolg.cpp
View file

@ -534,6 +534,14 @@ int SetupCoolg(DSWActor* actor)
return 0;
}
DEFINE_ACTION_FUNCTION(DSWCoolg, Initialize)
{
PARAM_SELF_PROLOGUE(DSWActor);
SetupCoolg(self);
return 0;
}
//---------------------------------------------------------------------------
//
//

6
source/games/sw/src/coolie.cpp
View file

@ -491,6 +491,12 @@ int SetupCoolie(DSWActor* actor)
return 0;
}
DEFINE_ACTION_FUNCTION(DSWCoolie, Initialize)
{
PARAM_SELF_PROLOGUE(DSWActor);
SetupCoolie(self);
return 0;
}
//---------------------------------------------------------------------------
//

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

@ -401,6 +401,13 @@ int SetupEel(DSWActor* actor)
return 0;
}
DEFINE_ACTION_FUNCTION(DSWEel, Initialize)
{
PARAM_SELF_PROLOGUE(DSWActor);
SetupEel(self);
return 0;
}
//---------------------------------------------------------------------------
//

8
source/games/sw/src/girlninj.cpp
View file

@ -728,6 +728,14 @@ int SetupGirlNinja(DSWActor* actor)
return 0;
}
DEFINE_ACTION_FUNCTION(DSWGirlNinja, Initialize)
{
PARAM_SELF_PROLOGUE(DSWActor);
SetupGirlNinja(self);
return 0;
}
//---------------------------------------------------------------------------
//
//

8
source/games/sw/src/goro.cpp
View file

@ -504,6 +504,14 @@ int SetupGoro(DSWActor* actor)
return 0;
}
DEFINE_ACTION_FUNCTION(DSWGoro, Initialize)
{
PARAM_SELF_PROLOGUE(DSWActor);
SetupGoro(self);
return 0;
}
//---------------------------------------------------------------------------
//
//

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

@ -313,6 +313,13 @@ int SetupHornet(DSWActor* actor)
return 0;
}
DEFINE_ACTION_FUNCTION(DSWHornet, Initialize)
{
PARAM_SELF_PROLOGUE(DSWActor);
SetupHornet(self);
return 0;
}
//---------------------------------------------------------------------------
//
//

5
source/games/sw/src/jsector.cpp
View file

@ -62,8 +62,6 @@ uint32_t oscilationclock;
// Voxel stuff
//bool bVoxelsOn = true; // Turn voxels on by default
bool bSpinBobVoxels = false; // Do twizzly stuff to voxels, but
// not by default
bool bAutoSize = true; // Autosizing on/off
//extern int chainnumpages;
extern AMB_INFO ambarray[];
@ -607,9 +605,6 @@ void GameInterface::LeavePortal(DCoreActor* viewer, int type)
void DoAutoSize(tspritetype* tspr)
{
if (!bAutoSize)
return;
switch (tspr->picnum)
{
case ICON_STAR: // 1793

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

@ -476,6 +476,13 @@ int SetupLava(DSWActor* actor)
return 0;
}
DEFINE_ACTION_FUNCTION(DSWLava, Initialize)
{
PARAM_SELF_PROLOGUE(DSWActor);
SetupLava(self);
return 0;
}
//---------------------------------------------------------------------------
//
//

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

@ -140,6 +140,13 @@ int SetupToiletGirl(DSWActor* actor)
return 0;
}
DEFINE_ACTION_FUNCTION(DSWToiletGirl, Initialize)
{
PARAM_SELF_PROLOGUE(DSWActor);
SetupToiletGirl(self);
return 0;
}
//---------------------------------------------------------------------------
//
//
@ -389,6 +396,13 @@ int SetupWashGirl(DSWActor* actor)
return 0;
}
DEFINE_ACTION_FUNCTION(DSWWashGirl, Initialize)
{
PARAM_SELF_PROLOGUE(DSWActor);
SetupWashGirl(self);
return 0;
}
//---------------------------------------------------------------------------
//
//
@ -725,6 +739,13 @@ int SetupPachinkoLight(DSWActor* actor)
return 0;
}
DEFINE_ACTION_FUNCTION(DSWPachinkoWinLight, Initialize)
{
PARAM_SELF_PROLOGUE(DSWActor);
SetupPachinkoLight(self);
return 0;
}
//---------------------------------------------------------------------------
//
//
@ -824,6 +845,13 @@ int SetupPachinko1(DSWActor* actor)
return 0;
}
DEFINE_ACTION_FUNCTION(DSWPachinko1, Initialize)
{
PARAM_SELF_PROLOGUE(DSWActor);
SetupPachinko1(self);
return 0;
}
//---------------------------------------------------------------------------
//
//
@ -994,6 +1022,13 @@ int SetupPachinko2(DSWActor* actor)
return 0;
}
DEFINE_ACTION_FUNCTION(DSWPachinko2, Initialize)
{
PARAM_SELF_PROLOGUE(DSWActor);
SetupPachinko2(self);
return 0;
}
//---------------------------------------------------------------------------
//
// PACHINKO MACHINE #3
@ -1076,6 +1111,12 @@ int SetupPachinko3(DSWActor* actor)
return 0;
}
DEFINE_ACTION_FUNCTION(DSWPachinko3, Initialize)
{
PARAM_SELF_PROLOGUE(DSWActor);
SetupPachinko3(self);
return 0;
}
//---------------------------------------------------------------------------
//
@ -1159,6 +1200,13 @@ int SetupPachinko4(DSWActor* actor)
return 0;
}
DEFINE_ACTION_FUNCTION(DSWPachinko4, Initialize)
{
PARAM_SELF_PROLOGUE(DSWActor);
SetupPachinko4(self);
return 0;
}
//---------------------------------------------------------------------------
//
//
@ -1269,6 +1317,13 @@ int SetupCarGirl(DSWActor* actor)
return 0;
}
DEFINE_ACTION_FUNCTION(DSWCarGirl, Initialize)
{
PARAM_SELF_PROLOGUE(DSWActor);
SetupCarGirl(self);
return 0;
}
//---------------------------------------------------------------------------
//
//
@ -1496,6 +1551,13 @@ int SetupMechanicGirl(DSWActor* actor)
return 0;
}
DEFINE_ACTION_FUNCTION(DSWMechanicGirl, Initialize)
{
PARAM_SELF_PROLOGUE(DSWActor);
SetupMechanicGirl(self);
return 0;
}
//---------------------------------------------------------------------------
//
//
@ -1724,6 +1786,13 @@ int SetupSailorGirl(DSWActor* actor)
return 0;
}
DEFINE_ACTION_FUNCTION(DSWSailorGirl, Initialize)
{
PARAM_SELF_PROLOGUE(DSWActor);
SetupEel(self);
return 0;
}
//---------------------------------------------------------------------------
//
//
@ -1946,6 +2015,13 @@ int SetupPruneGirl(DSWActor* actor)
return 0;
}
DEFINE_ACTION_FUNCTION(DSWPruneGirl, Initialize)
{
PARAM_SELF_PROLOGUE(DSWActor);
SetupPruneGirl(self);
return 0;
}
//---------------------------------------------------------------------------
//
//

4
source/games/sw/src/namelist.h
View file

@ -767,10 +767,6 @@ x(BREAK_LIGHT, 443)
x(BREAK_MUSHROOM, 666)
x(STAR1, 2049)
x(CRACK, 80)
x(MPLOCK1, 1846)
x(MPLOCK2, 1850)
x(MPLOCK3, 1852)
x(MPLOCK4, 2470)
x(BLADE4, 5011)
x(FFIRE1, 3143)
x(FFIRE2, 3157)

8
source/games/sw/src/ninja.cpp
View file

@ -1863,6 +1863,14 @@ int SetupNinja(DSWActor* actor)
return 0;
}
DEFINE_ACTION_FUNCTION(DSWNinja, Initialize)
{
PARAM_SELF_PROLOGUE(DSWActor);
SetupNinja(self);
return 0;
}
//---------------------------------------------------------------------------
//
//

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

@ -840,6 +840,13 @@ int SetupRipper(DSWActor* actor)
return 0;
}
DEFINE_ACTION_FUNCTION(DSWRipper, Initialize)
{
PARAM_SELF_PROLOGUE(DSWActor);
SetupRipper(self);
return 0;
}
//---------------------------------------------------------------------------
//
//

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

@ -909,6 +909,13 @@ int SetupRipper2(DSWActor* actor)
return 0;
}
DEFINE_ACTION_FUNCTION(DSWRipper2, Initialize)
{
PARAM_SELF_PROLOGUE(DSWActor);
SetupRipper2(self);
return 0;
}
//---------------------------------------------------------------------------
//
// HANGING - Jumping/Falling/Stationary

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

@ -727,6 +727,13 @@ int SetupSerp(DSWActor* actor)
return 0;
}
DEFINE_ACTION_FUNCTION(DSWSerpent, Initialize)
{
PARAM_SELF_PROLOGUE(DSWActor);
SetupSerp(self);
return 0;
}
int NullSerp(DSWActor* actor)
{
if (actor->user.Flags & (SPR_SLIDING))

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

@ -522,6 +522,13 @@ int SetupSkel(DSWActor* actor)
return 0;
}
DEFINE_ACTION_FUNCTION(DSWSkeleton, Initialize)
{
PARAM_SELF_PROLOGUE(DSWActor);
SetupSkel(self);
return 0;
}
//---------------------------------------------------------------------------
//
//

14
source/games/sw/src/skull.cpp
View file

@ -247,6 +247,13 @@ int SetupSkull(DSWActor* actor)
return 0;
}
DEFINE_ACTION_FUNCTION(DSWSkull, Initialize)
{
PARAM_SELF_PROLOGUE(DSWActor);
SetupSkull(self);
return 0;
}
//---------------------------------------------------------------------------
//
//
@ -657,6 +664,13 @@ int SetupBetty(DSWActor* actor)
return 0;
}
DEFINE_ACTION_FUNCTION(DSWBetty, Initialize)
{
PARAM_SELF_PROLOGUE(DSWActor);
SetupBetty(self);
return 0;
}
//---------------------------------------------------------------------------
//
//

2185
source/games/sw/src/sprite.cpp
View file

File diff suppressed because it is too large Load diff

8
source/games/sw/src/sumo.cpp
View file

@ -575,6 +575,14 @@ int SetupSumo(DSWActor* actor)
return 0;
}
DEFINE_ACTION_FUNCTION(DSWSumo, Initialize)
{
PARAM_SELF_PROLOGUE(DSWActor);
SetupSumo(self);
return 0;
}
//---------------------------------------------------------------------------
//
//

1
wadsrc/static/zscript/games/duke/dukeactor.zs
View file

@ -363,7 +363,6 @@ class DukeActor : CoreActor native
virtual native void Tick();
virtual void BeginPlay() {}
virtual void StaticSetup() {}
virtual void onHit(DukeActor hitter) { checkhitdefault(hitter); }
virtual void onHurt(DukePlayer p) {}