Tomaz's patch for r_waterwarp with controllable intensity

[xonotic/darkplaces.git] / menu.c

diff --git a/menu.c b/menu.c
index 881900c89b14f42ac7dd8ca29338315ed1279fba..ba6abad5532d4956467d14b4d462e8090d937e82 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -906,6 +906,7 @@ int         setup_oldbottom;
 int            setup_top;
 int            setup_bottom;
 int            setup_rate;
+int            setup_oldrate;
 
 #define        NUM_SETUP_CMDS  5
 
@@ -1096,6 +1097,9 @@ forward:
                        Cbuf_AddText ( va ("name \"%s\"\n", setup_myname) );
                if (setup_top != setup_oldtop || setup_bottom != setup_oldbottom)
                        Cbuf_AddText( va ("color %i %i\n", setup_top, setup_bottom) );
+               if (setup_rate != setup_oldrate)
+                       Cbuf_AddText(va("rate %i\n", setup_rate));
+
                m_entersound = true;
                M_Menu_MultiPlayer_f ();
                break;
@@ -1416,7 +1420,7 @@ void M_Options_Key (int k, char ascii)
        }
 }
 
-#define        OPTIONS_EFFECTS_ITEMS   22
+#define        OPTIONS_EFFECTS_ITEMS   23
 
 int options_effects_cursor;
 
@@ -1471,6 +1475,7 @@ void M_Menu_Options_Effects_AdjustSliders (int dir)
        else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&cl_particles_blood_bloodhack, !cl_particles_blood_bloodhack.integer);
        else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lerpmodels, !r_lerpmodels.integer);
        else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_lerpsprites, !r_lerpsprites.integer);
+       else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_waterwarp, bound(0, r_waterwarp.value + dir * 0.1, 1));
        else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_wateralpha, bound(0, r_wateralpha.value + dir * 0.1, 1));
        else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_waterscroll, bound(0, r_waterscroll.value + dir * 0.5, 10));
        else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_watershader, bound(0, r_watershader.value + dir * 0.25, 10));
@@ -1511,6 +1516,7 @@ void M_Options_Effects_Draw (void)
        M_Options_PrintCheckbox("Force New Blood Effect", true, cl_particles_blood_bloodhack.integer);
        M_Options_PrintCheckbox("   Model Interpolation", true, r_lerpmodels.integer);
        M_Options_PrintCheckbox("  Sprite Interpolation", true, r_lerpsprites.integer);
+       M_Options_PrintSlider(  "  Underwater View Warp", true, r_waterwarp.value, 0, 1);
        M_Options_PrintSlider(  " Water Alpha (opacity)", true, r_wateralpha.value, 0, 1);
        M_Options_PrintSlider(  "        Water Movement", true, r_waterscroll.value, 0, 10);
        M_Options_PrintSlider(  " GeForce3 Water Shader", true, r_watershader.value, 0, 10);
@@ -1874,7 +1880,18 @@ char *transfusionbindnames[][2] =
 {"impulse 26",         "next armor type"},
 {"impulse 27",         "identify player"},
 {"impulse 55",         "voting menu"},
-{"impulse 56",         "observer mode"}
+{"impulse 56",         "observer mode"},
+{"",                           "Taunts"},            // Taunts
+{"impulse 70",         "taunt 0"},
+{"impulse 71",         "taunt 1"},
+{"impulse 72",         "taunt 2"},
+{"impulse 73",         "taunt 3"},
+{"impulse 74",         "taunt 4"},
+{"impulse 75",         "taunt 5"},
+{"impulse 76",         "taunt 6"},
+{"impulse 77",         "taunt 7"},
+{"impulse 78",         "taunt 8"},
+{"impulse 79",         "taunt 9"}
 };
 
 char *goodvsbad2bindnames[][2] =