From f2467faebe2e4b65a5c87c04e452ca678529765c Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Sat, 29 Jan 2011 21:20:33 +0000
Subject: [PATCH] - added wxWidgets version info to g3d viewer help and map
 editor - added a log entry if sound thread starts to log

---
 source/g3d_viewer/main.cpp         | 2 +-
 source/glest_game/main/program.cpp | 3 +++
 source/glest_map_editor/main.cpp   | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/source/g3d_viewer/main.cpp b/source/g3d_viewer/main.cpp
index 11964fa78..92f6fe953 100644
--- a/source/g3d_viewer/main.cpp
+++ b/source/g3d_viewer/main.cpp
@@ -116,7 +116,7 @@ void printParameterHelp(const char *argv0, bool foundInvalidArgs) {
 			printf("\n");
 	}
 
-	printf("\n%s %s, usage\n",argv0,g3dviewerVersionString.c_str());
+	printf("\n%s %s, [Using %s] usage:\n",argv0,g3dviewerVersionString.c_str(),(const char *)wxConvCurrent->cWX2MB(wxVERSION_STRING));
 
 	printf("\n%s [G3D FILE]\n\n",argv0);
 	printf("Displays glest 3D-models and unit/projectile/splash particle systems.\n");
diff --git a/source/glest_game/main/program.cpp b/source/glest_game/main/program.cpp
index 504f5abd3..21dcf1be8 100644
--- a/source/glest_game/main/program.cpp
+++ b/source/glest_game/main/program.cpp
@@ -288,6 +288,9 @@ void Program::loopWorker() {
 			//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s %d]\n",__FILE__,__FUNCTION__,__LINE__);
 
 			if(soundThreadManager == NULL || soundThreadManager->isThreadExecutionLagging()) {
+				SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s %d] ERROR / WARNING soundThreadManager->isThreadExecutionLagging is TRUE\n",__FILE__,__FUNCTION__,__LINE__);
+				SystemFlags::OutputDebug(SystemFlags::debugError,"In [%s::%s %d] ERROR / WARNING soundThreadManager->isThreadExecutionLagging is TRUE\n",__FILE__,__FUNCTION__,__LINE__);
+
 				SoundRenderer::getInstance().update();
 				if(chronoUpdateLoop.getMillis() > 0) SystemFlags::OutputDebug(SystemFlags::debugPerformance,"In [%s::%s Line: %d] SoundRenderer::getInstance().update() took msecs: %lld, updateCount = %d\n",__FILE__,__FUNCTION__,__LINE__,chronoUpdateLoop.getMillis(),updateCount);
 				if(chronoUpdateLoop.getMillis() > 0) chronoUpdateLoop.start();
diff --git a/source/glest_map_editor/main.cpp b/source/glest_map_editor/main.cpp
index 17a2b4aa2..44d2b3a2f 100755
--- a/source/glest_map_editor/main.cpp
+++ b/source/glest_map_editor/main.cpp
@@ -1176,12 +1176,13 @@ bool App::OnInit() {
 	string fileparam;
 	if(argc==2){
 		if(argv[1][0]=='-') {   // any flag gives help and exits program.
-			std::cout << "MegaGlest map editor " << mapeditorVersionString << std::endl << std::endl;
+			std::cout << "MegaGlest map editor " << mapeditorVersionString << " [Using " << (const char *)wxConvCurrent->cWX2MB(wxVERSION_STRING) << "]" << std::endl << std::endl;
 			std::cout << "glest_map_editor [GBM OR MGM FILE]" << std::endl << std::endl;
 			std::cout << "Creates or edits glest/megaglest maps."  << std::endl;
 			std::cout << "Draw with left mouse button (select what and how large area in menu or toolbar)"  << std::endl;
 			std::cout << "Pan trough the map with right mouse button"  << std::endl;
 			std::cout << "Zoom with middle mouse button or mousewheel"  << std::endl;
+
 //			std::cout << " ~ more helps should be written here ~"  << std::endl;
 			std::cout << std::endl;
 			exit (0);