[Feuerkraft-CVS] rev 323 - in trunk/src: . groundmap

[Ingo Ruhnke]

Author: grumbel
Date: 2003-12-11 03:00:33 +0100 (Thu, 11 Dec 2003)
New Revision: 323

Modified:
   trunk/src/command_line_arguments.hxx
   trunk/src/game_session.cxx
   trunk/src/groundmap/grid_tile_generator.cxx
   trunk/src/keyboard_manager.cxx
Log:
- minor cleanup

Modified: trunk/src/command_line_arguments.hxx
===================================================================
--- trunk/src/command_line_arguments.hxx        2003-12-11 01:36:40 UTC (rev 
322)
+++ trunk/src/command_line_arguments.hxx        2003-12-11 02:00:33 UTC (rev 
323)
@@ -65,6 +65,8 @@
   void parse_arguments(int argc, char** argv);
 };
 
+extern CommandLineArguments* args;
+
 #endif
 
 /* EOF */

Modified: trunk/src/game_session.cxx
===================================================================
--- trunk/src/game_session.cxx  2003-12-11 01:36:40 UTC (rev 322)
+++ trunk/src/game_session.cxx  2003-12-11 02:00:33 UTC (rev 323)
@@ -63,7 +63,6 @@
 
 // FIXME: Replace this with a PlayerManager class or something similar
 Player*  player;
-extern CommandLineArguments* args;
 
 GameSession::GameSession(const std::string& arg_filename)
   : control_state(UNIT_CONTROL),

Modified: trunk/src/groundmap/grid_tile_generator.cxx
===================================================================
--- trunk/src/groundmap/grid_tile_generator.cxx 2003-12-11 01:36:40 UTC (rev 
322)
+++ trunk/src/groundmap/grid_tile_generator.cxx 2003-12-11 02:00:33 UTC (rev 
323)
@@ -18,6 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <iostream>
+#include "../command_line_arguments.hxx"
 #include "grid_tile.hxx"
 #include "grid_tile_generator.hxx"
 
@@ -164,7 +165,8 @@
       else
        {
          // The tile list is empty, no tile available
-          std::cout << "GridTileGenerator: Warning: Tile: " << data << " 
missing" << std::endl;
+          if (args->verbose)
+            std::cout << "GridTileGenerator: Warning: Tile: " << data << " 
missing" << std::endl;
           return 0;
        }
     }

Modified: trunk/src/keyboard_manager.cxx
===================================================================
--- trunk/src/keyboard_manager.cxx      2003-12-11 01:36:40 UTC (rev 322)
+++ trunk/src/keyboard_manager.cxx      2003-12-11 02:00:33 UTC (rev 323)
@@ -24,7 +24,6 @@
 #include "command_line_arguments.hxx"
 #include "keyboard_manager.hxx"
 
-extern CommandLineArguments* args;
 KeyboardManager* KeyboardManager::instance_ = 0;
 
 KeyboardManager::KeyboardManager()