Fix zc mouse showing during gameplay, setup for fancy mouse stuff.

Author: EmilyV99

src/base/render.cpp

@@ -290,6 +290,8 @@ namespace MouseSprite
 	}
 	void assign(int index, BITMAP* spr, int xf, int yf)
 	{
+		if(index < 0 || index >= MAX_MOUSESPRITE)
+			return;
 		ALLEGRO_MOUSE_CURSOR* old_cursor = zc_mouse_sprites[index];
 		all_set_transparent_palette_index(0);
 		ALLEGRO_BITMAP* a5_mouse_sprite = all_get_a5_bitmap(spr);
@@ -302,20 +304,31 @@ namespace MouseSprite
 		if(old_cursor)
 			al_destroy_mouse_cursor(old_cursor);
 	}
-	void set(int index)
+	bool set(int index)
 	{
 		if(index < 0 || index >= MAX_MOUSESPRITE)
 		{
 			active_mouse_sprite = -1;
 			set_nullmouse();
+			return true;
 		}
-		if(index == active_mouse_sprite) return;
+		if(index == active_mouse_sprite) return true;
 		if(zc_mouse_sprites[index])
 		{
 			active_mouse_sprite = index;
 			al_show_mouse_cursor(all_get_display());
 			al_set_mouse_cursor(all_get_display(), zc_mouse_sprites[index]);
+			return true;
 		}
+		return false;
+	}
+	void clear(int index)
+	{
+		if(index < 0 || index >= MAX_MOUSESPRITE)
+			return;
+		if(zc_mouse_sprites[index])
+			al_destroy_mouse_cursor(zc_mouse_sprites[index]);
+		zc_mouse_sprites[index] = nullptr;
 	}
 }
 

src/base/render.h

@@ -52,7 +52,8 @@ namespace MouseSprite
 {
 	#define MAX_MOUSESPRITE 35
 	void assign(int index, BITMAP* spr, int xf = 1, int yf = 1);
-	void set(int index);
+	bool set(int index);
+	void clear(int index);
 };
 
 extern RenderTreeItem rti_dialogs;

src/zc/title.cpp

@@ -4014,6 +4014,7 @@ int32_t custom_game(int32_t file)
 	gamemode_dlg[2].d1 = gamemode_dlg[4].d1 = 0;
 	gamemode_dlg[2].d2 = gamemode_dlg[4].d2 = 0;
 	system_pal();
+	sys_mouse();
 
 	clear_keybuf();
 
@@ -4061,6 +4062,7 @@ int32_t custom_game(int32_t file)
 	}
 	if(!customized) strcpy(qstpath, relpath);
 
+	game_mouse();
 	game_pal();
 	key[KEY_ESC]=0;
 	chosecustomquest = (ret==5) && customized;
@@ -4419,7 +4421,10 @@ if ( FFCore.coreflags&FFCORE_SCRIPTED_MIDI_VOLUME )
 		cont_game();
 		return;
 	}
