[[ Bug 12647 ]] Save the time when locking movements and apply an offset to each movement when unlocking movements

livecodestephen · runrevmark · commit 77658f71cf5b · 2014-06-20T11:48:32.000+01:00
diff --git a/engine/src/cmdss.cpp b/engine/src/cmdss.cpp
@@ -1136,7 +1136,7 @@ Exec_stat MCLock::exec(MCExecPoint &ep)
 		MClockmessages = True;
 		break;
 	case LC_MOVES:
-		MClockmoves = True;
+		MCscreen->setlockmoves(True);
 		break;
 	case LC_RECENT:
 		MClockrecent = True;
@@ -2004,7 +2004,7 @@ Exec_stat MCUnlock::exec(MCExecPoint &ep)
 		MClockmessages = False;
 		break;
 	case LC_MOVES:
-		MClockmoves = False;
+		MCscreen->setlockmoves(False);
 		break;
 	case LC_RECENT:
 		MClockrecent = False;
diff --git a/engine/src/globals.cpp b/engine/src/globals.cpp
@@ -404,7 +404,6 @@ Boolean MClockcolormap;
 Boolean MClockerrors;
 Boolean MClockmenus;
 Boolean MClockmessages;
-Boolean MClockmoves;
 Boolean MClockrecent;
 Boolean MCtwelvetime = True;
 Boolean MCuseprivatecmap;
@@ -761,7 +760,6 @@ void X_clear_globals(void)
 	MClockerrors = False;
 	MClockmenus = False;
 	MClockmessages = False;
-	MClockmoves = False;
 	MClockrecent = False;
 	MCtwelvetime = True;
 	MCuseprivatecmap = False;
diff --git a/engine/src/globals.h b/engine/src/globals.h
@@ -315,7 +315,6 @@ extern Boolean MClockcolormap;
 extern Boolean MClockerrors;
 extern Boolean MClockmenus;
 extern Boolean MClockmessages;
-extern Boolean MClockmoves;
 extern Boolean MClockrecent;
 extern Boolean MCtwelvetime;
 extern Boolean MCuseprivatecmap;
diff --git a/engine/src/property.cpp b/engine/src/property.cpp
@@ -1990,7 +1990,14 @@ Exec_stat MCProperty::set(MCExecPoint &ep)
 	case P_LOCK_MESSAGES:
 		return ep.getboolean(MClockmessages, line, pos, EE_PROPERTY_NAB);
 	case P_LOCK_MOVES:
-		return ep.getboolean(MClockmoves, line, pos, EE_PROPERTY_NAB);
+		{
+			Boolean t_new_value;
+			Exec_stat t_stat = ep.getboolean(t_new_value, line, pos, EE_PROPERTY_NAB);
+			if (t_stat == ES_NORMAL) {
+				MCscreen->setlockmoves(t_new_value);
+			}
+			return t_stat;
+		}
 	case P_LOCK_RECENT:
 		return ep.getboolean(MClockrecent, line, pos, EE_PROPERTY_NAB);
 	case P_PRIVATE_COLORS:
@@ -3400,7 +3407,7 @@ Exec_stat MCProperty::eval(MCExecPoint &ep)
 		ep.setboolean(MClockmessages);
 		break;
 	case P_LOCK_MOVES:
-		ep.setboolean(MClockmoves);
+		ep.setboolean(MCscreen->getlockmoves());
 		break;
 	case P_LOCK_RECENT:
 		ep.setboolean(MClockrecent);
diff --git a/engine/src/uidc.cpp b/engine/src/uidc.cpp
@@ -193,6 +193,8 @@ MCUIDC::MCUIDC()
 	nmessages = maxmessages = 0;
 	messages = NULL;
 	moving = NULL;
+	lockmoves = False;
+	locktime = 0.0;
 	ncolors = 0;
 	colors = NULL;
 	allocs = NULL;
@@ -1079,6 +1081,33 @@ Boolean MCUIDC::handlepending(real8& curtime, real8& eventtime, Boolean dispatch
     return t_handled;
 }
 
