Changeset 8858 for code/trunk/src/orxonox/gametypes/TeamBaseMatch.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/TeamBaseMatch.cc
r8327 r8858 141 141 return; 142 142 143 COUT(0) << "Points standing:" << std::endl << "Team 1: "<< pointsTeam1_ << std::endl << "Team 2: " << pointsTeam2_ << std::endl;144 if(pointsTeam1_ >=1700 && pointsTeam1_ < 2000) COUT(0) << "Team 1 is near victory!" << std::endl;145 if(pointsTeam2_ >=1700 && pointsTeam2_ < 2000) COUT(0) << "Team 2 is near victory!" << std::endl;143 orxout(message) << "Points standing:" << '\n' << "Team 1: "<< pointsTeam1_ << '\n' << "Team 2: " << pointsTeam2_ << endl; 144 if(pointsTeam1_ >=1700 && pointsTeam1_ < 2000) orxout(message) << "Team 1 is near victory!" << endl; 145 if(pointsTeam2_ >=1700 && pointsTeam2_ < 2000) orxout(message) << "Team 2 is near victory!" << endl; 146 146 } 147 147 … … 179 179 if (this->pointsTeam1_ > this->pointsTeam2_) 180 180 { 181 COUT(0) << "Team 1 has won the match" << std::endl;181 orxout(message) << "Team 1 has won the match" << endl; 182 182 winningteam = 0; 183 183 } 184 184 else 185 185 { 186 COUT(0) << "Team 2 has won the match" << std::endl;186 orxout(message) << "Team 2 has won the match" << endl; 187 187 winningteam = 1; 188 188 }
Note: See TracChangeset
for help on using the changeset viewer.