Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
jsalmon3 2003-10-13 20:35:56 +00:00
parent de83c89f7d
commit fd8072e5b8
1 changed files with 6 additions and 10 deletions

16
src/ui/mainscr.cpp
View file

@ -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 @@ local void UiDrawCompleted(int full, int ready)
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 @@ global void DrawUnitInfo(const Unit* unit)
//
// 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 @@ global void DrawUnitInfo(const Unit* unit)
// 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,