[Gemrb-commits] SF.net SVN: gemrb:[6612] gemrb/trunk/gemrb/plugins

[<lyn...@us...>]

Revision: 6612
          http://gemrb.svn.sourceforge.net/gemrb/?rev=6612&view=rev
Author:   lynxlupodian
Date:     2009-06-24 13:10:16 +0000 (Wed, 24 Jun 2009)

Log Message:
-----------
fixed a crash in SummonCreature

Modified Paths:
--------------
    gemrb/trunk/gemrb/plugins/Core/Interface.cpp
    gemrb/trunk/gemrb/plugins/FXOpcodes/FXOpc.cpp

Modified: gemrb/trunk/gemrb/plugins/Core/Interface.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/Interface.cpp	2009-06-24 11:30:12 UTC (rev 6611)
+++ gemrb/trunk/gemrb/plugins/Core/Interface.cpp	2009-06-24 13:10:16 UTC (rev 6612)
@@ -2445,7 +2445,12 @@
 			break;
 		}
 
-		Map *map = target->GetCurrentArea();
+		Map *map;
+		if (target) {
+			map = target->GetCurrentArea();
+		} else {
+			map = Owner->GetCurrentArea();
+		}
 		map->AddActor(ab);
 		ab->SetPosition(position, true, 0);
 		ab->RefreshEffects(NULL);

Modified: gemrb/trunk/gemrb/plugins/FXOpcodes/FXOpc.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/FXOpcodes/FXOpc.cpp	2009-06-24 11:30:12 UTC (rev 6611)
+++ gemrb/trunk/gemrb/plugins/FXOpcodes/FXOpc.cpp	2009-06-24 13:10:16 UTC (rev 6612)
@@ -3780,7 +3780,7 @@
 		break;
 	default:;
 	}
-	//create replacement
+	//create replacement; should we be passing the target instead of NULL?
 	core->SummonCreature(fx->Resource, fx->Resource2, Owner, NULL,p, -1,0);
 	return FX_NOT_APPLIED;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.