[Stratagus-CVS] stratagus/src/ui mainscr.c

[Jimmy Salmon]

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

Modified files:
        src/ui         : mainscr.c 

Log message:
        Removed IconWidth and IconHeight

Patches:
Index: stratagus/src/ui/mainscr.c
diff -u stratagus/src/ui/mainscr.c:1.135 stratagus/src/ui/mainscr.c:1.136
--- stratagus/src/ui/mainscr.c:1.135    Fri Oct 31 18:34:53 2003
+++ stratagus/src/ui/mainscr.c  Sat Nov  1 16:23:15 2003
@@ -27,7 +27,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: mainscr.c,v 1.135 2003/10/31 23:34:53 jsalmon3 Exp $
+//     $Id: mainscr.c,v 1.136 2003/11/01 21:23:15 jsalmon3 Exp $
 
 //@{
 
@@ -82,8 +82,9 @@
     int f;
     VMemType color;
 
-    y += IconHeight + 7;
-    VideoFillRectangleClip(ColorBlack, x, y, IconWidth + 7, 7);
+    y += unit->Type->Icon.Icon->Height + 7;
+    VideoFillRectangleClip(ColorBlack, x, y,
+       unit->Type->Icon.Icon->Width + 7, 7);
     if (unit->HP) {
        f = (100 * unit->HP) / unit->Stats->HitPoints;
        if (f > 75) {
@@ -95,7 +96,7 @@
        } else {
            color = ColorRed;
        }
-       f = (f * (IconWidth + 5)) / 100;
+       f = (f * (unit->Type->Icon.Icon->Width + 5)) / 100;
        VideoFillRectangleClip(color, x + 1, y + 1, f, 5);
     }
 }
@@ -113,13 +114,14 @@
 {
     int f;
 
-    y += IconHeight + 7;
-    VideoFillRectangleClip(ColorBlack, x, y + 3, IconWidth + 7, 4);
+    y += unit->Type->Icon.Icon->Height + 7;
+    VideoFillRectangleClip(ColorBlack, x, y + 3,
+       unit->Type->Icon.Icon->Width + 7, 4);
     if (unit->HP) {
        // s0m3body: mana bar should represent proportional value of Mana
        // with respect to MaxMana (unit->Type->_MaxMana) for the unit
        f = (100 * unit->Mana) / unit->Type->_MaxMana;
-       f = (f * (IconWidth + 5)) / 100;
+       f = (f * (unit->Type->Icon.Icon->Width + 5)) / 100;
        VideoFillRectangleClip(ColorBlue, x + 1, y + 3 + 1, f, 2);
     }
 }