pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 17:51:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for "ISO C++" taboo

Browse Source
This commit is contained in:
Uleat 2016-04-05 18:54:40 -04:00
parent e759bb6da8
commit 51c97211a8
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zone/bot_command.cpp
View File

@ -4215,7 +4215,7 @@ void bot_subcommand_bot_clone(Client *c, const Seperator *sep)
return; return;
} }
BotStanceType clone_stance = BotStancePassive; int clone_stance = BotStancePassive;
if (!botdb.LoadStance(my_bot->GetBotID(), clone_stance)) if (!botdb.LoadStance(my_bot->GetBotID(), clone_stance))
c->Message(m_fail, "%s for bot '%s'", BotDatabase::fail::LoadStance(), my_bot->GetCleanName()); c->Message(m_fail, "%s for bot '%s'", BotDatabase::fail::LoadStance(), my_bot->GetCleanName());
if (!botdb.SaveStance(clone_id, clone_stance)) if (!botdb.SaveStance(clone_id, clone_stance))

6
zone/bot_database.cpp
View File

@ -763,7 +763,7 @@ bool BotDatabase::DeleteBuffs(const uint32 bot_id)
return true; return true;
} }
bool BotDatabase::LoadStance(const uint32 bot_id, BotStanceType& bot_stance) bool BotDatabase::LoadStance(const uint32 bot_id, int& bot_stance)
{ {
if (!bot_id) if (!bot_id)
return false; return false;
@ -776,7 +776,7 @@ bool BotDatabase::LoadStance(const uint32 bot_id, BotStanceType& bot_stance)
return true; return true;
auto row = results.begin(); auto row = results.begin();
bot_stance = (BotStanceType)atoi(row[0]); bot_stance = atoi(row[0]);
return true; return true;
} }
@ -802,7 +802,7 @@ bool BotDatabase::LoadStance(Bot* bot_inst, bool& stance_flag)
return true; return true;
} }
bool BotDatabase::SaveStance(const uint32 bot_id, const BotStanceType bot_stance) bool BotDatabase::SaveStance(const uint32 bot_id, const int bot_stance)
{ {
if (!bot_id) if (!bot_id)
return false; return false;

5
zone/bot_database.h
View File

@ -34,7 +34,6 @@ class Bot;
class ItemInst; class ItemInst;
class Inventory; class Inventory;
struct BotsAvailableList; struct BotsAvailableList;
enum BotStanceType;
class BotDatabase : public DBcore class BotDatabase : public DBcore
@ -68,9 +67,9 @@ public:
bool SaveBuffs(Bot* bot_inst); bool SaveBuffs(Bot* bot_inst);
bool DeleteBuffs(const uint32 bot_id); bool DeleteBuffs(const uint32 bot_id);
bool LoadStance(const uint32 bot_id, BotStanceType& bot_stance); bool LoadStance(const uint32 bot_id, int& bot_stance);
bool LoadStance(Bot* bot_inst, bool& stance_flag); bool LoadStance(Bot* bot_inst, bool& stance_flag);
bool SaveStance(const uint32 bot_id, const BotStanceType bot_stance); bool SaveStance(const uint32 bot_id, const int bot_stance);
bool SaveStance(Bot* bot_inst); bool SaveStance(Bot* bot_inst);
bool DeleteStance(const uint32 bot_id); bool DeleteStance(const uint32 bot_id);