netpanzer-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[netPanzer-CVS] netpanzer ./ChangeLog ./BUGS src/NetPanzer/Clas...


From: Matthias Braun
Subject: [netPanzer-CVS] netpanzer ./ChangeLog ./BUGS src/NetPanzer/Clas...
Date: Fri, 07 Nov 2003 04:38:41 -0500

CVSROOT:        /cvsroot/netpanzer
Module name:    netpanzer
Branch:         
Changes by:     Matthias Braun <address@hidden> 03/11/07 04:38:41

Modified files:
        .              : ChangeLog BUGS 
        src/NetPanzer/Classes: UnitBucketArray.hpp UnitList.hpp 
                               WorldInputCmdProcessor.cpp 
        src/NetPanzer/Interfaces: MouseInterface.cpp MouseInterface.hpp 
        src/NetPanzer/Views/Game: ConsoleLoadingView.hpp GameView.cpp 
                                  LobbyView.cpp ProgressView.cpp 
        src/NetPanzer/Views/MainMenu: MenuTemplateView.cpp 
        src/Lib/PObject/Templates: ArrayGrowableTemplate.hpp 
                                   ArrayTemplate.hpp 
                                   BucketArrayTemplate.hpp 
                                   LinkListDoubleTemplate.hpp 
                                   LinkListSingleTemplate.hpp 
        src/UILib/Network: ClientSocket.cpp 

Log message:
        fixed HOM effect while joiining server and more cleanups

Patches:
Index: netpanzer/BUGS
diff -u netpanzer/BUGS:1.6 netpanzer/BUGS:1.7
--- netpanzer/BUGS:1.6  Thu Nov  6 12:53:25 2003
+++ netpanzer/BUGS      Fri Nov  7 04:38:40 2003
@@ -31,7 +31,7 @@
 - still SIGSEGV when client disconnect - fixed
 - does not display unit pictures in factory - fixed
 - objective game cannot finish - fixed
+- HOM effect outside the progressview window -fixed
 - Astar priority_queue "open" are not clear anytime
 - in LinkListDoubleTemplate.addFront sometime is (front==0 && rear != 0)
-- HOM effect outside the progressview window
 
Index: netpanzer/ChangeLog
diff -u netpanzer/ChangeLog:1.23 netpanzer/ChangeLog:1.24
--- netpanzer/ChangeLog:1.23    Thu Nov  6 14:58:27 2003
+++ netpanzer/ChangeLog Fri Nov  7 04:38:40 2003
@@ -1,7 +1,12 @@
+07-Nov-2003 by Matthias Braun
+-fixed HOM effect while joining server
+
 06-Nov-2003 by Matthias Braun
 -cleanups and imporvements to the IRC Lobby code
 -added a callback ability to input lines, when enter is pressed
 -removed chat button and make chat happen on return key
+-eleminated usage of DoubleLinkList template in PowerupInterface (using
+        std::vector now)
 
 05-Nov-2003 by Matthias Braun
 -added manpage contributed by Bartosz Fesnky <address@hidden>
Index: netpanzer/src/Lib/PObject/Templates/ArrayGrowableTemplate.hpp
diff -u netpanzer/src/Lib/PObject/Templates/ArrayGrowableTemplate.hpp:1.5 
netpanzer/src/Lib/PObject/Templates/ArrayGrowableTemplate.hpp:1.6
--- netpanzer/src/Lib/PObject/Templates/ArrayGrowableTemplate.hpp:1.5   Tue Sep 
16 16:16:09 2003
+++ netpanzer/src/Lib/PObject/Templates/ArrayGrowableTemplate.hpp       Fri Nov 
 7 04:38:40 2003
@@ -19,10 +19,11 @@
 #define _ARRAYGROWABLETEMPLATE_HPP
 
 #include <assert.h>
-#include <stdlib.h>
+
+#include "NoCopy.hpp"
 
 template< class TYPE >
