mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-21 07:31:21 +02:00
Code Issues Projects Releases Wiki Activity

- added wxWidgets version info to g3d viewer help and map editor

Browse Source 
- added a log entry if sound thread starts to log
This commit is contained in:
Mark Vejvoda
2011-01-29 21:20:33 +00:00
parent 7d09f24b9e
commit f2467faebe
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/g3d_viewer/main.cpp
View File

@@ -116,7 +116,7 @@ void printParameterHelp(const char *argv0, bool foundInvalidArgs) {
printf("\n"); 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("\n%s [G3D FILE]\n\n",argv0);
printf("Displays glest 3D-models and unit/projectile/splash particle systems.\n"); printf("Displays glest 3D-models and unit/projectile/splash particle systems.\n");

3
source/glest_game/main/program.cpp
View File

@@ -288,6 +288,9 @@ void Program::loopWorker() {
//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s %d]\n",__FILE__,__FUNCTION__,__LINE__); //SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s %d]\n",__FILE__,__FUNCTION__,__LINE__);
if(soundThreadManager == NULL || soundThreadManager->isThreadExecutionLagging()) { 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(); 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) 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(); if(chronoUpdateLoop.getMillis() > 0) chronoUpdateLoop.start();

3
source/glest_map_editor/main.cpp
View File

@@ -1176,12 +1176,13 @@ bool App::OnInit() {
string fileparam; string fileparam;
if(argc==2){ if(argc==2){
if(argv[1][0]=='-') { // any flag gives help and exits program. 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 << "glest_map_editor [GBM OR MGM FILE]" << std::endl << std::endl;
std::cout << "Creates or edits glest/megaglest maps." << 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 << "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 << "Pan trough the map with right mouse button" << std::endl;
std::cout << "Zoom with middle mouse button or mousewheel" << 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 << " ~ more helps should be written here ~" << std::endl;
std::cout << std::endl; std::cout << std::endl;
exit (0); exit (0);