← Back to team overview

widelands-dev team mailing list archive

[Merge] lp:~hjd/widelands/noise into lp:widelands

 

Hans Joachim Desserud has proposed merging lp:~hjd/widelands/noise into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1128024 in widelands: "Some way to silence most of the output"
  https://bugs.launchpad.net/widelands/+bug/1128024

For more details, see:
https://code.launchpad.net/~hjd/widelands/noise/+merge/195512

Removed/comment out some logging to reduce the output printed in the terminal.

The logging around trainingssites is fairly new, so I wasn't sure whether to remove it completely or leave it in, in case we need to turn it on. (Furthermore, I don't know whether WL has a policy on small sections of commented out code vs "if people really want it, it's in the history") 
-- 
https://code.launchpad.net/~hjd/widelands/noise/+merge/195512
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/noise into lp:widelands.
=== modified file 'src/logic/replay.cc'
--- src/logic/replay.cc	2013-07-26 20:19:36 +0000
+++ src/logic/replay.cc	2013-11-17 13:31:20 +0000
@@ -71,8 +71,6 @@
 
 			// There has to be a better way to do this.
 			game.gameController()->setDesiredSpeed(0);
-		} else {
-			log("REPLAY: Sync checked successfully.\n");
 		}
 	}
 

=== modified file 'src/logic/trainingsite.cc'
--- src/logic/trainingsite.cc	2013-09-23 18:47:02 +0000
+++ src/logic/trainingsite.cc	2013-11-17 13:31:20 +0000
@@ -770,7 +770,7 @@
 TrainingSite::trainingDone()
 {
 	TrainFailCount_t::iterator it;
-	log("TrainingSite::trainingDone() ");
+	// log("TrainingSite::trainingDone() ");
 	for (it = training_failure_count.begin(); it != training_failure_count.end(); it++)
 	{
 		// If a soldier is present at this training level, deteoriate
@@ -782,9 +782,9 @@
 		else // If no soldier, let's become optimistic
 		if (0 < it->second.first)
 			it->second.first--;
-		log("%d.%d %3d || ", it->first.first, it->first.second, it->second.first);
+		// log("%d.%d %3d || ", it->first.first, it->first.second, it->second.first);
 	}
-	log(" / %3d\n", max_stall_val);
+	// log(" / %3d\n", max_stall_val);
 }
 
 }