[netPanzer-CVS] netpanzer/src Lib/Exception.hpp Lib/2D/ColorTab...

[Ivo Danihelka]

CVSROOT:        /cvsroot/netpanzer
Module name:    netpanzer
Branch:         
Changes by:     Ivo Danihelka <address@hidden>  03/09/15 18:56:34

Modified files:
        src/Lib        : Exception.hpp 
        src/Lib/2D     : ColorTable.cpp Surface.cpp 
        src/NetPanzer/Classes: PlacementMatrix.cpp 
        src/NetPanzer/Classes/Network: NetPacketQueues.cpp 
        src/UILib/Network: ServerSocket.cpp 
        src/UILib/SDL  : SDLSound.cpp 

Log message:
        Fixed minor bugs in format strings

Patches:
Index: netpanzer/src/Lib/2D/ColorTable.cpp
diff -u netpanzer/src/Lib/2D/ColorTable.cpp:1.11 
netpanzer/src/Lib/2D/ColorTable.cpp:1.12
--- netpanzer/src/Lib/2D/ColorTable.cpp:1.11    Fri Sep 12 10:12:45 2003
+++ netpanzer/src/Lib/2D/ColorTable.cpp Mon Sep 15 18:56:33 2003
@@ -117,8 +117,8 @@
                        loadTable(filename);
                        return;
                } catch(Exception e) {
-                       LOG( ("Error while loading palette '%s': %s", filename, 
e.getMessage(),
-                                 e.getMessage()) );
+                       LOG( ("Error while loading palette '%s': %s", filename,
+                                               e.getMessage()) );
                }
        }
        
Index: netpanzer/src/Lib/2D/Surface.cpp
diff -u netpanzer/src/Lib/2D/Surface.cpp:1.21 
netpanzer/src/Lib/2D/Surface.cpp:1.22
--- netpanzer/src/Lib/2D/Surface.cpp:1.21       Sat Sep 13 21:03:15 2003
+++ netpanzer/src/Lib/2D/Surface.cpp    Mon Sep 15 18:56:33 2003
@@ -1377,10 +1377,10 @@
        fread(&head, sizeof(PIC_HEAD), 1, fp);
 
        LOG(("loadRAW -> picName: %s", filename));
-       LOG(("head.xPix:          %u", head.xPix));
-       LOG(("head.yPix:          %u", head.yPix));
-       LOG(("head.frameCount:     %u", head.frameCount));
-       LOG(("head.numBytes:      %u", head.xPix*head.yPix*head.frameCount));
+       LOG(("head.xPix:          %lu", head.xPix));
+       LOG(("head.yPix:          %lu", head.yPix));
+       LOG(("head.frameCount:     %lu", head.frameCount));
+       LOG(("head.numBytes:      %lu", head.xPix*head.yPix*head.frameCount));
 
        if (ferror(fp))
        {
Index: netpanzer/src/Lib/Exception.hpp
diff -u netpanzer/src/Lib/Exception.hpp:1.3 netpanzer/src/Lib/Exception.hpp:1.4
--- netpanzer/src/Lib/Exception.hpp:1.3 Fri Sep 12 10:12:45 2003
+++ netpanzer/src/Lib/Exception.hpp     Mon Sep 15 18:56:33 2003
@@ -18,7 +18,7 @@
 #ifndef __SOCKET_EXCEPTION_H__
 #define __SOCKET_EXCEPTION_H__
 
-#include <stdarg.h>
+#include <config.h>
 
 class Exception
 {
Index: netpanzer/src/NetPanzer/Classes/Network/NetPacketQueues.cpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetPacketQueues.cpp:1.4 
netpanzer/src/NetPanzer/Classes/Network/NetPacketQueues.cpp:1.5
--- netpanzer/src/NetPanzer/Classes/Network/NetPacketQueues.cpp:1.4     Sat Sep 
 6 11:18:18 2003
+++ netpanzer/src/NetPanzer/Classes/Network/NetPacketQueues.cpp Mon Sep 15 
18:56:34 2003
@@ -85,7 +85,7 @@
    { 
     if( array[ insert_index ].sequence != packet_sequence_num )
      {
-      LOG( ("*** REORDER QUEUE OVERFLOW Packet %d Current %d ***", 
packet_sequence_num, current_sequence_num ) );
+      LOG( ("*** REORDER QUEUE OVERFLOW Packet %lu Current %d ***", 
packet_sequence_num, current_sequence_num ) );
       //ConsoleInterface::postMessage( "*** REORDER QUEUE OVERFLOW Packet %d 
Current %d ***", packet_sequence_num, current_sequence_num  );
       while( (dequeue_sequence_num % size) != (insert_index + 1) )
        { 
Index: netpanzer/src/NetPanzer/Classes/PlacementMatrix.cpp
diff -u netpanzer/src/NetPanzer/Classes/PlacementMatrix.cpp:1.4 
netpanzer/src/NetPanzer/Classes/PlacementMatrix.cpp:1.5
--- netpanzer/src/NetPanzer/Classes/PlacementMatrix.cpp:1.4     Wed Sep 10 
08:32:52 2003
+++ netpanzer/src/NetPanzer/Classes/PlacementMatrix.cpp Mon Sep 15 18:56:33 2003
@@ -33,7 +33,6 @@
 bool PlacementMatrix::verifyLocation( iXY &loc )
  {
   long x_offset, y_offset;
-  long free_count = 0; 
   iXY succ;
   unsigned long direction_index;
 
@@ -67,14 +66,11 @@
         ( UnitBlackBoard::unitOccupiesLoc( succ ) == false ) 
          )
     {
-        free_count++;
+               return true;
        }
 
    }   
    
-  if ( free_count > 0 )
-   return( true );
-
   return ( false );
  }
 
Index: netpanzer/src/UILib/Network/ServerSocket.cpp
diff -u netpanzer/src/UILib/Network/ServerSocket.cpp:1.3 
netpanzer/src/UILib/Network/ServerSocket.cpp:1.4
--- netpanzer/src/UILib/Network/ServerSocket.cpp:1.3    Mon Sep  8 17:25:09 2003
+++ netpanzer/src/UILib/Network/ServerSocket.cpp        Mon Sep 15 18:56:34 2003
@@ -329,7 +329,7 @@
                        < (int) datasize)
        {
                clientlist->remove(client);
-               throw Exception("Error while sending to client %lu: %s", 
client->id,
+               throw Exception("Error while sending to client %d: %s", 
client->id,
                                SDLNet_GetError());
        }
 }
Index: netpanzer/src/UILib/SDL/SDLSound.cpp
diff -u netpanzer/src/UILib/SDL/SDLSound.cpp:1.8 
netpanzer/src/UILib/SDL/SDLSound.cpp:1.9
--- netpanzer/src/UILib/SDL/SDLSound.cpp:1.8    Sun Sep 14 14:04:21 2003
+++ netpanzer/src/UILib/SDL/SDLSound.cpp        Mon Sep 15 18:56:34 2003
@@ -29,7 +29,6 @@
 #include "Exception.hpp"
 #include "FileSystem.hpp"
 #include "SDLSound.hpp"
-#include "FileSystem.hpp"
 
 musics_t SDLSound::musicfiles;
 musics_t::iterator SDLSound::currentsong;