Turn not returning from a function into an error!!!!

dpjudas · Jan 19, 2025 · df125c3 · df125c3
1 parent fab7ec0
commit df125c3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -183,7 +183,8 @@ endif()
 
 # Set up flags for MSVC
 if (MSVC)
-	set( CMAKE_CXX_FLAGS "/MP ${CMAKE_CXX_FLAGS}" )
+	# /we4715 turns "'function' : not all control paths return a value" as it should be!!!!!!!!one1!
+	set( CMAKE_CXX_FLAGS "/MP /we4715 ${CMAKE_CXX_FLAGS}" )
 endif (MSVC)
 
 # Set up flags for GCC

diff --git a/src/r_data/gldefs.cpp b/src/r_data/gldefs.cpp
@@ -137,6 +137,7 @@ const GlobalShaderDesc * GetGlobalShader(GlobalShaderAddr index)
 
 	if(index.type == 1) return mapshaders[index.num].CheckKey(name);
 	if(index.type == 2) return classshaders[index.num].CheckKey(name);
+	return &nullglobalshader;
 }
 
 void CleanupGlobalShaders()