From bffefcad77445a906d1a31a2da8e616326d7fd6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Valor=20Mart=C3=ADnez?= <jaildesigner@gmail.com>
Date: Mon, 6 Sep 2021 18:05:40 +0200
Subject: [PATCH] clean up and fixes

---
 source/const.h  |  2 +-
 source/ifdefs.h |  3 ++-
 source/menu.cpp | 41 ++++++++++++++++++++++++++++++++++-------
 3 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/source/const.h b/source/const.h
index 14c5d23..10e8cd6 100644
--- a/source/const.h
+++ b/source/const.h
@@ -9,7 +9,7 @@
 
 // Textos
 #define WINDOW_CAPTION "Coffee Crisis"
-#define TEXT_COPYRIGHT "@2020,2021 JailDesigner (v2.0)"
+#define TEXT_COPYRIGHT "@2020,2021 JailDesigner (v2.0.1)"
 
 // Recursos
 #define BINFILE_SCORE 0
diff --git a/source/ifdefs.h b/source/ifdefs.h
index ffa925d..d5a071e 100644
--- a/source/ifdefs.h
+++ b/source/ifdefs.h
@@ -7,7 +7,8 @@
 #endif
 
 #ifdef __APPLE__
-#include "/Library/Frameworks/SDL2.framework/Versions/A/Headers/SDL.h"
+//#include "/Library/Frameworks/SDL2.framework/Versions/A/Headers/SDL.h"
+#include <SDL2/SDL.h>
 #endif
 
 #ifdef __linux__
diff --git a/source/menu.cpp b/source/menu.cpp
index e609ea4..c8deee5 100644
--- a/source/menu.cpp
+++ b/source/menu.cpp
@@ -227,11 +227,21 @@ bool Menu::increaseSelectorIndex()
 	mSelector.h = mSelector.originH = getSelectorHeight(mSelector.index);
 
 	// Calcula cual es el siguiente elemento
-	if (mSelector.index < (mTotalItems - 1))
+	//if (mSelector.index < (mTotalItems - 1))
+	//{
+	//	mSelector.index++;
+	//	while ((!mItem[mSelector.index].selectable) && (mSelector.index < (mTotalItems - 1)))
+	//		mSelector.index++;
+	//	success = true;
+	//}
+
+	// Calcula cual es el siguiente elemento (versión con loop)
+	//if (mSelector.index < (mTotalItems - 1))
 	{
-		mSelector.index++;
-		while ((!mItem[mSelector.index].selectable) && (mSelector.index < (mTotalItems - 1)))
-			mSelector.index++;
+		++mSelector.index %= mTotalItems;
+		while (!mItem[mSelector.index].selectable)
+			//mSelector.index++;
+			++mSelector.index %= mTotalItems;
 		success = true;
 	}
 
@@ -261,11 +271,28 @@ bool Menu::decreaseSelectorIndex()
 	mSelector.h = mSelector.originH = getSelectorHeight(mSelector.index);
 
 	// Calcula cual es el siguiente elemento
-	if (mSelector.index > 0)
+	//if (mSelector.index > 0)
+	//{
+	//	mSelector.index--;
+	//	while ((!mItem[mSelector.index].selectable) && (mSelector.index > 0))
+	//		mSelector.index--;
+	//	success = true;
+	//}
+
+	// Calcula cual es el siguiente elemento (versión con loop)
+	//if (mSelector.index > 0)
 	{
-		mSelector.index--;
-		while ((!mItem[mSelector.index].selectable) && (mSelector.index > 0))
+		if (mSelector.index == 0)
+			mSelector.index = mTotalItems;
+		else
 			mSelector.index--;
+		while (!mItem[mSelector.index].selectable)
+		{
+			if (mSelector.index == 0)
+				mSelector.index = mTotalItems;
+			else
+				mSelector.index--;
+		}
 		success = true;
 	}