+
+Boolean MCUIDC::getlockmoves() const
+{
+	return lockmoves;
+}
+
+void MCUIDC::setlockmoves(Boolean b)
+{
+	lockmoves = b;
+
+	if (lockmoves) {
+		// then save the time the lock started
+		locktime = MCS_time(); 
+
+	} else {
+		// adjust the start time of each movement.
+		real8 offset = MCS_time() - locktime;
+		if (moving != NULL)	{
+			MCMovingList *mptr = moving;
+			do {
+				mptr->starttime += offset;
+				mptr = mptr->next();
+			} while (mptr != moving);
+		}
+	}
+}
+
 void MCUIDC::addmove(MCObject *optr, MCPoint *pts, uint2 npts,
                      real8 &duration, Boolean waiting)
 {
@@ -1126,7 +1155,11 @@ void MCUIDC::addmove(MCObject *optr, MCPoint *pts, uint2 npts,
 			optr -> setrect(newrect);
 	}
 
-	mptr->starttime = MCS_time();
+	if (lockmoves) {
+		mptr->starttime = locktime;
+	} else {
+		mptr->starttime = MCS_time();
+	}
 }
 
 void MCUIDC::listmoves(MCExecPoint &ep)
@@ -1186,21 +1219,14 @@ void MCUIDC::stopmove(MCObject *optr, Boolean finish)
 
 void MCUIDC::handlemoves(real8 &curtime, real8 &eventtime)
 {
-	static real8 lasttime;
+	if (lockmoves) 
+		return;
 	eventtime = curtime + (real8)MCsyncrate / 1000.0;
 	MCMovingList *mptr = moving;
 	Boolean moved = False;
 	Boolean done = False;
 	do
 	{
-		if (MClockmoves)
-		{
-			if (lasttime != 0.0)
-				mptr->starttime += curtime - lasttime;
-			mptr = mptr->next();
-		}
-		else
-		{
 			MCRectangle rect = mptr->object->getrect();
 			MCRectangle newrect = rect;
 			real8 dt = 0.0;
@@ -1267,13 +1293,8 @@ void MCUIDC::handlemoves(real8 &curtime, real8 &eventtime)
 			}
 			else
 				mptr = mptr->next();
-		}
 	}
 	while (mptr != NULL && mptr != moving);
-	if (MClockmoves)
-		lasttime = curtime;
-	else
-		lasttime = 0.0;
 		
 	// MW-2012-12-09: [[ Bug 9905 ]] Make sure we update the screen if something
 	//   moved (previously it only did so if there were still things to move also!).
diff --git a/engine/src/uidc.h b/engine/src/uidc.h
@@ -243,6 +243,8 @@ class MCUIDC
 protected:
 	MCMessageList *messages;
 	MCMovingList *moving;
+	Boolean lockmoves;
+	real8 locktime;
 	uint4 messageid;
 	uint2 nmessages;
 	uint2 maxmessages;
@@ -572,6 +574,8 @@ class MCUIDC
     
 	void listmessages(MCExecPoint &ep);
 	Boolean handlepending(real8 &curtime, real8 &eventtime, Boolean dispatch);
+	Boolean getlockmoves() const;
+	void setlockmoves(Boolean b);
 	void addmove(MCObject *optr, MCPoint *pts, uint2 npts,
 	             real8 &duration, Boolean waiting);
 	void listmoves(MCExecPoint &ep);
diff --git a/engine/src/util.cpp b/engine/src/util.cpp
@@ -148,7 +148,8 @@ void MCU_resetprops(Boolean update)
 		}
 	}
 	MCerrorlock = 0;
-	MClockerrors = MClockmessages = MClockmoves = MClockrecent = False;
+	MClockerrors = MClockmessages = MClockrecent = False;
+	MCscreen->setlockmoves(False);
 	MCerrorlockptr = NULL;
 	MCinterrupt = False;
 	MCdragspeed = 0;
@@ -167,7 +168,7 @@ void MCU_saveprops(MCSaveprops &sp)
 	sp.errorlockptr = MCerrorlockptr;
 	sp.lockerrors = MClockerrors;
 	sp.lockmessages = MClockmessages;
-	sp.lockmoves = MClockmoves;
+	sp.lockmoves = MCscreen->getlockmoves();
 	sp.lockrecent = MClockrecent;
 	sp.interrupt = MCinterrupt;
 	sp.dragspeed = MCdragspeed;
@@ -189,7 +190,7 @@ void MCU_restoreprops(MCSaveprops &sp)
 	MCerrorlockptr = sp.errorlockptr;
 	MClockerrors = sp.lockerrors;
 	MClockmessages = sp.lockmessages;
-	MClockmoves = sp.lockmoves;
+	MCscreen->setlockmoves(sp.lockmoves);
 	MClockrecent = sp.lockrecent;
 	MCinterrupt = sp.interrupt;
 	MCdragspeed = sp.dragspeed;
