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

fix in german languagefile, buildings can set meeting points when under construction

Browse Source
This commit is contained in:
Titus Tscharntke 2011-01-09 20:52:00 +00:00
parent 033c56d7f0
commit 38da21ae18
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,7 +179,7 @@ void Gui::mouseDownLeftDisplay(int x, int y){
if(!selectingPos && !selectingMeetingPoint){
int posDisplay= computePosDisplay(x, y);
if(posDisplay!= invalidPos){
if(selection.isComandable()){
if(selection.isCommandable()){
if(selectingBuilding){
//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] selectingBuilding == true\n",__FILE__,__FUNCTION__);
@ -221,7 +221,7 @@ void Gui::mouseDownLeftGraphics(int x, int y, bool prepared){
else if(selectingMeetingPoint){
//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] selectingMeetingPoint == true\n",__FILE__,__FUNCTION__);
if(selection.isComandable()){
if(selection.isCommandable()){
//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] selection.isComandable() == true\n",__FILE__,__FUNCTION__);
@ -253,7 +253,7 @@ void Gui::mouseDownRightGraphics(int x, int y , bool prepared){
if(selectingPos || selectingMeetingPoint){
resetState();
}
else if(selection.isComandable()){
else if(selection.isCommandable()){
if(prepared){
givePreparedDefaultOrders(x, y);
}
@ -276,7 +276,7 @@ void Gui::mouseUpLeftGraphics(int x, int y){
{
computeSelected(false,true);
}
if(selection.isComandable() && random.randRange(0, 1)==0){
if(selection.isCommandable() && random.randRange(0, 1)==0){
SoundRenderer::getInstance().playFx(
selection.getFrontUnit()->getType()->getSelectionSound(),
selection.getFrontUnit()->getCurrVector(),
@ -632,7 +632,7 @@ void Gui::computeInfoString(int posDisplay){
Lang &lang= Lang::getInstance();
display.setInfoText("");
if(posDisplay!=invalidPos && selection.isComandable()){
if(posDisplay!=invalidPos && selection.isCommandable()){
if(!selectingBuilding){
if(posDisplay==cancelPos){
display.setInfoText(lang.get("Cancel"));
@ -721,7 +721,7 @@ void Gui::computeDisplay() {
display.setDownSelectedPos(activePos);
}
if(selection.isComandable()) {
if(selection.isCommandable()) {
//printf("selection.isComandable()\n");
if(selectingBuilding == false) {
@ -806,7 +806,7 @@ int Gui::computePosDisplay(int x, int y){
if(posDisplay<0 || posDisplay>=Display::downCellCount){
posDisplay= invalidPos;
}
else if(selection.isComandable()){
else if(selection.isCommandable()){
if(posDisplay!=cancelPos){
if(posDisplay!=meetingPointPos){
if(!selectingBuilding){

6
source/glest_game/gui/selection.cpp
View File

@ -132,11 +132,11 @@ bool Selection::isEnemy() const{
return selectedUnits.size()==1 && selectedUnits.front()->getFactionIndex()!=factionIndex;
}
bool Selection::isComandable() const{
bool Selection::isCommandable() const{
return
!isEmpty() &&
!isEnemy() &&
!(selectedUnits.size()==1 && !selectedUnits.front()->isOperative());
!(selectedUnits.size()==1 && !selectedUnits.front()->isAlive());
}
bool Selection::isCancelable() const{
@ -148,7 +148,7 @@ bool Selection::isCancelable() const{
bool Selection::isMeetable() const{
return
isUniform() &&
isComandable() &&
isCommandable() &&
selectedUnits.front()->getType()->getMeetingPoint();
}

3
source/glest_game/gui/selection.h
View File

@ -56,7 +56,8 @@ public:
bool isEmpty() const {return selectedUnits.empty();}
bool isUniform() const;
bool isEnemy() const;
bool isComandable() const;
//bool isComandable() const;
bool isCommandable() const;
bool isCancelable() const;
bool isMeetable() const;
int getCount() const {return selectedUnits.size();}