games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-09-16 09:26:28 +02:00
Code Issues Releases Activity

Garrison: Factor complex if statement to functions

Browse Source
This commit is contained in:
Sandy Carter
2015-08-24 18:41:41 -04:00
parent cd13807115
commit a89ef88ce3
2 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
client/widgets/CGarrisonInt.cpp
View File

@@ -137,14 +137,8 @@ bool CGarrisonSlot::ally() const
return PlayerRelations::ALLIES == LOCPLINT->cb->getPlayerRelations(LOCPLINT->playerID, getObj()->tempOwner);
}
void CGarrisonSlot::clickRight(tribool down, bool previousState)
{
if(down && creature)
{
GH.pushInt(new CStackWindow(myStack, true));
}
}
/// The creature slot has been clicked twice, therefore the creature info should be shown
/// @return Whether the view should be refreshed
bool CGarrisonSlot::viewInfo()
{
UpgradeInfo pom;
@@ -168,6 +162,8 @@ bool CGarrisonSlot::viewInfo()
return true;
}
/// The selection is empty, therefore the creature should be moved
/// @return Whether the view should be refreshed
bool CGarrisonSlot::highlightOrDropArtifact()
{
bool artSelected = false;
@@ -208,6 +204,8 @@ bool CGarrisonSlot::highlightOrDropArtifact()
return true;
}
/// The creature is only being partially moved
/// @return Whether the view should be refreshed
bool CGarrisonSlot::split()
{
const CGarrisonSlot * selection = owner->getSelection();
@@ -241,6 +239,35 @@ bool CGarrisonSlot::split()
return true;
}
/// If certain creates cannot be moved, the selection should change
/// Force reselection in these cases
/// * When attempting to swap creatures with an ally
/// * When attempting to take unremovable units
/// @return Whether reselection must be done
bool CGarrisonSlot::mustForceReselection() const
{
const CGarrisonSlot * selection = owner->getSelection();
// Attempt to swap creatures with ally
if (selection->creature != creature && !selection->our())
return true;
if (!owner->removableUnits)
{
if (selection->upg == EGarrisonType::UP)
return true;
else
return creature || upg == EGarrisonType::UP;
}
return false;
}
void CGarrisonSlot::clickRight(tribool down, bool previousState)
{
if(down && creature)
{
GH.pushInt(new CStackWindow(myStack, true));
}
}
void CGarrisonSlot::clickLeft(tribool down, bool previousState)
{
if(down)
@@ -251,14 +278,9 @@ void CGarrisonSlot::clickLeft(tribool down, bool previousState)
refr = highlightOrDropArtifact();
else if(selection == this)
refr = viewInfo();
// Only allow certain moves if troops aren't removable or not ours.
else if (!( ( selection->our()//our creature is selected
|| selection->creature == creature )//or we are rebalancing army
&& ( owner->removableUnits
|| (upg == EGarrisonType::UP && ( selection->upg == EGarrisonType::down && !creature ) )
|| (upg == EGarrisonType::down && selection->upg == EGarrisonType::down ) ) ))
// Re-highlight if troops aren't removable or not ours.
else if (mustForceReselection())
{
// Highlight
if(creature)
owner->selectSlot(this);
redraw();

1
client/widgets/CGarrisonInt.h
View File

@@ -43,6 +43,7 @@ class CGarrisonSlot : public CIntObject
bool viewInfo();
bool highlightOrDropArtifact();
bool split();
bool mustForceReselection() const;
void setHighlight(bool on);
public: