update

Author: bucanero

data/leon_luna.png

@@ -36,7 +36,7 @@ enum menu_screen_ids
 //Textures
 enum texture_index
 {
-	leon_jpg_index,
+	leon_luna_png_index,
 	bgimg_png_index,
 	column_1_png_index,
 	column_2_png_index,

include/menu.h

@@ -1,5 +1,5 @@
 void Draw_AboutMenu_Ani(void);
-void Draw_AboutMenu(void);
+void Draw_AboutMenu(int l);
 
 void Draw_UserCheatsMenu_Ani(save_list_t * list);
 void Draw_UserCheatsMenu(save_list_t * list, int menuSel, u8 alpha);

include/menu_gui.h

@@ -1,4 +1,4 @@
-#define APOLLO_VERSION          "0.7.0"     //Apollo Vita version (about menu)
+#define APOLLO_VERSION          "1.0.0"     //Apollo PS2 version (about menu)
 
 #define MENU_TITLE_OFF			30			//Offset of menu title text from menu mini icon
 #define MENU_ICON_OFF 			35          //X Offset to start printing menu mini icon

include/settings.h

@@ -223,7 +223,7 @@ static int LoadTextures_Menu(void)
 	//Init Main Menu textures
 	load_menu_texture(bgimg, png);
 	load_menu_texture(cheat, png);
-//	load_menu_texture(leon, jpg);
+	load_menu_texture(leon_luna, png);
 
 	load_menu_texture(circle_loading_bg, png);
 	load_menu_texture(circle_loading_seek, png);
@@ -549,7 +549,7 @@ int main(int argc, char *argv[])
 #ifdef APOLLO_ENABLE_LOGGING
 		// Calculate FPS and ms/frame
 		SetFontColor(APP_FONT_COLOR | 0xFF, 0);
-		DrawFormatString(50, 500, "FPS: %d", (1000 / deltaFrameTicks));
+		DrawFormatString(50, 400, "FPS: %d", (1000 / deltaFrameTicks));
 #endif
 		// Propagate the updated window to the screen
 		SDL_RenderPresent(renderer);

source/main.c

@@ -6,13 +6,52 @@
 #include "menu_gui.h"
 #include "libfont.h"
 
+#define FONT_W  24
+#define FONT_H  23
+#define STEP_X  -2         // horizontal displacement
+
+static int sx = SCREEN_WIDTH;
+
 const char * menu_about_strings[] = { "Bucanero", "Developer",
 									"", "",
 									"", "",
 									"Leon  ", "  Luna",
 									"2009-2022", "2011-2023",
 									NULL };
 
+/***********************************************************************
+* Draw a string of chars, amplifing y by sin(x)
+***********************************************************************/
+static void draw_sinetext(int y, const char* string)
+{
+    int x = sx;       // every call resets the initial x
+    int sl = strlen(string);
+    char tmp[2] = {0, 0};
+    float amp;
+
+    SetFontSize(FONT_W, FONT_H);
+    for(int i = 0; i < sl; i++)
+    {
+        amp = sinf(x      // testing sinf() from math.h
+                 * 0.02)  // it turns out in num of bends
+                 * 5;    // +/- vertical bounds over y
+
+        if(x > 0 && x < SCREEN_WIDTH - FONT_W)
+        {
+            tmp[0] = string[i];
+            DrawStringMono(x, y + amp, tmp);
+        }
+
+        x += FONT_W;
+    }
+
+    //* Move string by defined step
+    sx += STEP_X;
+
+    if(sx + (sl * FONT_W) < 0)           // horizontal bound, then loop
+        sx = SCREEN_WIDTH + FONT_W;
+}
+
 static void _draw_AboutMenu(u8 alpha)
 {
 	u8 alp2 = ((alpha*2) > 0xFF) ? 0xFF : (alpha * 2); 
@@ -48,7 +87,7 @@ static void _draw_AboutMenu(u8 alpha)
 	SetFontAlign(FONT_ALIGN_LEFT);
 }
 
-void Draw_AboutMenu_Ani()
+void Draw_AboutMenu_Ani(void)
 {
 	int ani = 0;
 	for (ani = 0; ani < MENU_ANI_MAX; ani++)
@@ -74,8 +113,20 @@ void Draw_AboutMenu_Ani()
 	}
 }
 
-void Draw_AboutMenu()
+static void _draw_LeonLuna(void)
+{
+	DrawTextureCentered(&menu_textures[leon_luna_png_index], SCREEN_WIDTH/2, SCREEN_HEIGHT/2, 0, menu_textures[leon_luna_png_index].width, menu_textures[leon_luna_png_index].height, 0xFFFFFF00 | 0xFF);
+//	DrawTexture(&menu_textures[help_png_index], 0, 320, 0, SCREEN_WIDTH + 10, 40, 0xFFFFFF00 | 0xFF);
+
+	SetFontColor(APP_FONT_COLOR | 0xFF, 0);
+	draw_sinetext(330, "... in memory of Leon & Luna - may your days be filled with eternal joy ...");
+}
+
+void Draw_AboutMenu(int ll)
 {
+	if (ll)
+		return(_draw_LeonLuna());
+
 	DrawHeader(cat_about_png_index, 0, "About", "v" APOLLO_VERSION, APP_FONT_TITLE_COLOR | 0xFF, 0xffffffff, 0);
 	_draw_AboutMenu(0xFF);
 }

source/menu_about.c

@@ -490,14 +490,24 @@ static void doMainMenu(void)
 
 static void doAboutMenu(void)
 {
+	static int ll = 0;
 	// Check the pads.
 	if (ps2PadGetButtonPressed(PAD_CIRCLE))
 	{
+		if (ll)
+			music_callback(!(ll & 0x01));
+
+		ll = 0;
 		SetMenu(MENU_MAIN_SCREEN);
 		return;
 	}
+	else if (!ll && ps2PadGetButtonPressed(PAD_SELECT))
+	{
+		ll = (0x02 | apollo_config.music);
+		music_callback(0);
+	}
 
-	Draw_AboutMenu();
+	Draw_AboutMenu(ll);
 }
 
 static void doOptionsMenu(void)

source/menu_main.c

@@ -56,7 +56,7 @@ static void _draw_OptionsMenu(u8 alpha)
     }
 }
 
-void Draw_OptionsMenu_Ani()
+void Draw_OptionsMenu_Ani(void)
 {
     int ani = 0;
     for (ani = 0; ani < MENU_ANI_MAX; ani++)
@@ -80,7 +80,7 @@ void Draw_OptionsMenu_Ani()
     }
 }
 
-void Draw_OptionsMenu()
+void Draw_OptionsMenu(void)
 {
     DrawHeader(cat_opt_png_index, 0, "Settings", NULL, APP_FONT_TITLE_COLOR | 0xFF, 0xffffffff, 0);
     _draw_OptionsMenu(0xFF);