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

[Jimmy Salmon]

CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     Jimmy Salmon <address@hidden>   03/10/13 17:35:57

Modified files:
        src/ui         : mainscr.c 

Log message:
        Removed Original drawing defines, fixed bug when completed bar text 
isn't defined

Patches:
Index: stratagus/src/ui/mainscr.c
diff -u stratagus/src/ui/mainscr.c:1.132 stratagus/src/ui/mainscr.c:1.133
--- stratagus/src/ui/mainscr.c:1.132    Mon Oct 13 05:38:01 2003
+++ stratagus/src/ui/mainscr.c  Mon Oct 13 17:35:56 2003
@@ -27,7 +27,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: mainscr.c,v 1.132 2003/10/13 09:38:01 martinxyz Exp $
+//     $Id: mainscr.c,v 1.133 2003/10/13 21:35:56 jsalmon3 Exp $
 
 //@{
 
@@ -60,11 +60,6 @@
 --     Defines
 ----------------------------------------------------------------------------*/
 
-// FIXME: should become global configurable
-#define OriginalTraining       0       /// 1 for the original training display
-#define OriginalBuilding       0       /// 1 for the original building display
-#define OriginalLevel          0       /// 1 for the original level display
-
 /*----------------------------------------------------------------------------
 --     Functions
 ----------------------------------------------------------------------------*/
@@ -146,8 +141,10 @@
     f = (f * TheUI.CompletedBarW) / 100;
     VideoFillRectangleClip(TheUI.CompletedBarColor,
        TheUI.CompletedBarX, TheUI.CompletedBarY, f, TheUI.CompletedBarH);
-    VideoDrawText(TheUI.CompletedBarTextX, TheUI.CompletedBarTextY,
-       TheUI.CompletedBarFont, TheUI.CompletedBarText);
+    if (TheUI.CompletedBarText) {
+       VideoDrawText(TheUI.CompletedBarTextX, TheUI.CompletedBarTextY,
+           TheUI.CompletedBarFont, TheUI.CompletedBarText);
+    }
 }
 
 /**
@@ -282,8 +279,7 @@
     //
     // Draw unit kills and experience.
     //
-    if (!OriginalLevel && stats->Level &&
-           !(type->Transporter && unit->InsideCount)) {
+    if (stats->Level && !(type->Transporter && unit->InsideCount)) {
         sprintf(buf, "XP:~<%d~> Kills:~<%d~>", unit->XP, unit->Kills);
        VideoDrawTextCentered(x + 114, y + 8 + 15 + 33, GameFont, buf);
     }
@@ -296,7 +292,7 @@
        //      Building under constuction.
        //
        if (unit->Orders[0].Action == UnitActionBuilded) {
-           if (!OriginalBuilding && unit->Data.Builded.Worker) {
+           if (unit->Data.Builded.Worker) {
                // FIXME: Position must be configured!
                DrawUnitIcon(unit->Data.Builded.Worker->Player,
                    unit->Data.Builded.Worker->Type->Icon.Icon,