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

Food shortage warning sound 

General sound to warn about consumable resources shortage
This commit is contained in:
titiger 2021-06-18 17:25:37 +02:00
parent fdf77e846e
commit 4e532db6dd
3 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source/glest_game/type_instances/faction.cpp
View File

@ -1181,8 +1181,10 @@ void Faction::deApplyStaticConsumption(const ProducibleType *p,const CommandType
}
//apply resource on interval (cosumable resouces)
void Faction::applyCostsOnInterval(const ResourceType *rtApply) {
// returns true if warning sound for food etc is needed
bool Faction::applyCostsOnInterval(const ResourceType *rtApply) {
bool warningSoundNeeded=false;
// For each Resource type we store in the int a total consumed value, then
// a vector of units that consume the resource type
std::map<const ResourceType *, std::pair<int, std::vector<Unit *> > > resourceIntervalUsage;
@ -1219,6 +1221,20 @@ void Faction::applyCostsOnInterval(const ResourceType *rtApply) {
int resourceTypeUsage = iter->second.first;
incResourceAmount(rt, resourceTypeUsage);
if (rt->getClass() == rcConsumable ) {
const Resource *r = getResource(rt);
if (r->getBalance() * 5 + r->getAmount() < 0 && r->getAmount() >= 0) {
// warning for player and team( if shared resources or control )
bool sharedTeamResources = world->getGame()->isFlagType1BitEnabled(ft1_allow_shared_team_resources);
bool sharedTeamUnits = world->getGame()->isFlagType1BitEnabled(ft1_allow_shared_team_units);
bool isTeam = ( this->getTeam() == world->getThisTeamIndex());
if (this->getIndex() == world->getThisFactionIndex() || (isTeam && (sharedTeamResources || sharedTeamUnits))) {
warningSoundNeeded=true;
}
}
}
// Check if we have any unit consumers
if(getResource(rt)->getAmount() < 0) {
resetResourceAmount(rt);
@ -1247,6 +1263,7 @@ void Faction::applyCostsOnInterval(const ResourceType *rtApply) {
}
}
}
return warningSoundNeeded;
}
int Faction::getAmountOfProducable(const ProducibleType *pt,const CommandType *ct) {
@ -1804,8 +1821,8 @@ void Faction::cleanupResourceTypeTargetCache(std::vector<Vec2i> *deleteListPtr,i
if(deleteList.empty() == false) {
if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true) {
char szBuf[8096]="";
snprintf(szBuf,8096,"[cleaning old resource targets] deleteList.size() [" MG_SIZE_T_SPECIFIER "] cacheResourceTargetList.size() [" MG_SIZE_T_SPECIFIER "], needToCleanup [%d]",
char szBuf[8095]="";
snprintf(szBuf,8095,"[cleaning old resource targets] deleteList.size() [" MG_SIZE_T_SPECIFIER "] cacheResourceTargetList.size() [" MG_SIZE_T_SPECIFIER "], needToCleanup [%d]",
deleteList.size(),cacheResourceTargetList.size(),needToCleanup);
//unit->logSynchData(szBuf);

2
source/glest_game/type_instances/faction.h
View File

@ -314,7 +314,7 @@ public:
void deApplyCosts(const ProducibleType *p,const CommandType *ct);
void deApplyStaticCosts(const ProducibleType *p,const CommandType *ct);
void deApplyStaticConsumption(const ProducibleType *p,const CommandType *ct);
void applyCostsOnInterval(const ResourceType *rtApply);
bool applyCostsOnInterval(const ResourceType *rtApply);
bool checkCosts(const ProducibleType *pt,const CommandType *ct);
int getAmountOfProducable(const ProducibleType *pt,const CommandType *ct);

10
source/glest_game/world/world.cpp
View File

@ -18,6 +18,7 @@
#include "faction.h"
#include "unit.h"
#include "game.h"
#include "core_data.h"
#include "logger.h"
#include "sound_renderer.h"
#include "game_settings.h"
@ -805,6 +806,7 @@ void World::underTakeDeadFactionUnits() {
void World::updateAllFactionConsumableCosts() {
//food costs
bool warningSoundNeeded=false;
int resourceTypeCount = techTree->getResourceTypeCount();
int factionCount = getFactionCount();
for(int i = 0; i < resourceTypeCount; ++i) {
@ -815,11 +817,15 @@ void World::updateAllFactionConsumableCosts() {
if(faction == NULL) {
throw megaglest_runtime_error("faction == NULL");
}
faction->applyCostsOnInterval(rt);
warningSoundNeeded = warningSoundNeeded || faction->applyCostsOnInterval(rt);
}
}
}
if (warningSoundNeeded) {
CoreData &coreData = CoreData::getInstance();
//StaticSound *sound= static_cast<const DieSkillType *>(unit->getType()->getFirstStOfClass(scDie))->getSound();
SoundRenderer::getInstance().playFx(coreData.getHighlightSound());
}
}
void World::update() {