Merge remote-tracking branch 'master/master'

Author: JKSunny

CMakeLists.txt

@@ -16,7 +16,9 @@
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 #============================================================================
 
-cmake_minimum_required(VERSION 3.1)
+# The <min>...<policy_max> syntax is needed to remain compatible with 3.1, but also newer versions that dropped 3.1 compatibility
+# More info here: https://cmake.org/cmake/help/latest/command/cmake_minimum_required.html
+cmake_minimum_required(VERSION 3.1...3.31)
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment version")
 
 set(InOpenJK ON)

code/qcommon/common.cpp

@@ -1093,12 +1093,12 @@ void Com_Init( char *commandLine ) {
 		//Swap_Init ();
 		Cbuf_Init ();
 
-		Com_InitZoneMemoryVars();
-		Cmd_Init ();
-
 		// override anything from the config files with command line args
 		Com_StartupVariable( NULL );
 
+		Com_InitZoneMemoryVars();
+		Cmd_Init ();
+
 		// done early so bind command exists
 		CL_InitKeyCommands();
 
@@ -1194,6 +1194,7 @@ void Com_Init( char *commandLine ) {
 				Cbuf_AddText ("cinematic openinglogos\n");
 			}
 		}
+		CL_StartHunkUsers();
 		com_fullyInitialized = qtrue;
 		Com_Printf ("--- Common Initialization Complete ---\n");
 

code/server/sv_savegame.cpp

@@ -1062,6 +1062,11 @@ static void SG_WriteScreenshot(qboolean qbAutosave, const char *psMapName)
 
 	if (!pbRawScreenShot)
 	{
+		if (byBlank != NULL)
+		{
+			delete[] byBlank;
+		}
+
 		const size_t bySize = SG_SCR_WIDTH * SG_SCR_HEIGHT * 3;
 
 		byBlank = new byte[bySize];

codemp/rd-rend2/tr_weather.cpp

@@ -1141,8 +1141,8 @@ void RB_SurfaceWeather( srfWeather_t *surf )
 		{
 			for (int x = -1; x <= 1; ++x, ++currentIndex)
 			{
-				chunkIndex  = (int(centerZoneOffsetX + numMinZonesX) + x + 1) % 3;
-				chunkIndex += (int(centerZoneOffsetY + numMinZonesY) + y + 1) % 3 * 3;
+				chunkIndex  = ((int(centerZoneOffsetX + numMinZonesX) + x + 1) % 3 + 3) % 3;
+				chunkIndex += (((int(centerZoneOffsetY + numMinZonesY) + y + 1) % 3 + 3) % 3) * 3;
 				VectorSet2(
 					zoneOffsets[chunkIndex],
 					x,