Core/Cleanup:

* move repeating code into separate method for storing locale strings in ObjectMgr (copy/paste sucks, you know)
* fix 'signed/unsigned' warnings (at least in VS)
* fix some other warnings and cleanup relative code

--HG--
branch : trunk
This commit is contained in:
azazel
2010-08-26 15:54:56 +06:00
parent 6036166716
commit 5fa14f58dc
23 changed files with 195 additions and 379 deletions

View File

@@ -47,7 +47,7 @@ public:
uint8 uiPlataformUrom;
uint8 m_auiEncounter[MAX_ENCOUNTER];
uint16 m_auiEncounter[MAX_ENCOUNTER];
std::string str_data;
std::list<uint64> GameObjectList;

View File

@@ -155,7 +155,7 @@ public:
uint8 uiDoorIntegrity;
uint8 m_auiEncounter[MAX_ENCOUNTER];
uint16 m_auiEncounter[MAX_ENCOUNTER];
uint8 uiCountErekemGuards;
uint8 uiCountActivationCrystals;
uint8 uiCyanigosaEventPhase;
@@ -652,8 +652,8 @@ public:
if (m_auiEncounter[i] == IN_PROGRESS)
m_auiEncounter[i] = NOT_STARTED;
uiFirstBoss = data3;
uiSecondBoss = data4;
uiFirstBoss = uint8(data3);
uiSecondBoss = uint8(data4);
} else OUT_LOAD_INST_DATA_FAIL;
OUT_LOAD_INST_DATA_COMPLETE;