[netPanzer-CVS] netpanzer/src/NetPanzer/Views/MainMenu/Multi IR...

[Hankin Chick]

CVSROOT:        /cvsroot/netpanzer
Module name:    netpanzer
Branch:         
Changes by:     Hankin Chick <address@hidden>   03/11/19 07:21:25

Modified files:
        src/NetPanzer/Views/MainMenu/Multi: IRCLobbyView.cpp 
                                            IRCLobbyView.hpp 
                                            HostJoinTemplateView.cpp 

Log message:
        Moving the irclobby to it's own directory.

Patches:
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp
diff -u 
netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp:1.25 
netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp:1.26
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp:1.25  
Sun Nov 16 02:19:35 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp       
Wed Nov 19 07:21:25 2003
@@ -18,6 +18,7 @@
 #include <config.h>
 
 #include <ctype.h>
+#include <sstream>
 #include "HostJoinTemplateView.hpp"
 #include "Desktop.hpp"
 #include "HostJoinTemplateView.hpp"
@@ -92,7 +93,9 @@
         Desktop::setVisibilityAllWindows(false);
 
         Desktop::setVisibility("LobbyView", true);
-        lobby_view->stopIRC();
+        std::stringstream join_mess;
+        join_mess << "join " << IPAddressView::szServer.getString();
+        lobby_view->stopIRC(join_mess.str().c_str());
 
         //this call should be redundant -- enumeration ceases
         //when a session is opened in any case:
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/IRCLobbyView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/IRCLobbyView.cpp:1.10 
netpanzer/src/NetPanzer/Views/MainMenu/Multi/IRCLobbyView.cpp:1.11
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/IRCLobbyView.cpp:1.10  Mon Nov 
17 08:14:31 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/IRCLobbyView.cpp       Wed Nov 
19 07:21:24 2003
@@ -179,7 +179,7 @@
         } else if (me.getSource(downButton)) {
             int max_size=lobby_connection->game_servers->size()-1;
             ++topViewableItem;
-            if (max_size>0 && topViewableItem >= max_size) {
+            if (topViewableItem >= max_size) {
                 topViewableItem = max_size;
             }
         }
@@ -216,7 +216,7 @@
         return;
 
     try {
-        stopIRC();
+        stopIRC("");
         lobby_connection=new IRCLobby(gameconfig->lobbyserver,
                 gameconfig->playername, "#netpanzerlob");
         lobby_connection->change_name=change_name;
@@ -226,9 +226,10 @@
     }
 }
 
-void IRCLobbyView::stopIRC()
+void IRCLobbyView::stopIRC(const char* reason)
 {
     if(lobby_connection) {
+        lobby_connection->stopThread(reason);
         delete lobby_connection;
     }
     lobby_connection=0;
@@ -237,7 +238,7 @@
 void IRCLobbyView::restartIRC()
 {
         // the crude method for nickname change...
-        stopIRC();
+        stopIRC("restart IRC");
         SDL_Delay(500);
         startIRC();
 }
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/IRCLobbyView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/IRCLobbyView.hpp:1.8 
netpanzer/src/NetPanzer/Views/MainMenu/Multi/IRCLobbyView.hpp:1.9
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/IRCLobbyView.hpp:1.8   Mon Nov 
17 08:14:31 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/IRCLobbyView.hpp       Wed Nov 
19 07:21:25 2003
@@ -33,7 +33,7 @@
     IRCLobbyView();
 
     void startIRC();
-    void stopIRC();
+    void stopIRC(const char* mess);
     void restartIRC();
 
     virtual void doDraw(Surface &windowArea, Surface &clientArea);