-class ArrayGrowableTemplate
+class ArrayGrowableTemplate : public NoCopy
 {
 protected:
     unsigned long size;
Index: netpanzer/src/Lib/PObject/Templates/ArrayTemplate.hpp
diff -u netpanzer/src/Lib/PObject/Templates/ArrayTemplate.hpp:1.6 
netpanzer/src/Lib/PObject/Templates/ArrayTemplate.hpp:1.7
--- netpanzer/src/Lib/PObject/Templates/ArrayTemplate.hpp:1.6   Tue Sep 16 
16:16:09 2003
+++ netpanzer/src/Lib/PObject/Templates/ArrayTemplate.hpp       Fri Nov  7 
04:38:40 2003
@@ -20,10 +20,11 @@
 
 #include <assert.h>
 #include <string.h>
-#include <stdlib.h>
+
+#include "NoCopy.hpp"
 
 template< class TYPE >
-class ArrayTemplate
+class ArrayTemplate : public NoCopy
 {
 protected:
     unsigned long size;
@@ -68,7 +69,6 @@
 
         size = 0;
     }
-
 };
 
 
Index: netpanzer/src/Lib/PObject/Templates/BucketArrayTemplate.hpp
diff -u netpanzer/src/Lib/PObject/Templates/BucketArrayTemplate.hpp:1.5 
netpanzer/src/Lib/PObject/Templates/BucketArrayTemplate.hpp:1.6
--- netpanzer/src/Lib/PObject/Templates/BucketArrayTemplate.hpp:1.5     Tue Sep 
16 16:16:09 2003
+++ netpanzer/src/Lib/PObject/Templates/BucketArrayTemplate.hpp Fri Nov  7 
04:38:40 2003
@@ -20,10 +20,10 @@
 
 #include <assert.h>
 #include "LinkListDoubleTemplate.hpp"
-
+#include "NoCopy.hpp"
 
 template< class TYPE >
