stratagus-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Stratagus-CVS] stratagus data/ccl/human/ui.ccl data/ccl/orc/ui...


From: Jimmy Salmon
Subject: [Stratagus-CVS] stratagus data/ccl/human/ui.ccl data/ccl/orc/ui...
Date: Thu, 16 Oct 2003 21:23:10 -0400

CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     Jimmy Salmon <address@hidden>   03/10/16 21:23:09

Modified files:
        data/ccl/human : ui.ccl 
        data/ccl/orc   : ui.ccl 
        src/clone      : mainloop.c 
        src/editor     : editloop.c 
        src/include    : ui.h 
        src/ui         : ccl_ui.c ui.c 

Log message:
        Rewrote menu-panel

Patches:
Index: stratagus/data/ccl/human/ui.ccl
diff -u stratagus/data/ccl/human/ui.ccl:1.42 
stratagus/data/ccl/human/ui.ccl:1.43
--- stratagus/data/ccl/human/ui.ccl:1.42        Thu Oct 16 18:10:44 2003
+++ stratagus/data/ccl/human/ui.ccl     Thu Oct 16 21:23:08 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: ui.ccl,v 1.42 2003/10/16 22:10:44 jsalmon3 Exp $
+;;     $Id: ui.ccl,v 1.43 2003/10/17 01:23:08 jsalmon3 Exp $
 
 (define-cursor 'cursor-point           'human
     'image "ui/human/cursors/human_gauntlet.png"
@@ -181,7 +181,26 @@
         (* 32 (trunc (/ (- screen_width 176 16) 32)))
         (* 32 (trunc (/ (- screen_height 16 16) 32)))))
 
-    'menu-panel (list "graphics/ui/human/menubutton.png" 0 0)
+    'menu-panel (list
+      'panel (list
+        'file "graphics/ui/human/menubutton.png"
+        'pos '(0 0))
+      'menu-button '(
+        pos (24 2)
+        size (128 19)
+        caption "Menu (~<F10~>)"
+        style main)
+      'network-menu-button '(
+        pos (6 2)
+        size (80 19)
+        caption "Menu"
+        style network)
+      'network-diplomacy-button '(
+        pos (90 2)
+        size (80 19)
+        caption "Diplomacy"
+        style network)
+    )
 
     'minimap (list
       'file "graphics/ui/human/minimap.png"
@@ -196,22 +215,6 @@
       'pos (list 176 (- screen_height 16))
       'text-pos (list (+ 2 176) (+ 2 (- screen_height 16)))
       'font 'game)
-
-    'menu-button '(
-      pos (24 2)
-      size (128 19)
-      caption "Menu (~<F10~>)"
-      style main)
-    'network-menu-button '(
-      pos (6 2)
-      size (80 19)
-      caption "Menu"
-      style network)
-    'network-diplomacy-button '(
-      pos (90 2)
-      size (80 19)
-      caption "Diplomacy"
-      style network)
 
     'cursors '(
       point cursor-point
Index: stratagus/data/ccl/orc/ui.ccl
diff -u stratagus/data/ccl/orc/ui.ccl:1.41 stratagus/data/ccl/orc/ui.ccl:1.42
--- stratagus/data/ccl/orc/ui.ccl:1.41  Thu Oct 16 18:10:44 2003
+++ stratagus/data/ccl/orc/ui.ccl       Thu Oct 16 21:23:09 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: ui.ccl,v 1.41 2003/10/16 22:10:44 jsalmon3 Exp $
+;;     $Id: ui.ccl,v 1.42 2003/10/17 01:23:09 jsalmon3 Exp $
 
 (define-cursor 'cursor-point           'orc
     'image "ui/orc/cursors/orcish_claw.png"
@@ -182,7 +182,26 @@
         (* 32 (trunc (/ (- screen_width 176 16) 32)))
         (* 32 (trunc (/ (- screen_height 16 16) 32)))))
 
-    'menu-panel (list "graphics/ui/orc/menubutton.png" 0 0)
+    'menu-panel (list
+      'panel (list
+        'file "graphics/ui/orc/menubutton.png"
+        'pos '(0 0))
+      'menu-button '(
+        pos (24 2)
+        size (128 19)
+        caption "Menu (~<F10~>)"
+        style main)
+      'network-menu-button '(
+        pos (6 2)
+        size (80 19)
+        caption "Menu"
+        style network)
+      'network-diplomacy-button '(
+        pos (90 2)
+        size (80 19)
+        caption "Diplomacy"
+        style network)
+    )
 
     'minimap (list
       'file "graphics/ui/orc/minimap.png"
