[netPanzer-CVS] netpanzer/src/NetPanzer Classes/UnitOpcodes.hpp...

[Ivo Danihelka]

CVSROOT:        /cvsroot/netpanzer
Module name:    netpanzer
Branch:         
Changes by:     Ivo Danihelka <address@hidden>  03/11/07 20:28:45

Modified files:
        src/NetPanzer/Classes: UnitOpcodes.hpp 
        src/NetPanzer/Classes/Units: Vehicle.cpp 
        src/NetPanzer/Interfaces: GameControlRulesDaemon.cpp 

Log message:
        Removed usage of QueueTemplate from UnitOpcodes

Patches:
Index: netpanzer/src/NetPanzer/Classes/UnitOpcodes.hpp
diff -u netpanzer/src/NetPanzer/Classes/UnitOpcodes.hpp:1.4 
netpanzer/src/NetPanzer/Classes/UnitOpcodes.hpp:1.5
--- netpanzer/src/NetPanzer/Classes/UnitOpcodes.hpp:1.4 Tue Sep 16 16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/UnitOpcodes.hpp     Fri Nov  7 20:28:45 2003
@@ -18,7 +18,7 @@
 #ifndef _UNITOPCODES_HPP
 #define _UNITOPCODES_HPP
 
-#include "QueueTemplate.hpp"
+#include <queue>
 
 enum { _unit_opcode_flag_sync = 0x01 };
 
@@ -38,7 +38,7 @@
 __attribute__((packed));
 
 
-typedef QueueTemplate< UnitOpcodeStruct > UnitOpcodeQueue;
+typedef std::queue< UnitOpcodeStruct > UnitOpcodeQueue;
 
 class UnitOpcode
 {
Index: netpanzer/src/NetPanzer/Classes/Units/Vehicle.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Vehicle.cpp:1.12 
netpanzer/src/NetPanzer/Classes/Units/Vehicle.cpp:1.13
--- netpanzer/src/NetPanzer/Classes/Units/Vehicle.cpp:1.12      Sun Oct  5 
09:50:13 2003
+++ netpanzer/src/NetPanzer/Classes/Units/Vehicle.cpp   Fri Nov  7 20:28:45 2003
@@ -55,9 +55,6 @@
     external_ai_event = _external_event_null;
     memset( fsm_active_list, 0, sizeof( bool ) * 7 );
 
-    opcode_queue.initialize( 25 );
-    move_opcode_queue.initialize( 25 );
-
     in_sync_flag = true;
 
     body_anim_shadow.setDrawModeBlend(&Palette::colorTableDarkenALot);
@@ -1809,15 +1806,16 @@
 {
     UnitOpcodeStruct opcode;
 
-    if ( move_opcode_queue.isReady() == true ) {
+    if (!move_opcode_queue.empty()) {
         if( fsm_active_list[ _control_move_map_square ] == false ) {
-            if ( move_opcode_queue.itemCount() >= 3 ) {
+            if ( move_opcode_queue.size() >= 3 ) {
                 for( int i = 0; i < 2; i++ ) {
-                    move_opcode_queue.dequeue();
+                    move_opcode_queue.pop();
                 }
                 //ConsoleInterface::postMessage( "Move Opcode Queue Adjusted" 
);
             }
-            opcode = move_opcode_queue.dequeue();
+            opcode = move_opcode_queue.front();
+            move_opcode_queue.pop();
             unitOpcodeMove( &opcode );
         }
     }
@@ -1830,50 +1828,50 @@
 
     processMoveOpcodeQueue();
 
-    if ( opcode_queue.isReady() ) {
-        opcode = opcode_queue.getFirst();
+    if (!opcode_queue.empty()) {
+        opcode = opcode_queue.front();
 
         switch( opcode.opcode ) {
 
         case _UNIT_OPCODE_TURRET_TRACK_POINT : {
                 unitOpcodeTrackPoint( &opcode );
-                opcode_queue.dequeue();
+                opcode_queue.pop();
             }
             break;
 
         case _UNIT_OPCODE_TURRET_TRACK_TARGET : {
                 unitOpcodeTrackTarget( &opcode );
-                opcode_queue.dequeue();
+                opcode_queue.pop();
             }
             break;
 
         case _UNIT_OPCODE_FIRE_WEAPON : {
                 unitOpcodeFireWeapon( &opcode );
-                opcode_queue.dequeue();
+                opcode_queue.pop();
             }
             break;
 
         case _UNIT_OPCODE_SYNC_UNIT : {
                 unitOpcodeSync( &opcode );
-                opcode_queue.dequeue();
+                opcode_queue.pop();
             }
             break;
 
         case _UNIT_OPCODE_UPDATE_STATE : {
                 unitOpcodeUpdateState( &opcode );
-                opcode_queue.dequeue();
+                opcode_queue.pop();
             }
             break;
 
         case _UNIT_OPCODE_DESTRUCT : {
                 unitOpcodeDestruct( &opcode );
-                opcode_queue.dequeue();
+                opcode_queue.pop();
             }
             break;
 
         } // ** switch
 
-    } // ** if opcode_queue.isReady()
+    } // ** if !opcode_queue.empty()
 }
 
 
@@ -1881,14 +1879,10 @@
 {
 
     if ( opcode->opcode == _UNIT_OPCODE_MOVE ) {
-        if ( move_opcode_queue.enqueue( *opcode ) == false ) {
-            LOG( ("ERROR : Move Opcode Queue Overwrite, Unit %d, %d", 
unit_id.getPlayer(), unit_id.getIndex() ) );
-        }
-    } else
-        if ( opcode_queue.enqueue( *opcode ) == false ) {
-            LOG( ("ERROR : Opcode Queue Overwrite, Unit %d, %d", 
unit_id.getPlayer(), unit_id.getIndex() ) );
-        }
-
+        move_opcode_queue.push( *opcode );
+    } else {
+        opcode_queue.push( *opcode );
+    }
 }
 
 
Index: netpanzer/src/NetPanzer/Interfaces/GameControlRulesDaemon.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameControlRulesDaemon.cpp:1.7 
netpanzer/src/NetPanzer/Interfaces/GameControlRulesDaemon.cpp:1.8
--- netpanzer/src/NetPanzer/Interfaces/GameControlRulesDaemon.cpp:1.7   Wed Oct 
22 09:19:30 2003
+++ netpanzer/src/NetPanzer/Interfaces/GameControlRulesDaemon.cpp       Fri Nov 
 7 20:28:45 2003
@@ -33,6 +33,7 @@
 
 #include "Desktop.hpp"
 #include "ProgressView.hpp"
+#include "Log.hpp"
 
 enum { _map_cycle_server_state_idle,
        _map_cycle_server_state_display_endgame_views,
@@ -193,6 +194,7 @@
 
                     MapsManager::cycleNextMapName( map_name );
                     gameconfig->map = map_name;
+                    LOGGER.info("Next Map: %s", map_name);
 
                     GameControlCycleMap cycle_map_mesg;
                     cycle_map_mesg.set( map_name );