Merge branch 'master' into drunk

2016-12-04 06:55:05 +11:00
parent c553d79439 398ccd5b3f
commit 81aa469595
3 changed files with 3 additions and 1 deletions
@@ -213,7 +213,7 @@ void RoomData::RunFrameCharacterBarrierCollisions() {


 				//DEBUG: output barrierIndex, battleIndex
-				std::cout << barrierIt.first << "\t" << barrierIt.second.GetBattleIndex() << std::endl;
+//				std::cout << barrierIt.first << "\t" << barrierIt.second.GetBattleIndex() << std::endl;

 				//Send the entry message to the client
 				BarrierPacket newPacket;