diff --git a/regamedll/dlls/player.h b/regamedll/dlls/player.h index ed42b142..156f78f7 100644 --- a/regamedll/dlls/player.h +++ b/regamedll/dlls/player.h @@ -77,13 +77,15 @@ // NOTE: It works for CZ #define MONEY_BLINK_AMOUNT 30 +// Player physics flags bits +// CBasePlayer::m_afPhysicsFlags #define PFLAG_ONLADDER (1<<0) #define PFLAG_ONSWING (1<<0) #define PFLAG_ONTRAIN (1<<1) #define PFLAG_ONBARNACLE (1<<2) -#define PFLAG_DUCKING (1<<3) -#define PFLAG_USING (1<<4) -#define PFLAG_OBSERVER (1<<5) +#define PFLAG_DUCKING (1<<3) // In the process of ducking, but totally squatted yet +#define PFLAG_USING (1<<4) // Using a continuous entity +#define PFLAG_OBSERVER (1<<5) // player is locked in stationary cam mode. Spectators can move, observers can't. #define TRAIN_OFF 0x00 #define TRAIN_NEUTRAL 0x01 @@ -157,6 +159,7 @@ enum RewardType RT_VIP_KILLED, RT_VIP_RESCUED_MYSELF }; + enum PLAYER_ANIM { PLAYER_IDLE, @@ -197,7 +200,6 @@ enum TeamName TERRORIST, CT, SPECTATOR, - }; enum ModelName @@ -225,7 +227,6 @@ enum JoinState SHOWTEAMSELECT, PICKINGTEAM, GETINTOGAME - }; enum TrackCommands @@ -239,7 +240,6 @@ enum TrackCommands CMD_LISTPLAYERS, CMD_NIGHTVISION, COMMANDS_TO_TRACK, - }; struct RebuyStruct @@ -327,10 +327,7 @@ public: class CSprayCan: public CBaseEntity { public: virtual void Think(); - virtual int ObjectCaps() - { - return FCAP_DONT_SAVE; - } + virtual int ObjectCaps() { return FCAP_DONT_SAVE; } #ifdef HOOK_GAMEDLL diff --git a/regamedll/dlls/weapontype.cpp b/regamedll/dlls/weapontype.cpp index d3ad4da1..c0301709 100644 --- a/regamedll/dlls/weapontype.cpp +++ b/regamedll/dlls/weapontype.cpp @@ -234,7 +234,7 @@ WeaponInfoStruct weaponInfo_default[] = { WEAPON_XM1014, XM1014_PRICE, AMMO_BUCKSHOT_PRICE, AMMO_BUCKSHOT_BUY, XM1014_MAX_CLIP, MAX_AMMO_BUCKSHOT, AMMO_BUCKSHOT, "weapon_xm1014", "ammo_buckshot" }, { WEAPON_MAC10, MAC10_PRICE, AMMO_45ACP_PRICE, AMMO_45ACP_BUY, MAC10_MAX_CLIP, MAX_AMMO_45ACP, AMMO_45ACP, "weapon_mac10", "ammo_45acp" }, { WEAPON_AUG, AUG_PRICE, AMMO_556MM_PRICE, AMMO_556NATO_BUY, AUG_MAX_CLIP, MAX_AMMO_556NATO, AMMO_556NATO, "weapon_aug", "ammo_556nato" }, - { WEAPON_ELITE, ELITE_PRICE, AMMO_9MM_PRICE, AMMO_9MM_BUY, ELITE_MAX_CLIP, MAX_AMMO_9MM, AMMO_9MM, "weapon_elite", "ammo_ammo_9mm" }, + { WEAPON_ELITE, ELITE_PRICE, AMMO_9MM_PRICE, AMMO_9MM_BUY, ELITE_MAX_CLIP, MAX_AMMO_9MM, AMMO_9MM, "weapon_elite", "ammo_9mm" }, { WEAPON_FIVESEVEN, FIVESEVEN_PRICE, AMMO_57MM_PRICE, AMMO_57MM_BUY, FIVESEVEN_MAX_CLIP, MAX_AMMO_57MM, AMMO_57MM, "weapon_fiveseven", "ammo_57mm" }, { WEAPON_UMP45, UMP45_PRICE, AMMO_45ACP_PRICE, AMMO_45ACP_BUY, UMP45_MAX_CLIP, MAX_AMMO_45ACP, AMMO_45ACP, "weapon_ump45", "ammo_45acp" }, { WEAPON_SG550, SG550_PRICE, AMMO_556MM_PRICE, AMMO_556NATO_BUY, SG550_MAX_CLIP, MAX_AMMO_556NATO, AMMO_556NATO, "weapon_sg550", "ammo_556nato" }, diff --git a/regamedll/extra/cssdk/dlls/player.h b/regamedll/extra/cssdk/dlls/player.h index 7cbc492a..33984f5c 100644 --- a/regamedll/extra/cssdk/dlls/player.h +++ b/regamedll/extra/cssdk/dlls/player.h @@ -67,13 +67,15 @@ // NOTE: It works for CZ #define MONEY_BLINK_AMOUNT 30 +// Player physics flags bits +// CBasePlayer::m_afPhysicsFlags #define PFLAG_ONLADDER (1<<0) #define PFLAG_ONSWING (1<<0) #define PFLAG_ONTRAIN (1<<1) #define PFLAG_ONBARNACLE (1<<2) -#define PFLAG_DUCKING (1<<3) -#define PFLAG_USING (1<<4) -#define PFLAG_OBSERVER (1<<5) +#define PFLAG_DUCKING (1<<3) // In the process of ducking, but totally squatted yet +#define PFLAG_USING (1<<4) // Using a continuous entity +#define PFLAG_OBSERVER (1<<5) // player is locked in stationary cam mode. Spectators can move, observers can't. #define TRAIN_OFF 0x00 #define TRAIN_NEUTRAL 0x01 @@ -161,7 +163,6 @@ enum PLAYER_ANIM PLAYER_LARGE_FLINCH, PLAYER_RELOAD, PLAYER_HOLDBOMB - }; enum _Menu @@ -181,7 +182,6 @@ enum _Menu Menu_Radio2, Menu_Radio3, Menu_ClientBuy - }; enum TeamName @@ -190,7 +190,6 @@ enum TeamName TERRORIST, CT, SPECTATOR, - }; enum ModelName @@ -208,7 +207,6 @@ enum ModelName MODEL_MILITIA, MODEL_SPETSNAZ, MODEL_AUTO - }; enum JoinState @@ -219,7 +217,6 @@ enum JoinState SHOWTEAMSELECT, PICKINGTEAM, GETINTOGAME - }; enum TrackCommands @@ -233,7 +230,6 @@ enum TrackCommands CMD_LISTPLAYERS, CMD_NIGHTVISION, COMMANDS_TO_TRACK, - }; struct RebuyStruct @@ -248,7 +244,6 @@ struct RebuyStruct int m_defuser; int m_nightVision; int m_armor; - }; enum ThrowDirection @@ -260,7 +255,6 @@ enum ThrowDirection THROW_BOMB, THROW_GRENADE, THROW_HITVEL_MINUS_AIRVEL - }; enum sbar_data