ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1214 from purplemarshmallow/Winback 

[Glide64] port winback hack from GLideN64
This commit is contained in:
zilmar 2016-11-18 03:03:58 +11:00 committed by GitHub
parent 8634b9fda3 f7e76f0c2a
commit 6203c0837b
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Glide64/Main.cpp
View File

@ -447,6 +447,8 @@ void ReadSpecialSettings(const char * name)
g_settings->hacks |= hack_GoldenEye; g_settings->hacks |= hack_GoldenEye;
else if (strstr(name, (const char *)"PUZZLE LEAGUE")) else if (strstr(name, (const char *)"PUZZLE LEAGUE"))
g_settings->hacks |= hack_PPL; g_settings->hacks |= hack_PPL;
else if (strstr(name, (const char *)"WIN BACK") || strstr(name, (const char *)"OPERATION WINBACK"))
g_settings->hacks |= hack_Winback;
g_settings->alt_tex_size = GetSetting(Set_alt_tex_size); g_settings->alt_tex_size = GetSetting(Set_alt_tex_size);
g_settings->use_sts1_only = GetSetting(Set_use_sts1_only); g_settings->use_sts1_only = GetSetting(Set_use_sts1_only);

7
Source/Glide64/Settings.h
View File

@ -151,9 +151,10 @@ public:
#define hack_TGR (1<<24) //Top Gear Rally #define hack_TGR (1<<24) //Top Gear Rally
#define hack_TGR2 (1<<25) //Top Gear Rally 2 #define hack_TGR2 (1<<25) //Top Gear Rally 2
#define hack_Tonic (1<<26) //tonic trouble #define hack_Tonic (1<<26) //tonic trouble
#define hack_Yoshi (1<<27) //Yoshi Story #define hack_Winback (1<<27) //WinBack - Covert Operations
#define hack_Zelda (1<<28) //zeldas hacks #define hack_Yoshi (1<<28) //Yoshi Story
#define hack_OoT (1<<29) //zelda OoT hacks #define hack_Zelda (1<<29) //zeldas hacks
#define hack_OoT (1<<30) //zelda OoT hacks
uint32_t hacks; uint32_t hacks;
//wrapper settings //wrapper settings

9
Source/Glide64/rdp.cpp
View File

@ -929,11 +929,16 @@ static void rdp_texrect()
else else
{ {
//gDPTextureRectangle //gDPTextureRectangle
if (g_settings->hacks&hack_ASB) if (g_settings->hacks&hack_ASB || g_settings->hacks&hack_Winback)
rdp.cmd2 = 0; rdp.cmd2 = 0;
else else
rdp.cmd2 = ((uint32_t*)gfx.RDRAM)[a + 0]; rdp.cmd2 = ((uint32_t*)gfx.RDRAM)[a + 0];
if (g_settings->hacks&hack_Winback)
rdp.cmd3 = 0;
else
rdp.cmd3 = ((uint32_t*)gfx.RDRAM)[a + 1]; rdp.cmd3 = ((uint32_t*)gfx.RDRAM)[a + 1];
rdp.pc[rdp.pc_i] += 8; rdp.pc[rdp.pc_i] += 8;
} }
} }
@ -943,7 +948,7 @@ static void rdp_texrect()
return; return;
} }
if (rdp.skip_drawing || (!fb_emulation_enabled && (rdp.cimg == rdp.zimg))) if (rdp.skip_drawing || (!fb_emulation_enabled && (rdp.cimg == rdp.zimg)) || rdp.cmd3 == 0)
{ {
if ((g_settings->hacks&hack_PMario) && rdp.ci_status == ci_useless) if ((g_settings->hacks&hack_PMario) && rdp.ci_status == ci_useless)
{ {