[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] demogame/ccl menus.ccl
From: |
Martin Renold |
Subject: |
[Stratagus-CVS] demogame/ccl menus.ccl |
Date: |
Fri, 10 Oct 2003 06:18:51 -0400 |
CVSROOT: /cvsroot/stratagus
Module name: demogame
Branch:
Changes by: Martin Renold <address@hidden> 03/10/10 06:18:48
Modified files:
ccl : menus.ccl
Log message:
cleanup
Patches:
Index: demogame/ccl/menus.ccl
diff -u demogame/ccl/menus.ccl:1.2 demogame/ccl/menus.ccl:1.3
--- demogame/ccl/menus.ccl:1.2 Mon Oct 6 17:10:13 2003
+++ demogame/ccl/menus.ccl Fri Oct 10 06:18:46 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.2 2003/10/06 21:10:13 martinxyz Exp $
+;; $Id: menus.ccl,v 1.3 2003/10/10 10:18:46 martinxyz Exp $
;;
;; load the keystroke helps
@@ -34,9 +34,9 @@
(load "ccl/keystrokes.ccl" #f #t)
; FIXME: get them from tileset definition
-(define tileset-names '("Summer" "Winter"))
(define race-names '("Alliance" "Mythical"))
-
+(define tileset-names '("Summer" "Winter" "None" "None"))
+(define map-default-tileset-names (append '("Map Default") tileset-names))
(define player-names '("Person" "Computer" "Rescue (Passive)" "Rescue
(Active)" "Neutral" "Nobody" ))
;;
@@ -500,12 +500,12 @@
'text '(caption "~<Map Tileset:~>" none)
'menu 'menu-custom-game)
(define-menu-item 'pos (list 220 (+ 10 300)) 'font 'game
- 'pulldown '(size (152 20)
- style pulldown
- func game-tss-action
- options (append "Map Default" tileset-name)
- default 0
- current 0)
+ 'pulldown (list 'size '(152 20)
+ 'style 'pulldown
+ 'func 'game-tss-action
+ 'options map-default-tileset-names
+ 'default 0
+ 'current 0)
'menu 'menu-custom-game)
(define-menu-item 'pos (list (- 640 224 16) (- (+ 10 300) 20)) 'font 'game
'text '(caption "~<Game Type:~>" none)
@@ -804,12 +804,12 @@
'text '(caption "~<Map Tileset:~>" none)
'menu 'menu-multi-setup)
(define-menu-item 'pos (list 220 (+ 10 300)) 'font 'game
- 'pulldown '(size (152 20)
- style pulldown
- func game-tss-action
- options (append "Map Default" tileset-name)
- default 0
- current 0)
+ 'pulldown (list 'size '(152 20)
+ 'style 'pulldown
+ 'func 'game-tss-action
+ 'options map-default-tileset-names
+ 'default 0
+ 'current 0)
'menu 'menu-multi-setup)
(define-menu-item 'pos (list (- 640 224 16) (- (+ 10 300) 20)) 'font 'game
'text '(caption "~<Game Type:~>" none)
@@ -1232,13 +1232,13 @@
'text '(caption "~<Map Tileset:~>" none)
'menu 'menu-net-multi-client)
(define-menu-item 'pos (list 220 (+ 10 300)) 'font 'game
- 'pulldown '(size (152 20)
- style pulldown
- func game-tss-action
- options (append "Map Default" tileset-name)
- state passive
- default 0
- current 0)
+ 'pulldown (list 'size '(152 20)
+ 'style 'pulldown
+ 'func 'game-tss-action
+ 'options
+ 'state 'passive
+ 'default 0
+ 'current 0)
'menu 'menu-net-multi-client)
(define-menu-item 'pos (list (- 640 224 16) (- (+ 10 300) 20)) 'font 'game
'text '(caption "~<Game Type:~>" none)
- [Stratagus-CVS] demogame/ccl menus.ccl,
Martin Renold <=