From 21077c401c705827a5ed0eeeb666cfc62c19314d Mon Sep 17 00:00:00 2001 From: Mark de Wever Date: Fri, 22 Dec 2006 23:50:41 +0000 Subject: [PATCH] Merge trunk 2006-12-22T21:58:14Z!crazy-ivanovic@gmx.net..2006-12-22T22:07:56Z!dominic.bolin@exong.net; patch #648 which fixes bug #8075 --- changelog | 3 ++- src/mouse_events.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/changelog b/changelog index 22a3c722950..d1a1e970f5d 100644 --- a/changelog +++ b/changelog @@ -33,7 +33,8 @@ Version 1.2: * misc: * fixed the AI usage of attack_weight (bug #7953) * the displayed terrain now has a space before the opening bracket - * fixed crash when image is missing (patch #647, thanks to pauli) + * fixed a crash when image is missing (patch #647, thanks to pauli) + * fixed a crash when attacking a sea serpent (bug #8075) (patch #648) Version 1.1.14: * campaigns: diff --git a/src/mouse_events.cpp b/src/mouse_events.cpp index f72da39f3c6..ed9591beee7 100644 --- a/src/mouse_events.cpp +++ b/src/mouse_events.cpp @@ -1090,10 +1090,11 @@ void mouse_handler::left_click(const SDL_MouseButtonEvent& event, const bool bro //check if unit is not known if (known_units.find(u->first)==known_units.end()) { - game_events::fire("sighted",u->first,attack_from); + game_events::raise("sighted",u->first,attack_from); } } } + game_events::pump(); return; } }