[Stratagus-CVS] stratagus data/ccl/menus.ccl data/ccl/tilesets....

[Jimmy Salmon]

CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     Jimmy Salmon <address@hidden>   03/11/03 01:29:56

Modified files:
        data/ccl       : menus.ccl tilesets.ccl 
        data/ccl/tilesets: summer.ccl swamp.ccl wasteland.ccl winter.ccl 
        src/ui         : menus.c 

Log message:
        Tileset menu items are generated automatically

Patches:
Index: stratagus/data/ccl/menus.ccl
diff -u stratagus/data/ccl/menus.ccl:1.96 stratagus/data/ccl/menus.ccl:1.97
--- stratagus/data/ccl/menus.ccl:1.96   Mon Oct 27 04:24:21 2003
+++ stratagus/data/ccl/menus.ccl        Mon Nov  3 01:29:55 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.96 2003/10/27 09:24:21 mr-russ Exp $
+;;     $Id: menus.ccl,v 1.97 2003/11/03 06:29:55 jsalmon3 Exp $
 
 ;;
 ;; load the keystroke helps
@@ -486,10 +486,7 @@
 (define-menu-item 'pos (list 220 (+ 10 300)) 'font 'game
   'pulldown '(size (152 20)
     style pulldown
-    func game-tss-action
-    options ("Map Default" "Forest" "Winter" "Wasteland" "Orc Swamp" )
-    default 0
-    current 0)
+    func game-tss-action)
   'menu 'menu-custom-game)
 (define-menu-item 'pos (list (- 640 224 16) (- (+ 10 300) 20)) 'font 'game
   'text '(caption "~<Game Type:~>" none)
@@ -814,10 +811,7 @@
 (define-menu-item 'pos (list 220 (+ 10 300)) 'font 'game
   'pulldown '(size (152 20)
     style pulldown
-    func game-tss-action
-    options ("Map Default" "Forest" "Winter" "Wasteland" "Orc Swamp" )
-    default 0
-    current 0)
+    func game-tss-action)
   'menu 'menu-multi-setup)
 (define-menu-item 'pos (list (- 640 224 16) (- (+ 10 300) 20)) 'font 'game
   'text '(caption "~<Game Type:~>" none)
@@ -1231,10 +1225,7 @@
   'pulldown '(size (152 20)
     style pulldown
     func game-tss-action
-    options ("Map Default" "Forest" "Winter" "Wasteland" "Orc Swamp" )
-    state passive
-    default 0
-    current 0)
+    state passive)
   'menu 'menu-net-multi-client)
 (define-menu-item 'pos (list (- 640 224 16) (- (+ 10 300) 20)) 'font 'game
   'text '(caption "~<Game Type:~>" none)
@@ -2423,10 +2414,7 @@
 (define-menu-item 'pos (list (+ 176 (- 288 (/ (- 288 260) 2) 152)) (+ 112 (+ 
11 (* 36 3) 22))) 'font 'game
   'pulldown '(size (152 20)
     style pulldown
-    func null
-    options ("Forest" "Winter" "Wasteland" "Orc Swamp" )
-    default 0
-    current 0)
+    func null)
   'menu 'menu-editor-new)
 (define-menu-item 'pos (list (- 320 106 23) 328) 'font 'large
   'button '(size (106 27)
@@ -2612,10 +2600,7 @@
 (define-menu-item 'pos (list (- 288 (/ (- 288 260) 2) 152) (+ 11 (* 36 3) 22)) 
'font 'game
   'pulldown '(size (152 20)
     style pulldown
-    func null
-    options ("Forest" "Winter" "Wasteland" "Orc Swamp" )
-    default 0
-    current 0)
+    func null)
   'menu 'menu-editor-map-properties)
 (define-menu-item 'pos (list (/ (- 288 260) 2) (+ 11 (* 36 4) 22)) 'font 'game
   'text '(caption "Version:" align left)
Index: stratagus/data/ccl/tilesets.ccl
diff -u stratagus/data/ccl/tilesets.ccl:1.12 
stratagus/data/ccl/tilesets.ccl:1.13
--- stratagus/data/ccl/tilesets.ccl:1.12        Thu Jul  3 13:30:01 2003
+++ stratagus/data/ccl/tilesets.ccl     Mon Nov  3 01:29:55 2003
@@ -10,7 +10,7 @@
 ;;
 ;;     tilesets.ccl    -       Define the used tilesets.
 ;;
-;;     (c) Copyright 1998,2000,2001 by Lutz Sammer
+;;     (c) Copyright 1998,2000-2003 by Lutz Sammer and Jimmy Salmon
 ;;
 ;;      This program is free software; you can redistribute it and/or modify
 ;;      it under the terms of the GNU General Public License as published by
@@ -26,18 +26,18 @@
 ;;      along with this program; if not, write to the Free Software
 ;;      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  
USA
 ;;
-;;     $Id: tilesets.ccl,v 1.12 2003/07/03 17:30:01 ingo Exp $
+;;     $Id: tilesets.ccl,v 1.13 2003/11/03 06:29:55 jsalmon3 Exp $
 
 ;;=============================================================================
 ;;     Load the different tileset definitions
 ;;
 ;;     FIXME: need a way to automatic load all available tileset definitions
 
-(define-tileset 'tileset-summer 'class "summer"
+(define-tileset 'tileset-summer 'class "summer" 'name "Forest"
   'file "ccl/tilesets/summer.ccl")
-(define-tileset 'tileset-winter 'class "winter"
+(define-tileset 'tileset-winter 'class "winter" 'name "Winter"
   'file "ccl/tilesets/winter.ccl")
-(define-tileset 'tileset-wasteland 'class "wasteland"
+(define-tileset 'tileset-wasteland 'class "wasteland" 'name "Wasteland"
   'file "ccl/tilesets/wasteland.ccl")
-(define-tileset 'tileset-swamp 'class "swamp"
+(define-tileset 'tileset-swamp 'class "swamp" 'name "Swamp"
   'file "ccl/tilesets/swamp.ccl")
Index: stratagus/data/ccl/tilesets/summer.ccl
diff -u stratagus/data/ccl/tilesets/summer.ccl:1.8 
stratagus/data/ccl/tilesets/summer.ccl:1.9
--- stratagus/data/ccl/tilesets/summer.ccl:1.8  Thu Sep 18 13:56:02 2003
+++ stratagus/data/ccl/tilesets/summer.ccl      Mon Nov  3 01:29:55 2003
@@ -10,7 +10,7 @@
 ;;
 ;;     summer.ccl              -       Define the summer tileset.
 ;;
-;;     (c) Copyright 2000-2002 by Lutz Sammer
+;;     (c) Copyright 2000-2003 by Lutz Sammer and Jimmy Salmon
 ;;
 ;;      This program is free software; you can redistribute it and/or modify
 ;;      it under the terms of the GNU General Public License as published by
@@ -26,15 +26,14 @@
 ;;      along with this program; if not, write to the Free Software
 ;;      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  
USA
 ;;
-;;     $Id: summer.ccl,v 1.8 2003/09/18 17:56:02 n0body Exp $
+;;     $Id: summer.ccl,v 1.9 2003/11/03 06:29:55 jsalmon3 Exp $
 
 ;;=============================================================================
 ;;     Define a tileset
 ;;
 ;;     (define-tileset ident class name image palette slots animations)
 ;;
-(define-tileset 'tileset-summer        'class "summer"
-  'name "original wc2 summer tileset"
+(define-tileset 'tileset-summer        'class "summer" 'name "Forest"
   'image "tilesets/summer/terrain/summer.png"
   'palette "tilesets/summer/summer.rgb"
   ;; Slots descriptions
Index: stratagus/data/ccl/tilesets/swamp.ccl
diff -u stratagus/data/ccl/tilesets/swamp.ccl:1.9 
stratagus/data/ccl/tilesets/swamp.ccl:1.10
--- stratagus/data/ccl/tilesets/swamp.ccl:1.9   Thu Sep 18 13:56:02 2003
+++ stratagus/data/ccl/tilesets/swamp.ccl       Mon Nov  3 01:29:55 2003
@@ -10,7 +10,7 @@
 ;;
 ;;     swamp.ccl               -       Define the orc swamp tileset.
 ;;
-;;     (c) Copyright 2000-2002 by Lutz Sammer
+;;     (c) Copyright 2000-2003 by Lutz Sammer and Jimmy Salmon
 ;;
 ;;      This program is free software; you can redistribute it and/or modify
 ;;      it under the terms of the GNU General Public License as published by
@@ -26,15 +26,14 @@
 ;;      along with this program; if not, write to the Free Software
 ;;      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  
USA
 ;;
-;;     $Id: swamp.ccl,v 1.9 2003/09/18 17:56:02 n0body Exp $
+;;     $Id: swamp.ccl,v 1.10 2003/11/03 06:29:55 jsalmon3 Exp $
 
 ;;=============================================================================
 ;;     Define a tileset
 ;;
 ;;     (define-tileset ident class name image palette slots animations)
 ;;
-(define-tileset 'tileset-swamp 'class "swamp"
-  'name "original wc2 orcish swamp tileset"
+(define-tileset 'tileset-swamp 'class "swamp" 'name "Swamp"
   'image "tilesets/swamp/terrain/swamp.png"
   'palette "tilesets/swamp/swamp.rgb"
   ;; Slots descriptions
Index: stratagus/data/ccl/tilesets/wasteland.ccl
diff -u stratagus/data/ccl/tilesets/wasteland.ccl:1.9 
stratagus/data/ccl/tilesets/wasteland.ccl:1.10
--- stratagus/data/ccl/tilesets/wasteland.ccl:1.9       Thu Sep 18 13:56:02 2003
+++ stratagus/data/ccl/tilesets/wasteland.ccl   Mon Nov  3 01:29:55 2003
@@ -10,7 +10,7 @@
 ;;
 ;;     wasteland.ccl           -       Define the wasteland tileset.
 ;;
-;;     (c) Copyright 2000,2001 by Lutz Sammer
+;;     (c) Copyright 2000-2003 by Lutz Sammer and Jimmy Salmon
 ;;
 ;;      This program is free software; you can redistribute it and/or modify
 ;;      it under the terms of the GNU General Public License as published by
@@ -26,15 +26,14 @@
 ;;      along with this program; if not, write to the Free Software
 ;;      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  
USA
 ;;
-;;     $Id: wasteland.ccl,v 1.9 2003/09/18 17:56:02 n0body Exp $
+;;     $Id: wasteland.ccl,v 1.10 2003/11/03 06:29:55 jsalmon3 Exp $
 
 ;;=============================================================================
 ;;     Define a tileset
 ;;
 ;;     (define-tileset ident class name image palette slots animations)
 ;;
-(define-tileset 'tileset-wasteland 'class "wasteland"
-  'name "original wc2 wasteland tileset"
+(define-tileset 'tileset-wasteland 'class "wasteland" 'name "Wasteland"
   'image "tilesets/wasteland/terrain/wasteland.png"
   'palette "tilesets/wasteland/wasteland.rgb"
   ;; Slots descriptions
Index: stratagus/data/ccl/tilesets/winter.ccl
diff -u stratagus/data/ccl/tilesets/winter.ccl:1.8 
stratagus/data/ccl/tilesets/winter.ccl:1.9
--- stratagus/data/ccl/tilesets/winter.ccl:1.8  Thu Sep 18 13:56:02 2003
+++ stratagus/data/ccl/tilesets/winter.ccl      Mon Nov  3 01:29:55 2003
@@ -10,7 +10,7 @@
 ;;
 ;;     winter.ccl              -       Define the winter tileset.
 ;;
-;;     (c) Copyright 2000-2002 by Lutz Sammer
+;;     (c) Copyright 2000-2003 by Lutz Sammer and Jimmy Salmon
 ;;
 ;;      This program is free software; you can redistribute it and/or modify
 ;;      it under the terms of the GNU General Public License as published by
@@ -26,15 +26,14 @@
 ;;      along with this program; if not, write to the Free Software
 ;;      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  
USA
 ;;
-;;     $Id: winter.ccl,v 1.8 2003/09/18 17:56:02 n0body Exp $
+;;     $Id: winter.ccl,v 1.9 2003/11/03 06:29:55 jsalmon3 Exp $
 
 ;;=============================================================================
 ;;     Define a tileset
 ;;
 ;;     (define-tileset ident class name image palette slots animations)
 ;;
-(define-tileset 'tileset-winter 'class "winter"
-  'name "original wc2 winter tileset"
+(define-tileset 'tileset-winter 'class "winter" 'name "Winter"
   'image "tilesets/winter/terrain/winter.png"
   'palette "tilesets/winter/winter.rgb"
   ;; Slots descriptions
Index: stratagus/src/ui/menus.c
diff -u stratagus/src/ui/menus.c:1.582 stratagus/src/ui/menus.c:1.583
--- stratagus/src/ui/menus.c:1.582      Wed Oct 29 08:08:36 2003
+++ stratagus/src/ui/menus.c    Mon Nov  3 01:29:56 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: menus.c,v 1.582 2003/10/29 13:08:36 mr-russ Exp $
+//     $Id: menus.c,v 1.583 2003/11/03 06:29:56 jsalmon3 Exp $
 
 //@{
 
@@ -4195,8 +4195,6 @@
            menu->Items[12].d.pulldown.curopt = 0;
        }
     }
-    // Initials to Number of Tilesets + 1 for default option.
-    menu->Items[14].d.pulldown.noptions = NumTilesets + 1;
 }
 
 /**
@@ -7142,9 +7140,9 @@
     ++n;
     //  Reallocate pulldown options.
     if (mi->d.pulldown.options) {
-       free (mi->d.pulldown.options);
+       free(mi->d.pulldown.options);
     }
-    mi->d.pulldown.options = (unsigned char **)malloc(n * sizeof(unsigned char 
*));
+    mi->d.pulldown.options = (unsigned char**)malloc(n * sizeof(unsigned 
char*));
     for (i = 0, n = 0; i < PlayerRaces.Count; ++i) {
        if (PlayerRaces.Visible[i]) {
            mi->d.pulldown.options[n++] = strdup(PlayerRaces.Display[i]);
@@ -7156,6 +7154,31 @@
 }
 
 /**
+**     Initialize tilesets for a menu item
+*/
+local void InitTilesets(Menuitem *mi, int mapdefault)
+{
+    int i;
+    int n;
+
+    //  Reallocate pulldown options.
+    if (mi->d.pulldown.options) {
+       free(mi->d.pulldown.options);
+    }
+    n = NumTilesets + (mapdefault ? 1 : 0);
+    mi->d.pulldown.options = (unsigned char**)malloc(n * sizeof(unsigned 
char*));
+    n = 0;
+    if (mapdefault) {
+       mi->d.pulldown.options[n++] = strdup("Map Default");
+    }
+    for (i = 0; i < NumTilesets; ++i) {
+       mi->d.pulldown.options[n++] = strdup(Tilesets[i]->Name);
+    }
+    mi->d.pulldown.noptions = n;
+    mi->d.pulldown.defopt = 0;
+}
+
+/**
 **     Initialize the loaded menu data
 */
 global void InitMenuData(void)
@@ -7166,10 +7189,17 @@
 
     menu = FindMenu("menu-custom-game");
     InitPlayerRaces(&menu->Items[6]);
+    InitTilesets(&menu->Items[14], 1);
     menu = FindMenu("menu-multi-setup");
     InitPlayerRaces(&menu->Items[21]);
+    InitTilesets(&menu->Items[29], 1);
     menu = FindMenu("menu-net-multi-client");
     InitPlayerRaces(&menu->Items[21]);
+    InitTilesets(&menu->Items[29], 1);
+    menu = FindMenu("menu-editor-new");
+    InitTilesets(&menu->Items[7], 0);
+    menu = FindMenu("menu-editor-map-properties");
+    InitTilesets(&menu->Items[6], 0);
 }
 
 /**