Merge branch 'master' of https://github.com/rheit/zdoom into zmaster

src/oplsynth/music_opldumper_mididevice.cpp

@@ -113,7 +113,7 @@ public:
 		BYTE chipnum = reg >> 8;
 		if (chipnum != CurChip)
 		{
-			BYTE switcher[2] = { chipnum + 1, 2 };
+			BYTE switcher[2] = { (BYTE)(chipnum + 1), 2 };
 			fwrite(switcher, 1, 2, File);
 		}
 		reg &= 255;
@@ -192,7 +192,7 @@ public:
 			   "\0\0\0\0"	// Total milliseconds
 			   "\0\0\0",	// Total data
 			   1, 20, File);
-		char type[4] = { Dual * 2, 0, 0, 0 };	// Single or dual OPL-2
+		char type[4] = { (char)(Dual * 2), 0, 0, 0 };	// Single or dual OPL-2
 		fwrite(type, 1, 4, File);
 	}
 	virtual ~OPL_DOSBOXdump()

src/sound/except.h

@@ -26,7 +26,14 @@ inline int CheckException(DWORD code)
 
 #else
 
+#ifdef __try
+#undef __try
+#endif
 #define __try
+
+#ifdef __except
+#undef __except
+#endif
 #define __except(a) if (0)
 
 #endif

src/sound/mpg123_decoder.cpp

@@ -3,10 +3,10 @@
 #include <windows.h>
 #define USE_WINDOWS_DWORD
 #endif
-#include "except.h"
 
 #include "mpg123_decoder.h"
 #include "files.h"
+#include "except.h"
 
 #ifdef HAVE_MPG123
 static bool inited = false;

src/sound/sndfile_decoder.cpp

@@ -3,12 +3,12 @@
 #include <windows.h>
 #define USE_WINDOWS_DWORD
 #endif
-#include "except.h"
 
 #include "sndfile_decoder.h"
 #include "templates.h"
 #include "files.h"
 #include "xs_Float.h"
+#include "except.h"
 
 #ifdef HAVE_SNDFILE
 

wadsrc/static/actors/chex/chexweapons.txt

@@ -21,6 +21,7 @@ actor MiniZorcher : Pistol
 	states
 	{
 		Spawn:
+			MINZ A -1
 			stop
 	}
 }

wadsrc/static/mapinfo/chex.txt

@@ -124,6 +124,7 @@ DoomEdNums
   3003 = Flembrane
   3004 = FlemoidusCommonus
   3006 = ChexSoul
+  5010 = MiniZorcher
 }
 
 skill baby