[netPanzer-CVS] netpanzer/src/NetPanzer/Classes WorldInputCmdPr...

[Ivo Danihelka]

CVSROOT:        /cvsroot/netpanzer
Module name:    netpanzer
Branch:         
Changes by:     Ivo Danihelka <address@hidden>  03/09/16 10:29:37

Modified files:
        src/NetPanzer/Classes: WorldInputCmdProcessor.cpp 
                               WorldInputCmdProcessor.hpp 

Log message:
        'd' display damage, cleaner code

Patches:
Index: netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp
diff -u netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.15 
netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.16
--- netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.15     Tue Sep 
16 10:13:58 2003
+++ netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp  Tue Sep 16 
10:29:37 2003
@@ -63,7 +63,6 @@
        _keyboard_input_mode_allie_mesg,
      };
 
-bool WorldInputCmdProcessor::unit_flag_visibility_state = false;
 short WorldInputCmdProcessor::selected_objective_id = 0;
 
 WorldInputCmdProcessor::WorldInputCmdProcessor()
@@ -235,15 +234,6 @@
   WorldViewInterface::setCameraPosition( world_pos );   
  } 
 
-void WorldInputCmdProcessor::toggleUnitFlagVisibility( void )
- {
-  if ( GameConfig::getDisplayUnitFlags() == true )
-   { GameConfig::setDisplayUnitFlags( false ); }
-  else
-   { GameConfig::setDisplayUnitFlags( true ); } 
- }
-
-
 void WorldInputCmdProcessor::getManualControlStatus( void )
  { 
   if ( KeyboardInterface::getKeyState( SDLK_LCTRL ) ||
@@ -267,8 +257,12 @@
   if ( (KeyboardInterface::getKeyPressed( SDLK_o ) == true) )
    { toggleDisplayOutpostNames();  }
 
-  if ( (KeyboardInterface::getKeyPressed( SDLK_f ) == true) )
-   { toggleUnitFlagVisibility();  }
+  if ( (KeyboardInterface::getKeyPressed( SDLK_f ) == true) ) { 
+   GameConfig::toggleDisplayUnitFlags();
+  }
+  if ( (KeyboardInterface::getKeyPressed( SDLK_d ) == true) ) { 
+   GameConfig::toggleDrawUnitDamage();
+  }
 
   if ( (KeyboardInterface::getKeyPressed( SDLK_RETURN ) == true)
                  && (KeyboardInterface::getKeyState( SDLK_LALT ) == false)
Index: netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.hpp
diff -u netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.hpp:1.4 
netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.hpp:1.5
--- netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.hpp:1.4      Wed Sep 
10 08:32:53 2003
+++ netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.hpp  Tue Sep 16 
10:29:37 2003
@@ -51,9 +51,6 @@
    unsigned long unit_cycle_search_iterator;
    void cycleNextUnitAndChangeFocus( void ); 
    
-   static bool unit_flag_visibility_state;
-   void toggleUnitFlagVisibility( void );
-
    unsigned char getCursorStatus( iXY &loc ); 
    void setMouseCursor( unsigned char world_cursor_status );