diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-02-25 09:08:45 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-02-25 09:08:45 +0000 |
| commit | cbb494dc1045c0671c60a86f7bc1f14391e3e54d (patch) | |
| tree | 9c94651fa608ce8399227b1a69abfdb404a0aadd | |
| parent | 5c1093ffa9fea3d979a720169e97ed31725e95c4 (diff) | |
| download | mana-cbb494dc1045c0671c60a86f7bc1f14391e3e54d.tar.gz mana-cbb494dc1045c0671c60a86f7bc1f14391e3e54d.tar.bz2 mana-cbb494dc1045c0671c60a86f7bc1f14391e3e54d.tar.xz mana-cbb494dc1045c0671c60a86f7bc1f14391e3e54d.zip | |
Small ChangeLog updates.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | src/gui/npc.cpp | 1 |
2 files changed, 2 insertions, 2 deletions
@@ -5,9 +5,10 @@ - Added ability to load resources from zip files - Added start of a minimap - Added new GUI skin, wallpaper and mouse cursor -- Reintroduced cancel button for npc choice dialog after Mra fixed it for us +- Fixed and reintroduced cancel button for NPC choice dialog (Mra) - Fixed character creation and deletion error handling - Fixed crash in fullscreen with hardware acceleration enabled (win32) +- Fixed talking to NPCs while NPC window is still open (Mra) - Reimplemented A* pathfinding, more flexible and stable now - Removed background music that wasn't ours diff --git a/src/gui/npc.cpp b/src/gui/npc.cpp index 4049b061..4f0a7943 100644 --- a/src/gui/npc.cpp +++ b/src/gui/npc.cpp @@ -110,7 +110,6 @@ void NpcListDialog::action(const std::string& eventId) setVisible(false); current_npc = 0; reset(); - } } else if (eventId == "cancel") { |