From fbc2aaeeec79079bfe5f532e12268929c96e8022 Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Wed, 9 Dec 2020 16:47:43 +0100
Subject: [PATCH] light: Make sure we're overriding patterns if switch_style is
 above 0 and below 11. You also want to go update worldspawn/vmap...

---
 src/client/entry.c                     | 17 -----------------
 src/gs-entbase/server/light.cpp        |  2 +-
 src/gs-entbase/server/point_camera.cpp |  6 ++++--
 src/server/valve/ammo.cpp              |  2 +-
 src/shared/valve/include.src           |  1 +
 5 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/src/client/entry.c b/src/client/entry.c
index e6377753..af120bda 100644
--- a/src/client/entry.c
+++ b/src/client/entry.c
@@ -297,23 +297,6 @@ CSQC_UpdateView(float w, float h, float focus)
 
 		setproperty(VF_DRAWWORLD, 1);
 
-		if (g_skyscale != 0 && g_skypos) {
-			vector porg;
-			vector realpos;
-
-			porg = getproperty(VF_ORIGIN);
-			if (autocvar_dev_skyscale) {
-				realpos[0] = porg[0] / autocvar_dev_skyscale;
-				realpos[1] = porg[1] / autocvar_dev_skyscale;
-				realpos[2] = porg[2] / autocvar_dev_skyscale;
-			} else {
-				realpos[0] = porg[0] / g_skyscale;
-				realpos[1] = porg[1] / g_skyscale;
-				realpos[2] = porg[2] / g_skyscale;
-			}
-			setproperty(VF_SKYROOM_CAMERA, g_skypos + realpos);
-		}
-
 		/* draw the viewmodel in a second pass if desired */
 		if (autocvar_r_viewmodelpass) {
 			renderscene();
diff --git a/src/gs-entbase/server/light.cpp b/src/gs-entbase/server/light.cpp
index 2fffdc05..2294c9eb 100644
--- a/src/gs-entbase/server/light.cpp
+++ b/src/gs-entbase/server/light.cpp
@@ -166,7 +166,7 @@ light::light(void)
 	CBaseTrigger::CBaseTrigger();
 
 	/* switch styles before 12 are builtins from Quake. */
-	if (m_flSwitchStyle <= 11) {
+	if (m_flSwitchStyle > 0 && m_flSwitchStyle <= 11) {
 		m_strPattern = getlightstyle(m_flSwitchStyle);
 	}
 }
diff --git a/src/gs-entbase/server/point_camera.cpp b/src/gs-entbase/server/point_camera.cpp
index e9bb1bba..dee0f160 100644
--- a/src/gs-entbase/server/point_camera.cpp
+++ b/src/gs-entbase/server/point_camera.cpp
@@ -60,8 +60,10 @@ point_camera::Input(entity eAct, string strInput, string strData)
 		m_flFOV = stof(strInput);
 		break;
 	case "SetOnAndTurnOthersOff":
-		for (point_camera e = world; e = (point_camera)find(e, ::classname, "point_camera");)
-			e.m_iValue = FALSE;
+		for (entity e = world; (e = find(e, ::classname, "point_camera"));) {
+			point_camera p = (point_camera)e;
+			p.m_iValue = FALSE;
+		}
 
 		m_iValue = TRUE;
 		break;
diff --git a/src/server/valve/ammo.cpp b/src/server/valve/ammo.cpp
index dbd5901f..f47920ca 100644
--- a/src/server/valve/ammo.cpp
+++ b/src/server/valve/ammo.cpp
@@ -1,4 +1,4 @@
-	/*
+/*
  * Copyright (c) 2016-2020 Marco Hladik <marco@icculus.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
diff --git a/src/shared/valve/include.src b/src/shared/valve/include.src
index 6ba80712..995015b6 100644
--- a/src/shared/valve/include.src
+++ b/src/shared/valve/include.src
@@ -6,6 +6,7 @@
 ../../shared/valve/animations.h
 ../../shared/valve/animations.c
 ../../shared/valve/pmove.c
+../../shared/valve/pmove_water.c
 
 ../../shared/valve/fx_blood.c
 ../../shared/valve/fx_breakmodel.c