1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-04-13 11:40:38 +02:00

- fixed (partially) #1028

- fix to last commit
This commit is contained in:
Ivan Savenko 2012-07-07 14:10:47 +00:00
parent 55c78e9f16
commit 846474af66
2 changed files with 5 additions and 1 deletions

View File

@ -279,6 +279,7 @@ void CPlayerInterface::heroMoved(const TryMoveHero & details)
} }
} }
adventureInt->heroList.update(ho);
return; //teleport - no fancy moving animation return; //teleport - no fancy moving animation
//TODO: smooth disappear / appear effect //TODO: smooth disappear / appear effect
} }
@ -300,6 +301,7 @@ void CPlayerInterface::heroMoved(const TryMoveHero & details)
ho->isStanding = true; ho->isStanding = true;
stillMoveHero.setn(STOP_MOVE); stillMoveHero.setn(STOP_MOVE);
GH.totalRedraw(); GH.totalRedraw();
adventureInt->heroList.update(ho);
return; return;
} }

View File

@ -371,10 +371,12 @@ void CAdventureMapButton::init(const CFunctionList<void()> &Callback, const std:
callback = Callback; callback = Callback;
hoverable = actOnDown = borderEnabled = soundDisabled = false; hoverable = actOnDown = borderEnabled = soundDisabled = false;
borderColor.unused = 1; // represents a transparent color, used for HighlightableButton borderColor.unused = 1; // represents a transparent color, used for HighlightableButton
assignedKeys.insert(key);
hoverTexts = Name; hoverTexts = Name;
helpBox=HelpBox; helpBox=HelpBox;
if (key != SDLK_UNKNOWN)
assignedKeys.insert(key);
pos.x += x; pos.x += x;
pos.y += y; pos.y += y;