From 5c6a48b2ff362a70416a6a00fda7d06e0f276f2d Mon Sep 17 00:00:00 2001
From: Ash Wolf <ninji@wuffs.org>
Date: Sat, 1 Jul 2023 02:43:29 +0100
Subject: i am in hell

---
 src/T2DLL/T2WordDefArray.cpp | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'src/T2DLL/T2WordDefArray.cpp')

diff --git a/src/T2DLL/T2WordDefArray.cpp b/src/T2DLL/T2WordDefArray.cpp
index 76b3248..46f05d2 100644
--- a/src/T2DLL/T2WordDefArray.cpp
+++ b/src/T2DLL/T2WordDefArray.cpp
@@ -15,35 +15,35 @@ void T2WordDefArray::GetWords(unsigned int sex, unsigned int age, unsigned int f
 
 	CResFile resFile;
 	if (resFile.OpenResource(mInstance, 1, 'WoDf')) {
-		unsigned int numOfWordDef;
-		resFile >> numOfWordDef;
+		unsigned int numOfWordDefs;
+		resFile >> numOfWordDefs;
 
-		T2WordDef *wordDef = new T2WordDef[numOfWordDef];
+		T2WordDef *theWordDef = new T2WordDef[numOfWordDefs];
 
-		for (unsigned int i = 0; i < numOfWordDef; i++)
-			wordDef[i].Read(resFile);
+		for (unsigned int i = 0; i < numOfWordDefs; i++)
+			theWordDef[i].Read(resFile);
 
-		if (numOfWordDef > 0) {
-			unsigned char *seen = (unsigned char *) malloc(numOfWordDef);
-			memset(seen, 0, numOfWordDef);
+		if (numOfWordDefs > 0) {
+			unsigned char *seenArray = (unsigned char *) malloc(numOfWordDefs);
+			memset(seenArray, 0, numOfWordDefs);
 
-			unsigned int i = 0;
-			while ((outStr == "") && i < numOfWordDef) {
-				int rnd = UT2Utils::Randomize(numOfWordDef);
-				if (!seen[rnd]) {
-					seen[rnd] = true;
-					wordDef[rnd].GetWords(sex, age, flags, level, outStr);
+			unsigned int i = 0, wordInd;
+			while ((outStr == "") && i < numOfWordDefs) {
+				wordInd = UT2Utils::Randomize(numOfWordDefs);
+				if (!seenArray[wordInd]) {
+                    seenArray[wordInd] = true;
+					theWordDef[wordInd].GetWords(sex, age, flags, level, outStr);
 				} else {
-					for (i = 0; i < numOfWordDef; i++) {
-						if (!seen[i])
+					for (i = 0; i < numOfWordDefs; i++) {
+						if (!seenArray[i])
 							break;
 					}
 				}
 			}
 
-			free(seen);
+			free(seenArray);
 		}
 
-		delete[] wordDef;
+		delete[] theWordDef;
 	}
 }
-- 
cgit v1.2.3