-class BucketArrayTemplate
+class BucketArrayTemplate : public NoCopy
 {
 protected:
     unsigned long size;
Index: netpanzer/src/Lib/PObject/Templates/LinkListDoubleTemplate.hpp
diff -u netpanzer/src/Lib/PObject/Templates/LinkListDoubleTemplate.hpp:1.5 
netpanzer/src/Lib/PObject/Templates/LinkListDoubleTemplate.hpp:1.6
--- netpanzer/src/Lib/PObject/Templates/LinkListDoubleTemplate.hpp:1.5  Tue Sep 
16 16:16:09 2003
+++ netpanzer/src/Lib/PObject/Templates/LinkListDoubleTemplate.hpp      Fri Nov 
 7 04:38:40 2003
@@ -18,10 +18,10 @@
 #ifndef _LINKLISTDOUBLETEMPLATE_HPP
 #define _LINKLISTDOUBLETEMPLATE_HPP
 
-#include <stdlib.h>
+#include "NoCopy.hpp"
 
 template< class TYPE >
-class LinkListDoubleTemplate
+class LinkListDoubleTemplate : public NoCopy
 {
 protected:
     TYPE *front;
@@ -35,58 +35,53 @@
 
     LinkListDoubleTemplate( unsigned long size );
 
-    ~LinkListDoubleTemplate( void );
+    ~LinkListDoubleTemplate();
 
     void initialize( unsigned long size );
 
-    inline TYPE * getFront( void )
+    TYPE* getFront() const
     {
-        return( front );
+        return front;
     }
 
-    inline TYPE * getRear( void )
+    TYPE * getRear() const
     {
-        return( rear );
+        return rear;
     }
 
-    inline void addRear( TYPE *object )
+    void addRear(TYPE *object)
     {
         object->next = 0;
-        object->prev = 0;
+        object->prev = rear;
 
-        if ( (front == 0) && (rear == 0) ) {
+        if (rear == 0) {
             front = object;
             rear = object;
         } else {
-            object->prev = rear;
             rear->next = object;
             rear = object;
         }
     }
 
-    inline void addFront( TYPE *object )
+    void addFront(TYPE *object)
     {
-        object->next = 0;
+        object->next = front;
         object->prev = 0;
 
-        if ( (front == 0) && (rear == 0) ) {
+        if (front == 0) {
             front = object;
             rear = object;
         } else {
-            object->next = front;
             front->prev = object;
             front = object;
         }
     }
 
-    inline void insertAfter( TYPE *after, TYPE *object )
+    void insertAfter(TYPE *after, TYPE *object)
     {
-        assert( after != 0 );
+        assert(after != 0);
 
-        object->next = 0;
-        object->prev = 0;
-
-        if( after->next != 0 ) {
+        if(after->next != 0) {
             after->next->prev = object;
         }
 
@@ -94,19 +89,16 @@
         after->next = object;
         object->prev = after;
 
-        if( after == rear ) {
+        if(after == rear) {
             rear = object;
         }
     }
 
-    inline void insertBefore( TYPE *before, TYPE *object )
+    void insertBefore(TYPE *before, TYPE *object)
     {
-        assert( before != 0 );
-
-        object->next = 0;
-        object->prev = 0;
+        assert(before != 0);
 
-        if( before->prev != 0 ) {
+        if(before->prev != 0) {
             before->prev->next = object;
         }
 
@@ -114,12 +106,12 @@
         before->prev = object;
         object->next = before;
 
-        if( before == front ) {
+        if(before == front) {
             front = object;
         }
     }
 
-    inline void deleteObject( TYPE *object )
+    void deleteObject(TYPE *object)
     {
         if( object->prev != 0 ) {
             object->prev->next = object->next;
@@ -129,24 +121,22 @@
             object->next->prev = object->prev;
         }
 
-        if( object == front ) {
+        if(object == front) {
             front = object->next;
         }
 
-        if( object == rear ) {
+        if(object == rear) {
             rear = object->prev;
         }
 
-        delete( object );
+        delete object;
     }
 
-    inline void deleteFront( void )
+    void deleteFront()
     {
-        TYPE *delete_ptr;
-
-        delete_ptr = front;
+        TYPE *oldfront = front;
 
-        if ( front != 0 ) {
+        if (front != 0) {
             if (front == rear) {
                 front = 0;
                 rear = 0;
@@ -154,16 +144,14 @@
                 front = front->next;
                 front->prev = 0;
             }
-
-            delete( delete_ptr );
         }
+
+        delete oldfront;
     }
 
-    inline void deleteRear( void )
+    void deleteRear()
     {
-        TYPE *delete_ptr;
-
-        delete_ptr = rear;
+        TYPE *oldrear = rear;
 
         if ( rear != 0 ) {
             if (front == rear) {
@@ -173,58 +161,53 @@
                 rear = rear->prev;
                 rear->next = 0;
             }
-
-            delete( delete_ptr );
         }
+
+        delete oldrear;
     }
 
-    inline void deleteAfter( TYPE *after )
+    void deleteAfter(TYPE *after)
     {
-        TYPE *delete_ptr;
         assert( after != 0 );
 
-        delete_ptr = after->next;
+        TYPE* object = after->next;
 
-        if( after->next != 0 ) {
-            if( after->next->next != 0 ) {
-                after->next->next->prev = after;
-                after->next = after->next->next ;
-            } else {
-                after->next = 0;
+        if(object != 0) {
+            after->next = object->next;
+
+            if(object->next != 0) {
+                object->next->prev = after;
             }
 
-            if( delete_ptr == rear ) {
+            if(object == rear) {
                 rear = after;
             }
-
-            delete( delete_ptr );
         }
+
+        delete oldobject;
     }
 
-    inline void deleteBefore( TYPE *before )
+    void deleteBefore(TYPE *before)
     {
-        TYPE *delete_ptr;
         assert( before != 0 );
 
-        delete_ptr = before->prev;
+        TYPE *object = before->prev;
 
-        if( before->prev != 0 ) {
-            if( before->prev->prev != 0 ) {
-                before->prev->prev->next = before;
-                before->prev = before->prev->prev;
-            } else {
-                before->prev = 0;
+        if( object != 0 ) {
+            before->prev = object->prev;            
+
+            if(object->prev != 0) {
+                object->prev->next = before;
             }
 
-            if( delete_ptr == front ) {
+            if(delete_ptr == front) {
                 front = before;
             }
-
-            delete( delete_ptr );
         }
+        delete object;
     }
 
-    inline void removeObject( TYPE *object )
+    void removeObject(TYPE *object)
     {
         if( object->prev != 0 ) {
             object->prev->next = object->next;
@@ -244,7 +227,7 @@
     }
 
 
-    inline TYPE* removeFront( void )
+    TYPE* removeFront()
     {
         TYPE *delete_ptr;
 
@@ -265,7 +248,7 @@
         return( 0 );
     }
 
-    inline TYPE* removeRear( void )
+    TYPE* removeRear()
     {
         TYPE *delete_ptr;
 
@@ -285,7 +268,7 @@
         return( 0 );
     }
 
-    inline TYPE* removeAfter( TYPE *after )
+    TYPE* removeAfter( TYPE *after )
     {
         TYPE *delete_ptr;
         assert( after != 0 );
@@ -310,7 +293,7 @@
         return( 0 );
     }
 
-    inline TYPE* removeBefore( TYPE *before )
+    TYPE* removeBefore( TYPE *before )
     {
         TYPE *delete_ptr;
         assert( before != 0 );
@@ -335,7 +318,7 @@
     }
 
 
-    inline unsigned long getSize( void )
+    unsigned long getSize()
     {
         TYPE *traversal_ptr;
         unsigned long count = 0;
@@ -349,7 +332,7 @@
         return( count );
     }
 
-    inline void deallocate( void )
+    void deallocate()
     {
         TYPE *traversal_ptr;
         TYPE *delete_ptr;
@@ -365,10 +348,7 @@
         front = 0;
         rear = 0;
     }
-
-};
-
-
+} __attribute__((deprecated));
 
 template< class TYPE >
 LinkListDoubleTemplate< TYPE >::LinkListDoubleTemplate( unsigned long size )
@@ -378,7 +358,7 @@
 }
 
 template< class TYPE >
-LinkListDoubleTemplate< TYPE >::~LinkListDoubleTemplate( void )
+LinkListDoubleTemplate< TYPE >::~LinkListDoubleTemplate()
 {
     deallocate();
 }
@@ -396,7 +376,6 @@
         object = new TYPE;
         addRear( object );
     }
-
 }
 
 
Index: netpanzer/src/Lib/PObject/Templates/LinkListSingleTemplate.hpp
diff -u netpanzer/src/Lib/PObject/Templates/LinkListSingleTemplate.hpp:1.5 
netpanzer/src/Lib/PObject/Templates/LinkListSingleTemplate.hpp:1.6
--- netpanzer/src/Lib/PObject/Templates/LinkListSingleTemplate.hpp:1.5  Tue Sep 
16 16:16:09 2003
+++ netpanzer/src/Lib/PObject/Templates/LinkListSingleTemplate.hpp      Fri Nov 
 7 04:38:41 2003
@@ -18,10 +18,10 @@
 #ifndef _LINKLISTSINGLETEMPLATE_HPP
 #define _LINKLISTSINGLETEMPLATE_HPP
 
-#include <stdlib.h>
+#include "NoCopy.hpp"
 
 template< class TYPE >
-class LinkListSingleTemplate
+class LinkListSingleTemplate : public NoCopy
 {
 protected:
     TYPE *front;
Index: netpanzer/src/NetPanzer/Classes/UnitBucketArray.hpp
diff -u netpanzer/src/NetPanzer/Classes/UnitBucketArray.hpp:1.4 
netpanzer/src/NetPanzer/Classes/UnitBucketArray.hpp:1.5
--- netpanzer/src/NetPanzer/Classes/UnitBucketArray.hpp:1.4     Tue Sep 16 
16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/UnitBucketArray.hpp Fri Nov  7 04:38:40 2003
@@ -165,6 +165,5 @@
     bool deleteUnitBucketPointer( UnitID unit_id, iXY world_loc );
 };
 
-
-
 #endif // ** _UNIT_BUCKET_ARRAY_HPP
+
Index: netpanzer/src/NetPanzer/Classes/UnitList.hpp
diff -u netpanzer/src/NetPanzer/Classes/UnitList.hpp:1.3 
netpanzer/src/NetPanzer/Classes/UnitList.hpp:1.4
--- netpanzer/src/NetPanzer/Classes/UnitList.hpp:1.3    Tue Sep 16 16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/UnitList.hpp        Fri Nov  7 04:38:40 2003
@@ -18,7 +18,6 @@
 #ifndef _UNITLIST_HPP
 #define _UNITLIST_HPP
 
-#include "PArray.hpp"
 #include "UnitBase.hpp"
 #include "UnitID.hpp"
 #include "LinkListSingleTemplate.hpp"
Index: netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp
diff -u netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.21 
netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.22
--- netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.21     Sun Oct 
 5 09:50:12 2003
+++ netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp  Fri Nov  7 
04:38:40 2003
@@ -557,10 +557,9 @@
         }
     }
 
-    MouseEvent event;
-
-    while( MouseInterface::event_queue.isReady() ) {
-        event = MouseInterface::event_queue.dequeue();
+    while( !MouseInterface::event_queue.empty() ) {
+        MouseEvent event = MouseInterface::event_queue.front();
+        MouseInterface::event_queue.pop();
 
         if( event.button == MouseInterface::left_button )
             evalLeftMButtonEvents( event );
Index: netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp:1.17 
netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp:1.18
--- netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp:1.17  Wed Oct 22 
19:05:40 2003
+++ netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp       Fri Nov  7 
04:38:40 2003
@@ -60,8 +60,6 @@
 
 void MouseInterface::initialize()
 {
-    event_queue.initialize( 20 );
-
     const char* cursorpath = "pics/cursors/";
     char** cursorfiles = FileSystem::enumerateFiles(cursorpath);
     for(char** i = cursorfiles; *i != 0; i++) {
@@ -129,7 +127,7 @@
     event.button = left_button;
     event.event = MouseEvent::EVENT_DOWN;
     event.down_pos = left_button_down_pos;
-    event_queue.enqueue( event );
+    event_queue.push(event);
 }
 
 void MouseInterface::setLeftButtonUp()
@@ -152,10 +150,10 @@
         event.event  = MouseEvent::EVENT_CLICK;
 
     event.down_pos = left_button_down_pos;
-    event_queue.enqueue( event );
+    event_queue.push(event);
 
     event.event = MouseEvent::EVENT_UP;
-    event_queue.enqueue( event );
+    event_queue.push(event);
 }
 
 void MouseInterface::setLeftButtonDoubleDown()
@@ -182,7 +180,7 @@
     event.button = right_button;
     event.event = MouseEvent::EVENT_DOWN;
     event.down_pos = right_button_down_pos;
-    event_queue.enqueue( event );
+    event_queue.push( event );
 }
 
 void MouseInterface::setRightButtonUp( void )
@@ -205,10 +203,10 @@
         event.event  = MouseEvent::EVENT_CLICK;
 
     event.down_pos = right_button_down_pos;
-    event_queue.enqueue( event );
+    event_queue.push( event );
 
     event.event = MouseEvent::EVENT_UP;
-    event_queue.enqueue( event );
+    event_queue.push( event );
 }
 
 void MouseInterface::setRightButtonDoubleDown()
@@ -235,7 +233,7 @@
     event.button = middle_button;
     event.event = MouseEvent::EVENT_DOWN;
     event.down_pos = middle_button_down_pos;
-    event_queue.enqueue( event );
+    event_queue.push( event );
 }
 
 void MouseInterface::setMiddleButtonUp()
@@ -258,10 +256,10 @@
         event.event  = MouseEvent::EVENT_CLICK;
 
     event.down_pos = middle_button_down_pos;
-    event_queue.enqueue( event );
+    event_queue.push( event );
 
     event.event = MouseEvent::EVENT_UP;
-    event_queue.enqueue( event );
+    event_queue.push( event );
 }
 
 void MouseInterface::setMiddleButtonDoubleDown()
Index: netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp:1.10 
netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp:1.11
--- netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp:1.10  Mon Sep 22 
18:21:46 2003
+++ netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp       Fri Nov  7 
04:38:40 2003
@@ -20,7 +20,8 @@
 
 #include <string>
 #include <map>
-#include "QueueTemplate.hpp"
+#include <queue>
+
 #include "Surface.hpp"
 
 #include "cTimeStamp.hpp"
@@ -44,7 +45,7 @@
     iXY   up_pos;
 };
 
-typedef QueueTemplate< MouseEvent > MouseEventQueue;
+typedef std::queue<MouseEvent> MouseEventQueue;
 
 class MouseInterface
 {
Index: netpanzer/src/NetPanzer/Views/Game/ConsoleLoadingView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/ConsoleLoadingView.hpp:1.1 
netpanzer/src/NetPanzer/Views/Game/ConsoleLoadingView.hpp:1.2
--- netpanzer/src/NetPanzer/Views/Game/ConsoleLoadingView.hpp:1.1       Wed Oct 
22 09:19:31 2003
+++ netpanzer/src/NetPanzer/Views/Game/ConsoleLoadingView.hpp   Fri Nov  7 
04:38:40 2003
@@ -36,6 +36,8 @@
     virtual void close() {};
     virtual void toggleGameView();
     virtual void toggleMainMenu();
+private:
+    virtual void blitToScreen() { }
 };
 
 #endif
Index: netpanzer/src/NetPanzer/Views/Game/GameView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/GameView.cpp:1.11 
netpanzer/src/NetPanzer/Views/Game/GameView.cpp:1.12
--- netpanzer/src/NetPanzer/Views/Game/GameView.cpp:1.11        Mon Oct 13 
10:30:18 2003
+++ netpanzer/src/NetPanzer/Views/Game/GameView.cpp     Fri Nov  7 04:38:40 2003
@@ -118,7 +118,7 @@
 void GameView::doActivate()
 {
     View::doActivate();
-    MouseInterface::event_queue.reset();
+    // MouseInterface::event_queue.clear();
     MouseInterface::resetButtonHoldStatus();
     COMMAND_PROCESSOR.inFocus();
 
Index: netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp:1.16 
netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp:1.17
--- netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp:1.16       Sat Oct 25 
10:52:16 2003
+++ netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp    Fri Nov  7 04:38:40 2003
@@ -21,6 +21,7 @@
 #include "LobbyView.hpp"
 #include "Desktop.hpp"
 #include "GameManager.hpp"
+#include "ScreenSurface.hpp"
 
 LoadingView *lobbyView = 0;
 
@@ -69,10 +70,8 @@
         loadBackgroundSurface();
     }
 
+    screen->fill(Color::black);
     backgroundSurface.blt(clientArea);
-
-    //MenuTemplateView::doDraw(viewArea, clientArea);
-
     background.blt(clientArea, 179, 153);
 
     View::doDraw(viewArea, clientArea);
Index: netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp:1.18 
netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp:1.19
--- netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp:1.18    Sat Oct 25 
10:52:16 2003
+++ netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp Fri Nov  7 04:38:40 2003
@@ -58,6 +58,7 @@
         loadBackgroundSurface();
     }
 
+    screen->fill(Color::black);
     backgroundSurface.blt(clientArea);
     background.blt(clientArea, iXY(179, 153));
 
@@ -100,7 +101,8 @@
     if (!backgroundSurface.getDoesExist()) {
         loadBackgroundSurface();
     }
-                                                  
+    
+    screen->fill(Color::black);
     backgroundSurface.blt(*screen, min);
     background.blt(*screen, min + iXY(179, 153));
                                                   
Index: netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp:1.21 
netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp:1.22
--- netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp:1.21    Sat Oct 
25 10:52:16 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp Fri Nov  7 
04:38:40 2003
@@ -222,8 +222,7 @@
        // When in mainmenu, make background dark and draw menu image
         if(screen->getPixX() > 640 ||
            screen->getPixY() > 480)
-            screen->fillRect(0, 0, screen->getPixX(), screen->getPixY(),
-                            Color::black);
+            screen->fill(Color::black);
         
         // Set the following to get does exist.
         if (backgroundSurface.getFrameCount() > 0) {
Index: netpanzer/src/UILib/Network/ClientSocket.cpp
diff -u netpanzer/src/UILib/Network/ClientSocket.cpp:1.5 
netpanzer/src/UILib/Network/ClientSocket.cpp:1.6
--- netpanzer/src/UILib/Network/ClientSocket.cpp:1.5    Fri Sep 19 05:43:52 2003
+++ netpanzer/src/UILib/Network/ClientSocket.cpp        Fri Nov  7 04:38:41 2003
@@ -30,7 +30,7 @@
     
     // resolve server name
     IPaddress serverip;
-    // XXX why deosn't ResolveHost take a const char*? Is this cast safe?
+    // some old version of SDL_net take a char* instead of a const char*
     if(SDLNet_ResolveHost(&serverip, const_cast<char*>(servername),
                           port) < 0) {
         throw Exception("couldn't resolve name '%s'.", servername);




reply via email to

[Prev in Thread] Current Thread [Next in Thread]