[netPanzer-CVS] netpanzer/src/NetPanzer/Interfaces GameControlR...

[Ivo Danihelka]

CVSROOT:        /cvsroot/netpanzer
Module name:    netpanzer
Branch:         
Changes by:     Ivo Danihelka <address@hidden>  03/10/20 19:55:06

Modified files:
        src/NetPanzer/Interfaces: GameControlRulesDaemon.cpp 
                                  GameManager.cpp GameManager.hpp 

Log message:
        Fixed Objective goal.
        Removed old duplicited code.

Patches:
Index: netpanzer/src/NetPanzer/Interfaces/GameControlRulesDaemon.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameControlRulesDaemon.cpp:1.5 
netpanzer/src/NetPanzer/Interfaces/GameControlRulesDaemon.cpp:1.6
--- netpanzer/src/NetPanzer/Interfaces/GameControlRulesDaemon.cpp:1.5   Sat Oct 
 4 10:44:38 2003
+++ netpanzer/src/NetPanzer/Interfaces/GameControlRulesDaemon.cpp       Mon Oct 
20 19:55:04 2003
@@ -374,7 +374,7 @@
 
         case _gametype_objective : {
                 if ( PlayerInterface::testRuleObjectiveRatio(
-                            gameconfig->objectiveoccupationpercentage, 
&player_state ) == true ) {
+                            gameconfig->objectiveoccupationpercentage / 100.0, 
&player_state ) == true ) {
                     onObjectiveGameCompleted( );
                 }
             }
Index: netpanzer/src/NetPanzer/Interfaces/GameManager.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.62 
netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.63
--- netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.62     Mon Oct 13 
10:30:16 2003
+++ netpanzer/src/NetPanzer/Interfaces/GameManager.cpp  Mon Oct 20 19:55:05 2003
@@ -795,83 +795,6 @@
 
 // ******************************************************************
 
-void GameManager::fraglimitGameCompleted( PlayerState *winner_player_state )
-{
-    SystemViewControl view_control;
-
-    view_control.set( "WinnerMesgView", _view_control_flag_visible_on | 
_view_control_flag_close_all );
-
-    Desktop::setVisibilityAllWindows(false);
-    Desktop::setVisibility("GameView", true);
-    Desktop::setVisibility( "WinnerMesgView", true );
-
-    SERVER->sendMessage( &view_control, sizeof( SystemViewControl ), 0 );
-
-    game_state = _game_state_completed;
-}
-
-void GameManager::objectiveGameCompleted( PlayerState *winner_player_state )
-{
-    SystemViewControl view_control;
-
-    view_control.set( "WinnerMesgView", _view_control_flag_visible_on | 
_view_control_flag_close_all );
-
-    Desktop::setVisibilityAllWindows(false);
-    Desktop::setVisibility("GameView", true);
-    Desktop::setVisibility( "WinnerMesgView", true );
-
-    SERVER->sendMessage( &view_control, sizeof( SystemViewControl ), 0 );
-
-    game_state = _game_state_completed;
-}
-
-// ******************************************************************
-void GameManager::evaluateGameRules()
-{
-    PlayerState *player_state;
-
-    if ( game_state == _game_state_in_progress ) {
-        if ( NetworkState::status == _network_state_server ) {
-            unsigned char game_type;
-            game_type = gameconfig->gametype;
-
-            switch( game_type ) {
-
-            case _gametype_fraglimit : {
-                    if ( 
PlayerInterface::testRuleScoreLimit(gameconfig->fraglimit, &player_state ) == 
true ) {
-                        fraglimitGameCompleted( player_state );
-                    }
-                }
-                break;
-
-            case _gametype_objective : {
-                    if ( PlayerInterface::testRuleObjectiveRatio(
-                                gameconfig->objectiveoccupationpercentage, 
&player_state ) == true ) {
-                        objectiveGameCompleted( player_state );
-                    }
-                }
-                break;
-
-            } // ** switch
-
-            // ** Check for Player Respawns **
-            bool respawn_rule_complete = false;
-            while( respawn_rule_complete == false ) {
-                if ( PlayerInterface::testRulePlayerRespawn( 
&respawn_rule_complete, &player_state ) ) {
-                    spawnPlayer( player_state );
-                } // ** if testRulePlayerRespawn
-
-            } // ** while
-
-
-        } // ** if NetworkState::status == _network_state_server
-    }
-
-
-}
-
-// ******************************************************************
-
 void GameManager::netMessageSetView( NetMessage *message )
 {
     SystemSetPlayerView *set_view;
@@ -1462,7 +1385,6 @@
     ParticleSystem2D::simAll();
     Particle2D::simAll();
 
-    //evaluateGameRules();
     GameControlRulesDaemon::updateGameControlFlow();
 }
 
@@ -1541,7 +1463,6 @@
 
     Physics::sim();
 
-    //evaluateGameRules();
     GameControlRulesDaemon::updateGameControlFlow();
 }
 
Index: netpanzer/src/NetPanzer/Interfaces/GameManager.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameManager.hpp:1.15 
netpanzer/src/NetPanzer/Interfaces/GameManager.hpp:1.16
--- netpanzer/src/NetPanzer/Interfaces/GameManager.hpp:1.15     Sat Oct  4 
10:44:38 2003
+++ netpanzer/src/NetPanzer/Interfaces/GameManager.hpp  Mon Oct 20 19:55:05 2003
@@ -124,9 +124,6 @@
     // ** Game Rules Methods
     static void spawnPlayer( PlayerState *player_state );
     static void respawnAllPlayers();
-    static void fraglimitGameCompleted( PlayerState *winner_player_state );
-    static void objectiveGameCompleted( PlayerState *winner_player_state );
-    static void evaluateGameRules();
 
     // ** Network Message Handlers
     static void netMessageSetView( NetMessage *message );