@@ -197,22 +216,6 @@
       'pos (list 176 (- screen_height 16))
       'text-pos (list (+ 2 176) (+ 2 (- screen_height 16)))
       'font 'game)
-
-    'menu-button '(
-      pos (24 2)
-      size (128 19)
-      caption "Menu (~<F10~>)"
-      style main)
-    'network-menu-button '(
-      pos (6 2)
-      size (80 19)
-      caption "Menu"
-      style network)
-    'network-diplomacy-button '(
-      pos (90 2)
-      size (80 19)
-      caption "Diplomacy"
-      style network)
 
     'cursors '(
       point cursor-point
Index: stratagus/src/clone/mainloop.c
diff -u stratagus/src/clone/mainloop.c:1.148 
stratagus/src/clone/mainloop.c:1.149
--- stratagus/src/clone/mainloop.c:1.148        Thu Oct  9 23:56:40 2003
+++ stratagus/src/clone/mainloop.c      Thu Oct 16 21:23:09 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: mainloop.c,v 1.148 2003/10/10 03:56:40 jsalmon3 Exp $
+//     $Id: mainloop.c,v 1.149 2003/10/17 01:23:09 jsalmon3 Exp $
 
 //@{
 
@@ -266,11 +266,11 @@
 */
 local void DrawMenuButtonArea(void)
 {
-    if (TheUI.MenuButtonGraphic.Graphic) {
-       VideoDrawSub(TheUI.MenuButtonGraphic.Graphic, 0, 0,
-           TheUI.MenuButtonGraphic.Graphic->Width,
-           TheUI.MenuButtonGraphic.Graphic->Height,
-           TheUI.MenuButtonGraphicX, TheUI.MenuButtonGraphicY);
+    if (TheUI.MenuPanel.Graphic) {
+       VideoDrawSub(TheUI.MenuPanel.Graphic, 0, 0,
+           TheUI.MenuPanel.Graphic->Width,
+           TheUI.MenuPanel.Graphic->Height,
+           TheUI.MenuPanelX, TheUI.MenuPanelY);
     }
     if (NetworkFildes == (Socket)-1) {
        if (TheUI.MenuButton.X != -1) {
Index: stratagus/src/editor/editloop.c
diff -u stratagus/src/editor/editloop.c:1.133 
stratagus/src/editor/editloop.c:1.134
--- stratagus/src/editor/editloop.c:1.133       Tue Oct  7 20:06:42 2003
+++ stratagus/src/editor/editloop.c     Thu Oct 16 21:23:09 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: editloop.c,v 1.133 2003/10/08 00:06:42 jsalmon3 Exp $
+//     $Id: editloop.c,v 1.134 2003/10/17 01:23:09 jsalmon3 Exp $
 
 //@{
 
@@ -905,11 +905,11 @@
     //
     //  Menu button
     //
-    if (TheUI.MenuButtonGraphic.Graphic) {
-       VideoDrawSub(TheUI.MenuButtonGraphic.Graphic, 0, 0,
-           TheUI.MenuButtonGraphic.Graphic->Width,
-           TheUI.MenuButtonGraphic.Graphic->Height,
-           TheUI.MenuButtonGraphicX, TheUI.MenuButtonGraphicY);
+    if (TheUI.MenuPanel.Graphic) {
+       VideoDrawSub(TheUI.MenuPanel.Graphic, 0, 0,
+           TheUI.MenuPanel.Graphic->Width,
+           TheUI.MenuPanel.Graphic->Height,
+           TheUI.MenuPanelX, TheUI.MenuPanelY);
     }
     DrawMenuButton(TheUI.MenuButton.Button,
        (ButtonAreaUnderCursor == ButtonAreaMenu
Index: stratagus/src/include/ui.h
diff -u stratagus/src/include/ui.h:1.74 stratagus/src/include/ui.h:1.75
--- stratagus/src/include/ui.h:1.74     Thu Oct 16 18:10:44 2003
+++ stratagus/src/include/ui.h  Thu Oct 16 21:23:09 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: ui.h,v 1.74 2003/10/16 22:10:44 jsalmon3 Exp $
+//     $Id: ui.h,v 1.75 2003/10/17 01:23:09 jsalmon3 Exp $
 
 #ifndef __UI_H__
 #define __UI_H__
@@ -255,10 +255,10 @@
     // Map* attributes of Viewport are unused here:
     Viewport   MapArea;                /// geometry of the whole map area
 
-    // The menu button graphic
-    GraphicConfig MenuButtonGraphic;   /// menu button background
-    int                MenuButtonGraphicX;     /// menu button screen X 
position
-    int                MenuButtonGraphicY;     /// menu button screen Y 
position
+    // The menu panel
+    GraphicConfig MenuPanel;           /// menu panel background
+    int                MenuPanelX;             /// menu panel screen X position
+    int                MenuPanelY;             /// menu panel screen Y position
 
     /// Menu buttons
     struct {
Index: stratagus/src/ui/ccl_ui.c
diff -u stratagus/src/ui/ccl_ui.c:1.137 stratagus/src/ui/ccl_ui.c:1.138
--- stratagus/src/ui/ccl_ui.c:1.137     Thu Oct 16 18:10:44 2003
+++ stratagus/src/ui/ccl_ui.c   Thu Oct 16 21:23:09 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: ccl_ui.c,v 1.137 2003/10/16 22:10:44 jsalmon3 Exp $
+//     $Id: ccl_ui.c,v 1.138 2003/10/17 01:23:09 jsalmon3 Exp $
 
 //@{
 
@@ -1072,9 +1072,9 @@
     ui->ButtonPanelX = -1;
     ui->ButtonPanelY = -1;
 
-    ui->MenuButtonGraphic.File = NULL;
-    ui->MenuButtonGraphicX = -1;
-    ui->MenuButtonGraphicY = -1;
+    ui->MenuPanel.File = NULL;
+    ui->MenuPanelX = -1;
+    ui->MenuPanelY = -1;
     
     ui->MinimapPanel.File = NULL;
     ui->MinimapPanelX = -1;
@@ -1350,9 +1350,124 @@
        } else if (gh_eq_p(value, gh_symbol2scm("menu-panel"))) {
            sublist = gh_car(list);
            list = gh_cdr(list);
-           ui->MenuButtonGraphic.File = SCM_PopNewStr(&sublist);
-           ui->MenuButtonGraphicX = SCM_PopInt(&sublist);
-           ui->MenuButtonGraphicY = SCM_PopInt(&sublist);
+           while (!gh_null_p(sublist)) {
+               value = gh_car(sublist);
+               sublist = gh_cdr(sublist);
+               if (gh_eq_p(value, gh_symbol2scm("panel"))) {
+                   SCM slist;
+
+                   slist = gh_car(sublist);
+                   sublist = gh_cdr(sublist);
+                   while (!gh_null_p(slist)) {
+                       value = gh_car(slist);
+                       slist = gh_cdr(slist);
+                       if (gh_eq_p(value, gh_symbol2scm("file"))) {
+                           value = gh_car(slist);
+                           slist = gh_cdr(slist);
+                           ui->MenuPanel.File = gh_scm2newstr(value, NULL);
+                       } else if (gh_eq_p(value, gh_symbol2scm("pos"))) {
+                           value = gh_car(slist);
+                           slist = gh_cdr(slist);
+                           ui->MenuPanelX = gh_scm2int(gh_car(value));
+                           ui->MenuPanelY = gh_scm2int(gh_car(gh_cdr(value)));
+                       } else {
+                           errl("Unsupported tag", value);
+                       }
+                   }
+               } else if (gh_eq_p(value, gh_symbol2scm("menu-button"))) {
+                   SCM slist;
+
+                   slist = gh_car(sublist);
+                   sublist = gh_cdr(sublist);
+                   while (!gh_null_p(slist)) {
+                       value = gh_car(slist);
+                       slist = gh_cdr(slist);
+                       if (gh_eq_p(value, gh_symbol2scm("pos"))) {
+                           value = gh_car(slist);
+                           slist = gh_cdr(slist);
+                           ui->MenuButton.X = gh_scm2int(gh_car(value));
+                           ui->MenuButton.Y = 
gh_scm2int(gh_car(gh_cdr(value)));
+                       } else if (gh_eq_p(value, gh_symbol2scm("size"))) {
+                           value = gh_car(slist);
+                           slist = gh_cdr(slist);
+                           ui->MenuButton.Width = gh_scm2int(gh_car(value));
+                           ui->MenuButton.Height = 
gh_scm2int(gh_car(gh_cdr(value)));
+                       } else if (gh_eq_p(value, gh_symbol2scm("caption"))) {
+                           value = gh_car(slist);
+                           slist = gh_cdr(slist);
+                           ui->MenuButton.Text = gh_scm2newstr(value, NULL);
+                       } else if (gh_eq_p(value, gh_symbol2scm("style"))) {
+                           value = gh_car(slist);
+                           slist = gh_cdr(slist);
+                           ui->MenuButton.Button = scm2buttonid(value);
+                       } else {
+                           errl("Unsupported tag", value);
+                       }
+                   }
+               } else if (gh_eq_p(value, 
gh_symbol2scm("network-menu-button"))) {
+                   SCM slist;
+
+                   slist = gh_car(sublist);
+                   sublist = gh_cdr(sublist);
+                   while (!gh_null_p(slist)) {
+                       value = gh_car(slist);
+                       slist = gh_cdr(slist);
+                       if (gh_eq_p(value, gh_symbol2scm("pos"))) {
+                           value = gh_car(slist);
+                           slist = gh_cdr(slist);
+                           ui->NetworkMenuButton.X = gh_scm2int(gh_car(value));
+                           ui->NetworkMenuButton.Y = 
gh_scm2int(gh_car(gh_cdr(value)));
+                       } else if (gh_eq_p(value, gh_symbol2scm("size"))) {
+                           value = gh_car(slist);
+                           slist = gh_cdr(slist);
+                           ui->NetworkMenuButton.Width = 
gh_scm2int(gh_car(value));
+                           ui->NetworkMenuButton.Height = 
gh_scm2int(gh_car(gh_cdr(value)));
+                       } else if (gh_eq_p(value, gh_symbol2scm("caption"))) {
+                           value = gh_car(slist);
+                           slist = gh_cdr(slist);
+                           ui->NetworkMenuButton.Text = gh_scm2newstr(value, 
NULL);
+                       } else if (gh_eq_p(value, gh_symbol2scm("style"))) {
+                           value = gh_car(slist);
+                           slist = gh_cdr(slist);
+                           ui->NetworkMenuButton.Button = scm2buttonid(value);
+                       } else {
+                           errl("Unsupported tag", value);
+                       }
+                   }
+               } else if (gh_eq_p(value, 
gh_symbol2scm("network-diplomacy-button"))) {
+                   SCM slist;
+
+                   slist = gh_car(sublist);
+                   sublist = gh_cdr(sublist);
+                   while (!gh_null_p(slist)) {
+                       value = gh_car(slist);
+                       slist = gh_cdr(slist);
+                       if (gh_eq_p(value, gh_symbol2scm("pos"))) {
+                           value = gh_car(slist);
+                           slist = gh_cdr(slist);
+                           ui->NetworkDiplomacyButton.X = 
gh_scm2int(gh_car(value));
+                           ui->NetworkDiplomacyButton.Y = 
gh_scm2int(gh_car(gh_cdr(value)));
+                       } else if (gh_eq_p(value, gh_symbol2scm("size"))) {
+                           value = gh_car(slist);
+                           slist = gh_cdr(slist);
+                           ui->NetworkDiplomacyButton.Width = 
gh_scm2int(gh_car(value));
+                           ui->NetworkDiplomacyButton.Height = 
gh_scm2int(gh_car(gh_cdr(value)));
+                       } else if (gh_eq_p(value, gh_symbol2scm("caption"))) {
+                           value = gh_car(slist);
+                           slist = gh_cdr(slist);
+                           ui->NetworkDiplomacyButton.Text = 
gh_scm2newstr(value, NULL);
+                       } else if (gh_eq_p(value, gh_symbol2scm("style"))) {
+                           value = gh_car(slist);
+                           slist = gh_cdr(slist);
+                           ui->NetworkDiplomacyButton.Button = 
scm2buttonid(value);
+                       } else {
+                           errl("Unsupported tag", value);
+                       }
+                   }
+               } else {
+                   errl("Unsupported tag", value);
+               }
+           }
        } else if (gh_eq_p(value, gh_symbol2scm("minimap"))) {
            sublist = gh_car(list);
            list = gh_cdr(list);
@@ -1408,90 +1523,6 @@
                    value = gh_car(sublist);
                    sublist = gh_cdr(sublist);
                    ui->StatusLineFont = CclFontByIdentifier(value);
-               } else {
-                   errl("Unsupported tag", value);
-               }
-           }
-       } else if (gh_eq_p(value, gh_symbol2scm("menu-button"))) {
-           sublist = gh_car(list);
-           list = gh_cdr(list);
-           while (!gh_null_p(sublist)) {
-               value = gh_car(sublist);
-               sublist = gh_cdr(sublist);
-               if (gh_eq_p(value, gh_symbol2scm("pos"))) {
-                   value = gh_car(sublist);
-                   sublist = gh_cdr(sublist);
-                   ui->MenuButton.X = gh_scm2int(gh_car(value));
-                   ui->MenuButton.Y = gh_scm2int(gh_car(gh_cdr(value)));
-               } else if (gh_eq_p(value, gh_symbol2scm("size"))) {
-                   value = gh_car(sublist);
-                   sublist = gh_cdr(sublist);
-                   ui->MenuButton.Width = gh_scm2int(gh_car(value));
-                   ui->MenuButton.Height = gh_scm2int(gh_car(gh_cdr(value)));
-               } else if (gh_eq_p(value, gh_symbol2scm("caption"))) {
-                   value = gh_car(sublist);
-                   sublist = gh_cdr(sublist);
-                   ui->MenuButton.Text = gh_scm2newstr(value, NULL);
-               } else if (gh_eq_p(value, gh_symbol2scm("style"))) {
-                   value = gh_car(sublist);
-                   sublist = gh_cdr(sublist);
-                   ui->MenuButton.Button = scm2buttonid(value);
-               } else {
-                   errl("Unsupported tag", value);
-               }
-           }
-       } else if (gh_eq_p(value, gh_symbol2scm("network-menu-button"))) {
-           sublist = gh_car(list);
-           list = gh_cdr(list);
-           while (!gh_null_p(sublist)) {
-               value = gh_car(sublist);
-               sublist = gh_cdr(sublist);
-               if (gh_eq_p(value, gh_symbol2scm("pos"))) {
-                   value = gh_car(sublist);
-                   sublist = gh_cdr(sublist);
-                   ui->NetworkMenuButton.X = gh_scm2int(gh_car(value));
-                   ui->NetworkMenuButton.Y = gh_scm2int(gh_car(gh_cdr(value)));
-               } else if (gh_eq_p(value, gh_symbol2scm("size"))) {
-                   value = gh_car(sublist);
-                   sublist = gh_cdr(sublist);
-                   ui->NetworkMenuButton.Width = gh_scm2int(gh_car(value));
-                   ui->NetworkMenuButton.Height = 
gh_scm2int(gh_car(gh_cdr(value)));
-               } else if (gh_eq_p(value, gh_symbol2scm("caption"))) {
-                   value = gh_car(sublist);
-                   sublist = gh_cdr(sublist);
-                   ui->NetworkMenuButton.Text = gh_scm2newstr(value, NULL);
-               } else if (gh_eq_p(value, gh_symbol2scm("style"))) {
-                   value = gh_car(sublist);
-                   sublist = gh_cdr(sublist);
-                   ui->NetworkMenuButton.Button = scm2buttonid(value);
-               } else {
-                   errl("Unsupported tag", value);
-               }
-           }
-       } else if (gh_eq_p(value, gh_symbol2scm("network-diplomacy-button"))) {
-           sublist = gh_car(list);
-           list = gh_cdr(list);
-           while (!gh_null_p(sublist)) {
-               value = gh_car(sublist);
-               sublist = gh_cdr(sublist);
-               if (gh_eq_p(value, gh_symbol2scm("pos"))) {
-                   value = gh_car(sublist);
-                   sublist = gh_cdr(sublist);
-                   ui->NetworkDiplomacyButton.X = gh_scm2int(gh_car(value));
-                   ui->NetworkDiplomacyButton.Y = 
gh_scm2int(gh_car(gh_cdr(value)));
-               } else if (gh_eq_p(value, gh_symbol2scm("size"))) {
-                   value = gh_car(sublist);
-                   sublist = gh_cdr(sublist);
-                   ui->NetworkDiplomacyButton.Width = 
gh_scm2int(gh_car(value));
-                   ui->NetworkDiplomacyButton.Height = 
gh_scm2int(gh_car(gh_cdr(value)));
-               } else if (gh_eq_p(value, gh_symbol2scm("caption"))) {
-                   value = gh_car(sublist);
-                   sublist = gh_cdr(sublist);
-                   ui->NetworkDiplomacyButton.Text = gh_scm2newstr(value, 
NULL);
-               } else if (gh_eq_p(value, gh_symbol2scm("style"))) {
-                   value = gh_car(sublist);
-                   sublist = gh_cdr(sublist);
-                   ui->NetworkDiplomacyButton.Button = scm2buttonid(value);
                } else {
                    errl("Unsupported tag", value);
                }
Index: stratagus/src/ui/ui.c
diff -u stratagus/src/ui/ui.c:1.82 stratagus/src/ui/ui.c:1.83
--- stratagus/src/ui/ui.c:1.82  Thu Oct 16 18:10:44 2003
+++ stratagus/src/ui/ui.c       Thu Oct 16 21:23:09 2003
@@ -27,7 +27,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: ui.c,v 1.82 2003/10/16 22:10:44 jsalmon3 Exp $
+//     $Id: ui.c,v 1.83 2003/10/17 01:23:09 jsalmon3 Exp $
 
 //@{
 
@@ -239,12 +239,12 @@
            TheUI.ButtonPanel.Graphic->Height);
 #endif
     }
-    if (TheUI.MenuButtonGraphic.File) {
-       TheUI.MenuButtonGraphic.Graphic = 
LoadGraphic(TheUI.MenuButtonGraphic.File);
+    if (TheUI.MenuPanel.File) {
+       TheUI.MenuPanel.Graphic = LoadGraphic(TheUI.MenuPanel.File);
 #ifdef USE_OPENGL
-       MakeTexture(TheUI.MenuButtonGraphic.Graphic,
-           TheUI.MenuButtonGraphic.Graphic->Width,
-           TheUI.MenuButtonGraphic.Graphic->Height);
+       MakeTexture(TheUI.MenuPanel.Graphic,
+           TheUI.MenuPanel.Graphic->Width,
+           TheUI.MenuPanel.Graphic->Height);
 #endif
     }
     if (TheUI.MinimapPanel.File) {
@@ -512,8 +512,8 @@
 
     CLprintf(file, "  ; Menu button background\n");
     CLprintf(file, "  'menu-panel (list \"%s\" %d %d)\n",
-       ui->MenuButtonGraphic.File, ui->MenuButtonGraphicX,
-       ui->MenuButtonGraphicY);
+       ui->MenuPanel.File, ui->MenuPanelX,
+       ui->MenuPanelY);
 
     CLprintf(file, "  'minimap (list\n");
     CLprintf(file, "    'file \"%s\"\n", ui->MinimapPanel.File);
@@ -633,7 +633,7 @@
     int i;
 
     CLprintf(file, "\n;;; -----------------------------------------\n");
-    CLprintf(file, ";;; MODULE: ui $Id: ui.c,v 1.82 2003/10/16 22:10:44 
jsalmon3 Exp $\n\n");
+    CLprintf(file, ";;; MODULE: ui $Id: ui.c,v 1.83 2003/10/17 01:23:09 
jsalmon3 Exp $\n\n");
 
     // Contrast, Brightness, Saturation
     CLprintf(file, "(set-contrast! %d)\n", TheUI.Contrast);
@@ -706,7 +706,7 @@
     free(ui->ButtonPanel.File);
 
     // Menu Button
-    free(ui->MenuButtonGraphic.File);
+    free(ui->MenuPanel.File);
 
     // Minimap
     free(ui->MinimapPanel.File);
@@ -776,7 +776,7 @@
 
     VideoSaveFree(TheUI.InfoPanel.Graphic);
     VideoSaveFree(TheUI.ButtonPanel.Graphic);
-    VideoSaveFree(TheUI.MenuButtonGraphic.Graphic);
+    VideoSaveFree(TheUI.MenuPanel.Graphic);
     VideoSaveFree(TheUI.MinimapPanel.Graphic);
     VideoSaveFree(TheUI.StatusLine.Graphic);
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]