From: Samual Lenks <samual@xonotic.org>
Date: Mon, 30 Dec 2013 18:48:32 +0000 (-0500)
Subject: Remove r_hidewater changes from this branch
X-Git-Tag: xonotic-v0.8.0~246^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3bd8ea157a941ab1abce64df8619b42e8a19dd5c;p=xonotic%2Fxonotic-data.pk3dir.git

Remove r_hidewater changes from this branch
---

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_view.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_view.c
index 3012835e9..b2b440a1c 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_view.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_view.c
@@ -73,7 +73,7 @@ void XonoticViewDialog_fill(entity me)
 
 	me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn);
 		me.TD(me, 1, 3, e = makeXonoticRadioButton(1, "chase_active", "0", _("1st person perspective")));
-		makeMulti(e, "crosshair_hittest_showimpact !r_water_hideplayer");
+		makeMulti(e, "crosshair_hittest_showimpact");
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 2.8, e = makeXonoticCheckBoxEx(0.05, 0, "cl_bobfall", _("Smooth the view when landing from a jump")));
@@ -94,7 +94,7 @@ void XonoticViewDialog_fill(entity me)
 	me.TR(me);
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeXonoticRadioButton(1, "chase_active", "1", _("3rd person perspective")));
-		makeMulti(e, "crosshair_hittest_showimpact !r_water_hideplayer");
+		makeMulti(e, "crosshair_hittest_showimpact");
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Back distance")));