Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

3 cycle resource warning instead of percentage warning / sailboat texture fixed in menu

This commit is contained in:
Titus Tscharntke 2011-10-18 22:00:59 +00:00
parent a114e27e7d
commit c151f538b1
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/glest_game/game/game_constants.h
View File

@ -33,6 +33,7 @@ const Vec4f CYAN(0.0f, 1.0f, 1.0f, 1.0f);
const Vec4f YELLOW(1.0f, 1.0f, 0.0f, 1.0f);
const Vec4f MAGENTA(1.0f, 0.0f, 1.0f, 1.0f);
const Vec4f WHITE(1.0f, 1.0f, 1.0f, 1.0f);
const Vec4f ORANGE(1.0f, 0.7f, 0.0f, 1.0f);
enum PathFinderType {
pfBasic,

25
source/glest_game/graphics/renderer.cpp
View File

@ -1613,24 +1613,29 @@ void Renderer::renderResourceStatus() {
bool isNegativeConsumableDisplayCycle = false;
if(rt->getClass() == rcConsumable) {
// Show in red font if negative
const double minWarnPercent = 25.0;
//if(r->getBalance() < 0) {
if(r->getBalance() < 0 &&
((thisFaction->getStoreAmount(rt) > 0 && (double)r->getAmount() / (double)thisFaction->getStoreAmount(rt) * 100.0 <= minWarnPercent) ||
(thisFaction->getStoreAmount(rt) <= 0 && (double)r->getAmount() <= minWarnPercent))) {
// Show in yellow/orange/red font if negative
if(r->getBalance()*3+r->getAmount()<0){
if(time(NULL) % 2 == 0) {
isNegativeConsumableDisplayCycle = true;
glColor3f(RED.x,RED.y,RED.z);
resourceFontColor = RED;
if(r->getBalance()*1+r->getAmount()<0){
glColor3f(RED.x,RED.y,RED.z);
resourceFontColor = RED;
}
else if(r->getBalance()*2+r->getAmount()<0){
glColor3f(ORANGE.x,ORANGE.y,ORANGE.z);
resourceFontColor = ORANGE;
}
else if(r->getBalance()*3+r->getAmount()<0){
glColor3f(YELLOW.x,YELLOW.y,YELLOW.z);
resourceFontColor = YELLOW;
}
}
//printf("Balance is negative!");
}
}
if(isNegativeConsumableDisplayCycle == false) {
glColor3f(1.f, 1.f, 1.f);
}
renderQuad(j*100+200, metrics.getVirtualH()-30, 16, 16, rt->getImage());
if(rt->getClass() != rcStatic) {