Fix screen hooks removing on scrip end

GetCollision returns avoid flag on invalid point instead of error, no longer level specific fix possible crashes with reveal room
swinkz · Dec 11, 2013 · f22334e · f22334e
1 parent 867bbce
commit f22334e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/JSGame.cpp b/JSGame.cpp
@@ -383,8 +383,8 @@ JSAPI_FUNC(my_getCollision)
 		{ THROW_ERROR(cx, "Level Not loaded");}
 
 	ActMap* map = ActMap::GetMap(level);
-	if(!map->IsValidPoint(point))
-		{ map->CleanUp(); THROW_ERROR(cx, "Invalid point!");}
+	//if(!map->IsValidPoint(point))  //return avoid instead and make it not lvl depenant
+	//	{ map->CleanUp(); THROW_ERROR(cx, "Invalid point!");}
 
 	jsval rval;
 	JS_BeginRequest(cx);
@@ -1621,10 +1621,13 @@ JSAPI_FUNC(my_revealLevel)
 	if (argc == 1 && JSVAL_IS_BOOLEAN(JS_ARGV(cx, vp)[0])) {
 		bDrawPresets = !!JSVAL_TO_BOOLEAN(JS_ARGV(cx, vp)[0]);
 	}
+	AutoCriticalRoom* cRoom = new AutoCriticalRoom;
+	if(!GameReady())
+		{delete cRoom; return JS_TRUE;}
 
 	for(Room2* room = level->pRoom2First; room; room = room->pRoom2Next) {
 		RevealRoom(room, bDrawPresets);
 	}
-
+	delete cRoom;
 	return JS_TRUE;
 }
diff --git a/JSRoom.cpp b/JSRoom.cpp
@@ -96,6 +96,7 @@ JSAPI_FUNC(room_getPresetUnits)
 	AutoCriticalRoom* cRoom = new AutoCriticalRoom;
 	if(!pRoom2 || !GameReady())
 		{delete cRoom; return JS_TRUE;}
+
 	if(!pRoom2->pRoom1)
 	{
 		bAdded = TRUE;
@@ -457,15 +458,15 @@ JSAPI_FUNC(room_unitInRoom)
 JSAPI_FUNC(room_reveal)
 {
 	Room2* pRoom2 = (Room2*)JS_GetPrivate(cx, JS_THIS_OBJECT(cx, vp));
-	if(!pRoom2)
-		return JS_TRUE;
-
+
 	BOOL bDrawPresets = false;
 	if (argc == 1 && JSVAL_IS_BOOLEAN(JS_ARGV(cx, vp)[0]))
 		bDrawPresets = !!JSVAL_TO_BOOLEAN(JS_ARGV(cx, vp)[0]);
 
 	AutoCriticalRoom* cRoom = new AutoCriticalRoom;
-
+	if(!pRoom2 || !GameReady())
+		{delete cRoom; return JS_TRUE;}
+
 	JS_SET_RVAL(cx, vp, BOOLEAN_TO_JSVAL(RevealRoom(pRoom2, bDrawPresets)));
 	delete cRoom;
 	return JS_TRUE;

diff --git a/ScreenHook.cpp b/ScreenHook.cpp
@@ -178,7 +178,7 @@ void Genhook::Clean(Script* owner)
 	HookIterator it = visible.begin();
 	while(it != visible.end())
 	{
-		if( (*it)->owner != owner)
+		if( (*it)->owner == owner)
 		{
 			Genhook* i = *it;
 			it = invisible.erase(it);
@@ -191,7 +191,7 @@ void Genhook::Clean(Script* owner)
 	it = invisible.begin();
 	while(it != invisible.end())
 	{
-		if( (*it)->owner != owner)
+		if( (*it)->owner == owner)
 		{
 			Genhook* i = *it;
 			it = invisible.erase(it);