From d46ba7bfb72562604bba4e4a2573362c8183ee1c Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 27 Apr 2015 10:24:49 +0200 Subject: [PATCH 1/3] - added pickup sprite for Chex Quest's Mini Zorcher (i.e. pistol replacement.) --- wadsrc/static/actors/chex/chexweapons.txt | 1 + wadsrc/static/mapinfo/chex.txt | 1 + wadsrc/static/sprites/minza0.png | Bin 0 -> 848 bytes 3 files changed, 2 insertions(+) create mode 100644 wadsrc/static/sprites/minza0.png diff --git a/wadsrc/static/actors/chex/chexweapons.txt b/wadsrc/static/actors/chex/chexweapons.txt index 755e7ad451..0cdb968491 100644 --- a/wadsrc/static/actors/chex/chexweapons.txt +++ b/wadsrc/static/actors/chex/chexweapons.txt @@ -21,6 +21,7 @@ actor MiniZorcher : Pistol states { Spawn: + MINZ A -1 stop } } diff --git a/wadsrc/static/mapinfo/chex.txt b/wadsrc/static/mapinfo/chex.txt index 9bd974bc7f..ba93ec36de 100644 --- a/wadsrc/static/mapinfo/chex.txt +++ b/wadsrc/static/mapinfo/chex.txt @@ -124,6 +124,7 @@ DoomEdNums 3003 = Flembrane 3004 = FlemoidusCommonus 3006 = ChexSoul + 5010 = MiniZorcher } skill baby diff --git a/wadsrc/static/sprites/minza0.png b/wadsrc/static/sprites/minza0.png new file mode 100644 index 0000000000000000000000000000000000000000..6a00cb73db3261d7efef86b5c7636dd83703ecc6 GIT binary patch literal 848 zcmV-W1F!svP)Dj9n00008XL3Pe0000C z0000Yk}Sc400033P)t-s00029v$MCix4*x?tE;P@pPxrZM>jV&CnqN_FE8ik=a-k4 zlarH+i;I7Me|L9xZ*Ol~TU$?0Pt()WLqkJ5J3GtE%g4vZr>Cd?Utj+}KmQ*eM>8Y$ ztE+2kYhz<$OG`^5BO_bCPfMRaS65eqgM&{yEB^oh?*IU&007qj05@|hCsP|ALl>KW zYiCnGTVqE*D;xj2yZ@V;|9gAihll^Sx8L92+uPeilQ-i407p+VKZ7ru004gg0ROXl zHzN}-8w(p78~@we@9*yy4+mF6Gp9d4FJmKr8yj;I6K4wx|I@pNS2Mo=0J8u9Q$H_X zLnBjHJ3lWMKSwJ!KPO&3jSK()00DGTPE!Ct=GbNc00HPpL_t(|UR}=RmLoX~fKf}v zV&))2Gcyh|?Y{r3jMJG^D*gSF?$NQyva%{kU0KvadDn#h8j6aVd0|ZY= z@{$lfN7j4zdUCBSv|@uR~W@{Qa~nt0zv!$jQ3E{f{#- zn-*t}JoCV=;l>kIE~ZucjpC`BcWOvFG3WC8;_RWtGuKK;oeg literal 0 HcmV?d00001 From 47e7a30cab2a48825c5c908e90891f16f2ac322c Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 27 Apr 2015 13:19:34 +0200 Subject: [PATCH 2/3] - reshuffled some stuff to satisfy Linux compilers (hopefully) --- src/sound/except.h | 7 +++++++ src/sound/mpg123_decoder.cpp | 2 +- src/sound/sndfile_decoder.cpp | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/sound/except.h b/src/sound/except.h index 10b4841309..45c952805f 100644 --- a/src/sound/except.h +++ b/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 diff --git a/src/sound/mpg123_decoder.cpp b/src/sound/mpg123_decoder.cpp index 551fe84346..5b33100a51 100644 --- a/src/sound/mpg123_decoder.cpp +++ b/src/sound/mpg123_decoder.cpp @@ -3,10 +3,10 @@ #include #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; diff --git a/src/sound/sndfile_decoder.cpp b/src/sound/sndfile_decoder.cpp index a5b10faf32..52376a6c73 100644 --- a/src/sound/sndfile_decoder.cpp +++ b/src/sound/sndfile_decoder.cpp @@ -3,12 +3,12 @@ #include #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 From 346fcf584cd338b7d1642dfcb23dd19a8a785e1c Mon Sep 17 00:00:00 2001 From: Edoardo Prezioso Date: Mon, 27 Apr 2015 15:22:09 +0200 Subject: [PATCH 3/3] - Fixed C++11 warnings from recent commits. --- src/oplsynth/music_opldumper_mididevice.cpp | 4 +- src/sound/oalsound.cpp | 42 ++++++++++----------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/oplsynth/music_opldumper_mididevice.cpp b/src/oplsynth/music_opldumper_mididevice.cpp index 33e026c07d..46dcdfef21 100644 --- a/src/oplsynth/music_opldumper_mididevice.cpp +++ b/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() diff --git a/src/sound/oalsound.cpp b/src/sound/oalsound.cpp index 6d7cb210e6..447de49f98 100644 --- a/src/sound/oalsound.cpp +++ b/src/sound/oalsound.cpp @@ -634,7 +634,7 @@ ALCdevice *OpenALSoundRenderer::InitDevice() { device = alcOpenDevice(*snd_aldevice); if(!device) - Printf(TEXTCOLOR_BLUE" Failed to open device "TEXTCOLOR_BOLD"%s"TEXTCOLOR_BLUE". Trying default.\n", *snd_aldevice); + Printf(TEXTCOLOR_BLUE" Failed to open device " TEXTCOLOR_BOLD"%s" TEXTCOLOR_BLUE". Trying default.\n", *snd_aldevice); } if(!device) @@ -674,13 +674,13 @@ OpenALSoundRenderer::OpenALSoundRenderer() current = alcGetString(Device, ALC_ALL_DEVICES_SPECIFIER); if(alcGetError(Device) != ALC_NO_ERROR || !current) current = alcGetString(Device, ALC_DEVICE_SPECIFIER); - Printf(" Opened device "TEXTCOLOR_ORANGE"%s\n", current); + Printf(" Opened device " TEXTCOLOR_ORANGE"%s\n", current); ALCint major=0, minor=0; alcGetIntegerv(Device, ALC_MAJOR_VERSION, 1, &major); alcGetIntegerv(Device, ALC_MINOR_VERSION, 1, &minor); - DPrintf(" ALC Version: "TEXTCOLOR_BLUE"%d.%d\n", major, minor); - DPrintf(" ALC Extensions: "TEXTCOLOR_ORANGE"%s\n", alcGetString(Device, ALC_EXTENSIONS)); + DPrintf(" ALC Version: " TEXTCOLOR_BLUE"%d.%d\n", major, minor); + DPrintf(" ALC Extensions: " TEXTCOLOR_ORANGE"%s\n", alcGetString(Device, ALC_EXTENSIONS)); TArray attribs; if(*snd_samplerate > 0) @@ -710,10 +710,10 @@ OpenALSoundRenderer::OpenALSoundRenderer() } attribs.Clear(); - DPrintf(" Vendor: "TEXTCOLOR_ORANGE"%s\n", alGetString(AL_VENDOR)); - DPrintf(" Renderer: "TEXTCOLOR_ORANGE"%s\n", alGetString(AL_RENDERER)); - DPrintf(" Version: "TEXTCOLOR_ORANGE"%s\n", alGetString(AL_VERSION)); - DPrintf(" Extensions: "TEXTCOLOR_ORANGE"%s\n", alGetString(AL_EXTENSIONS)); + DPrintf(" Vendor: " TEXTCOLOR_ORANGE"%s\n", alGetString(AL_VENDOR)); + DPrintf(" Renderer: " TEXTCOLOR_ORANGE"%s\n", alGetString(AL_RENDERER)); + DPrintf(" Version: " TEXTCOLOR_ORANGE"%s\n", alGetString(AL_VERSION)); + DPrintf(" Extensions: " TEXTCOLOR_ORANGE"%s\n", alGetString(AL_EXTENSIONS)); ALC.EXT_EFX = !!alcIsExtensionPresent(Device, "ALC_EXT_EFX"); ALC.EXT_disconnect = !!alcIsExtensionPresent(Device, "ALC_EXT_disconnect");; @@ -775,7 +775,7 @@ OpenALSoundRenderer::OpenALSoundRenderer() return; } FreeSfx = Sources; - DPrintf(" Allocated "TEXTCOLOR_BLUE"%u"TEXTCOLOR_NORMAL" sources\n", Sources.Size()); + DPrintf(" Allocated " TEXTCOLOR_BLUE"%u" TEXTCOLOR_NORMAL" sources\n", Sources.Size()); WasInWater = false; if(*snd_efx && ALC.EXT_EFX) @@ -1735,7 +1735,7 @@ float OpenALSoundRenderer::GetAudibility(FISoundChannel *chan) void OpenALSoundRenderer::PrintStatus() { - Printf("Output device: "TEXTCOLOR_ORANGE"%s\n", alcGetString(Device, ALC_DEVICE_SPECIFIER)); + Printf("Output device: " TEXTCOLOR_ORANGE"%s\n", alcGetString(Device, ALC_DEVICE_SPECIFIER)); getALCError(Device); ALCint frequency, major, minor, mono, stereo; @@ -1746,10 +1746,10 @@ void OpenALSoundRenderer::PrintStatus() alcGetIntegerv(Device, ALC_STEREO_SOURCES, 1, &stereo); if(getALCError(Device) == AL_NO_ERROR) { - Printf("Device sample rate: "TEXTCOLOR_BLUE"%d"TEXTCOLOR_NORMAL"hz\n", frequency); - Printf("ALC Version: "TEXTCOLOR_BLUE"%d.%d\n", major, minor); - Printf("ALC Extensions: "TEXTCOLOR_ORANGE"%s\n", alcGetString(Device, ALC_EXTENSIONS)); - Printf("Available sources: "TEXTCOLOR_BLUE"%d"TEXTCOLOR_NORMAL" ("TEXTCOLOR_BLUE"%d"TEXTCOLOR_NORMAL" mono, "TEXTCOLOR_BLUE"%d"TEXTCOLOR_NORMAL" stereo)\n", mono+stereo, mono, stereo); + Printf("Device sample rate: " TEXTCOLOR_BLUE"%d" TEXTCOLOR_NORMAL"hz\n", frequency); + Printf("ALC Version: " TEXTCOLOR_BLUE"%d.%d\n", major, minor); + Printf("ALC Extensions: " TEXTCOLOR_ORANGE"%s\n", alcGetString(Device, ALC_EXTENSIONS)); + Printf("Available sources: " TEXTCOLOR_BLUE"%d" TEXTCOLOR_NORMAL" (" TEXTCOLOR_BLUE"%d" TEXTCOLOR_NORMAL" mono, " TEXTCOLOR_BLUE"%d" TEXTCOLOR_NORMAL" stereo)\n", mono+stereo, mono, stereo); } if(!alcIsExtensionPresent(Device, "ALC_EXT_EFX")) Printf("EFX not found\n"); @@ -1761,14 +1761,14 @@ void OpenALSoundRenderer::PrintStatus() alcGetIntegerv(Device, ALC_MAX_AUXILIARY_SENDS, 1, &sends); if(getALCError(Device) == AL_NO_ERROR) { - Printf("EFX Version: "TEXTCOLOR_BLUE"%d.%d\n", major, minor); - Printf("Auxiliary sends: "TEXTCOLOR_BLUE"%d\n", sends); + Printf("EFX Version: " TEXTCOLOR_BLUE"%d.%d\n", major, minor); + Printf("Auxiliary sends: " TEXTCOLOR_BLUE"%d\n", sends); } } - Printf("Vendor: "TEXTCOLOR_ORANGE"%s\n", alGetString(AL_VENDOR)); - Printf("Renderer: "TEXTCOLOR_ORANGE"%s\n", alGetString(AL_RENDERER)); - Printf("Version: "TEXTCOLOR_ORANGE"%s\n", alGetString(AL_VERSION)); - Printf("Extensions: "TEXTCOLOR_ORANGE"%s\n", alGetString(AL_EXTENSIONS)); + Printf("Vendor: " TEXTCOLOR_ORANGE"%s\n", alGetString(AL_VENDOR)); + Printf("Renderer: " TEXTCOLOR_ORANGE"%s\n", alGetString(AL_RENDERER)); + Printf("Version: " TEXTCOLOR_ORANGE"%s\n", alGetString(AL_VERSION)); + Printf("Extensions: " TEXTCOLOR_ORANGE"%s\n", alGetString(AL_EXTENSIONS)); getALError(); } @@ -1783,7 +1783,7 @@ FString OpenALSoundRenderer::GatherStats() uint32 unused = FreeSfx.Size(); FString out; - out.Format("%u sources ("TEXTCOLOR_YELLOW"%u"TEXTCOLOR_NORMAL" active, "TEXTCOLOR_YELLOW"%u"TEXTCOLOR_NORMAL" free), Update interval: "TEXTCOLOR_YELLOW"%d"TEXTCOLOR_NORMAL"ms", + out.Format("%u sources (" TEXTCOLOR_YELLOW"%u" TEXTCOLOR_NORMAL" active, " TEXTCOLOR_YELLOW"%u" TEXTCOLOR_NORMAL" free), Update interval: " TEXTCOLOR_YELLOW"%d" TEXTCOLOR_NORMAL"ms", total, used, unused, 1000/updates); return out; }