From 13eae3a7bd8f291f00b167b77ddb5b297fc3f01a Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sun, 22 Nov 2020 13:34:05 +0100
Subject: [PATCH] - a bit more cleanup

---
 source/blood/src/blood.cpp    |  7 -------
 source/blood/src/loadsave.cpp |  3 ---
 source/blood/src/player.cpp   |  6 +-----
 source/blood/src/player.h     |  8 --------
 source/blood/src/sbar.cpp     | 11 ++---------
 5 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/source/blood/src/blood.cpp b/source/blood/src/blood.cpp
index 1c9f423e1..9012e5ded 100644
--- a/source/blood/src/blood.cpp
+++ b/source/blood/src/blood.cpp
@@ -198,10 +198,6 @@ void StartLevel(MapRecord* level)
 	{
 		if (!(gGameOptions.uGameFlags & GF_AdvanceLevel))
 		{
-			if (numplayers == 1)
-			{
-				gProfile[i].skill = gSkill;
-			}
 			playerInit(i, 0);
 		}
 		playerStart(i, 1);
@@ -530,9 +526,6 @@ static void gameInit()
 	gViewIndex = myconnectindex;
 	gMe = gView = &gPlayer[myconnectindex];
 
-	PROFILE* pProfile = &gProfile[myconnectindex];
-	pProfile->skill = gSkill;
-
 	UpdateNetworkMenus();
 	if (gGameOptions.nGameType > 0)
 	{
diff --git a/source/blood/src/loadsave.cpp b/source/blood/src/loadsave.cpp
index 00ce52553..b3f886b0b 100644
--- a/source/blood/src/loadsave.cpp
+++ b/source/blood/src/loadsave.cpp
@@ -521,9 +521,6 @@ bool GameInterface::LoadGame()
 #endif
 
 	Mus_ResumeSaved();
-
-    PROFILE* pProfile = &gProfile[myconnectindex];
-    pProfile->skill = gSkill;
     return true;
 }
 
diff --git a/source/blood/src/player.cpp b/source/blood/src/player.cpp
index 877615e0d..865a3c85e 100644
--- a/source/blood/src/player.cpp
+++ b/source/blood/src/player.cpp
@@ -51,8 +51,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 BEGIN_BLD_NS
 
-PROFILE gProfile[kMaxPlayers];
-
 PLAYER gPlayer[kMaxPlayers];
 PLAYER *gMe, *gView;
 
@@ -603,7 +601,7 @@ void playerSetRace(PLAYER *pPlayer, int nLifeMode)
     pPlayer->pSprite->clipdist = pDudeInfo->clipdist;
     
     for (int i = 0; i < 7; i++)
-        pDudeInfo->at70[i] = mulscale8(Handicap[gProfile[pPlayer->nPlayer].skill], pDudeInfo->startDamage[i]);
+        pDudeInfo->at70[i] = mulscale8(Handicap[gSkill], pDudeInfo->startDamage[i]);
 }
 
 void playerSetGodMode(PLAYER *pPlayer, bool bGodMode)
@@ -2175,7 +2173,6 @@ void PlayerLoadSave::Load(void)
 
     Read(team_score, sizeof(team_score));
     Read(&gNetPlayers, sizeof(gNetPlayers));
-    Read(&gProfile, sizeof(gProfile));
     Read(&gPlayer, sizeof(gPlayer));
     #ifdef NOONE_EXTENSIONS
         Read(&gPlayerCtrl, sizeof(gPlayerCtrl));
@@ -2209,7 +2206,6 @@ void PlayerLoadSave::Save(void)
 {
     Write(team_score, sizeof(team_score));
     Write(&gNetPlayers, sizeof(gNetPlayers));
-    Write(&gProfile, sizeof(gProfile));
     Write(&gPlayer, sizeof(gPlayer));
     
     #ifdef NOONE_EXTENSIONS
diff --git a/source/blood/src/player.h b/source/blood/src/player.h
index badfd38b4..0398f8b4a 100644
--- a/source/blood/src/player.h
+++ b/source/blood/src/player.h
@@ -185,12 +185,6 @@ struct PLAYER
     POSTURE             pPosture[kModeMax][kPostureMax];
 };
 
-struct PROFILE
-{
-    int skill;
-    //char name[MAXPLAYERNAME];
-};
-
 struct AMMOINFO
 {
     int max;
@@ -213,8 +207,6 @@ extern PLAYER *gMe, *gView;
 extern bool gBlueFlagDropped;
 extern bool gRedFlagDropped;
 
-extern PROFILE gProfile[kMaxPlayers];
-
 extern int team_score[kMaxPlayers];
 extern int team_ticker[kMaxPlayers];
 extern AMMOINFO gAmmoInfo[];
diff --git a/source/blood/src/sbar.cpp b/source/blood/src/sbar.cpp
index 515b5341a..9eedaf619 100644
--- a/source/blood/src/sbar.cpp
+++ b/source/blood/src/sbar.cpp
@@ -429,11 +429,7 @@ private:
             int y = 9 * (i / 4);
             int col = gPlayer[p].teamId & 3;
             const char* name = PlayerName(p);
-            if (gProfile[p].skill == 2)
-                gTempStr.Format("%s", name);
-            else
-                gTempStr.Format("%s [%d]", name, gProfile[p].skill);
-            
+            gTempStr.Format("%s", name);
             int color = CR_UNDEFINED;// todo: remap the colors. (11+col)
             SBar_DrawString(this, tinyf, gTempStr, x + 4, y, DI_SCREEN_CENTER_TOP, color, 1., -1, -1, 1, 1);
             gTempStr.Format("%2d", gPlayer[p].fragCount);
@@ -457,10 +453,7 @@ private:
             int y = 9 * (i / 4);
             int col = gPlayer[p].teamId & 3;
             const char* name = PlayerName(p);
-            if (gProfile[p].skill == 2)
-                gTempStr.Format("%s", name);
-            else
-                gTempStr.Format("%s [%d]", name, gProfile[p].skill);
+            gTempStr.Format("%s", name);
             gTempStr.ToUpper();
             int color = CR_UNDEFINED;// todo: remap the colors.
             SBar_DrawString(this, tinyf, gTempStr, x + 4, y, DI_SCREEN_CENTER_TOP, color, 1., -1, -1, 1, 1);