https://github.com/libsdl-org/Maelstrom/commit/5224dcc5d9486da41f9df8d5a21c3240fe8034be
From 5224dcc5d9486da41f9df8d5a21c3240fe8034be Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Wed, 2 Nov 2011 01:31:54 -0400
Subject: [PATCH] Removed unused icon
---
Maelstrom_Globals.h | 2 +-
init.cpp | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Maelstrom_Globals.h b/Maelstrom_Globals.h
index 07eb07e2..a6ccb3cc 100644
--- a/Maelstrom_Globals.h
+++ b/Maelstrom_Globals.h
@@ -178,6 +178,6 @@ extern BlitPtr gThrust1, gThrust2, gShrapnel1, gShrapnel2;
extern SDL_Texture *gAutoFireIcon, *gAirBrakesIcon, *gMult2Icon, *gMult3Icon;
extern SDL_Texture *gMult4Icon, *gMult5Icon, *gLuckOfTheIrishIcon;
-extern SDL_Texture *gLongFireIcon, *gTripleFireIcon, *gKeyIcon, *gShieldIcon;
+extern SDL_Texture *gLongFireIcon, *gTripleFireIcon, *gShieldIcon;
#endif // _Maelstrom_Globals_h
diff --git a/init.cpp b/init.cpp
index eb02ced4..030c0586 100644
--- a/init.cpp
+++ b/init.cpp
@@ -69,7 +69,7 @@ BlitPtr gThrust1, gThrust2, gShrapnel1, gShrapnel2;
SDL_Texture *gAutoFireIcon, *gAirBrakesIcon, *gMult2Icon, *gMult3Icon;
SDL_Texture *gMult4Icon, *gMult5Icon, *gLuckOfTheIrishIcon, *gLongFireIcon;
-SDL_Texture *gTripleFireIcon, *gKeyIcon, *gShieldIcon;
+SDL_Texture *gTripleFireIcon, *gShieldIcon;
// Local functions used in this file.
static void DrawLoadBar(int stage);
@@ -1134,8 +1134,9 @@ static int LoadCICNS(void)
return(-1);
if ( (gShieldIcon = GetCIcon(screen, 137)) == NULL )
return(-1);
- if ( (gKeyIcon = GetCIcon(screen, 100)) == NULL )
- return(-1);
+ // This was only used for the main menu, which is XML now.
+ //if ( (gKeyIcon = GetCIcon(screen, 100)) == NULL )
+ // return(-1);
return(0);
} /* -- LoadCICNS */