X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Femu.c;h=f8b4e65e3b3a1232b753bf9999635edb4605a827;hb=e31266dd116b6bea59ce3f2036feeb6725c45a72;hp=73ca01bb0bdc9cfe17a6e7f1c0eb3ccb5d2438c5;hpb=f11bad75edc8966e9f84b040163cc86e830c46c6;p=libpicofe.git

diff --git a/common/emu.c b/common/emu.c
index 73ca01b..f8b4e65 100644
--- a/common/emu.c
+++ b/common/emu.c
@@ -16,6 +16,7 @@
 #include "lprintf.h"
 #include "config.h"
 #include "common.h"
+#include "plat.h"
 
 #include <pico/pico_int.h>
 #include <pico/patch.h>
@@ -23,25 +24,30 @@
 #include <zlib/zlib.h>
 
 
+void *g_screen_ptr;
+
+#if !SCREEN_SIZE_FIXED
+int g_screen_width  = SCREEN_WIDTH;
+int g_screen_height = SCREEN_HEIGHT;
+#endif
+
 char *PicoConfigFile = "config.cfg";
 currentConfig_t currentConfig, defaultConfig;
-int rom_loaded = 0;
 char noticeMsg[64] = { 0, };
 int state_slot = 0;
 int config_slot = 0, config_slot_current = 0;
-char loadedRomFName[512] = { 0, };
 int kb_combo_keys = 0, kb_combo_acts = 0;	// keys and actions which need button combos
 int pico_inp_mode = 0;
+int engineState = PGS_Menu;
+
+/* TODO: len checking */
+char rom_fname_reload[512] = { 0, };
+char rom_fname_loaded[512] = { 0, };
+int rom_loaded = 0;
 
 unsigned char *movie_data = NULL;
 static int movie_size = 0;
 
-// provided by platform code:
-extern void emu_noticeMsgUpdated(void);
-extern int  emu_getMainDir(char *dst, int len);
-extern void menu_romload_prepare(const char *rom_name);
-extern void menu_romload_end(void);
-
 
 // utilities
 static void strlwr_(char *string)
@@ -492,8 +498,8 @@ int emu_ReloadRom(char *rom_fname)
 	if (currentConfig.EmuOpt & EOPT_USE_SRAM)
 		emu_SaveLoadGame(1, 1);
 
-	strncpy(loadedRomFName, rom_fname, sizeof(loadedRomFName)-1);
-	loadedRomFName[sizeof(loadedRomFName)-1] = 0;
+	strncpy(rom_fname_loaded, rom_fname, sizeof(rom_fname_loaded)-1);
+	rom_fname_loaded[sizeof(rom_fname_loaded)-1] = 0;
 	rom_loaded = 1;
 	return 1;
 
@@ -518,8 +524,8 @@ static void romfname_ext(char *dst, const char *prefix, const char *ext)
 	int prefix_len = 0;
 
 	// make save filename
-	p = loadedRomFName+strlen(loadedRomFName)-1;
-	for (; p >= loadedRomFName && *p != PATH_SEP_C; p--); p++;
+	p = rom_fname_loaded + strlen(rom_fname_loaded) - 1;
+	for (; p >= rom_fname_loaded && *p != PATH_SEP_C; p--); p++;
 	*dst = 0;
 	if (prefix) {
 		int len = emu_getMainDir(dst, 512);
@@ -527,7 +533,7 @@ static void romfname_ext(char *dst, const char *prefix, const char *ext)
 		prefix_len = len + strlen(prefix);
 	}
 #ifdef UIQ3
-	else p = loadedRomFName; // backward compatibility
+	else p = rom_fname_loaded; // backward compatibility
 #endif
 	strncpy(dst + prefix_len, p, 511-prefix_len);
 	dst[511-8] = 0;
@@ -670,54 +676,46 @@ int emu_WriteConfig(int is_game)
 }
 
 
