Merge pull request #456 from GrognardsFromHell/SA_bugfix

Sa bugfix
GrognardsFromHell · Jan 15, 2021 · f033cd7 · f033cd7
2 parents 45f56b1 + 1c80bbf
commit f033cd7
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/TemplePlus/action_sequence.cpp b/TemplePlus/action_sequence.cpp
@@ -2209,7 +2209,18 @@ int32_t ActionSequenceSystem::InterruptNonCounterspell(D20Actn* d20a)
 
 int32_t ActionSequenceSystem::InterruptCounterspell(D20Actn* d20a)
 {
-	uint32_t result = 0;
+	auto result = FALSE;
+
+	for (auto rdyAction = ReadiedActionGetNext(nullptr, d20a);
+		rdyAction!= nullptr; rdyAction = ReadiedActionGetNext(rdyAction, d20a)) {
+		if (rdyAction->readyType == ReadyVsTypeEnum::RV_Counterspell) {
+			InterruptSwitchActionSequence(rdyAction);
+			result = TRUE;
+		}
+	}
+
+	return result;
+	/*uint32_t result = 0;
 	__asm{
 		push esi;
 		push ecx;
@@ -2223,7 +2234,7 @@ int32_t ActionSequenceSystem::InterruptCounterspell(D20Actn* d20a)
 		pop ecx;
 		pop esi;
 	}
-	return result;
+	return result;*/
 
 }
 
@@ -2314,6 +2325,11 @@ ReadiedActionPacket* ActionSequenceSystem::ReadiedActionGetNext(ReadiedActionPac
 
 void ActionSequenceSystem::InterruptSwitchActionSequence(ReadiedActionPacket* readiedAction)
 {
+	if (!readiedAction->interrupter) {
+		logger->error("InterruptSwitchActionSequence: Null objHnd! Aborting.");
+		return;
+	}
+
 	if (readiedAction->readyType == RV_Counterspell)
 		return addresses.Counterspell_sthg(readiedAction);
 

diff --git a/TemplePlus/tig/tig_mouse.cpp b/TemplePlus/tig/tig_mouse.cpp
@@ -93,10 +93,13 @@ void MouseFuncs::SetPos(int x, int y, int wheelDelta)
 	auto& mouseLastChange = temple::GetRef<int>(0x10D251C4);
 	auto systemTime = temple::GetRef<int>(0x11E74578);
 
+
+
 	static int slowMoveRefX = mouseState->x, slowMoveRefY = mouseState->y;
 
 	auto slowMoveDelta = abs(x - slowMoveRefX) + abs(y - slowMoveRefY);
-	auto timeDeltaMs = systemTime - mouseLastChange;
+	// systemTime += 2793682137;
+	auto timeDeltaMs = abs(systemTime - mouseLastChange); // abs delta in case the time stamp is above the integer limit
 	if (x != mouseState->x || y != mouseState->y ) {
 		mouseIsStatic = 0;
 		//if (slowMoveDelta  > 0) { // this was the effective vanilla condition