Rewind progress bar optimisations, desc fixes

Author: Maciek

main.c

@@ -260,18 +260,25 @@ void mainloop(void)
 			if( get_nShortcutKey(paddata.buttons) == 8 ){ // 8 == REWIND_SHORTCUT KEY
 
 				wavout_enable=0;
-
+				int refreshProgress = 0;
 				while(1){
 					renderer_set_msg(get_rewind_progress_bar());
 					//begin rewinds
 					if( read_rewind_state() > 0 ){
-
+						refreshProgress = 1;
 						for(line=0; line<154; line++) //emulate a frame
 							gb_run();
 
 						pgScreenFlip();
+					}else{
+						if(refreshProgress){
+							for(line=0; line<154; line++) //emulate a frame
+								gb_run();
+
+							pgScreenFlip();
+							refreshProgress = 0;
+						}
 					}
-
 					sceKernelDelayThread(WAIT_MILIS);
 
 

menu_credits.c

@@ -11,7 +11,6 @@ static unsigned long get_text_color() {
 static char* credits[] = {
 	"     RIN REWIND MOD CREDITS AND VERSION HISTORY",
 	"",
-	"",
 	"Mr. Mirakichi - 2005/08/22",
 	"  Original version of RIN 1.32",
 	"",
@@ -22,7 +21,8 @@ static char* credits[] = {
 	"  Rewind mod v2 (this version):",
 	"    - Sources ported to latest PSP SDK,",
 	"    - Dedicated menu for rewind,",
-	"    - Support for extra memory (PSP Slim),",
+	"    - Support for extra memory (PSP Slim and higher,",
+	"      PS Vita with Adrenaline)",
 	"    - Adjustable memory and states amount in rewind,",
 	"    - Progress bar for actual rewind status,",
 	"    - Fixed crash when loading game with a different",

menu_rewind.c

@@ -173,7 +173,7 @@ static void print_rewind_states_limit_line(unsigned long *x, unsigned long *y, c
 
 static void print_rewind_states_help(unsigned long *x, unsigned long *y, const SETTING *local, const long sel) {
 #define HELP_COLOR RGB(26, 163, 255)
-	unsigned help_y = 15;
+	unsigned help_y = 13;
 	unsigned help_x = 4;
 	char tmpString[MAX_MENU_ENTRY_LENGTH] = {0};
 	if(local->rewind_always_use_max_states){
@@ -184,15 +184,19 @@ static void print_rewind_states_help(unsigned long *x, unsigned long *y, const S
 
 	pgPrintf(help_x,help_y,HELP_COLOR, "---------------------------------------------------");
 	help_y += 2;
-	pgPrintf(help_x,help_y,HELP_COLOR, "On newer PSP models more memory for rewind can be ");
+	pgPrintf(help_x,help_y,HELP_COLOR, "On newer PSP models (PSP Slim and higher), more");
 	help_y += 1;
-	pgPrintf(help_x,help_y,HELP_COLOR, "enabled by using CFW with extra memory for homebrew");
+	pgPrintf(help_x,help_y,HELP_COLOR, "memory for rewind can be enabled by using CFW with");
 	help_y += 1;
-	pgPrintf(help_x,help_y,HELP_COLOR, "support. Enter recovery menu and enable:");
+	pgPrintf(help_x,help_y,HELP_COLOR, "extra memory for homebrew support.");
+	help_y += 1;
+	pgPrintf(help_x,help_y,HELP_COLOR, "Enter recovery menu and enable:");
 	help_y += 1;
 	pgPrintf(help_x,help_y,HELP_COLOR, "\"Advanced/Force High Memory Layout\".");
+	help_y += 1;
+	pgPrintf(help_x,help_y,HELP_COLOR, "The same applies to PS Vita with Adrenaline.");
 	help_y += 2;
-	pgPrintf(help_x,help_y,HELP_COLOR, "---------------------------------------------------");
+	pgPrintf(help_x,help_y,HELP_COLOR, "----------------------------------------------------");
 	help_y += 1;
 	pgPrintf(help_x,help_y,HELP_COLOR, "");
 }

rewind.c

@@ -10,6 +10,7 @@ e-mail: efengeler@gmail.com
 
 int num_rwnd_states = 0;
 int rwnd_state_size = 0;
+int number_of_used_states = 0;
 const int TOTAL_REWIND_MEMORY = 5*1024*1024; //reserves 5 MB for rewind states
 const int SAFE_MEMORY_MARGIN = 1*1024*1024;//left for system to use
 unsigned max_rewind_memory = 5*1024*1024;
@@ -25,17 +26,23 @@ struct rewind_state{
 struct rewind_state *ptr_rewind_states, *prev_state, *next_state;
 
 int get_used_rewind_states_number(){
-	int retVal = 0;
-	if(setting.rewind_enabled && ptr_rewind_states != NULL){
-		struct rewind_state* act = ptr_rewind_states->next;
-		while(act != ptr_rewind_states){
-			if(act->have_data){
-				retVal++;
-			}
-			act = act->next;
-		}
-	}
-	return retVal;
+//	int retVal = 0;
+//	if(setting.rewind_enabled && ptr_rewind_states != NULL){
+//		if(ptr_rewind_states->have_data){
+//			retVal++;
+//		}
+//		struct rewind_state* act = ptr_rewind_states->next;
+//		while(act != ptr_rewind_states){
+//			if(act->have_data){
+//				retVal++;
+//			}
+//			act = act->next;
+//		}
+//	}
+//	return retVal;
+//	printf("NUM STATES DIRECT: %d\n",retVal);
+//	printf("NUM STATES VARIAB: %d\n\n",number_of_used_states);
+	return number_of_used_states;
 }
 
 char* get_rewind_progress_bar(){
@@ -75,6 +82,7 @@ void allocate_rewind_states(void){
 		created_state->next = first_state;
 		first_state->prev = created_state;
 		ptr_rewind_states = first_state;
+		number_of_used_states = 0;
 	}
 
 	print_rewind_debug_info(setting,"allocate_rewind_states");
@@ -100,9 +108,9 @@ static void set_number_of_rewind_states(int *number_of_states) {
 }
 
 void free_rewind_states(void){
-	
-	struct rewind_state *now_state; 
-	
+
+	struct rewind_state *now_state;
+
 	now_state = ptr_rewind_states;
 	if(ptr_rewind_states){
         prev_state = now_state->prev;
@@ -117,25 +125,30 @@ void free_rewind_states(void){
             now_state = next_state;
         }
         ptr_rewind_states = NULL;
+        number_of_used_states = 0;
 	}
 }
 
 
 void save_rewind_state(void){
-	
+
 	gb_save_state(ptr_rewind_states->data); //declared in "gbcore/gb.h"
+	if(!ptr_rewind_states->have_data){
+		number_of_used_states++;
+	}
 	ptr_rewind_states->have_data = 1;
 	ptr_rewind_states = ptr_rewind_states->next;
 }
 
 int read_rewind_state(void){
-	
+
 	int ret_val = -999;
 	prev_state = ptr_rewind_states->prev;
 
 	if (prev_state->have_data > 0 ){
 		load_state_tmp( prev_state->data); //declarado en "saveload.h"
 		prev_state->have_data = 0;
+		number_of_used_states--;
 		ptr_rewind_states = ptr_rewind_states->prev;
 		ret_val = 1;
 	}

tools.c

@@ -14,9 +14,9 @@ char *get_progress_bar(int max, int act) {
 	const char ACT_CHAR = 9;
 	const char BUILD_CHAR = 10;
 	static char progress[MAX_PROGRESS];
-	static char string[MAX_STR];
+//	static char string[MAX_STR];
 	if (max == 0) {
-		string[0] = '\0';
+		progress[0] = '\0';
 	} else {
 		memset(progress, BUILD_CHAR, MAX_PROGRESS);
 
@@ -33,11 +33,11 @@ char *get_progress_bar(int max, int act) {
 		}
 		progress[actInBar] = ACT_CHAR;
 
-		memset(string, 0, MAX_STR);
+//		memset(string, 0, MAX_STR);
 //		snprintf(string, MAX_STR, " Rewind :%s", progress);
-		snprintf(string, MAX_STR, "%s", progress);
+//		snprintf(string, MAX_STR, "%s", progress);
 	}
-	return string;
+	return progress;
 }
 
 //#define TESTING