[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus/src/ui ui.c
From: |
Jimmy Salmon |
Subject: |
[Stratagus-CVS] stratagus/src/ui ui.c |
Date: |
Fri, 17 Oct 2003 10:56:17 -0400 |
CVSROOT: /cvsroot/stratagus
Module name: stratagus
Branch:
Changes by: Jimmy Salmon <address@hidden> 03/10/17 10:56:16
Modified files:
src/ui : ui.c
Log message:
Fixed bug #6010, saved menu-panel
Patches:
Index: stratagus/src/ui/ui.c
diff -u stratagus/src/ui/ui.c:1.83 stratagus/src/ui/ui.c:1.84
--- stratagus/src/ui/ui.c:1.83 Thu Oct 16 21:23:09 2003
+++ stratagus/src/ui/ui.c Fri Oct 17 10:56:16 2003
@@ -27,7 +27,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ui.c,v 1.83 2003/10/17 01:23:09 jsalmon3 Exp $
+// $Id: ui.c,v 1.84 2003/10/17 14:56:16 jsalmon3 Exp $
//@{
@@ -508,64 +508,65 @@
CLprintf(file, "\n 'size '(%d %d)",
ui->MapArea.EndX - ui->MapArea.X + 1,
ui->MapArea.EndY - ui->MapArea.Y + 1);
- CLprintf(file, ")\n\n");
-
- CLprintf(file, " ; Menu button background\n");
- CLprintf(file, " 'menu-panel (list \"%s\" %d %d)\n",
- ui->MenuPanel.File, ui->MenuPanelX,
- ui->MenuPanelY);
-
- CLprintf(file, " 'minimap (list\n");
- CLprintf(file, " 'file \"%s\"\n", ui->MinimapPanel.File);
- if (ui->MinimapTransparent) {
- CLprintf(file, " 'transparent\n");
- }
- CLprintf(file, " 'panel-pos '(%d %d)\n",
- ui->MinimapPanelX, ui->MinimapPanelY);
- CLprintf(file, " 'pos '(%d %d)\n",
- ui->MinimapPosX, ui->MinimapPosY);
- CLprintf(file, " 'size '(%d %d))\n",
- ui->MinimapW, ui->MinimapH);
-
- CLprintf(file, "\n 'status-line '(");
- CLprintf(file, "\n file \"%s\"",ui->StatusLine.File);
- CLprintf(file, "\n pos (%d %d)",ui->StatusLineX,ui->StatusLineY);
- CLprintf(file, "\n text-pos (%d %d)",
- ui->StatusLineTextX, ui->StatusLineTextY);
- CLprintf(file, "\n font %s",FontNames[ui->StatusLineFont]);
CLprintf(file, ")\n");
- CLprintf(file, "\n 'menu-button '(");
- CLprintf(file, "\n pos (%d %d)",
+ CLprintf(file, "\n 'menu-panel (list\n");
+ CLprintf(file, "\n 'panel (list");
+ CLprintf(file, "\n 'file \"%s\"", ui->MenuPanel.File);
+ CLprintf(file, "\n 'pos '(%d %d)",
+ ui->MenuPanelX, ui->MenuPanelY);
+ CLprintf(file, ")");
+ CLprintf(file, "\n 'menu-button '(");
+ CLprintf(file, "\n pos (%d %d)",
ui->MenuButton.X, ui->MenuButton.Y);
- CLprintf(file, "\n size (%d %d)",
+ CLprintf(file, "\n size (%d %d)",
ui->MenuButton.Width, ui->MenuButton.Height);
- CLprintf(file, "\n caption \"%s\"",
+ CLprintf(file, "\n caption \"%s\"",
ui->MenuButton.Text);
- CLprintf(file, "\n style %s",
+ CLprintf(file, "\n style %s",
MenuButtonStyle(ui->MenuButton.Button));
CLprintf(file, ")");
-
- CLprintf(file, "\n 'network-menu-button '(");
- CLprintf(file, "\n pos (%d %d)",
+ CLprintf(file, "\n 'network-menu-button '(");
+ CLprintf(file, "\n pos (%d %d)",
ui->NetworkMenuButton.X, ui->NetworkMenuButton.Y);
- CLprintf(file, "\n size (%d %d)",
+ CLprintf(file, "\n size (%d %d)",
ui->NetworkMenuButton.Width, ui->NetworkMenuButton.Height);
- CLprintf(file, "\n caption \"%s\"",
+ CLprintf(file, "\n caption \"%s\"",
ui->NetworkMenuButton.Text);
- CLprintf(file, "\n style %s",
+ CLprintf(file, "\n style %s",
MenuButtonStyle(ui->NetworkMenuButton.Button));
CLprintf(file, ")");
-
- CLprintf(file, "\n 'network-diplomacy-button '(");
- CLprintf(file, "\n pos (%d %d)",
+ CLprintf(file, "\n 'network-diplomacy-button '(");
+ CLprintf(file, "\n pos (%d %d)",
ui->NetworkDiplomacyButton.X, ui->NetworkDiplomacyButton.Y);
- CLprintf(file, "\n size (%d %d)",
+ CLprintf(file, "\n size (%d %d)",
ui->NetworkDiplomacyButton.Width, ui->NetworkDiplomacyButton.Height);
- CLprintf(file, "\n caption \"%s\"",
+ CLprintf(file, "\n caption \"%s\"",
ui->NetworkDiplomacyButton.Text);
- CLprintf(file, "\n style %s",
+ CLprintf(file, "\n style %s",
MenuButtonStyle(ui->NetworkDiplomacyButton.Button));
+ CLprintf(file, ")");
+ CLprintf(file, ")\n");
+
+ CLprintf(file, "\n 'minimap (list");
+ CLprintf(file, "\n 'file \"%s\"", ui->MinimapPanel.File);
+ if (ui->MinimapTransparent) {
+ CLprintf(file, "\n 'transparent");
+ }
+ CLprintf(file, "\n 'panel-pos '(%d %d)",
+ ui->MinimapPanelX, ui->MinimapPanelY);
+ CLprintf(file, "\n 'pos '(%d %d)",
+ ui->MinimapPosX, ui->MinimapPosY);
+ CLprintf(file, "\n 'size '(%d %d)",
+ ui->MinimapW, ui->MinimapH);
+ CLprintf(file, ")\n");
+
+ CLprintf(file, "\n 'status-line '(");
+ CLprintf(file, "\n file \"%s\"",ui->StatusLine.File);
+ CLprintf(file, "\n pos (%d %d)",ui->StatusLineX,ui->StatusLineY);
+ CLprintf(file, "\n text-pos (%d %d)",
+ ui->StatusLineTextX, ui->StatusLineTextY);
+ CLprintf(file, "\n font %s",FontNames[ui->StatusLineFont]);
CLprintf(file, ")\n");
CLprintf(file, "\n 'cursors '(");
@@ -633,7 +634,7 @@
int i;
CLprintf(file, "\n;;; -----------------------------------------\n");
- CLprintf(file, ";;; MODULE: ui $Id: ui.c,v 1.83 2003/10/17 01:23:09
jsalmon3 Exp $\n\n");
+ CLprintf(file, ";;; MODULE: ui $Id: ui.c,v 1.84 2003/10/17 14:56:16
jsalmon3 Exp $\n\n");
// Contrast, Brightness, Saturation
CLprintf(file, "(set-contrast! %d)\n", TheUI.Contrast);