3 files changed, 27 insertions, 26 deletions

diff --git a/src/Frontend.cpp b/src/Frontend.cpp
index 1cac3d2b..de9e8a65 100644
--- a/src/Frontend.cpp
+++ b/src/Frontend.cpp
@@ -458,12 +458,12 @@ void CMenuManager::Draw()
 			else {
 				CFont::SetFontStyle(FONT_HEADING);
 
-				int LeftMENUCOLUMN =
+				int LeftMenuColumn =
 					m_nCurrScreen == MENUPAGE_SOUND_SETTINGS ||
 					m_nCurrScreen == MENUPAGE_GRAPHICS_SETTINGS ||
 					m_nCurrScreen == MENUPAGE_MOUSE_CONTROLS;
 
-				if (LeftMENUCOLUMN) {
+				if (LeftMenuColumn) {
 					CFont::SetAlignment(ALIGN_LEFT);
 					CFont::SetScale(SCREEN_SCALE_X(0.55f), SCREEN_SCALE_Y(0.8f));
 					fVerticalSpacing = MENUCOLUMN_SPACING_MIN;
diff --git a/src/Frontend.h b/src/Frontend.h
index c515be8c..dd6464b8 100644
--- a/src/Frontend.h
+++ b/src/Frontend.h
@@ -106,6 +106,7 @@ enum eMenuSprites
 enum eSaveSlot
 {
 	SAVESLOT_NONE,
+	SAVESLOT_0,
 	SAVESLOT_1,
 	SAVESLOT_2,
 	SAVESLOT_3,
diff --git a/src/MenuScreens.h b/src/MenuScreens.h
index b9d6906e..640952ed 100644
--- a/src/MenuScreens.h
+++ b/src/MenuScreens.h
@@ -66,27 +66,27 @@ const CMenuScreen aScreens[] = {
 	// MENUPAGE_CHOOSE_LOAD_SLOT = 8
 	{ "FET_LG", MENUPAGE_NEW_GAME, MENUPAGE_NEW_GAME, MENUPAGE_NEW_GAME, MENUROW_1, MENUROW_1,
 		MENUACTION_CHANGEMENU,	"FESZ_CA", SAVESLOT_NONE,	MENUPAGE_NEW_GAME,
-		MENUACTION_CHECKSAVE,	"FEM_SL1", SAVESLOT_1 + 1,	MENUPAGE_LOAD_SLOT_CONFIRM,
-		MENUACTION_CHECKSAVE,	"FEM_SL2", SAVESLOT_2 + 1,	MENUPAGE_LOAD_SLOT_CONFIRM,
-		MENUACTION_CHECKSAVE,	"FEM_SL3", SAVESLOT_3 + 1,	MENUPAGE_LOAD_SLOT_CONFIRM,
-		MENUACTION_CHECKSAVE,	"FEM_SL4", SAVESLOT_4 + 1,	MENUPAGE_LOAD_SLOT_CONFIRM,
-		MENUACTION_CHECKSAVE,	"FEM_SL5", SAVESLOT_5 + 1,	MENUPAGE_LOAD_SLOT_CONFIRM,
-		MENUACTION_CHECKSAVE,	"FEM_SL6", SAVESLOT_6 + 1,	MENUPAGE_LOAD_SLOT_CONFIRM,
-		MENUACTION_CHECKSAVE,	"FEM_SL7", SAVESLOT_7 + 1,	MENUPAGE_LOAD_SLOT_CONFIRM,
-		MENUACTION_CHECKSAVE,	"FEM_SL8", SAVESLOT_8 + 1,	MENUPAGE_LOAD_SLOT_CONFIRM,
+		MENUACTION_CHECKSAVE,	"FEM_SL1", SAVESLOT_1,	MENUPAGE_LOAD_SLOT_CONFIRM,
+		MENUACTION_CHECKSAVE,	"FEM_SL2", SAVESLOT_2,	MENUPAGE_LOAD_SLOT_CONFIRM,
+		MENUACTION_CHECKSAVE,	"FEM_SL3", SAVESLOT_3,	MENUPAGE_LOAD_SLOT_CONFIRM,
+		MENUACTION_CHECKSAVE,	"FEM_SL4", SAVESLOT_4,	MENUPAGE_LOAD_SLOT_CONFIRM,
+		MENUACTION_CHECKSAVE,	"FEM_SL5", SAVESLOT_5,	MENUPAGE_LOAD_SLOT_CONFIRM,
+		MENUACTION_CHECKSAVE,	"FEM_SL6", SAVESLOT_6,	MENUPAGE_LOAD_SLOT_CONFIRM,
+		MENUACTION_CHECKSAVE,	"FEM_SL7", SAVESLOT_7,	MENUPAGE_LOAD_SLOT_CONFIRM,
+		MENUACTION_CHECKSAVE,	"FEM_SL8", SAVESLOT_8,	MENUPAGE_LOAD_SLOT_CONFIRM,
 	},
 
 	// MENUPAGE_CHOOSE_DELETE_SLOT = 9
 	{ "FET_DG", MENUPAGE_NEW_GAME, MENUPAGE_NEW_GAME, MENUPAGE_NEW_GAME, MENUROW_2, MENUROW_2,
 		MENUACTION_CHANGEMENU, "FESZ_CA", SAVESLOT_NONE,	MENUPAGE_NEW_GAME,
-		MENUACTION_CHANGEMENU, "FEM_SL1", SAVESLOT_1 + 1,	MENUPAGE_DELETE_SLOT_CONFIRM,
-		MENUACTION_CHANGEMENU, "FEM_SL2", SAVESLOT_2 + 1,	MENUPAGE_DELETE_SLOT_CONFIRM,
-		MENUACTION_CHANGEMENU, "FEM_SL3", SAVESLOT_3 + 1,	MENUPAGE_DELETE_SLOT_CONFIRM,
-		MENUACTION_CHANGEMENU, "FEM_SL4", SAVESLOT_4 + 1,	MENUPAGE_DELETE_SLOT_CONFIRM,
-		MENUACTION_CHANGEMENU, "FEM_SL5", SAVESLOT_5 + 1,	MENUPAGE_DELETE_SLOT_CONFIRM,
-		MENUACTION_CHANGEMENU, "FEM_SL6", SAVESLOT_6 + 1,	MENUPAGE_DELETE_SLOT_CONFIRM,
-		MENUACTION_CHANGEMENU, "FEM_SL7", SAVESLOT_7 + 1,	MENUPAGE_DELETE_SLOT_CONFIRM,
-		MENUACTION_CHANGEMENU, "FEM_SL8", SAVESLOT_8 + 1,	MENUPAGE_DELETE_SLOT_CONFIRM,
+		MENUACTION_CHANGEMENU, "FEM_SL1", SAVESLOT_1,	MENUPAGE_DELETE_SLOT_CONFIRM,
+		MENUACTION_CHANGEMENU, "FEM_SL2", SAVESLOT_2,	MENUPAGE_DELETE_SLOT_CONFIRM,
+		MENUACTION_CHANGEMENU, "FEM_SL3", SAVESLOT_3,	MENUPAGE_DELETE_SLOT_CONFIRM,
+		MENUACTION_CHANGEMENU, "FEM_SL4", SAVESLOT_4,	MENUPAGE_DELETE_SLOT_CONFIRM,
+		MENUACTION_CHANGEMENU, "FEM_SL5", SAVESLOT_5,	MENUPAGE_DELETE_SLOT_CONFIRM,
+		MENUACTION_CHANGEMENU, "FEM_SL6", SAVESLOT_6,	MENUPAGE_DELETE_SLOT_CONFIRM,
+		MENUACTION_CHANGEMENU, "FEM_SL7", SAVESLOT_7,	MENUPAGE_DELETE_SLOT_CONFIRM,
+		MENUACTION_CHANGEMENU, "FEM_SL8", SAVESLOT_8,	MENUPAGE_DELETE_SLOT_CONFIRM,
 	},
 
 	// MENUPAGE_NEW_GAME_RELOAD = 10
@@ -181,14 +181,14 @@ const CMenuScreen aScreens[] = {
 	// MENUPAGE_CHOOSE_SAVE_SLOT = 26
 	{ "FET_SG", MENUPAGE_DISABLED, MENUPAGE_DISABLED, MENUPAGE_DISABLED, MENUROW_0, MENUROW_0,
 		MENUACTION_UPDATEMEMCARDSAVE,	"FESZ_CA", SAVESLOT_NONE,	MENUPAGE_NONE,
-		MENUACTION_CHANGEMENU,			"FEM_SL1", SAVESLOT_1 + 1,	MENUPAGE_SAVE_OVERWRITE_CONFIRM,
-		MENUACTION_CHANGEMENU,			"FEM_SL2", SAVESLOT_2 + 1,	MENUPAGE_SAVE_OVERWRITE_CONFIRM,
-		MENUACTION_CHANGEMENU,			"FEM_SL3", SAVESLOT_3 + 1,	MENUPAGE_SAVE_OVERWRITE_CONFIRM,
-		MENUACTION_CHANGEMENU,			"FEM_SL4", SAVESLOT_4 + 1,	MENUPAGE_SAVE_OVERWRITE_CONFIRM,
-		MENUACTION_CHANGEMENU,			"FEM_SL5", SAVESLOT_5 + 1,	MENUPAGE_SAVE_OVERWRITE_CONFIRM,
-		MENUACTION_CHANGEMENU,			"FEM_SL6", SAVESLOT_6 + 1,	MENUPAGE_SAVE_OVERWRITE_CONFIRM,
-		MENUACTION_CHANGEMENU,			"FEM_SL7", SAVESLOT_7 + 1,	MENUPAGE_SAVE_OVERWRITE_CONFIRM,
-		MENUACTION_CHANGEMENU,			"FEM_SL8", SAVESLOT_8 + 1,	MENUPAGE_SAVE_OVERWRITE_CONFIRM,
+		MENUACTION_CHANGEMENU,			"FEM_SL1", SAVESLOT_1,	MENUPAGE_SAVE_OVERWRITE_CONFIRM,
+		MENUACTION_CHANGEMENU,			"FEM_SL2", SAVESLOT_2,	MENUPAGE_SAVE_OVERWRITE_CONFIRM,
+		MENUACTION_CHANGEMENU,			"FEM_SL3", SAVESLOT_3,	MENUPAGE_SAVE_OVERWRITE_CONFIRM,
+		MENUACTION_CHANGEMENU,			"FEM_SL4", SAVESLOT_4,	MENUPAGE_SAVE_OVERWRITE_CONFIRM,
+		MENUACTION_CHANGEMENU,			"FEM_SL5", SAVESLOT_5,	MENUPAGE_SAVE_OVERWRITE_CONFIRM,
+		MENUACTION_CHANGEMENU,			"FEM_SL6", SAVESLOT_6,	MENUPAGE_SAVE_OVERWRITE_CONFIRM,
+		MENUACTION_CHANGEMENU,			"FEM_SL7", SAVESLOT_7,	MENUPAGE_SAVE_OVERWRITE_CONFIRM,
+		MENUACTION_CHANGEMENU,			"FEM_SL8", SAVESLOT_8,	MENUPAGE_SAVE_OVERWRITE_CONFIRM,
 	},
 
 	// MENUPAGE_SAVE_OVERWRITE_CONFIRM = 27