Fix for "ISO C++" taboo

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

View File

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

View File

@ -763,7 +763,7 @@ bool BotDatabase::DeleteBuffs(const uint32 bot_id)
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)
return false;
@ -776,7 +776,7 @@ bool BotDatabase::LoadStance(const uint32 bot_id, BotStanceType& bot_stance)
return true;
auto row = results.begin();
bot_stance = (BotStanceType)atoi(row[0]);
bot_stance = atoi(row[0]);
return true;
}
@ -802,7 +802,7 @@ bool BotDatabase::LoadStance(Bot* bot_inst, bool& stance_flag)
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)
return false;

View File

@ -34,7 +34,6 @@ class Bot;
class ItemInst;
class Inventory;
struct BotsAvailableList;
enum BotStanceType;
class BotDatabase : public DBcore
@ -68,9 +67,9 @@ public:
bool SaveBuffs(Bot* bot_inst);
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 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 DeleteStance(const uint32 bot_id);