teamnwah
/
openmw-tes3coop
forked from mirror/openmw-tes3mp
2
0
Fork 1
Code Issues Pull Requests 1 Releases Wiki Activity

Using less confusing names for server stat functions

Browse Source
coverity_scan^2
David Cernat 8 years ago
parent 08a5cdc4f3
commit 69030579c1
2 changed files with 55 additions and 54 deletions
Show Stats Download Patch File Download Diff File

36
apps/openmw-mp/Script/Functions/Stats.cpp
Unescape Escape View File

@ -150,7 +150,7 @@ void StatsFunctions::SetLevel(unsigned short pid, int value) noexcept
player->CreatureStats()->mLevel = value; player->CreatureStats()->mLevel = value;
} }
float StatsFunctions::GetHealth(unsigned short pid) noexcept float StatsFunctions::GetHealthBase(unsigned short pid) noexcept
{ {
Player *player; Player *player;
GET_PLAYER(pid, player,0.f); GET_PLAYER(pid, player,0.f);
@ -158,7 +158,7 @@ float StatsFunctions::GetHealth(unsigned short pid) noexcept
return player->CreatureStats()->mDynamic[0].mBase; return player->CreatureStats()->mDynamic[0].mBase;
} }
void StatsFunctions::SetHealth(unsigned short pid, float value) noexcept void StatsFunctions::SetHealthBase(unsigned short pid, float value) noexcept
{ {
Player *player; Player *player;
GET_PLAYER(pid, player,); GET_PLAYER(pid, player,);
@ -166,7 +166,7 @@ void StatsFunctions::SetHealth(unsigned short pid, float value) noexcept
player->CreatureStats()->mDynamic[0].mBase = value; player->CreatureStats()->mDynamic[0].mBase = value;
} }
float StatsFunctions::GetCurrentHealth(unsigned short pid) noexcept float StatsFunctions::GetHealthCurrent(unsigned short pid) noexcept
{ {
Player *player; Player *player;
GET_PLAYER(pid, player, 0.f); GET_PLAYER(pid, player, 0.f);
@ -174,7 +174,7 @@ float StatsFunctions::GetCurrentHealth(unsigned short pid) noexcept
return player->CreatureStats()->mDynamic[0].mCurrent; return player->CreatureStats()->mDynamic[0].mCurrent;
} }
void StatsFunctions::SetCurrentHealth(unsigned short pid, float value) noexcept void StatsFunctions::SetHealthCurrent(unsigned short pid, float value) noexcept
{ {
Player *player; Player *player;
GET_PLAYER(pid, player,); GET_PLAYER(pid, player,);
@ -182,7 +182,7 @@ void StatsFunctions::SetCurrentHealth(unsigned short pid, float value) noexcept
player->CreatureStats()->mDynamic[0].mCurrent = 0; player->CreatureStats()->mDynamic[0].mCurrent = 0;
} }
float StatsFunctions::GetMagicka(unsigned short pid) noexcept float StatsFunctions::GetMagickaBase(unsigned short pid) noexcept
{ {
Player *player; Player *player;
GET_PLAYER(pid, player,0.f); GET_PLAYER(pid, player,0.f);
@ -190,7 +190,7 @@ float StatsFunctions::GetMagicka(unsigned short pid) noexcept
return player->CreatureStats()->mDynamic[1].mBase; return player->CreatureStats()->mDynamic[1].mBase;
} }
void StatsFunctions::SetMagicka(unsigned short pid, float value) noexcept void StatsFunctions::SetMagickaBase(unsigned short pid, float value) noexcept
{ {
Player *player; Player *player;
GET_PLAYER(pid, player,); GET_PLAYER(pid, player,);
@ -198,7 +198,7 @@ void StatsFunctions::SetMagicka(unsigned short pid, float value) noexcept
player->CreatureStats()->mDynamic[1].mBase = value; player->CreatureStats()->mDynamic[1].mBase = value;
} }
float StatsFunctions::GetCurrentMagicka(unsigned short pid) noexcept float StatsFunctions::GetMagickaCurrent(unsigned short pid) noexcept
{ {
Player *player; Player *player;
GET_PLAYER(pid, player, 0.f); GET_PLAYER(pid, player, 0.f);
@ -206,7 +206,7 @@ float StatsFunctions::GetCurrentMagicka(unsigned short pid) noexcept
return player->CreatureStats()->mDynamic[1].mCurrent; return player->CreatureStats()->mDynamic[1].mCurrent;
} }
void StatsFunctions::SetCurrentMagicka(unsigned short pid, float value) noexcept void StatsFunctions::SetMagickaCurrent(unsigned short pid, float value) noexcept
{ {
Player *player; Player *player;
GET_PLAYER(pid, player,); GET_PLAYER(pid, player,);
@ -214,7 +214,7 @@ void StatsFunctions::SetCurrentMagicka(unsigned short pid, float value) noexcept
player->CreatureStats()->mDynamic[1].mCurrent = 0; player->CreatureStats()->mDynamic[1].mCurrent = 0;
} }
float StatsFunctions::GetFatigue(unsigned short pid) noexcept float StatsFunctions::GetFatigueBase(unsigned short pid) noexcept
{ {
Player *player; Player *player;
GET_PLAYER(pid, player,0.f); GET_PLAYER(pid, player,0.f);
@ -222,7 +222,7 @@ float StatsFunctions::GetFatigue(unsigned short pid) noexcept
return player->CreatureStats()->mDynamic[2].mBase; return player->CreatureStats()->mDynamic[2].mBase;
} }
void StatsFunctions::SetFatigue(unsigned short pid, float value) noexcept void StatsFunctions::SetFatigueBase(unsigned short pid, float value) noexcept
{ {
Player *player; Player *player;
GET_PLAYER(pid, player,); GET_PLAYER(pid, player,);
@ -230,7 +230,7 @@ void StatsFunctions::SetFatigue(unsigned short pid, float value) noexcept
player->CreatureStats()->mDynamic[2].mBase = value; player->CreatureStats()->mDynamic[2].mBase = value;
} }
float StatsFunctions::GetCurrentFatigue(unsigned short pid) noexcept float StatsFunctions::GetFatigueCurrent(unsigned short pid) noexcept
{ {
Player *player; Player *player;
GET_PLAYER(pid, player, 0.f); GET_PLAYER(pid, player, 0.f);
@ -238,7 +238,7 @@ float StatsFunctions::GetCurrentFatigue(unsigned short pid) noexcept
return player->CreatureStats()->mDynamic[2].mCurrent; return player->CreatureStats()->mDynamic[2].mCurrent;
} }
void StatsFunctions::SetCurrentFatigue(unsigned short pid, float value) noexcept void StatsFunctions::SetFatigueCurrent(unsigned short pid, float value) noexcept
{ {
Player *player; Player *player;
GET_PLAYER(pid, player,); GET_PLAYER(pid, player,);
@ -320,7 +320,7 @@ void StatsFunctions::SetAttribute(unsigned short pid, unsigned short attribute,
player->CreatureStats()->mAttributes[attribute].mBase = value; player->CreatureStats()->mAttributes[attribute].mBase = value;
} }
int StatsFunctions::GetCurrentAttribute(unsigned short pid, unsigned short attribute) noexcept int StatsFunctions::GetAttributeCurrent(unsigned short pid, unsigned short attribute) noexcept
{ {
Player *player; Player *player;
GET_PLAYER(pid, player, 0); GET_PLAYER(pid, player, 0);
@ -331,7 +331,7 @@ int StatsFunctions::GetCurrentAttribute(unsigned short pid, unsigned short attri
return player->CreatureStats()->mAttributes[attribute].mCurrent; return player->CreatureStats()->mAttributes[attribute].mCurrent;
} }
void StatsFunctions::SetCurrentAttribute(unsigned short pid, unsigned short attribute, int value) noexcept void StatsFunctions::SetAttributeCurrent(unsigned short pid, unsigned short attribute, int value) noexcept
{ {
Player *player; Player *player;
GET_PLAYER(pid, player,); GET_PLAYER(pid, player,);
@ -366,7 +366,7 @@ void StatsFunctions::SetSkill(unsigned short pid, unsigned short skill, int valu
//DEBUG_PRINTF("SetSkill(%d, %d, %d)\n", pid, skill, value); //DEBUG_PRINTF("SetSkill(%d, %d, %d)\n", pid, skill, value);
} }
int StatsFunctions::GetCurrentSkill(unsigned short pid, unsigned short skill) noexcept int StatsFunctions::GetSkillCurrent(unsigned short pid, unsigned short skill) noexcept
{ {
Player *player; Player *player;
GET_PLAYER(pid, player, 0); GET_PLAYER(pid, player, 0);
@ -377,7 +377,7 @@ int StatsFunctions::GetCurrentSkill(unsigned short pid, unsigned short skill) no
return player->NpcStats()->mSkills[skill].mCurrent; return player->NpcStats()->mSkills[skill].mCurrent;
} }
void StatsFunctions::SetCurrentSkill(unsigned short pid, unsigned short skill, int value) noexcept //TODO: need packet for one value void StatsFunctions::SetSkillCurrent(unsigned short pid, unsigned short skill, int value) noexcept //TODO: need packet for one value
{ {
Player *player; Player *player;
GET_PLAYER(pid, player,); GET_PLAYER(pid, player,);
@ -388,7 +388,7 @@ void StatsFunctions::SetCurrentSkill(unsigned short pid, unsigned short skill, i
player->NpcStats()->mSkills[skill].mCurrent = value; player->NpcStats()->mSkills[skill].mCurrent = value;
} }
int StatsFunctions::GetIncreaseSkill(unsigned short pid, unsigned int pos) noexcept int StatsFunctions::GetSkillIncrease(unsigned short pid, unsigned int pos) noexcept
{ {
Player *player; Player *player;
GET_PLAYER(pid, player, 0); GET_PLAYER(pid, player, 0);
@ -399,7 +399,7 @@ int StatsFunctions::GetIncreaseSkill(unsigned short pid, unsigned int pos) noexc
return player->NpcStats()->mSkillIncrease[pos]; return player->NpcStats()->mSkillIncrease[pos];
} }
void StatsFunctions::SetIncreaseSkill(unsigned short pid, unsigned int pos, int value) noexcept // TODO: need packet for transmit it void StatsFunctions::SetSkillIncrease(unsigned short pid, unsigned int pos, int value) noexcept // TODO: need packet for transmit it
{ {
Player *player; Player *player;
GET_PLAYER(pid, player,); GET_PLAYER(pid, player,);

73
apps/openmw-mp/Script/Functions/Stats.hpp
Unescape Escape View File

@ -36,30 +36,31 @@
\ \
{"GetAttribute", StatsFunctions::GetAttribute},\ {"GetAttribute", StatsFunctions::GetAttribute},\
{"SetAttribute", StatsFunctions::SetAttribute},\ {"SetAttribute", StatsFunctions::SetAttribute},\
{"GetCurrentAttribute", StatsFunctions::GetCurrentAttribute},\ {"GetAttributeCurrent", StatsFunctions::GetAttributeCurrent},\
{"SetCurrentAttribute", StatsFunctions::SetCurrentAttribute},\ {"SetAttributeCurrent", StatsFunctions::SetAttributeCurrent},\
{"GetSkill", StatsFunctions::GetSkill},\ {"GetSkill", StatsFunctions::GetSkill},\
{"SetSkill", StatsFunctions::SetSkill},\ {"SetSkill", StatsFunctions::SetSkill},\
{"GetCurrentSkill", StatsFunctions::GetCurrentSkill},\ {"GetSkillCurrent", StatsFunctions::GetSkillCurrent},\
{"SetCurrentSkill", StatsFunctions::SetCurrentSkill},\ {"SetSkillCurrent", StatsFunctions::SetSkillCurrent},\
\ \
{"GetHealth", StatsFunctions::GetHealth},\ {"GetHealthBase", StatsFunctions::GetHealthBase},\
{"SetHealth", StatsFunctions::SetHealth},\ {"SetHealthBase", StatsFunctions::SetHealthBase},\
{"GetCurrentHealth", StatsFunctions::GetCurrentHealth},\ {"GetHealthCurrent", StatsFunctions::GetHealthCurrent},\
{"SetCurrentHealth", StatsFunctions::SetCurrentHealth},\ {"SetHealthCurrent", StatsFunctions::SetHealthCurrent},\
\ \
{"GetMagicka", StatsFunctions::GetMagicka},\ {"GetMagickaBase", StatsFunctions::GetMagickaBase},\
{"SetMagicka", StatsFunctions::SetMagicka},\ {"SetMagickaBase", StatsFunctions::SetMagickaBase},\
{"GetCurrentMagicka", StatsFunctions::GetCurrentMagicka},\ {"GetMagickaCurrent", StatsFunctions::GetMagickaCurrent},\
{"SetCurrentMagicka", StatsFunctions::SetCurrentMagicka},\ {"SetMagickaCurrent", StatsFunctions::SetMagickaCurrent},\
\ \
{"SetFatigue", StatsFunctions::SetFatigue},\ {"SetFatigueBase", StatsFunctions::SetFatigueBase},\
{"GetFatigue", StatsFunctions::GetFatigue},\ {"GetFatigueBase", StatsFunctions::GetFatigueBase},\
{"SetCurrentFatigue", StatsFunctions::SetCurrentFatigue},\ {"SetFatigueCurrent", StatsFunctions::SetFatigueCurrent},\
{"GetCurrentFatigue", StatsFunctions::GetCurrentFatigue},\ {"GetFatigueCurrent", StatsFunctions::GetFatigueCurrent},\
\
{"GetSkillIncrease", StatsFunctions::GetSkillIncrease},\
{"SetSkillIncrease", StatsFunctions::SetSkillIncrease},\
\ \
{"GetIncreaseSkill", StatsFunctions::GetIncreaseSkill},\
{"SetIncreaseSkill", StatsFunctions::SetIncreaseSkill},\
{"SetCharGenStage", StatsFunctions::SetCharGenStage},\ {"SetCharGenStage", StatsFunctions::SetCharGenStage},\
{"Resurrect", StatsFunctions::Resurrect},\ {"Resurrect", StatsFunctions::Resurrect},\
{"SendBaseInfo", StatsFunctions::SendBaseInfo},\ {"SendBaseInfo", StatsFunctions::SendBaseInfo},\
@ -95,20 +96,20 @@ public:
static int GetLevel(unsigned short pid) noexcept; static int GetLevel(unsigned short pid) noexcept;
static void SetLevel(unsigned short pid, int value) noexcept; static void SetLevel(unsigned short pid, int value) noexcept;
static float GetHealth(unsigned short pid) noexcept; static float GetHealthBase(unsigned short pid) noexcept;
static void SetHealth(unsigned short pid, float value) noexcept; static void SetHealthBase(unsigned short pid, float value) noexcept;
static float GetCurrentHealth(unsigned short pid) noexcept; static float GetHealthCurrent(unsigned short pid) noexcept;
static void SetCurrentHealth(unsigned short pid, float value) noexcept; static void SetHealthCurrent(unsigned short pid, float value) noexcept;
static float GetMagicka(unsigned short pid) noexcept; static float GetMagickaBase(unsigned short pid) noexcept;
static void SetMagicka(unsigned short pid, float value) noexcept; static void SetMagickaBase(unsigned short pid, float value) noexcept;
static float GetCurrentMagicka(unsigned short pid) noexcept; static float GetMagickaCurrent(unsigned short pid) noexcept;
static void SetCurrentMagicka(unsigned short pid, float value) noexcept; static void SetMagickaCurrent(unsigned short pid, float value) noexcept;
static float GetFatigue(unsigned short pid) noexcept; static float GetFatigueBase(unsigned short pid) noexcept;
static void SetFatigue(unsigned short pid, float value) noexcept; static void SetFatigueBase(unsigned short pid, float value) noexcept;
static float GetCurrentFatigue(unsigned short pid) noexcept; static float GetFatigueCurrent(unsigned short pid) noexcept;
static void SetCurrentFatigue(unsigned short pid, float value) noexcept; static void SetFatigueCurrent(unsigned short pid, float value) noexcept;
static int GetAttributeCount() noexcept; static int GetAttributeCount() noexcept;
static int GetSkillCount() noexcept; static int GetSkillCount() noexcept;
@ -119,16 +120,16 @@ public:
static int GetAttribute(unsigned short pid, unsigned short attribute) noexcept; static int GetAttribute(unsigned short pid, unsigned short attribute) noexcept;
static void SetAttribute(unsigned short pid, unsigned short attribute, int value) noexcept; static void SetAttribute(unsigned short pid, unsigned short attribute, int value) noexcept;
static int GetCurrentAttribute(unsigned short pid, unsigned short attribute) noexcept; static int GetAttributeCurrent(unsigned short pid, unsigned short attribute) noexcept;
static void SetCurrentAttribute(unsigned short pid, unsigned short attribute, int value) noexcept; static void SetAttributeCurrent(unsigned short pid, unsigned short attribute, int value) noexcept;
static int GetSkill(unsigned short pid, unsigned short skill) noexcept; static int GetSkill(unsigned short pid, unsigned short skill) noexcept;
static void SetSkill(unsigned short pid, unsigned short skill, int value) noexcept; static void SetSkill(unsigned short pid, unsigned short skill, int value) noexcept;
static int GetCurrentSkill(unsigned short pid, unsigned short skill) noexcept; static int GetSkillCurrent(unsigned short pid, unsigned short skill) noexcept;
static void SetCurrentSkill(unsigned short pid, unsigned short skill, int value) noexcept; static void SetSkillCurrent(unsigned short pid, unsigned short skill, int value) noexcept;
static int GetIncreaseSkill(unsigned short pid, unsigned int pos) noexcept; static int GetSkillIncrease(unsigned short pid, unsigned int pos) noexcept;
static void SetIncreaseSkill(unsigned short pid, unsigned int pos, int value) noexcept; static void SetSkillIncrease(unsigned short pid, unsigned int pos, int value) noexcept;
static void Resurrect(unsigned short pid); static void Resurrect(unsigned short pid);
static void SetCharGenStage(unsigned short pid, int start, int end) noexcept; static void SetCharGenStage(unsigned short pid, int start, int end) noexcept;

Write Preview
Loading…
Cancel
Save