[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/20 04:37:38

Modified files:
        src/NetPanzer/Views/MainMenu/Multi: IRCLobbyView.cpp 
        src/Lib/IRCLobby: IRCLobby.cpp 

Log message:
        made chat window larger in lobby
        added more chars you can type in chat
        fixed bug from last commit with dedicated server not answering to 
clients

Patches:
Index: netpanzer/src/Lib/IRCLobby/IRCLobby.cpp
diff -u netpanzer/src/Lib/IRCLobby/IRCLobby.cpp:1.1 
netpanzer/src/Lib/IRCLobby/IRCLobby.cpp:1.2
--- netpanzer/src/Lib/IRCLobby/IRCLobby.cpp:1.1 Wed Nov 19 07:24:41 2003
+++ netpanzer/src/Lib/IRCLobby/IRCLobby.cpp     Thu Nov 20 04:37:38 2003
@@ -386,7 +386,7 @@
     assert(irc_server_socket != 0);
     
     char buf[1024];
-    char *host, *mess, *host_end, *user_end, *code,*user;
+    char *host, *mess, *host_end, *user_end, *code,*user,*real_user;
 
     readIRCLine(buf, sizeof(buf));
 #ifndef WITHOUT_NETPANZER
@@ -395,7 +395,8 @@
     
     if(buf[0]!=':')
         return;
-    user=buf+1;
+
+    real_user=user=buf+1;
     if(strncmp(user,nickname_prefix,sizeof(nickname_prefix)-1)==0) {
         user+=sizeof(nickname_prefix)-1;
     }
@@ -529,7 +530,7 @@
         if(strcmp(mess+1, ask_server_running_mess)==0) {
             if(gameconfig->hostorjoin== _game_session_host) {
                 // reply with server details
-                sendServerInfo(user);
+                sendServerInfo(real_user);
             }
         }
         else 
@@ -561,11 +562,11 @@
                 SDL_mutexP(game_servers_mutex);
                 game_servers->push_back(
                         GameServer(host, port,
-                            user, map, players, max_players));
+                            real_user, map, players, max_players));
                 SDL_mutexV(game_servers_mutex);
             }
             else {
-                server->user = user;
+                server->user = real_user;
                 server->map = map;
                 server->playercount = players;
                 server->max_players = max_players;
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/IRCLobbyView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/IRCLobbyView.cpp:1.11 
netpanzer/src/NetPanzer/Views/MainMenu/Multi/IRCLobbyView.cpp:1.12
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/IRCLobbyView.cpp:1.11  Wed Nov 
19 07:21:24 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/IRCLobbyView.cpp       Thu Nov 
20 04:37:37 2003
@@ -34,7 +34,7 @@
 {
     lobby_connection=0;
     change_name=0;
-    lobby_view_height=160;
+    lobby_view_height=184;
     total_displayed_servers=0;
     setSearchName("IRCLobbyView");
     setTitle("Lobby");
@@ -45,20 +45,19 @@
     setVisible(false);
     topViewableItem=0;
 
-    moveTo(iXY(bodyTextRect.max.x-400, bodyTextRect.min.y + 200));
+    moveTo(iXY(bodyTextRect.max.x-440, bodyTextRect.min.y + 170));
 
-    iXY  area_size = iXY(400, lobby_view_height);
+    iXY  area_size = iXY(440, lobby_view_height);
     resizeClientArea(area_size);
 
     int chat_y=lobby_view_height-(Surface::getFontHeight()*2);
-    //addButtonCenterText(iXY(320, chat_y ), 80,  "Chat", "", buttonChat);
-    addButtonCenterText(iXY(320, chat_y), 80,  "Refresh", "", buttonRefresh);
-    szChat.init("  ", 34);
+    addButtonCenterText(iXY(getClientRect().getSizeX()-80, chat_y), 80,  
"Refresh", "", buttonRefresh);
+    szChat.init("  ", 255,39);
     cInputField* input = addInputField(iXY(4, chat_y), &szChat, "", true);
     input->setReturnAction(chatReturnPressed);
 
-    server_list_end_y=lobby_view_height-(Surface::getFontHeight()*6);
-    chat_list_end_y=server_list_end_y+(Surface::getFontHeight()*4);      
+    server_list_end_y=(Surface::getFontHeight()*6);
+    chat_list_end_y=getClientRect().getSizeY()-(Surface::getFontHeight()*2);
     server_list_end_x=(getClientRect().getSizeX()-12);
 
     iXY size(12, 12);