-
+	
+	game_mouse_index = ZCM_BLANK; //Force game mouse to blank
+	MouseSprite::clear(ZCM_CUSTOM); //Delete any custom cursor between quests
+	
 	if (replay_get_mode() == ReplayMode::Record)
 	{
 		replay_save();

src/zc/zc_sys.cpp

@@ -680,58 +680,113 @@ void dump_pal(BITMAP *dest)
 
 //----------------------------------------------------------------
 
+int game_mouse_index = ZCM_BLANK;
+static bool system_mouse = false;
+bool sys_mouse()
+{
+	system_mouse = true;
+	return MouseSprite::set(ZCM_NORMAL);
+}
+bool game_mouse()
+{
+	system_mouse = false;
+	return MouseSprite::set(game_mouse_index);
+}
+void custom_mouse(BITMAP* bmp, int fx, int fy, bool sys_recolor, bool user_scale)
+{
+	if(!bmp)
+		return;
+	float scale = vbound(zc_get_config("zeldadx","cursor_scale_large",1.5),1.0,5.0);
+	int scaledw = bmp->w*scale, scaledh = bmp->h*scale;
+	if(bmp->w == scaledw && bmp->h == scaledh)
+		user_scale = false;
+	if(user_scale || sys_recolor)
+	{
+		if(!user_scale) scale = 1;
+		BITMAP* tmpbmp = create_bitmap_ex(8,bmp->w*scale,bmp->h*scale);
+		if(user_scale)
+			stretch_blit(bmp, tmpbmp, 0, 0, bmp->w, bmp->h, 0, 0, tmpbmp->w, tmpbmp->h);
+		else
+			blit(bmp, tmpbmp, 0, 0, 0, 0, bmp->w, bmp->h);
+		if(sys_recolor)
+			recolor_mouse(tmpbmp);
+		MouseSprite::assign(ZCM_CUSTOM, tmpbmp, fx*scale, fy*scale);
+		destroy_bitmap(tmpbmp);
+	}
+	else
+	{
+		MouseSprite::assign(ZCM_CUSTOM, bmp, fx, fy);
+	}
+	if(!system_mouse && game_mouse_index == ZCM_CUSTOM)
+		MouseSprite::set(ZCM_CUSTOM); //Reload the new sprite
+}
+
 //Handles converting the mouse sprite from the .dat file
+void recolor_mouse(BITMAP* bmp)
+{
+	for(int32_t x = 0; x < bmp->w; ++x)
+	{
+		for(int32_t y = 0; y < bmp->h; ++y)
+		{
+			int32_t color = getpixel(bmp, x, y);
+			switch(color)
+			{
+				case dvc(1):
+					color = jwin_pal[jcCURSORMISC];
+					break;
+				case dvc(2):
+					color = jwin_pal[jcCURSOROUTLINE];
+					break;
+				case dvc(3):
+					color = jwin_pal[jcCURSORLIGHT];
+					break;
+				case dvc(5):
+					color = jwin_pal[jcCURSORDARK];
+					break;
+				default:
+					continue;
+			}
+			putpixel(bmp, x, y, color);
+		}
+	}
+}
 void load_mouse()
 {
 	system_pal();
 	MouseSprite::set(-1);
-	int32_t sz = vbound(int32_t(16*(zc_get_config("zeldadx","cursor_scale_large",1.5))),16,80);
-	for(int32_t j = 0; j < 4; ++j)
+	float scale = vbound(zc_get_config("zeldadx","cursor_scale_large",1.5),1.0,5.0);
+	int32_t sz = 16*scale;
+	for(int32_t j = 0; j < 1; ++j)
 	{
 		BITMAP* tmpbmp = create_bitmap_ex(8,16,16);
-		BITMAP* subbmp = create_bitmap_ex(8,16,16);
 		if(zcmouse[j])
 			destroy_bitmap(zcmouse[j]);
 		zcmouse[j] = create_bitmap_ex(8,sz,sz);
 		clear_bitmap(zcmouse[j]);
 		clear_bitmap(tmpbmp);
-		clear_bitmap(subbmp);
 		blit((BITMAP*)datafile[BMP_MOUSE].dat,tmpbmp,1,j*17+1,0,0,16,16);
-		for(int32_t x = 0; x < 16; ++x)
-		{
-			for(int32_t y = 0; y < 16; ++y)
-			{
-				int32_t color = getpixel(tmpbmp, x, y);
-				switch(color)
-				{
-					case dvc(1):
-						color = jwin_pal[jcCURSORMISC];
-						break;
-					case dvc(2):
-						color = jwin_pal[jcCURSOROUTLINE];
-						break;
-					case dvc(3):
-						color = jwin_pal[jcCURSORLIGHT];
-						break;
-					case dvc(5):
-						color = jwin_pal[jcCURSORDARK];
-						break;
-				}
-				putpixel(subbmp, x, y, color);
-			}
-		}
+		recolor_mouse(tmpbmp);
 		if(sz!=16)
-			stretch_blit(subbmp, zcmouse[j], 0, 0, 16, 16, 0, 0, sz, sz);
+			stretch_blit(tmpbmp, zcmouse[j], 0, 0, 16, 16, 0, 0, sz, sz);
 		else
-			blit(subbmp, zcmouse[j], 0, 0, 0, 0, 16, 16);
+			blit(tmpbmp, zcmouse[j], 0, 0, 0, 0, 16, 16);
 		destroy_bitmap(tmpbmp);
-		destroy_bitmap(subbmp);
 	}
 	zc_set_palette(*hw_palette);
 
-	MouseSprite::assign(0, zcmouse[0]);
-	MouseSprite::set(0);
+	BITMAP* blankmouse = create_bitmap_ex(8,16,16);
+	clear_bitmap(blankmouse);
+	
+	MouseSprite::assign(ZCM_NORMAL, zcmouse[0], 1*scale, 1*scale);
+	MouseSprite::assign(ZCM_BLANK, blankmouse);
+	//Don't assign ZCM_CUSTOM. That'll be handled by scripts.
+	
+	//Reload the mouse
+	if(system_mouse)
+		sys_mouse();
+	else game_mouse();
 
+	destroy_bitmap(blankmouse);
 	game_pal();
 }
 
@@ -745,7 +800,7 @@ bool game_vid_mode(int32_t mode,int32_t wait)
 
 	scrx = (resx-320)>>1;
 	scry = (resy-240)>>1;
-	for(int32_t q = 0; q < 4; ++q)
+	for(int32_t q = 0; q < NUM_ZCMOUSE; ++q)
 		zcmouse[q] = NULL;
 	load_mouse();
 
@@ -4248,6 +4303,7 @@ void f_Quit(int32_t type)
 	{
 		music_pause();
 		pause_all_sfx();
+		sys_mouse();
 	}
 	enter_sys_pal();
 	clear_keybuf();
@@ -4291,6 +4347,7 @@ void f_Quit(int32_t type)
 	}
 
 	if(!from_menu)
