diff --git a/source/glest_game/game/game.cpp b/source/glest_game/game/game.cpp index bea2f999..83752a14 100644 --- a/source/glest_game/game/game.cpp +++ b/source/glest_game/game/game.cpp @@ -5291,13 +5291,6 @@ void Game::render3d(){ if(SystemFlags::getSystemSettingType(SystemFlags::debugPerformance).enabled && chrono.getMillis() > 0) SystemFlags::OutputDebug(SystemFlags::debugPerformance,"In [%s::%s Line: %d] renderFps = %d took msecs: %lld [renderUnits]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,renderFps,chrono.getMillis()); if(SystemFlags::getSystemSettingType(SystemFlags::debugPerformance).enabled && chrono.getMillis() > 0) chrono.start(); - // renderTeamColorPlane - if((renderExtraTeamColor&renderTeamColorPlaneBit)>0){ - renderer.renderTeamColorPlane(); - if(SystemFlags::getSystemSettingType(SystemFlags::debugPerformance).enabled && chrono.getMillis() > 0) SystemFlags::OutputDebug(SystemFlags::debugPerformance,"In [%s::%s Line: %d] renderFps = %d took msecs: %lld [renderObjects]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,renderFps,chrono.getMillis()); - if(SystemFlags::getSystemSettingType(SystemFlags::debugPerformance).enabled && chrono.getMillis() > 0) chrono.start(); - } - //water renderer.renderWater(); renderer.renderWaterEffects(); @@ -5319,6 +5312,13 @@ void Game::render3d(){ renderer.renderHealthBars(healthbarMode); } + // renderTeamColorPlane + if((renderExtraTeamColor&renderTeamColorPlaneBit)>0){ + renderer.renderTeamColorPlane(); + if(SystemFlags::getSystemSettingType(SystemFlags::debugPerformance).enabled && chrono.getMillis() > 0) SystemFlags::OutputDebug(SystemFlags::debugPerformance,"In [%s::%s Line: %d] renderFps = %d took msecs: %lld [renderObjects]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,renderFps,chrono.getMillis()); + if(SystemFlags::getSystemSettingType(SystemFlags::debugPerformance).enabled && chrono.getMillis() > 0) chrono.start(); + } + //mouse 3d renderer.renderMouse3d(); if(SystemFlags::getSystemSettingType(SystemFlags::debugPerformance).enabled && chrono.getMillis() > 0) SystemFlags::OutputDebug(SystemFlags::debugPerformance,"In [%s::%s Line: %d] renderFps = %d took msecs: %lld [renderMouse3d]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,renderFps,chrono.getMillis()); diff --git a/source/glest_game/graphics/renderer.cpp b/source/glest_game/graphics/renderer.cpp index b029e08e..2f32d067 100644 --- a/source/glest_game/graphics/renderer.cpp +++ b/source/glest_game/graphics/renderer.cpp @@ -5241,9 +5241,11 @@ void Renderer::renderTeamColorPlane(){ for(int visibleUnitIndex = 0; visibleUnitIndex < (int)qCache.visibleQuadUnitList.size(); ++visibleUnitIndex){ Unit *unit = qCache.visibleQuadUnitList[visibleUnitIndex]; - Vec3f currVec= unit->getCurrVectorFlat(); - renderTeamColorEffect(currVec,visibleUnitIndex,unit->getType()->getSize(), - unit->getFaction()->getTexture()->getPixmapConst()->getPixel3f(0,0),texture); + if( unit->isAlive()){ + Vec3f currVec= unit->getCurrVectorFlat(); + renderTeamColorEffect(currVec,visibleUnitIndex,unit->getType()->getSize(), + unit->getFaction()->getTexture()->getPixmapConst()->getPixel3f(0,0),texture); + } } glDisable(GL_COLOR_MATERIAL); glPopAttrib();