From 4fa5baf291f324bd6924b79d201315373814bf0b Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Wed, 10 Oct 2018 16:41:24 +0200
Subject: [PATCH] Apply enum to _pSplLvl

---
 Source/objects.cpp | 24 ++++++++++++------------
 Source/player.cpp  |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Source/objects.cpp b/Source/objects.cpp
index 32a10f478..2e7b326d4 100644
--- a/Source/objects.cpp
+++ b/Source/objects.cpp
@@ -5215,12 +5215,12 @@ LABEL_47:
 					return;
 				v7 = 21720 * arglist;
 				plr[arglist]._pMemSpells64 |= (__int64)1 << (SPL_FIREBOLT - 1);
-				v67 = plr[arglist]._pSplLvl[1];
+				v67 = plr[arglist]._pSplLvl[SPL_FIREBOLT];
 				if ( v67 < 15 )
-					plr[0]._pSplLvl[v7 + 1] = v67 + 1;
-				v68 = plr[0]._pSplLvl[v7 + 1];
+					plr[0]._pSplLvl[v7 + SPL_FIREBOLT] = v67 + 1;
+				v68 = plr[0]._pSplLvl[v7 + SPL_FIREBOLT];
 				if ( v68 < 15 )
-					plr[0]._pSplLvl[v7 + 1] = v68 + 1;
+					plr[0]._pSplLvl[v7 + SPL_FIREBOLT] = v68 + 1;
 				v69 = *(int *)((char *)&plr[0]._pMaxManaBase + v7);
 				v70 = *(int *)((char *)&plr[0]._pManaBase + v7);
 				v71 = *(int *)((char *)&plr[0]._pMana + v7) - v70;
@@ -5408,12 +5408,12 @@ LABEL_47:
 					return;
 				v7 = 21720 * arglist;
 				plr[arglist]._pMemSpells64 |= (__int64)1 << (SPL_CBOLT - 1);
-				v96 = plr[arglist]._pSplLvl[30];
+				v96 = plr[arglist]._pSplLvl[SPL_CBOLT];
 				if ( v96 < 15 )
-					plr[0]._pSplLvl[v7 + 30] = v96 + 1;
-				v97 = plr[0]._pSplLvl[v7 + 30];
+					plr[0]._pSplLvl[v7 + SPL_CBOLT] = v96 + 1;
+				v97 = plr[0]._pSplLvl[v7 + SPL_CBOLT];
 				if ( v97 < 15 )
-					plr[0]._pSplLvl[v7 + 30] = v97 + 1;
+					plr[0]._pSplLvl[v7 + SPL_CBOLT] = v97 + 1;
 				v98 = *(int *)((char *)&plr[0]._pMaxManaBase + v7);
 				v99 = *(int *)((char *)&plr[0]._pManaBase + v7);
 				v100 = *(int *)((char *)&plr[0]._pMana + v7) - v99;
@@ -5534,12 +5534,12 @@ LABEL_47:
 					return;
 				v7 = 21720 * arglist;
 				plr[arglist]._pMemSpells64 |= (__int64)1 << (SPL_HBOLT - 1);
-				v115 = plr[arglist]._pSplLvl[31];
+				v115 = plr[arglist]._pSplLvl[SPL_HBOLT];
 				if ( v115 < 15 )
-					plr[0]._pSplLvl[v7 + 31] = v115 + 1;
-				v116 = plr[0]._pSplLvl[v7 + 31];
+					plr[0]._pSplLvl[v7 + SPL_HBOLT] = v115 + 1;
+				v116 = plr[0]._pSplLvl[v7 + SPL_HBOLT];
 				if ( v116 < 15 )
-					plr[0]._pSplLvl[v7 + 31] = v116 + 1;
+					plr[0]._pSplLvl[v7 + SPL_HBOLT] = v116 + 1;
 				v117 = *(int *)((char *)&plr[0]._pMaxManaBase + v7);
 				v118 = *(int *)((char *)&plr[0]._pManaBase + v7);
 				v119 = *(int *)((char *)&plr[0]._pMana + v7) - v118;
diff --git a/Source/player.cpp b/Source/player.cpp
index e37f7c287..c39db03de 100644
--- a/Source/player.cpp
+++ b/Source/player.cpp
@@ -622,7 +622,7 @@ void __fastcall CreatePlayer(int pnum, char c)
     plr[pnum]._pSpellFlags = 0;
 
     if (plr[pnum]._pClass == PC_SORCERER) {
-        plr[pnum]._pSplLvl[1] = 2;
+        plr[pnum]._pSplLvl[SPL_FIREBOLT] = 2;
     }
 
     // interestingly, only the first three hotkeys are reset