+		game_mouse();
 	eat_buttons();
 
 	zc_readrawkey(KEY_ESC);
@@ -6342,11 +6399,13 @@ int32_t onGoToComplete()
 	system_pal();
 	music_pause();
 	pause_all_sfx();
+	sys_mouse();
 	onGoTo();
 	eat_buttons();
 
 	zc_readrawkey(KEY_ESC);
-		
+	
+	game_mouse();
 	game_pal();
 	music_resume();
 	resume_all_sfx();
@@ -8332,6 +8391,7 @@ void System()
 		misc_menu[5].flags = Playing ? 0 : D_DISABLED;
 	misc_menu[7].flags = !Playing ? 0 : D_DISABLED;
 	clear_keybuf();
+	sys_mouse();
 
 	DIALOG_PLAYER *p;
 
@@ -8467,6 +8527,7 @@ void System()
 	//  font=oldfont;
 	mouse_down=gui_mouse_b();
 	shutdown_dialog(p);
+	game_mouse();
 	MenuOpen = false;
 	if(Quit)
 	{

src/zc/zc_sys.h

@@ -26,7 +26,6 @@ bool flash_reduction_enabled(bool check_qr = true);
 void large_dialog(DIALOG *d);
 void large_dialog(DIALOG *d, float RESIZE_AMT);
 
-bool game_vid_mode(int32_t mode,int32_t wait);
 int32_t Z_init_timers();
 void Z_remove_timers();
 void Z_init_sound();
@@ -194,6 +193,11 @@ enum {bosCIRCLE=0, bosOVAL, bosTRIANGLE, bosSMAS, bosFADEBLACK, bosMAX};
 void go();
 void comeback();
 void dump_pal(BITMAP *dest);
+extern int game_mouse_index;
+bool sys_mouse();
+bool game_mouse();
+void custom_mouse(BITMAP* bmp, int fx, int fy, bool sys_recolor, bool user_scale);
+void recolor_mouse(BITMAP* bmp);
 bool game_vid_mode(int32_t mode,int32_t wait);
 void init_NES_mode();
 

src/zc/zelda.cpp

@@ -333,7 +333,7 @@ BITMAP     *framebuf, *menu_bmp, *gui_bmp, *scrollbuf, *tmp_bmp, *tmp_scr, *scre
            *msg_portrait_display_buf, *msg_txt_display_buf, *msg_bg_display_buf,
 		   *pricesdisplaybuf, *tb_page[3], *temp_buf, *prim_bmp,
 		   *script_menu_buf, *f6_menu_buf;
-BITMAP     *zcmouse[4];
+BITMAP     *zcmouse[NUM_ZCMOUSE];
 DATAFILE   *datafile, *sfxdata, *fontsdata, *mididata;
 PALETTE    RAMpal;
 byte       *colordata, *trashbuf;
@@ -5763,9 +5763,6 @@ void quit_game()
 	set_clip_state(pricesdisplaybuf, 1);
 	destroy_bitmap(pricesdisplaybuf);
 	destroy_bitmap(zcmouse[0]);
-	destroy_bitmap(zcmouse[1]);
-	destroy_bitmap(zcmouse[2]);
-	destroy_bitmap(zcmouse[3]);
 	destroy_bitmap(script_menu_buf);
 	destroy_bitmap(f6_menu_buf);
 	destroy_bitmap(darkscr_bmp_curscr);

src/zc/zelda.h

@@ -312,7 +312,8 @@ extern BITMAP   *darkscr_bmp_curscr, *darkscr_bmp_scrollscr,
                 *darkscr_bmp_curscr_trans, *darkscr_bmp_scrollscr_trans;
 extern BITMAP *lightbeam_bmp;
 extern bool lightbeam_present;
-extern BITMAP *zcmouse[4];
+#define NUM_ZCMOUSE 1
+extern BITMAP *zcmouse[NUM_ZCMOUSE];
 extern DATAFILE *datafile, *sfxdata, *fontsdata, *mididata;
 extern SAMPLE   wav_refill;
 extern PALETTE  RAMpal;
@@ -542,6 +543,14 @@ extern zctune tunes[MAXMIDIS];
 //extern zcmidi_ tunes[MAXMIDIS];
 //extern emusic enhancedMusic[MAXMUSIC];
 
+//Mouse stuff
+enum
+{
+	ZCM_NORMAL,
+	ZCM_BLANK,
+	ZCM_CUSTOM
+};
+
 #endif
 
 /*** end of zelda.h ***/