zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-11 07:12:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

- moved AInventory::DoRespawn fully to the script side.

Browse source
This commit is contained in:
Christoph Oelckers 2018-11-30 00:20:06 +01:00
parent 3922f817fb
commit bc1990b6d7
5 changed files with 31 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/g_inventory/a_pickups.cpp
View file

@ -225,35 +225,6 @@ AInventory *AInventory::NextInv ()
return item;
}
//===========================================================================
//
// AInventory :: DoRespawn
//
//===========================================================================
bool AInventory::DoRespawn ()
{
if (SpawnPointClass != NULL)
{
AActor *spot = NULL;
DSpotState *state = DSpotState::GetSpotState();
if (state != NULL) spot = state->GetRandomSpot(SpawnPointClass);
if (spot != NULL)
{
SetOrigin (spot->Pos(), false);
SetZ(floorz);
}
}
return true;
}
DEFINE_ACTION_FUNCTION(AInventory, DoRespawn)
{
PARAM_SELF_PROLOGUE(AInventory);
ACTION_RETURN_BOOL(self->DoRespawn());
}
//===========================================================================
//
// AInventory :: CallTryPickup

2
src/g_inventory/a_pickups.h
View file

@ -75,8 +75,6 @@ public:
void DepleteOrDestroy (); // virtual on the script side.
bool DoRespawn();
AInventory *PrevInv(); // Returns the previous item with IF_INVBAR set.
AInventory *NextInv(); // Returns the next item with IF_INVBAR set.

7
src/g_shared/a_specialspot.cpp
View file

@ -368,6 +368,13 @@ ASpecialSpot *DSpotState::GetRandomSpot(PClassActor *type, bool onlyonce)
return NULL;
}
DEFINE_ACTION_FUNCTION(DSpotState, GetRandomSpot)
{
PARAM_SELF_PROLOGUE(DSpotState);
PARAM_CLASS(type, AActor);
PARAM_BOOL(onlyonce);
ACTION_RETURN_POINTER(self->GetRandomSpot(type, onlyonce));
}
//----------------------------------------------------------------------------
//

1
wadsrc/static/zscript/base.txt
View file

@ -599,6 +599,7 @@ class SpotState : Object native
native static SpotState GetSpotState();
native SpecialSpot GetNextInList(class<Actor> type, int skipcounter);
native SpecialSpot GetSpotWithMinMaxDistance(Class<Actor> type, double x, double y, double mindist, double maxdist);
native SpecialSpot GetRandomSpot(class<Actor> type, bool onlyonce);
}

24
wadsrc/static/zscript/inventory/inventory.txt
View file

@ -49,7 +49,6 @@ class Inventory : Actor native
Inventory.PickupMessage "$TXT_DEFAULTPICKUPMSG";
}
native bool DoRespawn();
native static void PrintPickupMessage (bool localview, String str);
States(Actor)
@ -169,6 +168,29 @@ class Inventory : Actor native
}
}
//===========================================================================
//
// AInventory :: DoRespawn
//
//===========================================================================
bool DoRespawn ()
{
if (SpawnPointClass != NULL)
{
Actor spot = NULL;
let state = SpotState.GetSpotState();
if (state != NULL) spot = state.GetRandomSpot(SpawnPointClass, false);
if (spot != NULL)
{
SetOrigin (spot.Pos, false);
SetZ(floorz);
}
}
return true;
}
//===========================================================================
//
// AInventory :: Grind