OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge https://github.com/coelckers/gzdoom

Browse source
This commit is contained in:
Rachael Alexanderson 2017-02-12 21:39:20 -05:00
commit 8c176575c8
64 changed files with 5296 additions and 4532 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/p_user.cpp
View file

@ -60,6 +60,7 @@
#include "p_spec.h"
#include "virtual.h"
#include "g_levellocals.h"
#include "r_data/r_translate.h"
static FRandom pr_skullpop ("SkullPop");
@ -142,6 +143,13 @@ bool FPlayerClass::CheckSkin (int skin)
return false;
}
DEFINE_ACTION_FUNCTION(FPlayerClass, CheckSkin)
{
PARAM_SELF_STRUCT_PROLOGUE(FPlayerClass);
PARAM_INT(skin);
ACTION_RETURN_BOOL(self->CheckSkin(skin));
}
//===========================================================================
//
// GetDisplayName
@ -3342,3 +3350,7 @@ DEFINE_FIELD_X(PlayerInfo, player_t, cmd)
DEFINE_FIELD_X(PlayerInfo, player_t, original_cmd)
DEFINE_FIELD_X(PlayerInfo, player_t, userinfo)
DEFINE_FIELD_X(PlayerInfo, player_t, weapons)
DEFINE_FIELD(FPlayerClass, Type)
DEFINE_FIELD(FPlayerClass, Flags)
DEFINE_FIELD(FPlayerClass, Skins)