mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-10-02 10:26:45 +02:00
Code Issues Projects Releases Wiki Activity

added some new lua methods to determine day or night and new event

Browse Source
This commit is contained in:
Mark Vejvoda
2013-05-25 20:46:36 +00:00
parent de68fc759d
commit aa69a5818b
7 changed files with 132 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2424,7 +2424,7 @@ void Renderer::renderResourceStatus() {
glPushAttrib(GL_ENABLE_BIT);
int j= 0;
int resourceCountRendered = 0;
for(int i= 0; i < world->getTechTree()->getResourceTypeCount(); ++i) {
const ResourceType *rt = world->getTechTree()->getResourceType(i);
const Resource *r = thisFaction->getResource(rt);
@@ -2475,7 +2475,11 @@ void Renderer::renderResourceStatus() {
if(isNegativeConsumableDisplayCycle == false) {
glColor3f(1.f, 1.f, 1.f);
}
renderQuad(j*100+200, metrics.getVirtualH()-30, 16, 16, rt->getImage());
const int MAX_RESOURCES_PER_ROW = 6;
int resourceRow = (resourceCountRendered > 0 ? resourceCountRendered / MAX_RESOURCES_PER_ROW : 0);
int resourceCol = resourceCountRendered % MAX_RESOURCES_PER_ROW;
//renderQuad(resourceCountRendered*100+200, metrics.getVirtualH()-30 - (30 * resourceRows), 16, 16, rt->getImage());
renderQuad(resourceCol * 100 + 200, metrics.getVirtualH()-30 - (30 * resourceRow), 16, 16, rt->getImage());
if(rt->getClass() != rcStatic) {
str+= "/" + intToStr(thisFaction->getStoreAmount(rt));
@@ -2494,15 +2498,15 @@ void Renderer::renderResourceStatus() {
renderTextShadow3D(
str, CoreData::getInstance().getDisplayFontSmall3D(),
resourceFontColor,
j*100+220, metrics.getVirtualH()-30, false);
resourceCol * 100 + 220, metrics.getVirtualH()-30 - (30 * resourceRow), false);
}
else {
renderTextShadow(
str, CoreData::getInstance().getDisplayFontSmall(),
resourceFontColor,
j*100+220, metrics.getVirtualH()-30, false);
resourceCol * 100 + 220, metrics.getVirtualH()-30 - (30 * resourceRow), false);
}
++j;
++resourceCountRendered;
}
}