Changeset 8858 for code/trunk/src/orxonox/gametypes/Gametype.cc
- Timestamp:
- Aug 23, 2011, 12:45:53 AM (13 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:ignore
-
old new 1 1 build 2 2 codeblocks 3 vs 3 4 dependencies
-
- Property svn:mergeinfo changed
/code/branches/output (added) merged: 8739-8740,8765,8771-8772,8774-8780,8787-8789,8794-8799,8801,8803-8812,8814,8816-8817,8820,8822,8825-8837,8840,8844,8846,8848-8850,8853-8854
- Property svn:ignore
-
code/trunk/src/orxonox/gametypes/Gametype.cc
r8706 r8858 297 297 } 298 298 else 299 COUT(2) << "Warning: Killed Pawn was not in the playerlist" << std::endl;299 orxout(internal_warning) << "Killed Pawn was not in the playerlist" << endl; 300 300 } 301 301 } … … 344 344 } 345 345 346 COUT(2) << "Warning: Fallback SpawnPoint was used,because there were no active SpawnPoints." << endl;346 orxout(internal_warning) << "Fallback SpawnPoint was used because there were no active SpawnPoints." << endl; 347 347 return fallbackSpawnPoint; 348 348 } … … 444 444 else 445 445 { 446 COUT(1) << "Error: No SpawnPoints in current Gametype" << std::endl;446 orxout(user_error) << "No SpawnPoints in current Gametype" << endl; 447 447 abort(); 448 448 } … … 461 461 else 462 462 { 463 COUT(1) << "Error: No SpawnPoints in current Gametype" << std::endl;463 orxout(user_error) << "No SpawnPoints in current Gametype" << endl; 464 464 abort(); 465 465 }
Note: See TracChangeset
for help on using the changeset viewer.