vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

Menu: Cleaned up gamma hack.

Browse source
This commit is contained in:
Marco Cawthorne 2020-08-09 00:53:18 +02:00
parent 36a80aea38
commit 19b565b202
3 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gs-entbase/server/func_button.cpp
View file

@ -285,12 +285,13 @@ void func_button::Use(void)
void func_button::Pain (int body) void func_button::Pain (int body)
{ {
Trigger(TRIG_TOGGLE); /* how you doin? */
} }
void func_button::Death (int body) void func_button::Death (int body)
{ {
Trigger(TRIG_TOGGLE); Trigger(TRIG_TOGGLE);
health = m_oldHealth;
} }
void func_button::Blocked(void) void func_button::Blocked(void)

27
src/menu-fn/entry.cpp
View file

@ -71,6 +71,21 @@ Menu_AutoScale(void)
} }
} }
/* for old Half-Life configs */
void
Menu_GammaHack(void)
{
if (cvar("brightness") != cvar("vid_brightness")) {
cvar_set("brightness", "0");
print("^1Menu_RendererRestarted^7: Brightness hack.\n");
}
if (cvar("gamma") != cvar("vid_gamma")) {
cvar_set("gamma", "1");
print("^1Menu_RendererRestarted^7: Gamma hack.\n");
}
}
void void
m_init(void) m_init(void)
{ {
@ -115,6 +130,7 @@ m_init(void)
g_menupage = PAGE_UPDATES; g_menupage = PAGE_UPDATES;
} }
Menu_AutoScale(); Menu_AutoScale();
Menu_GammaHack();
} }
void void
@ -122,16 +138,7 @@ Menu_RendererRestarted(string rendererdesc)
{ {
localcmd("menu_restart\n"); localcmd("menu_restart\n");
Menu_AutoScale(); Menu_AutoScale();
Menu_GammaHack();
if (cvar("brightness") != cvar("vid_brightness")) {
cvar_set("brightness", cvar_string("vid_brightness"));
print("^1Menu_RendererRestarted^7: Brightness hack.\n");
}
if (cvar("gamma") != cvar("vid_gamma")) {
cvar_set("gamma", cvar_string("vid_gamma"));
print("^1Menu_RendererRestarted^7: Gamma hack.\n");
}
} }
void void

7
src/menu-fn/m_videooptions.cpp
View file

@ -14,6 +14,9 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
var float autocvar_vid_brightness = 0.0f;
var float autocvar_vid_gamma = 1.0f;
CWidget fn_vidoptions; CWidget fn_vidoptions;
CMainButton vo_btnDone; CMainButton vo_btnDone;
CSlider vo_sldScreensize; CSlider vo_sldScreensize;
@ -45,13 +48,13 @@ vo_sldscreensize_changed(float val)
void void
vo_sldgamma_changed(float val) vo_sldgamma_changed(float val)
{ {
cvar_set("gamma", ftos(val)); localcmd(sprintf("seta gamma %f; seta vid_gamma %f\n", val, val));
} }
void void
vo_sldglare_changed(float val) vo_sldglare_changed(float val)
{ {
cvar_set("brightness", ftos(val * 0.5)); localcmd(sprintf("seta brightness %f; seta vid_brightness %f\n", val, val));
} }
/* Init */ /* Init */