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

- added a more simpler version of right click to set meeting point from RCL

This commit is contained in:
Mark Vejvoda 2010-05-10 23:56:55 +00:00
parent e7d06aebc3
commit f091df9954
3 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
source/glest_game/game/commander.cpp
View File

@ -107,39 +107,60 @@ CommandResult Commander::tryGiveCommand(const Selection *selection, const Comman
//auto command
CommandResult Commander::tryGiveCommand(const Selection *selection, const Vec2i &pos, const Unit *targetUnit, bool tryQueue) const{
if(!selection->isEmpty()){
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
CommandResult result = crFailUndefined;
if(selection->isEmpty() == false){
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
Vec2i refPos, currPos;
CommandResultContainer results;
//give orders to all selected units
refPos= computeRefPos(selection);
for(int i=0; i<selection->getCount(); ++i){
for(int i=0; i<selection->getCount(); ++i) {
//every unit is ordered to a different pos
currPos= computeDestPos(refPos, selection->getUnit(i)->getPos(), pos);
const Unit *unit = selection->getUnit(i);
assert(unit != NULL);
currPos= computeDestPos(refPos, unit->getPos(), pos);
//get command type
const CommandType *commandType= selection->getUnit(i)->computeCommandType(pos, targetUnit);
const CommandType *commandType= unit->computeCommandType(pos, targetUnit);
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] unit = [%s] commandType = %p\n",__FILE__,__FUNCTION__,__LINE__,unit->getFullName().c_str(), commandType);
//give commands
if(commandType!=NULL){
if(commandType!=NULL) {
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] commandType->toString() [%s]\n",__FILE__,__FUNCTION__,__LINE__,commandType->toString().c_str());
int targetId= targetUnit==NULL? Unit::invalidId: targetUnit->getId();
int unitId= selection->getUnit(i)->getId();
int unitId= unit->getId();
NetworkCommand networkCommand(this->world,nctGiveCommand, unitId, commandType->getId(), currPos, -1, targetId, -1, tryQueue);
CommandResult result= pushNetworkCommand(&networkCommand);
results.push_back(result);
}
else{
else if(unit->isMeetingPointSettable() == true) {
NetworkCommand command(this->world,nctSetMeetingPoint, unit->getId(), -1, currPos);
CommandResult result= pushNetworkCommand(&command);
results.push_back(result);
}
else {
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
results.push_back(crFailUndefined);
}
}
return computeResult(results);
}
else{
return crFailUndefined;
result = computeResult(results);
}
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] result = %d\n",__FILE__,__FUNCTION__,__LINE__,result);
return result;
}
CommandResult Commander::tryCancelCommand(const Selection *selection) const{

4
source/glest_game/type_instances/unit.cpp
View File

@ -1194,6 +1194,10 @@ void Unit::setMeetingPos(const Vec2i &meetingPos) {
logSynchData(string(__FILE__) + string("::") + string(__FUNCTION__) + string(" Line: ") + intToStr(__LINE__));
}
bool Unit::isMeetingPointSettable() const {
return (type != NULL ? type->getMeetingPoint() : false);
}
int Unit::getFrameCount() {
int frameCount = 0;
const Game *game = Renderer::getInstance().getGame();

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

@ -309,6 +309,8 @@ public:
void setModelFacing(CardinalDir value);
CardinalDir getModelFacing() { return modelFacing; }
bool isMeetingPointSettable() const;
private:
float computeHeight(const Vec2i &pos) const;
void updateTarget();