Merge branch 'master' of https://github.com/coelckers/gzdoom into vulkan2

src/CMakeLists.txt

@@ -384,8 +384,11 @@ if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
 	# Remove extra warnings when using the official DirectX headers.
 	# Also, TDM-GCC 4.4.0 no longer accepts glibc-style printf formats as valid,
 	# which is a royal pain. The previous version I had been using was fine with them.
+	# MinGW: switch to the Windows Unicode API.
 	if( WIN32 )
 		set( CMAKE_CXX_FLAGS "-Wno-unknown-pragmas -Wno-comment -Wno-format ${CMAKE_CXX_FLAGS}" )
+		set( CMAKE_CXX_FLAGS "-D_UNICODE -DUNICODE ${CMAKE_CXX_FLAGS}" )
+		set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -municode" )
 	endif()
 
 	# Detect FreeBSD and add flags

src/d_event.h

@@ -76,6 +76,7 @@ enum gameaction_t : int
 	ga_screenshot,
 	ga_togglemap,
 	ga_fullconsole,
+	ga_resumeconversation,
 };
 
 

src/g_game.cpp

@@ -74,6 +74,7 @@
 #include "gi.h"
 #include "a_dynlight.h"
 #include "i_system.h"
+#include "p_conversation.h"
 
 #include "g_hub.h"
 #include "g_levellocals.h"
@@ -1095,6 +1096,10 @@ void G_Ticker ()
 			AM_ToggleMap ();
 			gameaction = ga_nothing;
 			break;
+		case ga_resumeconversation:
+			P_ResumeConversation ();
+			gameaction = ga_nothing;
+			break;
 		default:
 		case ga_nothing:
 			break;

src/intermission/intermission.cpp

@@ -804,7 +804,7 @@ void DIntermissionController::Ticker ()
 				primaryLevel->SetMusic();
 				gamestate = GS_LEVEL;
 				wipegamestate = GS_LEVEL;
-				P_ResumeConversation ();
+				gameaction = ga_resumeconversation;
 				viewactive = true;
 				Destroy();
 				break;

src/scripting/backend/dynarrays.cpp

@@ -783,6 +783,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_Obj, Find, ArrayFind<FDynArray_Obj COMMA
 
 int ObjArrayPush(FDynArray_Obj *self, DObject *obj)
 {
+    if (self == nullptr) NullParam("\"self\"");
 	GC::WriteBarrier(obj);
 	return self->Push(obj);
 }
@@ -811,6 +812,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_Obj, Delete, ArrayDelete<FDynArray_Obj>)
 
 void ObjArrayInsert(FDynArray_Obj *self,int index, DObject *obj)
 {
+    if (self == nullptr) NullParam("\"self\"");
 	GC::WriteBarrier(obj);
 	self->Insert(index, obj);
 }

src/utility/m_swap.h

@@ -119,12 +119,12 @@ inline unsigned short BigShort(unsigned short x)
 	return x;
 }
 
-inline unsigned int BigLong(unsigned int &x)
+inline unsigned int BigLong(unsigned int x)
 {
 	return x;
 }
 
-inline int BigLong(int &x)
+inline int BigLong(int x)
 {
 	return x;
 }

src/win32/i_main.cpp

@@ -1111,7 +1111,8 @@ void DoomSpecificInfo (char *buffer, size_t bufflen)
 	int i;
 
 	buffer += mysnprintf (buffer, buffend - buffer, GAMENAME " version %s (%s)", GetVersionString(), GetGitHash());
-	buffer += mysnprintf (buffer, buffend - buffer, "\r\nCommand line: %s\r\n", GetCommandLine());
+	FString cmdline(GetCommandLineW());
+	buffer += mysnprintf (buffer, buffend - buffer, "\r\nCommand line: %s\r\n", cmdline.GetChars() );
 
 	for (i = 0; (arg = Wads.GetWadName (i)) != NULL; ++i)
 	{