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

No red 3d arrow pointer is painted when commanding via minimap

This commit is contained in:
Titus Tscharntke 2010-12-20 03:12:00 +00:00
parent fa952efaf9
commit 591acdded4
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/glest_game/gui/gui.cpp
View File

@ -404,14 +404,14 @@ void Gui::giveDefaultOrders(int x, int y){
console->addStdMessage("InvalidPosition"); console->addStdMessage("InvalidPosition");
return; return;
} }
giveDefaultOrders(targetPos.x,targetPos.y,targetUnit); giveDefaultOrders(targetPos.x,targetPos.y,targetUnit,true);
} }
void Gui::givePreparedDefaultOrders(int x, int y){ void Gui::givePreparedDefaultOrders(int x, int y){
giveDefaultOrders(x, y, NULL); giveDefaultOrders(x, y, NULL,false);
} }
void Gui::giveDefaultOrders(int x, int y,const Unit *targetUnit){ void Gui::giveDefaultOrders(int x, int y,const Unit *targetUnit, bool paintMouse3d){
bool queueKeyDown = isKeyDown(queueCommandKey); bool queueKeyDown = isKeyDown(queueCommandKey);
Vec2i targetPos=Vec2i(x, y); Vec2i targetPos=Vec2i(x, y);
//give order //give order
@ -420,7 +420,8 @@ void Gui::giveDefaultOrders(int x, int y,const Unit *targetUnit){
//graphical result //graphical result
addOrdersResultToConsole(activeCommandClass, result); addOrdersResultToConsole(activeCommandClass, result);
if(result == crSuccess || result == crSomeFailed){ if(result == crSuccess || result == crSomeFailed){
mouse3d.enable(); if(paintMouse3d)
mouse3d.enable();
if(random.randRange(0, 1)==0){ if(random.randRange(0, 1)==0){
SoundRenderer::getInstance().playFx( SoundRenderer::getInstance().playFx(
@ -474,7 +475,9 @@ void Gui::giveTwoClickOrders(int x, int y , bool prepared){
//graphical result //graphical result
addOrdersResultToConsole(activeCommandClass, result); addOrdersResultToConsole(activeCommandClass, result);
if(result == crSuccess || result == crSomeFailed){ if(result == crSuccess || result == crSomeFailed){
mouse3d.enable(); if(!prepared){
mouse3d.enable();
}
if(random.randRange(0, 1)==0){ if(random.randRange(0, 1)==0){
SoundRenderer::getInstance().playFx( SoundRenderer::getInstance().playFx(

2
source/glest_game/gui/gui.h
View File

@ -183,7 +183,7 @@ private:
//orders //orders
void giveDefaultOrders(int x, int y); void giveDefaultOrders(int x, int y);
void giveDefaultOrders(int x, int y, const Unit *targetUnit); void giveDefaultOrders(int x, int y, const Unit *targetUnit, bool paintMouse3d);
void givePreparedDefaultOrders(int x, int y); void givePreparedDefaultOrders(int x, int y);
void giveOneClickOrders(); void giveOneClickOrders();
void giveTwoClickOrders(int x, int y, bool prepared); void giveTwoClickOrders(int x, int y, bool prepared);