[Top][All Lists]
[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: |
Sat, 08 Nov 2003 12:29:56 -0500 |
CVSROOT: /cvsroot/stratagus
Module name: stratagus
Branch:
Changes by: Jimmy Salmon <address@hidden> 03/11/08 12:29:56
Modified files:
data/ccl/human : ui.ccl
data/ccl/orc : ui.ccl
src/include : ui.h
src/ui : ccl_ui.c mainscr.c
Log message:
Clean up max-tex
Patches:
Index: stratagus/data/ccl/human/ui.ccl
diff -u stratagus/data/ccl/human/ui.ccl:1.44
stratagus/data/ccl/human/ui.ccl:1.45
--- stratagus/data/ccl/human/ui.ccl:1.44 Sun Nov 2 19:14:32 2003
+++ stratagus/data/ccl/human/ui.ccl Sat Nov 8 12:29:53 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.44 2003/11/03 00:14:32 nehalmistry Exp $
+;; $Id: ui.ccl,v 1.45 2003/11/08 17:29:53 jsalmon3 Exp $
(define-cursor 'cursor-point 'human
'image "ui/human/cursors/human_gauntlet.png"
@@ -99,7 +99,9 @@
(list 'pos '( 6 274) 'size icon_size)
(list 'pos '( 62 274) 'size icon_size)
(list 'pos '(118 274) 'size icon_size))
- 'max-text-pos (list (+ info_panel_x 10) (+ info_panel_y 10)))
+ 'max-text (list
+ 'font 'game
+ 'pos (list (+ info_panel_x 10) (+ info_panel_y 10))))
)
'training (list
'single (list
@@ -109,8 +111,7 @@
'pos (list (+ info_panel_x 37) (+ info_panel_y 8 78)))
'icon (list
'pos (list (+ info_panel_x 107) (+ info_panel_y 8 70))
- 'size icon_size)
- )
+ 'size icon_size))
'multiple (list
'icons (list
(list 'pos '( 6 216) 'size icon_size)
Index: stratagus/data/ccl/orc/ui.ccl
diff -u stratagus/data/ccl/orc/ui.ccl:1.43 stratagus/data/ccl/orc/ui.ccl:1.44
--- stratagus/data/ccl/orc/ui.ccl:1.43 Sun Nov 2 19:14:32 2003
+++ stratagus/data/ccl/orc/ui.ccl Sat Nov 8 12:29:54 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.43 2003/11/03 00:14:32 nehalmistry Exp $
+;; $Id: ui.ccl,v 1.44 2003/11/08 17:29:54 jsalmon3 Exp $
(define-cursor 'cursor-point 'orc
'image "ui/orc/cursors/orcish_claw.png"
@@ -99,7 +99,9 @@
(list 'pos '( 6 274) 'size icon_size)
(list 'pos '( 62 274) 'size icon_size)
(list 'pos '(118 274) 'size icon_size))
- 'max-text-pos (list (+ info_panel_x 10) (+ info_panel_y 10)))
+ 'max-text (list
+ 'font 'game
+ 'pos (list (+ info_panel_x 10) (+ info_panel_y 10))))
)
'training (list
'single (list
@@ -109,8 +111,7 @@
'pos (list (+ info_panel_x 37) (+ info_panel_y 8 78)))
'icon (list
'pos (list (+ info_panel_x 107) (+ info_panel_y 8 70))
- 'size icon_size)
- )
+ 'size icon_size))
'multiple (list
'icons (list
(list 'pos '( 6 216) 'size icon_size)
Index: stratagus/src/include/ui.h
diff -u stratagus/src/include/ui.h:1.76 stratagus/src/include/ui.h:1.77
--- stratagus/src/include/ui.h:1.76 Sun Nov 2 19:14:33 2003
+++ stratagus/src/include/ui.h Sat Nov 8 12:29:55 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ui.h,v 1.76 2003/11/03 00:14:33 nehalmistry Exp $
+// $Id: ui.h,v 1.77 2003/11/08 17:29:55 jsalmon3 Exp $
#ifndef __UI_H__
#define __UI_H__
@@ -195,6 +195,7 @@
int SelectedFont;
int SelectedTextX;
int SelectedTextY;
+ int MaxSelectedFont;
int MaxSelectedTextX; /// position to place '+#' text
int MaxSelectedTextY; /// if > maximum units selected
Index: stratagus/src/ui/ccl_ui.c
diff -u stratagus/src/ui/ccl_ui.c:1.145 stratagus/src/ui/ccl_ui.c:1.146
--- stratagus/src/ui/ccl_ui.c:1.145 Sun Nov 2 19:14:33 2003
+++ stratagus/src/ui/ccl_ui.c Sat Nov 8 12:29:55 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ccl_ui.c,v 1.145 2003/11/03 00:14:33 nehalmistry Exp $
+// $Id: ccl_ui.c,v 1.146 2003/11/08 17:29:55 jsalmon3 Exp $
//@{
@@ -770,11 +770,13 @@
slist = gh_cdr(slist);
CclParseIcon(value, &ui->SelectedButtons[i++]);
}
- } else if (gh_eq_p(value, gh_symbol2scm("max-text-pos"))) {
+ } else if (gh_eq_p(value, gh_symbol2scm("max-text"))) {
value = gh_car(sublist);
sublist = gh_cdr(sublist);
- ui->MaxSelectedTextX = gh_scm2int(gh_car(value));
- ui->MaxSelectedTextY = gh_scm2int(gh_car(gh_cdr(value)));
+ CclParseInfoText(value, &text);
+ ui->MaxSelectedFont = text.Font;
+ ui->MaxSelectedTextX = text.X;
+ ui->MaxSelectedTextY = text.Y;
} else {
errl("Unsupported tag", value);
}
Index: stratagus/src/ui/mainscr.c
diff -u stratagus/src/ui/mainscr.c:1.139 stratagus/src/ui/mainscr.c:1.140
--- stratagus/src/ui/mainscr.c:1.139 Mon Nov 3 13:22:56 2003
+++ stratagus/src/ui/mainscr.c Sat Nov 8 12:29:55 2003
@@ -27,7 +27,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: mainscr.c,v 1.139 2003/11/03 18:22:56 jsalmon3 Exp $
+// $Id: mainscr.c,v 1.140 2003/11/08 17:29:55 jsalmon3 Exp $
//@{
@@ -1108,9 +1108,6 @@
global void DrawInfoPanel(void)
{
int i;
- UI *ui;
-
- ui = &TheUI;
if (NumSelected) {
if (NumSelected > 1) {
@@ -1119,8 +1116,8 @@
//
PlayerPixels(ThisPlayer); // can only be own!
DrawInfoPanelBackground(0);
- for (i = 0; i < (NumSelected > ui->NumSelectedButtons ?
- ui->NumSelectedButtons : NumSelected); ++i) {
+ for (i = 0; i < (NumSelected > TheUI.NumSelectedButtons ?
+ TheUI.NumSelectedButtons : NumSelected); ++i) {
DrawUnitIcon(ThisPlayer,
Selected[i]->Type->Icon.Icon,
(ButtonAreaUnderCursor == ButtonAreaSelected &&
ButtonUnderCursor == i) ?
@@ -1142,10 +1139,11 @@
}
}
}
- if (NumSelected > ui->NumSelectedButtons) {
- char buf[4];
+ if (NumSelected > TheUI.NumSelectedButtons) {
+ char buf[5];
sprintf(buf, "+%d", NumSelected - TheUI.NumSelectedButtons);
- VideoDrawText(ui->MaxSelectedTextX, ui->MaxSelectedTextY,
GameFont, buf);
+ VideoDrawText(TheUI.MaxSelectedTextX, TheUI.MaxSelectedTextY,
+ TheUI.MaxSelectedFont, buf);
}
return;
} else {