[Stratagus-CVS] stratagus data/ccl/menus.ccl src/network/master...

[Russell Smith]

CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     Russell Smith <address@hidden>  03/10/14 23:04:05

Modified files:
        data/ccl       : menus.ccl 
        src/network    : master.c 
        src/ui         : menus.c 

Log message:
        Updated Protcol, game list now shown correctly. parameters still need 
work

Patches:
Index: stratagus/data/ccl/menus.ccl
diff -u stratagus/data/ccl/menus.ccl:1.92 stratagus/data/ccl/menus.ccl:1.93
--- stratagus/data/ccl/menus.ccl:1.92   Tue Oct 14 22:00:58 2003
+++ stratagus/data/ccl/menus.ccl        Tue Oct 14 23:04:04 2003
@@ -26,7 +26,7 @@
 ;;      along with this program; if not, write to the Free Software
 ;;      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  
USA
 ;;
-;;     $Id: menus.ccl,v 1.92 2003/10/15 02:00:58 mr-russ Exp $
+;;     $Id: menus.ccl,v 1.93 2003/10/15 03:04:04 mr-russ Exp $
 
 ;;
 ;; load the keystroke helps
@@ -579,7 +579,7 @@
   'button '(size (224 27)
     caption "~!Join Internet Game"
     hotkey "j"
-    func menu-metaserver-init
+    func metaserver-list
     style gm-full)
   'menu 'menu-internet-create-join-menu)
 (define-menu-item 'pos (list 208 (+ 320 (* 36 1))) 'font 'large
@@ -3774,143 +3774,143 @@
 ;;-----------------------------------------------------------------
 ;; **** Show master server game list
 ;;-----------------------------------------------------------------
-;; menu-metaserver-list
+;; metaserver-list
 ;;
-(define-menu 'name 'menu-metaserver-list 'geometry '(0 0 640 480)
+(define-menu 'name 'metaserver-list 'geometry '(0 0 640 480)
   'panel 'none 'default '3)
-(define-menu-item 'pos (list 0 0) 'font 'game  'init 'menu-metaserver-init 
'exit 'menu-metaserver-exit 
-   'menu 'menu-metaserver-list )
+(define-menu-item 'pos (list 0 0) 'font 'game  'init 'metaserver-list-init 
'exit 'menu-metaserver-exit 
+   'menu 'metaserver-list )
 (define-menu-item 'pos (list (+ (/ 640 2) 12) 8) 'font 'large
   'text '(caption "~<Online Game List ~>" align center)
-  'menu 'menu-metaserver-list )
+  'menu 'metaserver-list )
 (define-menu-item 'pos (list (- 640 224 16) (+ 360 (* 36 2))) 'font 'large
   'button '(size (224 27)
     caption "~!Cancel Game"
     hotkey "c"
     func end-menu
     style gm-full)
-  'menu 'menu-metaserver-list )
+  'menu 'metaserver-list )
 (define-menu-item 'pos (list (- 640 224 16) (+ 360 (* 36 1))) 'font 'large 
   'button '(size (224 27)
     caption "~!Refresh"
     hotkey "c"
-    func menu-metaserver-list  ;; refresh game list.
+    func metaserver-list       ;; refresh game list.
     style gm-full)
-  'menu 'menu-metaserver-list )
+  'menu 'metaserver-list )
 
 ;;------------------------------------------------- nickname
 (define-menu-item 'pos (list 40 (+ 32 (* 22 0))) 'font 'game
   'text '(caption "~<Nickname~>" )
-  'menu 'menu-metaserver-list )
+  'menu 'metaserver-list )
 ;;------------------------------------------------- IP:Port
 (define-menu-item 'pos (list 160 (+ 32 (* 22 0))) 'font 'game
   'text '(caption "~<IP:PORT~>" )
-  'menu 'menu-metaserver-list )
+  'menu 'metaserver-list )
 ;;------------------------------------------------- OS
 (define-menu-item 'pos (list 280 (+ 32 (* 22 0))) 'font 'game
   'text '(caption "~<OS~>" )
-  'menu 'menu-metaserver-list )
+  'menu 'metaserver-list )
 ;;------------------------------------------------- Other
 (define-menu-item 'pos (list 400 (+ 32 (* 22 0))) 'font 'game
   'text '(caption "~<Other Argument~>" )
-  'menu 'menu-metaserver-list )
+  'menu 'metaserver-list )
 ;;------------------------------------------------- checkbox
 (define-menu-item 'pos (list 15 (+ 32 (* 22 0)))
   'gem '(size (18 18)
     state unchecked
     func select-game-server
     style gem-square)
-  'menu 'menu-metaserver-list )
+  'menu 'metaserver-list )
 ;;------------------------------------------------- nickname
 (define-menu-item 'pos (list 40 (+ 32 (* 22 1))) 'font 'game
   'text '(caption "~<Nickname~>" )
-  'menu 'menu-metaserver-list )
+  'menu 'metaserver-list )
 ;;------------------------------------------------- IP:Port
 (define-menu-item 'pos (list 160 (+ 32 (* 22 1))) 'font 'game
   'text '(caption "~<IP:PORT~>" )
-  'menu 'menu-metaserver-list )
+  'menu 'metaserver-list )
 ;;------------------------------------------------- OS
 (define-menu-item 'pos (list 280 (+ 32 (* 22 1))) 'font 'game
   'text '(caption "~<OS~>" )
-  'menu 'menu-metaserver-list )
+  'menu 'metaserver-list )
 ;;------------------------------------------------- Other
 (define-menu-item 'pos (list 400 (+ 32 (* 22 1))) 'font 'game
   'text '(caption "~<Other Argument~>" )
-  'menu 'menu-metaserver-list )
+  'menu 'metaserver-list )
 ;;------------------------------------------------- checkbox
 (define-menu-item 'pos (list 15 (+ 32 (* 22 1)))
   'gem '(size (18 18)
     state unchecked
     func select-game-server
     style gem-square)
-  'menu 'menu-metaserver-list )
+  'menu 'metaserver-list )
 ;;------------------------------------------------- nickname
 (define-menu-item 'pos (list 40 (+ 32 (* 22 2))) 'font 'game
   'text '(caption "~<Nickname~>" )
-  'menu 'menu-metaserver-list )
+  'menu 'metaserver-list )
 ;;------------------------------------------------- IP:Port
 (define-menu-item 'pos (list 160 (+ 32 (* 22 2))) 'font 'game
   'text '(caption "~<IP:PORT~>" )
-  'menu 'menu-metaserver-list )
+  'menu 'metaserver-list )
 ;;------------------------------------------------- OS
 (define-menu-item 'pos (list 280 (+ 32 (* 22 2))) 'font 'game
   'text '(caption "~<OS~>" )
-  'menu 'menu-metaserver-list )
+  'menu 'metaserver-list )
 ;;------------------------------------------------- Other
 (define-menu-item 'pos (list 400 (+ 32 (* 22 2))) 'font 'game
   'text '(caption "~<Other Argument~>" )
-  'menu 'menu-metaserver-list )
+  'menu 'metaserver-list )
 ;;------------------------------------------------- checkbox
 (define-menu-item 'pos (list 15 (+ 32 (* 22 2)))
   'gem '(size (18 18)
     state unchecked
     func select-game-server
     style gem-square)
-  'menu 'menu-metaserver-list )
+  'menu 'metaserver-list )
 ;;------------------------------------------------- nickname
 (define-menu-item 'pos (list 40 (+ 32 (* 22 3))) 'font 'game
   'text '(caption "~<Nickname~>" )
-  'menu 'menu-metaserver-list )
+  'menu 'metaserver-list )
 ;;------------------------------------------------- IP:Port
 (define-menu-item 'pos (list 160 (+ 32 (* 22 3))) 'font 'game
   'text '(caption "~<IP:PORT~>" )
-  'menu 'menu-metaserver-list )
+  'menu 'metaserver-list )
 ;;------------------------------------------------- OS
 (define-menu-item 'pos (list 280 (+ 32 (* 22 3))) 'font 'game
   'text '(caption "~<OS~>" )
-  'menu 'menu-metaserver-list )
+  'menu 'metaserver-list )
 ;;------------------------------------------------- Other
 (define-menu-item 'pos (list 400 (+ 32 (* 22 3))) 'font 'game
   'text '(caption "~<Other Argument~>" )
-  'menu 'menu-metaserver-list )
+  'menu 'metaserver-list )
 ;;------------------------------------------------- checkbox
 (define-menu-item 'pos (list 15 (+ 32 (* 22 3)))
   'gem '(size (18 18)
     state unchecked
     func select-game-server
     style gem-square)
-  'menu 'menu-metaserver-list )
+  'menu 'metaserver-list )
 ;;------------------------------------------------- nickname
 (define-menu-item 'pos (list 40 (+ 32 (* 22 4))) 'font 'game
   'text '(caption "~<Nickname~>" )
-  'menu 'menu-metaserver-list )
+  'menu 'metaserver-list )
 ;;------------------------------------------------- IP:Port
 (define-menu-item 'pos (list 160 (+ 32 (* 22 4))) 'font 'game
   'text '(caption "~<IP:PORT~>" )
-  'menu 'menu-metaserver-list )
+  'menu 'metaserver-list )
 ;;------------------------------------------------- OS
 (define-menu-item 'pos (list 280 (+ 32 (* 22 4))) 'font 'game
   'text '(caption "~<OS~>" )
-  'menu 'menu-metaserver-list )
+  'menu 'metaserver-list )
 ;;------------------------------------------------- Other
 (define-menu-item 'pos (list 400 (+ 32 (* 22 4))) 'font 'game
   'text '(caption "~<Other Argument~>" )
-  'menu 'menu-metaserver-list )
+  'menu 'metaserver-list )
 ;;------------------------------------------------- checkbox
 (define-menu-item 'pos (list 15 (+ 32 (* 22 4)))
   'gem '(size (18 18)
     state unchecked
     func select-game-server
     style gem-square)
-  'menu 'menu-metaserver-list )
+  'menu 'metaserver-list )
 
