From cbb494dc1045c0671c60a86f7bc1f14391e3e54d Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Fri, 25 Feb 2005 09:08:45 +0000 Subject: Small ChangeLog updates. --- ChangeLog | 3 ++- src/gui/npc.cpp | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index da0fd3d2..e938f8e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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") { -- cgit v1.2.3-70-g09d2