Changeset 3197
- Timestamp:
- 03/04/2010 01:43:09 PM (6 months ago)
- Location:
- trunk/src
- Files:
-
- 8 modified
-
arcemu-shared/Database/MySQLDatabase.cpp (modified) (1 diff)
-
arcemu-world/ArathiBasin.cpp (modified) (1 diff)
-
arcemu-world/BattlegroundMgr.cpp (modified) (7 diffs)
-
arcemu-world/EyeOfTheStorm.cpp (modified) (1 diff)
-
arcemu-world/InstanceCommands.cpp (modified) (1 diff)
-
arcemu-world/LocalizationMgr.cpp (modified) (1 diff)
-
arcemu-world/LootMgr.cpp (modified) (4 diffs)
-
arcemu-world/Master.cpp (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/arcemu-shared/Database/MySQLDatabase.cpp
r3131 r3197 159 159 } 160 160 else 161 Log.Error("Sql query failed due to [%s], Query: [%s]\n", mysql_error( static_cast<MySQLDatabaseConnection*>(con)->MySql ), Sql);161 sLog.outError("Sql query failed due to [%s], Query: [%s]", mysql_error( static_cast<MySQLDatabaseConnection*>(con)->MySql ), Sql); 162 162 } 163 163 -
trunk/src/arcemu-world/ArathiBasin.cpp
r3131 r3197 685 685 break; 686 686 default: 687 Log.Error("ArathiBasin", "Encountered unhandled areatrigger id %u", id);687 sLog.outError("ArathiBasin", "Encountered unhandled areatrigger id %u", id); 688 688 return; 689 689 break; -
trunk/src/arcemu-world/BattlegroundMgr.cpp
r3156 r3197 404 404 if (ar == NULL) 405 405 { 406 Log.Error("BattlegroundMgr", "%s (%u): Couldn't create Arena Instance", __FILE__, __LINE__);406 sLog.outError("BattlegroundMgr", "%s (%u): Couldn't create Arena Instance", __FILE__, __LINE__); 407 407 m_queueLock.Release(); 408 408 m_instanceLock.Release(); … … 583 583 if ( arena == NULL ) 584 584 { 585 Log.Error("BattlegroundMgr", "%s (%u): Couldn't create Arena Instance", __FILE__, __LINE__);585 sLog.outError("BattlegroundMgr", "%s (%u): Couldn't create Arena Instance", __FILE__, __LINE__); 586 586 m_queueLock.Release(); 587 587 m_instanceLock.Release(); … … 674 674 if(itz == m_queuedGroups[i].end()) 675 675 { 676 Log.Error("BattlegroundMgr", "Internal error at %s:%u", __FILE__, __LINE__);676 sLog.outError("BattlegroundMgr", "Internal error at %s:%u", __FILE__, __LINE__); 677 677 m_queueLock.Release(); 678 678 m_instanceLock.Release(); … … 721 721 if(itz == possibleGroups.end()) 722 722 { 723 Log.Error("BattlegroundMgr", "Internal error at %s:%u", __FILE__, __LINE__);723 sLog.outError("BattlegroundMgr", "Internal error at %s:%u", __FILE__, __LINE__); 724 724 m_queueLock.Release(); 725 725 m_instanceLock.Release(); … … 1227 1227 if(mgr == NULL) 1228 1228 { 1229 Log.Error("BattlegroundManager", "Arena CreateInstance() call failed for map %u, type %u, level group %u", mapid, Type, LevelGroup);1229 sLog.outError("BattlegroundManager", "Arena CreateInstance() call failed for map %u, type %u, level group %u", mapid, Type, LevelGroup); 1230 1230 return NULL; // Shouldn't happen 1231 1231 } … … 1262 1262 if(cfunc == NULL) 1263 1263 { 1264 Log.Error("BattlegroundManager", "Could not find CreateBattlegroundFunc pointer for type %u level group %u", Type, LevelGroup);1264 sLog.outError("BattlegroundManager", "Could not find CreateBattlegroundFunc pointer for type %u level group %u", Type, LevelGroup); 1265 1265 return NULL; 1266 1266 } … … 1293 1293 if(mgr == NULL) 1294 1294 { 1295 Log.Error("BattlegroundManager", "CreateInstance() call failed for map %u, type %u, level group %u", BGMapIds[Type], Type, LevelGroup);1295 sLog.outError("BattlegroundManager", "CreateInstance() call failed for map %u, type %u, level group %u", BGMapIds[Type], Type, LevelGroup); 1296 1296 return NULL; // Shouldn't happen 1297 1297 } -
trunk/src/arcemu-world/EyeOfTheStorm.cpp
r3175 r3197 294 294 break; 295 295 default: 296 Log.Error("EyeOfTheStorm", "Encountered unhandled areatrigger id %u", id);296 sLog.outError("EyeOfTheStorm", "Encountered unhandled areatrigger id %u", id); 297 297 return; 298 298 break; -
trunk/src/arcemu-world/InstanceCommands.cpp
r3131 r3197 327 327 if(mgr == NULL) 328 328 { 329 Log.Error("CreateInstanceGMCommand", "CreateInstance() call failed for map %u", mapid);329 sLog.outError("CreateInstanceGMCommand", "CreateInstance() call failed for map %u", mapid); 330 330 return false; // Shouldn't happen 331 331 } -
trunk/src/arcemu-world/LocalizationMgr.cpp
r2998 r3197 548 548 if(source_language_id== 0 || dest_language_id == 0) 549 549 { 550 Log.Error("LocalizationMgr", "Invalid locale conversion string specified: %u->%u (%s->%s)", source_language_id, dest_language_id, itr->second.c_str(), itr->first.c_str());550 sLog.outError("LocalizationMgr", "Invalid locale conversion string specified: %u->%u (%s->%s)", source_language_id, dest_language_id, itr->second.c_str(), itr->first.c_str()); 551 551 continue; 552 552 } -
trunk/src/arcemu-world/LootMgr.cpp
r3153 r3197 158 158 if(rp == NULL) 159 159 { 160 Log.Error("LoadLootProp", "RandomProp group %u references non-existent randomprop %u.", id, eid);160 sLog.outError("LoadLootProp", "RandomProp group %u references non-existent randomprop %u.", id, eid); 161 161 continue; 162 162 } … … 190 190 if(rs == NULL) 191 191 { 192 Log.Error("LoadLootProp", "RandomSuffix group %u references non-existent randomsuffix %u.", id, eid);192 sLog.outError("LoadLootProp", "RandomSuffix group %u references non-existent randomsuffix %u.", id, eid); 193 193 continue; 194 194 } … … 247 247 if(!result) 248 248 { 249 Log.Error("LootMgr", "Loading loot from table %s failed.", szTableName);249 sLog.outError("LootMgr", "Loading loot from table %s failed.", szTableName); 250 250 return; 251 251 } … … 263 263 if(entry_id < last_entry) 264 264 { 265 Log.Error("LootMgr", "WARNING: Out of order loot table being loaded.\n");265 sLog.outError("LootMgr", "WARNING: Out of order loot table being loaded.\n"); 266 266 return; 267 267 } -
trunk/src/arcemu-world/Master.cpp
r3131 r3197 254 254 else 255 255 { 256 Log.Error( "Config", ">> configs/world.conf" );256 sLog.outError( "Config", ">> configs/world.conf" ); 257 257 return false; 258 258 } … … 262 262 else 263 263 { 264 Log.Error("Config", ">> configs/optional.conf");264 sLog.outError("Config", ">> configs/optional.conf"); 265 265 return false; 266 266 }