Index: stratagus/src/network/master.c
diff -u stratagus/src/network/master.c:1.17 stratagus/src/network/master.c:1.18
--- stratagus/src/network/master.c:1.17 Tue Oct 14 22:00:58 2003
+++ stratagus/src/network/master.c      Tue Oct 14 23:04:05 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: master.c,v 1.17 2003/10/15 02:00:58 mr-russ Exp $
+//     $Id: master.c,v 1.18 2003/10/15 03:04:05 mr-russ Exp $
 
 //@{
 
@@ -157,10 +157,15 @@
 {
     char* endline;
 
-    *value = reply;
+    // Take Care for OK/ERR
+    *value = strchr(reply, '\n');
+    (*value)++;
 
     while (pos-- && *value) {
-       *value = strstr(*value,"\n");
+       (*value) = strchr((*value), '\n');
+       if (*value) {
+           (*value)++;
+       }
     }
 
     if (!*value) {
@@ -168,7 +173,11 @@
        return -1;
     }
 
-    endline = strstr(*value,"\n");
+    if (*value[0] == '\n') {
+       (*value)++;
+    }
+
+    endline = strchr(*value, '\n');
 
     if (!endline) {
        return -1;
Index: stratagus/src/ui/menus.c
diff -u stratagus/src/ui/menus.c:1.563 stratagus/src/ui/menus.c:1.564
--- stratagus/src/ui/menus.c:1.563      Tue Oct 14 22:00:58 2003
+++ stratagus/src/ui/menus.c    Tue Oct 14 23:04:05 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: menus.c,v 1.563 2003/10/15 02:00:58 mr-russ Exp $
+//     $Id: menus.c,v 1.564 2003/10/15 03:04:05 mr-russ Exp $
 
 //@{
 
@@ -780,8 +780,8 @@
     HASHADD(ReplayGameCancel,"replay-game-cancel");
 
 // Metaserver
-    HASHADD(ShowMetaServerList,"menu-metaserver-list");
-    HASHADD(MultiMetaServerGameSetupInit,"menu-metaserver-init");
+    HASHADD(ShowMetaServerList,"metaserver-list");
+    HASHADD(MultiMetaServerGameSetupInit,"metaserver-list-init");
     HASHADD(MultiMetaServerGameSetupExit,"menu-metaserver-exit");
     HASHADD(SelectGameServer,"select-game-server");
 }
@@ -7255,7 +7255,7 @@
     VideoUnlockScreen();
     Invalidate();
 
-    ProcessMenu("menu-metaserver-list", 1);
+    ProcessMenu("metaserver-list", 1);
     if (GuiGameStarted) {
        GameMenuReturn();
     }
@@ -7274,7 +7274,7 @@
 
     DestroyCursorBackground();
     GuiGameStarted = 0;
-    ProcessMenu("menu-metaserver-list", 1);
+    ProcessMenu("metaserver-list", 1);
     if (GuiGameStarted) {
        GameMenuReturn();
     }
@@ -7296,21 +7296,19 @@
     int nummenus;
     char* parameter;
     char* reply;
-    Menu *menu;
+    Menu* menu;
 
     SendMetaCommand("NumberOfGames","");
-    menu = FindMenu("menu-metaserver-list");
+    menu = FindMenu("metaserver-list");
 
     reply = NULL;
     //receive
     //check okay
-    if (1 || RecvMetaReply(&reply) == -1) {
+    if (RecvMetaReply(&reply) == -1) {
        //TODO: Notify player that connection was aborted...
-       nummenus = 1;
-
-       
+       nummenus = 0;
     } else {
-       GetMetaParameter(reply, 1, &parameter);
+       GetMetaParameter(reply, 0, &parameter);
        nummenus = atoi(parameter);
     }
     // Meta server only sends matching version
@@ -7399,7 +7397,7 @@
        VideoLockScreen();
        MenusSetBackground();
        VideoUnlockScreen();
-       ProcessMenu("menu-metaserver-list",1);
+       ProcessMenu("metaserver-list",1);
        return;
     }
     NetworkInitClientConnect();