[Stratagus-CVS] stratagus/src/ui botpanel.c icons.c ui.c

[address@hidden]

CVSROOT:        /home/strat
Module name:    stratagus
Changes by:      <address@hidden>       04/01/03 11:31:50

Modified files:
        src/ui         : botpanel.c icons.c ui.c 

Log message:
        Load/Save updates

Patches:
Index: stratagus/src/ui/botpanel.c
diff -u stratagus/src/ui/botpanel.c:1.99 stratagus/src/ui/botpanel.c:1.100
--- stratagus/src/ui/botpanel.c:1.99    Sat Dec 20 16:33:38 2003
+++ stratagus/src/ui/botpanel.c Sat Jan  3 11:31:49 2004
@@ -27,7 +27,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: botpanel.c,v 1.99 2003/12/20 05:33:38 jsalmon3 Exp $
+//     $Id: botpanel.c,v 1.100 2004/01/03 00:31:49 jsalmon3 Exp $
 
 //@{
 
@@ -98,12 +98,13 @@
 */
 global void SaveButtons(CLFile* file)
 {
+#if 0
        int i;
        int n;
        char* cp;
 
        CLprintf(file, "\n;;; -----------------------------------------\n");
-       CLprintf(file, ";;; MODULE: buttons $Id: botpanel.c,v 1.99 2003/12/20 
05:33:38 jsalmon3 Exp $\n\n");
+       CLprintf(file, ";;; MODULE: buttons $Id: botpanel.c,v 1.100 2004/01/03 
00:31:49 jsalmon3 Exp $\n\n");
 
        for (i = 0; i < NumUnitButtons; ++i) {
                CLprintf(file, "(define-button 'pos %d 'level %d 'icon '%s\n",
@@ -239,6 +240,7 @@
 
        CLprintf(file, "(set-show-command-key! %s)\n\n",
                ShowCommandKey ? "#t" : "#f");
+#endif
 }
 
 
Index: stratagus/src/ui/icons.c
diff -u stratagus/src/ui/icons.c:1.60 stratagus/src/ui/icons.c:1.61
--- stratagus/src/ui/icons.c:1.60       Fri Jan  2 08:24:18 2004
+++ stratagus/src/ui/icons.c    Sat Jan  3 11:31:49 2004
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: icons.c,v 1.60 2004/01/01 21:24:18 jsalmon3 Exp $
+//     $Id: icons.c,v 1.61 2004/01/03 00:31:49 jsalmon3 Exp $
 
 //@{
 
@@ -422,17 +422,18 @@
 }
 
 /**
-**             Save state of the icons to file.
+**  Save state of the icons to file.
 **
-**             @param file             Output file.
+**  @param file  Output file.
 */
 global void SaveIcons(CLFile* file)
 {
+#if 0
        char* const* cp;
        int i;
 
-       CLprintf(file, "\n;;; -----------------------------------------\n");
-       CLprintf(file, ";;; MODULE: icons $Id: icons.c,v 1.60 2004/01/01 
21:24:18 jsalmon3 Exp $\n\n");
+       CLprintf(file, "\n--- -----------------------------------------\n");
+       CLprintf(file, "--- MODULE: icons $Id: icons.c,v 1.61 2004/01/03 
00:31:49 jsalmon3 Exp $\n\n");
 
        //
        //  Mapping the original icon numbers in puds to our internal strings
@@ -471,6 +472,7 @@
                CLprintf(file, "(define-icon-alias '%s '%s)\n",
                        IconAliases[i * 2 + 0], IconAliases[i * 2 + 1]);
        }
+#endif
 }
 
 /**
Index: stratagus/src/ui/ui.c
diff -u stratagus/src/ui/ui.c:1.92 stratagus/src/ui/ui.c:1.93
--- stratagus/src/ui/ui.c:1.92  Mon Dec 22 19:01:28 2003
+++ stratagus/src/ui/ui.c       Sat Jan  3 11:31:50 2004
@@ -27,7 +27,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: ui.c,v 1.92 2003/12/22 08:01:28 wizzard Exp $
+//     $Id: ui.c,v 1.93 2004/01/03 00:31:50 jsalmon3 Exp $
 
 //@{
 
@@ -629,35 +629,36 @@
 }
 
 /**
-**             Save the viewports.
+**  Save the viewports.
 **
-**             @param file             Save file handle
-**             @param ui               User interface to save
+**  @param file  Save file handle
+**  @param ui    User interface to save
 */
-local void SaveViewports(CLFile* file,const UI* ui)
+local void SaveViewports(CLFile* file, const UI* ui)
 {
        int i;
        const Viewport* vp;
 
-       CLprintf(file, "(define-viewports 'mode %d", ui->ViewportMode);
+       CLprintf(file, "DefineViewports(\"mode\", %d", ui->ViewportMode);
        for (i = 0; i < ui->NumViewports; ++i) {
                vp = &ui->Viewports[i];
-               CLprintf(file, "\n  'viewport '(%d %d)", vp->MapX, vp->MapY);
+               CLprintf(file, ",\n  \"viewport\", {%d, %d}", vp->MapX, 
vp->MapY);
        }
        CLprintf(file, ")\n\n");
 }
 
 /**
-**             Save the user interface module.
+**  Save the user interface module.
 **
-**             @param file             Save file handle
+**  @param file  Save file handle
 */
 global void SaveUserInterface(CLFile* file)
 {
+#if 0
        int i;
 
        CLprintf(file, "\n;;; -----------------------------------------\n");
-       CLprintf(file, ";;; MODULE: ui $Id: ui.c,v 1.92 2003/12/22 08:01:28 
wizzard Exp $\n\n");
+       CLprintf(file, ";;; MODULE: ui $Id: ui.c,v 1.93 2004/01/03 00:31:50 
jsalmon3 Exp $\n\n");
 
        // Contrast, Brightness, Saturation
        CLprintf(file, "(set-contrast! %d)\n", TheUI.Contrast);
@@ -675,6 +676,7 @@
        for (i = 0; UI_Table[i]; ++i) {
                SaveUi(file, UI_Table[i]);
        }
+#endif
 
        SaveViewports(file, &TheUI);
 }