mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-02-25 04:02:30 +01:00
Code Issues Projects Releases Wiki Activity

alarmsound when enemy units are seen ( will be improved soon )

Browse Source
This commit is contained in:
Titus Tscharntke 2010-12-18 20:17:41 +00:00
parent 6a99e2db8e
commit 886bd3b37e
3 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/glest_game/types/command_type.h
View File

@ -67,12 +67,12 @@ enum Queueability {
class CommandType: public RequirableType {
protected:
CommandClass commandTypeClass;
Clicks clicks;
int id;
public:
static const int invalidId= -1;
CommandClass commandTypeClass;
public:
CommandType() {

34
source/glest_game/world/unit_updater.cpp
View File

@ -53,6 +53,7 @@ UnitUpdater::UnitUpdater() {
this->scriptManager= NULL;
this->routePlanner = NULL;
this->pathFinder = NULL;
lastWarnFrameCount=0;
//UnitRangeCellsLookupItemCacheTimerCount = 0;
}
@ -67,6 +68,7 @@ void UnitUpdater::init(Game *game){
this->scriptManager= game->getScriptManager();
this->routePlanner = NULL;
this->pathFinder = NULL;
lastWarnFrameCount=0;
//UnitRangeCellsLookupItemCacheTimerCount = 0;
switch(this->game->getGameSettings()->getPathFinderType()) {
@ -180,6 +182,12 @@ void UnitUpdater::updateUnitCommand(Unit *unit) {
//if unit has command process it
if(unit->anyCommand()) {
CommandClass cc=unit->getCurrCommand()->getCommandType()->commandTypeClass;
if(unit->isOperative() && (!(cc==ccStop || cc==ccAttack)) )
{//stop and attack already check for themselves
Unit *sighted;
attackerOnSight(unit, &sighted);
}
unit->getCurrCommand()->getCommandType()->update(this, unit);
}
@ -194,6 +202,12 @@ void UnitUpdater::updateUnitCommand(Unit *unit) {
//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
unit->giveCommand(new Command(unit->getType()->getFirstCtOfClass(ccStop)));
}
else
{
// buidings have no stop skill but hav to check for attackers too.
Unit *sighted;
attackerOnSight(unit, &sighted);
}
}
if(chrono.getMillis() > 0) SystemFlags::OutputDebug(SystemFlags::debugPerformance,"In [%s::%s] Line: %d took msecs: %lld --------------------------- [END OF METHOD] ---------------------------\n",__FILE__,__FUNCTION__,__LINE__,chrono.getMillis());
@ -1692,7 +1706,7 @@ void UnitUpdater::findEnemiesForCell(const AttackSkillType *ast, Cell *cell, con
bool UnitUpdater::unitOnRange(const Unit *unit, int range, Unit **rangedPtr,
const AttackSkillType *ast){
vector<Unit*> enemies;
bool result=false;
//we check command target
const Unit *commandTarget = NULL;
if(unit->anyCommand()) {
@ -1743,18 +1757,30 @@ bool UnitUpdater::unitOnRange(const Unit *unit, int range, Unit **rangedPtr,
if(enemies[i]->getType()->hasSkillClass(scAttack)) {
*rangedPtr= enemies[i];
return true;
result=true;
break;
}
}
//any enemy
if(enemies.size() > 0) {
if(!result && (enemies.size() > 0)) {
*rangedPtr= enemies.front();
return true;
}
return false;
if(result)
{
if(world->getFrameCount()-lastWarnFrameCount>80) //after 100 frames attack break we warn again
{
SoundRenderer::getInstance().playFx(CoreData::getInstance().getAttentionSound());
}
lastWarnFrameCount=world->getFrameCount();
}
return result;
}
// =====================================================

3
source/glest_game/world/unit_updater.h
View File

@ -69,7 +69,8 @@ private:
PathFinder *pathFinder;
RoutePlanner *routePlanner;
Game *game;
RandomGen random;
RandomGen random;
int lastWarnFrameCount;
std::map<Vec2i, std::map<int, std::map<int, UnitRangeCellsLookupItem > > > UnitRangeCellsLookupItemCache;
//std::map<int,ExploredCellsLookupKey> ExploredCellsLookupItemCacheTimer;