[netPanzer-CVS] netpanzer/src ChangeLog Lib/2D/PackedSurface.cp...

[Ivo Danihelka]

CVSROOT:        /cvsroot/netpanzer
Module name:    netpanzer
Branch:         
Changes by:     Ivo Danihelka <address@hidden>  03/09/16 12:54:50

Modified files:
        src            : ChangeLog 
        src/Lib/2D     : PackedSurface.cpp 
        src/NetPanzer/Classes: PlayerState.hpp SpriteSorter.cpp 
        src/NetPanzer/Interfaces: GameConfig.hpp PlayerInterface.cpp 
        src/NetPanzer/Views/Game: VehicleSelectionView.cpp 

Log message:
        cleaning code with valgrind

Patches:
Index: netpanzer/src/ChangeLog
diff -u netpanzer/src/ChangeLog:1.24 netpanzer/src/ChangeLog:1.25
--- netpanzer/src/ChangeLog:1.24        Mon Sep 15 17:42:15 2003
+++ netpanzer/src/ChangeLog     Tue Sep 16 12:54:50 2003
@@ -1,3 +1,8 @@
+16-Sep-2003 by Ivo Danihelka
+-Alt+Enter don't start chat now
+-'d' display damage
+-cleaning code with valgrind
+
 15-Sep-2003 by Matthias Braun
 -removed the GetConnectionTypeView menu. We're only using tcp/ip.
 -made the Join view working again
Index: netpanzer/src/Lib/2D/PackedSurface.cpp
diff -u netpanzer/src/Lib/2D/PackedSurface.cpp:1.9 
netpanzer/src/Lib/2D/PackedSurface.cpp:1.10
--- netpanzer/src/Lib/2D/PackedSurface.cpp:1.9  Sat Sep 13 18:38:21 2003
+++ netpanzer/src/Lib/2D/PackedSurface.cpp      Tue Sep 16 12:54:50 2003
@@ -481,7 +481,7 @@
        iXY srcMin;
        if (destX < 0) {
                srcMin.x = -destX;
-               if (srcMin >= pix.x) return; // off left
+               if (srcMin.x >= pix.x) return; // off left
                needClipX = 1;
        } else {
                srcMin.x = 0;
Index: netpanzer/src/NetPanzer/Classes/PlayerState.hpp
diff -u netpanzer/src/NetPanzer/Classes/PlayerState.hpp:1.4 
netpanzer/src/NetPanzer/Classes/PlayerState.hpp:1.5
--- netpanzer/src/NetPanzer/Classes/PlayerState.hpp:1.4 Wed Sep 10 08:03:17 2003
+++ netpanzer/src/NetPanzer/Classes/PlayerState.hpp     Tue Sep 16 12:54:50 2003
@@ -48,7 +48,8 @@
 
    void setName( const char *player_name )
     {
-     strcpy( name, player_name );
+     strncpy(name, player_name, 64);
+     name[63] = '\0';
     }
 
    void setID( PlayerID player_id )
Index: netpanzer/src/NetPanzer/Classes/SpriteSorter.cpp
diff -u netpanzer/src/NetPanzer/Classes/SpriteSorter.cpp:1.6 
netpanzer/src/NetPanzer/Classes/SpriteSorter.cpp:1.7
--- netpanzer/src/NetPanzer/Classes/SpriteSorter.cpp:1.6        Wed Sep 10 
09:20:57 2003
+++ netpanzer/src/NetPanzer/Classes/SpriteSorter.cpp    Tue Sep 16 12:54:50 2003
@@ -60,7 +60,6 @@
   for ( i = 0; i < 3; i++ )
    {
     sprite_lists[i].resize(50);    
-       list_counts[i] = 0;
    }
 
   sprite_lists[3].resize(500);
@@ -70,11 +69,11 @@
   for ( i = 6; i < _MAX_HEIGHT_LEVELS; i++ )
    {
     sprite_lists[i].resize(50);
-    list_counts[i] = 0;
    }
 
   for ( i = 0; i < _MAX_HEIGHT_LEVELS; i++ )
    {
+    list_counts[i] = 0;
     max_sprite_stats[i] = 0;
    }
 }
@@ -98,18 +97,9 @@
 
 void SpriteSorter::addSprite(Sprite *sprite)
 {
-       unsigned char height;
-  
        if ( sprite->isVisible( world_window ) )
        {
-               height = sprite->getHeight();
-       
-               assert( height < _MAX_HEIGHT_LEVELS );
-        
-               if(sprite_lists[height].size() < list_counts[height])
-                       sprite_lists[height].resize(list_counts[height]);
-               sprite_lists[height] [list_counts[height]] = sprite;
-               list_counts[ height ]++;
+               forceAddSprite(sprite);
        } 
 }
  
@@ -121,8 +111,8 @@
        
        assert( height < _MAX_HEIGHT_LEVELS );
 
-       if(sprite_lists[height].size() < list_counts[height])
-               sprite_lists[height].resize(list_counts[height]);
+       if(sprite_lists[height].size() <= list_counts[height])
+               sprite_lists[height].resize(1 + list_counts[height]);
        sprite_lists[height] [list_counts[height]] = sprite;
   
        list_counts[ height ]++;
Index: netpanzer/src/NetPanzer/Interfaces/GameConfig.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameConfig.hpp:1.5 
netpanzer/src/NetPanzer/Interfaces/GameConfig.hpp:1.6
--- netpanzer/src/NetPanzer/Interfaces/GameConfig.hpp:1.5       Wed Sep 10 
08:32:54 2003
+++ netpanzer/src/NetPanzer/Interfaces/GameConfig.hpp   Tue Sep 16 12:54:50 2003
@@ -377,7 +377,9 @@
         { return (_GAME_CONFIG_INITIAL_UNIT_LIMIT_LOWER ); }
 
        static inline void SetPlayerName(const char *player_name)
-       {       memmove(PlayerName, player_name, 64);}
+       {       strncpy(PlayerName, player_name, 64);
+               PlayerName[63] = '\0';
+       }
 
        static inline char *GetPlayerName()
        {       return(PlayerName);}
Index: netpanzer/src/NetPanzer/Interfaces/PlayerInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/PlayerInterface.cpp:1.5 
netpanzer/src/NetPanzer/Interfaces/PlayerInterface.cpp:1.6
--- netpanzer/src/NetPanzer/Interfaces/PlayerInterface.cpp:1.5  Wed Sep 10 
08:32:54 2003
+++ netpanzer/src/NetPanzer/Interfaces/PlayerInterface.cpp      Tue Sep 16 
12:54:50 2003
@@ -83,7 +83,7 @@
 void PlayerInterface::cleanUp( void )
  {
   delete [ ] player_lists;
-  delete( alliance_matrix );
+  delete [] alliance_matrix;
   max_players = 0;
  }
 
Index: netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.cpp:1.6 
netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.cpp:1.7
--- netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.cpp:1.6     Wed Sep 
10 08:32:55 2003
+++ netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.cpp Tue Sep 16 
12:54:50 2003
@@ -495,6 +495,13 @@
        unitImages.setFrame(i++);
        unitImages.fill(Color::blue);
 
+       maxHitPoints = 1;
+       maxAttackFactor = 1;
+       maxAttackRange = 1;
+       maxDefendRange = 1;
+       maxTotalSpeed = 1;
+       maxReloadTime = 1;
+       maxRegenTime = 1;
        getProfileData();
 
        highlightedUnitType = 0;