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

[Jimmy Salmon]

CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     Jimmy Salmon <address@hidden>   03/10/04 01:25:41

Modified files:
        src/ui         : mainscr.c 

Log message:
        Don't require food and score icons

Patches:
Index: stratagus/src/ui/mainscr.c
diff -u stratagus/src/ui/mainscr.c:1.125 stratagus/src/ui/mainscr.c:1.126
--- stratagus/src/ui/mainscr.c:1.125    Tue Sep 30 16:07:00 2003
+++ stratagus/src/ui/mainscr.c  Sat Oct  4 01:25:41 2003
@@ -27,7 +27,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: mainscr.c,v 1.125 2003/09/30 20:07:00 jsalmon3 Exp $
+//     $Id: mainscr.c,v 1.126 2003/10/04 05:25:41 jsalmon3 Exp $
 
 //@{
 
@@ -572,10 +572,12 @@
                    v > 99999 ? SmallFont : GameFont, v);
            }
        }
-       VideoDrawSubClip(TheUI.Resources[FoodCost].Icon.Graphic, 0,
-           TheUI.Resources[FoodCost].IconRow * TheUI.Resources[FoodCost].IconH,
-           TheUI.Resources[FoodCost].IconW, TheUI.Resources[FoodCost].IconH,
-           TheUI.Resources[FoodCost].IconX, TheUI.Resources[FoodCost].IconY);
+       if (TheUI.Resources[FoodCost].Icon.Graphic) {
+           VideoDrawSubClip(TheUI.Resources[FoodCost].Icon.Graphic, 0,
+               TheUI.Resources[FoodCost].IconRow * 
TheUI.Resources[FoodCost].IconH,
+               TheUI.Resources[FoodCost].IconW, 
TheUI.Resources[FoodCost].IconH,
+               TheUI.Resources[FoodCost].IconX, 
TheUI.Resources[FoodCost].IconY);
+       }
        sprintf(tmp, "%d/%d", ThisPlayer->NumFoodUnits, ThisPlayer->Food);
        if (ThisPlayer->Food < ThisPlayer->NumFoodUnits) {
            VideoDrawReverseText(TheUI.Resources[FoodCost].TextX,
@@ -585,10 +587,12 @@
                TheUI.Resources[FoodCost].TextY, GameFont, tmp);
        }
 
-       VideoDrawSubClip(TheUI.Resources[ScoreCost].Icon.Graphic, 0,
-           TheUI.Resources[ScoreCost].IconRow * 
TheUI.Resources[ScoreCost].IconH,
-           TheUI.Resources[ScoreCost].IconW, TheUI.Resources[ScoreCost].IconH,
-           TheUI.Resources[ScoreCost].IconX, TheUI.Resources[ScoreCost].IconY);
+       if (TheUI.Resources[ScoreCost].Icon.Graphic) {
+           VideoDrawSubClip(TheUI.Resources[ScoreCost].Icon.Graphic, 0,
+               TheUI.Resources[ScoreCost].IconRow * 
TheUI.Resources[ScoreCost].IconH,
+               TheUI.Resources[ScoreCost].IconW, 
TheUI.Resources[ScoreCost].IconH,
+               TheUI.Resources[ScoreCost].IconX, 
TheUI.Resources[ScoreCost].IconY);
+       }
        v = ThisPlayer->Score;
        VideoDrawNumber(TheUI.Resources[ScoreCost].TextX,
            TheUI.Resources[ScoreCost].TextY + (v > 99999) * 3,