[Glide64] Make flame_corona private

This commit is contained in:
zilmar 2017-03-13 07:19:09 +11:00
parent 0daa369800
commit 160fa97aa9
4 changed files with 6 additions and 5 deletions

View File

@ -63,7 +63,7 @@ CSettings::CSettings() :
m_fast_crc(false),
m_alt_tex_size(false),
m_use_sts1_only(false),
flame_corona(0), //hack for zeldas flame's corona
m_flame_corona(false), //hack for zeldas flame's corona
increase_texrect_edge(0), // add 1 to lower right corner coordinates of texrect
decrease_fillrect_edge(0), // sub 1 from lower right corner coordinates of fillrect
texture_correction(0), // enable perspective texture correction emulation. is on by default
@ -795,7 +795,7 @@ void CSettings::ReadGameSettings(const char * name)
SetSwapMode((SwapMode_t)GetSetting(g_romopen ? Set_swapmode : Set_swapmode_default));
SetAspectmode((AspectMode_t)GetSetting(g_romopen ? Set_aspect : Set_aspect_default));
SetLODmode((PixelLevelOfDetail_t)GetSetting(g_romopen ? Set_lodmode : Set_lodmode_default));
g_settings->flame_corona = g_settings->hacks(hack_Zelda) && !fb_depth_render_enabled();
m_flame_corona = g_settings->hacks(hack_Zelda) && !fb_depth_render_enabled();
}
void CSettings::WriteSettings(void)

View File

@ -237,7 +237,7 @@ public:
inline bool fast_crc(void) const { return m_fast_crc; }
inline bool alt_tex_size(void) const { return m_alt_tex_size; }
inline bool use_sts1_only(void) const { return m_use_sts1_only; }
int flame_corona; //hack for zeldas flame's corona
inline bool flame_corona(void) const { return m_flame_corona; } //hack for zeldas flame's corona
int increase_texrect_edge; // add 1 to lower right corner coordinates of texrect
int decrease_fillrect_edge; // sub 1 from lower right corner coordinates of fillrect
int texture_correction; // enable perspective texture correction emulation. is on by default
@ -356,6 +356,7 @@ private:
bool m_fast_crc;
bool m_alt_tex_size;
bool m_use_sts1_only;
bool m_flame_corona;
StippleMode_t m_stipple_mode;
hacks_t m_hacks;
};

View File

@ -922,7 +922,7 @@ static void uc0_setothermode_l()
rdp.update |= UPDATE_FOG_ENABLED; //if blender has no fog bits, fog must be set off
rdp.render_mode_changed |= rdp.rm ^ rdp.othermode_l;
rdp.rm = rdp.othermode_l;
if (g_settings->flame_corona && (rdp.rm == 0x00504341)) //hack for flame's corona
if (g_settings->flame_corona() && (rdp.rm == 0x00504341)) //hack for flame's corona
{
rdp.othermode_l |= 0x00000010;
}

View File

@ -413,7 +413,7 @@ static void uc2_geom_mode()
{
if ((rdp.flags & ZBUF_ENABLED))
{
if (!g_settings->flame_corona || (rdp.rm != 0x00504341)) //hack for flame's corona
if (!g_settings->flame_corona() || (rdp.rm != 0x00504341)) //hack for flame's corona
{
rdp.flags ^= ZBUF_ENABLED;
}