From: Laszlo T. <ave...@us...> - 2012-01-12 20:21:17
|
gemrb: Infinity Engine emulator The branch master has been updated via c533ca12ba8a6212a30eddfeae6466b772f5b0b4 (commit) Summary of changes: gemrb/core/GameScript/Matching.cpp | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) from 766e90ef8f03aa974fd5eb3066ee10e6fa58ab94 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=c533ca12ba8a6212a30eddfeae6466b772f5b0b4 commit c533ca12ba8a6212a30eddfeae6466b772f5b0b4 Author: Avenger <ave...@so...> Date: Thu Jan 12 21:20:25 2012 +0100 fixed ar1512 puzzle (bug #3472986) diff --git a/gemrb/core/GameScript/Matching.cpp b/gemrb/core/GameScript/Matching.cpp index a61bc18..fbcd999 100644 --- a/gemrb/core/GameScript/Matching.cpp +++ b/gemrb/core/GameScript/Matching.cpp @@ -148,15 +148,18 @@ static Targets* EvaluateObject(Map *map, Scriptable* Sender, Object* oC, int ga_ /*if (!aC && (ga_flags&GA_GLOBAL) ) { aC = FindActorNearby(oC->objectName, map, ga_flags ); }*/ - if (!aC) { - aC = map->GetTileMap()->GetInfoPoint(oC->objectName); - } + + //This order is the same as in GetActorObject + //TODO:merge them if (!aC) { aC = map->GetTileMap()->GetDoor(oC->objectName); } if (!aC) { aC = map->GetTileMap()->GetContainer(oC->objectName); } + if (!aC) { + aC = map->GetTileMap()->GetInfoPoint(oC->objectName); + } //return here because object name/IDS targeting are mutually exclusive return ReturnScriptableAsTarget(aC); ----------------------------------------------------------------------- This is an automated email from the git hooks/post-receive script. -- gemrb: Infinity Engine emulator |