ChangeLevel: Resolve stacked targets immediately

See: issue #375
arx · Apr 17, 2017 · 2f270d8 · 2f270d8
1 parent d59c499
commit 2f270d8
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/scene/ChangeLevel.cpp b/src/scene/ChangeLevel.cpp
@@ -2226,7 +2226,9 @@ static Entity * ARX_CHANGELEVEL_Pop_IO(const std::string & idString, EntityInsta
 				std::copy(as->stacked, as->stacked + SAVED_MAX_STACKED_BEHAVIOR, io->_npcdata->stacked);
 				// TODO properly load stacked animations
 
-				memcpy(Gaids[Gaids_Number.handleData()]->stackedtarget, as->stackedtarget, SIZE_ID * SAVED_MAX_STACKED_BEHAVIOR);
+				for(size_t iii = 0; iii < MAX_STACKED_BEHAVIOR; iii++) {
+					io->_npcdata->stacked[iii].target = ReadTargetInfo(as->stackedtarget[iii]);
+				}
 
 				io->_npcdata->critical = as->critical;
 				io->_npcdata->reach = as->reach;
@@ -2479,12 +2481,6 @@ static void ARX_CHANGELEVEL_PopAllIO_FINISH(bool reloadflag, bool firstTime) {
 				}
 			}
 
-			if(io->ioflags & IO_NPC) {
-				for(size_t iii = 0; iii < MAX_STACKED_BEHAVIOR; iii++) {
-					io->_npcdata->stacked[iii].target = ReadTargetInfo(aids->stackedtarget[iii]);
-				}
-			}
-
 		}
 	}