diff options
author | megamage <none@none> | 2009-02-24 11:14:28 -0600 |
---|---|---|
committer | megamage <none@none> | 2009-02-24 11:14:28 -0600 |
commit | 699bc588b86a5176fce0900804fb7d00425383fe (patch) | |
tree | 18dde44b0118d86bfeaf294f7917c7ff0310fbbd /src/game/Map.cpp | |
parent | 9d160c855fe950d96386165fe7f6e484b427b89d (diff) |
[7330] Code warnings and style cleanups. Some bugs fixes. Author: VladimirMangos
1) comparison singed and unsigned values
2) redundent includes
3) wrong constructor :-part field initilization
4) unused not-/*name*/-guarded args in template/virtual functions that not required like args.
5) explicitly list not implemented achievement types.
Also bugs fixed:
1) Drop wrong phase mask 0 check in WorldObject::InSamePhase.
2) ArenaTeamMember::ModifyPersonalRating incorrect work with move points in negative with infinity values in result.
3) ArenaTeam::SaveToDB code send uint64 value to string with arg format %u.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Map.cpp')
-rw-r--r-- | src/game/Map.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/game/Map.cpp b/src/game/Map.cpp index ac4a6fd18df..598b74e903f 100644 --- a/src/game/Map.cpp +++ b/src/game/Map.cpp @@ -210,9 +210,9 @@ void Map::DeleteStateMachine() } Map::Map(uint32 id, time_t expiry, uint32 InstanceId, uint8 SpawnMode) - : i_id(id), i_gridExpiry(expiry), i_mapEntry (sMapStore.LookupEntry(id)), - i_InstanceId(InstanceId), i_spawnMode(SpawnMode), m_unloadTimer(0) - , i_lock(false) + : i_mapEntry (sMapStore.LookupEntry(id)), i_spawnMode(SpawnMode), + i_id(id), i_InstanceId(InstanceId), m_unloadTimer(0), i_gridExpiry(expiry) + , i_lock(false) { for(unsigned int idx=0; idx < MAX_NUMBER_OF_GRIDS; ++idx) { @@ -1641,8 +1641,9 @@ template void Map::Remove(DynamicObject *, bool); /* ******* Dungeon Instance Maps ******* */ InstanceMap::InstanceMap(uint32 id, time_t expiry, uint32 InstanceId, uint8 SpawnMode) - : Map(id, expiry, InstanceId, SpawnMode), i_data(NULL), - m_resetAfterUnload(false), m_unloadWhenEmpty(false) + : Map(id, expiry, InstanceId, SpawnMode), + m_resetAfterUnload(false), m_unloadWhenEmpty(false), + i_data(NULL), i_script_id(0) { // the timer is started by default, and stopped when the first player joins // this make sure it gets unloaded if for some reason no player joins |