-#ifndef UIQ3
-void emu_textOut8(int x, int y, const char *text)
+void emu_writelrom(void)
 {
-	int i,l,len=strlen(text);
-	unsigned char *screen = (unsigned char *)SCREEN_BUFFER + x + y*SCREEN_WIDTH;
+	char cfg[512];
+	make_config_cfg(cfg);
+	config_writelrom(cfg);
+#ifndef NO_SYNC
+	sync();
+#endif
+}
 
-	/* always using built-in font */
-	for (i = 0; i < len; i++)
-	{
-		for (l=0;l<8;l++)
-		{
-			unsigned char fd = fontdata8x8[((text[i])*8)+l];
-			if (fd&0x80) screen[l*SCREEN_WIDTH+0]=0xf0;
-			if (fd&0x40) screen[l*SCREEN_WIDTH+1]=0xf0;
-			if (fd&0x20) screen[l*SCREEN_WIDTH+2]=0xf0;
-			if (fd&0x10) screen[l*SCREEN_WIDTH+3]=0xf0;
-			if (fd&0x08) screen[l*SCREEN_WIDTH+4]=0xf0;
-			if (fd&0x04) screen[l*SCREEN_WIDTH+5]=0xf0;
-			if (fd&0x02) screen[l*SCREEN_WIDTH+6]=0xf0;
-			if (fd&0x01) screen[l*SCREEN_WIDTH+7]=0xf0;
-		}
-		screen += 8;
-	}
+/* always using built-in font */
+
+#define mk_text_out(name, type, val) \
+void name(int x, int y, const char *text)				\
+{									\
+	int i, l, len = strlen(text);					\
+	type *screen = (type *)g_screen_ptr + x + y * g_screen_width;	\
+									\
+	for (i = 0; i < len; i++, screen += 8)				\
+	{								\
+		for (l = 0; l < 8; l++)					\
+		{							\
+			unsigned char fd = fontdata8x8[text[i] * 8 + l];\
+			type *s = screen + l * g_screen_width;		\
+			if (fd&0x80) s[0] = val;			\
+			if (fd&0x40) s[1] = val;			\
+			if (fd&0x20) s[2] = val;			\
+			if (fd&0x10) s[3] = val;			\
+			if (fd&0x08) s[4] = val;			\
+			if (fd&0x04) s[5] = val;			\
+			if (fd&0x02) s[6] = val;			\
+			if (fd&0x01) s[7] = val;			\
+		}							\
+	}								\
 }
 
-void emu_textOut16(int x, int y, const char *text)
-{
-	int i,l,len=strlen(text);
-	unsigned short *screen = (unsigned short *)SCREEN_BUFFER + x + y*SCREEN_WIDTH;
+mk_text_out(emu_textOut8, unsigned char, 0xf0)
+mk_text_out(emu_textOut16, unsigned short, 0xffff)
 
-	for (i = 0; i < len; i++)
-	{
-		for (l=0;l<8;l++)
-		{
-			unsigned char fd = fontdata8x8[((text[i])*8)+l];
-			if(fd&0x80) screen[l*SCREEN_WIDTH+0]=0xffff;
-			if(fd&0x40) screen[l*SCREEN_WIDTH+1]=0xffff;
-			if(fd&0x20) screen[l*SCREEN_WIDTH+2]=0xffff;
-			if(fd&0x10) screen[l*SCREEN_WIDTH+3]=0xffff;
-			if(fd&0x08) screen[l*SCREEN_WIDTH+4]=0xffff;
-			if(fd&0x04) screen[l*SCREEN_WIDTH+5]=0xffff;
-			if(fd&0x02) screen[l*SCREEN_WIDTH+6]=0xffff;
-			if(fd&0x01) screen[l*SCREEN_WIDTH+7]=0xffff;
-		}
-		screen += 8;
-	}
-}
-#endif
+#undef mk_text_out
 
 #ifdef PSP
 #define MAX_COMBO_KEY 23
@@ -725,6 +723,7 @@ void emu_textOut16(int x, int y, const char *text)
 #define MAX_COMBO_KEY 31
 #endif
 
+// FIXME
 void emu_findKeyBindCombos(void)
 {
 	int act, u;