From 7873bd4356b27933cb75a7ad78bbc9b86ae028ef Mon Sep 17 00:00:00 2001
From: Robin Eklind <rnd0x00@gmail.com>
Date: Tue, 14 Apr 2020 00:34:12 +0200
Subject: [PATCH] minitext: fix variable names of minitext.cpp

The variable names were mixed up.

	sgLastScroll -> qtextSpd
	scrolltexty -> qtextDelay
	qtextSpd -> sgLastScroll
---
 Source/minitext.cpp | 28 ++++++++++++++--------------
 Source/minitext.h   |  2 --
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/Source/minitext.cpp b/Source/minitext.cpp
index 54ca65f17..3484b31af 100644
--- a/Source/minitext.cpp
+++ b/Source/minitext.cpp
@@ -7,10 +7,10 @@
 
 int qtexty;
 char *qtextptr;
-int qtextSpd;
-BOOLEAN qtextflag;
-int scrolltexty;
 int sgLastScroll;
+BOOLEAN qtextflag;
+int qtextDelay;
+int qtextSpd;
 BYTE *pMedTextCels;
 BYTE *pTextBoxCels;
 
@@ -72,9 +72,9 @@ void InitQTextMsg(int m)
 		qtextptr = alltext[m].txtstr;
 		qtextflag = TRUE;
 		qtexty = 500;
-		sgLastScroll = qscroll_spd_tbl[alltext[m].txtspd - 1];
-		scrolltexty = sgLastScroll;
-		qtextSpd = GetTickCount();
+		qtextSpd = qscroll_spd_tbl[alltext[m].txtspd - 1];
+		qtextDelay = qtextSpd;
+		sgLastScroll = GetTickCount();
 	}
 	PlaySFX(alltext[m].sfxnr);
 }
@@ -272,17 +272,17 @@ void DrawQText()
 
 	currTime = GetTickCount();
 	while (1) {
-		if (sgLastScroll <= 0) {
+		if (qtextSpd <= 0) {
 			qtexty--;
-			qtexty += sgLastScroll;
+			qtexty += qtextSpd;
 		} else {
-			scrolltexty--;
-			if (scrolltexty != 0) {
+			qtextDelay--;
+			if (qtextDelay != 0) {
 				qtexty--;
 			}
 		}
-		if (scrolltexty == 0) {
-			scrolltexty = sgLastScroll;
+		if (qtextDelay == 0) {
+			qtextDelay = qtextSpd;
 		}
 		if (qtexty <= 209) {
 			qtexty += 38;
@@ -292,8 +292,8 @@ void DrawQText()
 			}
 			break;
 		}
-		qtextSpd += 50;
-		if (currTime - qtextSpd >= 0x7FFFFFFF) {
+		sgLastScroll += 50;
+		if (currTime - sgLastScroll >= 0x7FFFFFFF) {
 			break;
 		}
 	}
diff --git a/Source/minitext.h b/Source/minitext.h
index 568e51b6f..27b740e5c 100644
--- a/Source/minitext.h
+++ b/Source/minitext.h
@@ -8,9 +8,7 @@
 
 extern int qtexty;
 extern char *qtextptr;
-extern int qtextSpd;
 extern BOOLEAN qtextflag;
-extern int scrolltexty;
 extern BYTE *pMedTextCels;
 extern BYTE *pTextBoxCels;