OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- removed all remaining native parts of APlayerPawn.

Browse source 
Unlike the other classes, the places where variables from this class were accessed were quite scattered so there isn't much scriptified code. Instead, most of these places are now using the script variable access methods.
This was the last remaining subclass of AActor, meaning that class Actor can now be opened for user-side extensions.
This commit is contained in:
Christoph Oelckers 2019-01-03 22:05:49 +01:00
commit 9521b6cd1f
36 changed files with 154 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/m_cheat.cpp
View file

@ -536,7 +536,7 @@ FString cht_Morph(player_t *player, PClassActor *morphclass, bool quickundo)
{
if (player->mo == nullptr) return "";
IFVIRTUALPTR(player->mo, APlayerPawn, CheatMorph)
IFVIRTUALPTRNAME(player->mo, NAME_PlayerPawn, CheatMorph)
{
FString message;
VMReturn msgret(&message);
@ -550,7 +550,7 @@ FString cht_Morph(player_t *player, PClassActor *morphclass, bool quickundo)
void cht_SetInv(player_t *player, const char *string, int amount, bool beyond)
{
if (!player->mo) return;
IFVIRTUALPTR(player->mo, APlayerPawn, CheatTakeInv)
IFVIRTUALPTRNAME(player->mo, NAME_PlayerPawn, CheatTakeInv)
{
FString message = string;
VMValue params[] = { player->mo, &message, amount, beyond };
@ -561,7 +561,7 @@ void cht_SetInv(player_t *player, const char *string, int amount, bool beyond)
void cht_Give (player_t *player, const char *name, int amount)
{
if (!player->mo) return;
IFVIRTUALPTR(player->mo, APlayerPawn, CheatGive)
IFVIRTUALPTRNAME(player->mo, NAME_PlayerPawn, CheatGive)
{
FString namestr = name;
VMValue params[3] = { player->mo, &namestr, amount };
@ -572,7 +572,7 @@ void cht_Give (player_t *player, const char *name, int amount)
void cht_Take (player_t *player, const char *name, int amount)
{
if (!player->mo) return;
IFVIRTUALPTR(player->mo, APlayerPawn, CheatTake)
IFVIRTUALPTRNAME(player->mo, NAME_PlayerPawn, CheatTake)
{
FString namestr = name;
VMValue params[3] = { player->mo, &namestr, amount };
@ -583,7 +583,7 @@ void cht_Take (player_t *player, const char *name, int amount)
void cht_Takeweaps(player_t *player)
{
if (!player->mo) return;
IFVIRTUALPTR(player->mo, APlayerPawn, CheatTakeWeaps)
IFVIRTUALPTRNAME(player->mo, NAME_PlayerPawn, CheatTakeWeaps)
{
VMValue params[3] = { player->mo };
VMCall(func, params, 1, nullptr, 0);
@ -595,7 +595,7 @@ class DSuicider : public DThinker
DECLARE_CLASS(DSuicider, DThinker)
HAS_OBJECT_POINTERS;
public:
TObjPtr<APlayerPawn*> Pawn;
TObjPtr<AActor*> Pawn;
void Tick()
{
@ -644,7 +644,7 @@ void cht_Suicide (player_t *plyr)
DEFINE_ACTION_FUNCTION(APlayerPawn, CheatSuicide)
{
PARAM_SELF_PROLOGUE(APlayerPawn);
PARAM_SELF_PROLOGUE(AActor);
cht_Suicide(self->player);
return 0;
}