Add sanity check for script timers when loading

arx · Jul 19, 2016 · 02908e3 · 02908e3
1 parent c045a13
commit 02908e3
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/scene/ChangeLevel.cpp b/src/scene/ChangeLevel.cpp
@@ -2140,7 +2140,14 @@ static Entity * ARX_CHANGELEVEL_Pop_IO(const std::string & idString, EntityInsta
 			scr_timer[num].pos = ats->pos;
 			// TODO if the script has changed since the last save, this position may be invalid
 
-			const unsigned long remaining = checked_range_cast<unsigned long>(ats->remaining);
+			unsigned long remaining = checked_range_cast<unsigned long>(ats->remaining);
+			if(remaining > (unsigned long)ats->interval) {
+				LogWarning << "Found bad script timer " << scr_timer[num].name
+				           << " for entity " << io->idString() << " in save file: remaining time ("
+				           << remaining << "ms) > interval (" << ats->interval << "ms) " << ats->flags;
+				remaining = ats->interval;
+			}
+
 			const ArxInstant tt = (ARX_CHANGELEVEL_DesiredTime + remaining) - ats->interval;
 			scr_timer[num].start = tt;