zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 23:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Christoph Oelckers 2015-04-27 18:19:44 +02:00
commit 98029a12ec
8 changed files with 34 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/oplsynth/music_opldumper_mididevice.cpp
View file

@ -113,7 +113,7 @@ public:
BYTE chipnum = reg >> 8; BYTE chipnum = reg >> 8;
if (chipnum != CurChip) if (chipnum != CurChip)
{ {
BYTE switcher[2] = { chipnum + 1, 2 }; BYTE switcher[2] = { (BYTE)(chipnum + 1), 2 };
fwrite(switcher, 1, 2, File); fwrite(switcher, 1, 2, File);
} }
reg &= 255; reg &= 255;
@ -192,7 +192,7 @@ public:
"\0\0\0\0" // Total milliseconds "\0\0\0\0" // Total milliseconds
"\0\0\0", // Total data "\0\0\0", // Total data
1, 20, File); 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); fwrite(type, 1, 4, File);
} }
virtual ~OPL_DOSBOXdump() virtual ~OPL_DOSBOXdump()

7
src/sound/except.h
View file

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

2
src/sound/mpg123_decoder.cpp
View file

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

42
src/sound/oalsound.cpp
View file

@ -634,7 +634,7 @@ ALCdevice *OpenALSoundRenderer::InitDevice()
{ {
device = alcOpenDevice(*snd_aldevice); device = alcOpenDevice(*snd_aldevice);
if(!device) 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) if(!device)
@ -674,13 +674,13 @@ OpenALSoundRenderer::OpenALSoundRenderer()
current = alcGetString(Device, ALC_ALL_DEVICES_SPECIFIER); current = alcGetString(Device, ALC_ALL_DEVICES_SPECIFIER);
if(alcGetError(Device) != ALC_NO_ERROR || !current) if(alcGetError(Device) != ALC_NO_ERROR || !current)
current = alcGetString(Device, ALC_DEVICE_SPECIFIER); 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; ALCint major=0, minor=0;
alcGetIntegerv(Device, ALC_MAJOR_VERSION, 1, &major); alcGetIntegerv(Device, ALC_MAJOR_VERSION, 1, &major);
alcGetIntegerv(Device, ALC_MINOR_VERSION, 1, &minor); alcGetIntegerv(Device, ALC_MINOR_VERSION, 1, &minor);
DPrintf(" ALC Version: "TEXTCOLOR_BLUE"%d.%d\n", major, minor); DPrintf(" ALC Version: " TEXTCOLOR_BLUE"%d.%d\n", major, minor);
DPrintf(" ALC Extensions: "TEXTCOLOR_ORANGE"%s\n", alcGetString(Device, ALC_EXTENSIONS)); DPrintf(" ALC Extensions: " TEXTCOLOR_ORANGE"%s\n", alcGetString(Device, ALC_EXTENSIONS));
TArray<ALCint> attribs; TArray<ALCint> attribs;
if(*snd_samplerate > 0) if(*snd_samplerate > 0)
@ -710,10 +710,10 @@ OpenALSoundRenderer::OpenALSoundRenderer()
} }
attribs.Clear(); attribs.Clear();
DPrintf(" Vendor: "TEXTCOLOR_ORANGE"%s\n", alGetString(AL_VENDOR)); DPrintf(" Vendor: " TEXTCOLOR_ORANGE"%s\n", alGetString(AL_VENDOR));
DPrintf(" Renderer: "TEXTCOLOR_ORANGE"%s\n", alGetString(AL_RENDERER)); DPrintf(" Renderer: " TEXTCOLOR_ORANGE"%s\n", alGetString(AL_RENDERER));
DPrintf(" Version: "TEXTCOLOR_ORANGE"%s\n", alGetString(AL_VERSION)); DPrintf(" Version: " TEXTCOLOR_ORANGE"%s\n", alGetString(AL_VERSION));
DPrintf(" Extensions: "TEXTCOLOR_ORANGE"%s\n", alGetString(AL_EXTENSIONS)); DPrintf(" Extensions: " TEXTCOLOR_ORANGE"%s\n", alGetString(AL_EXTENSIONS));
ALC.EXT_EFX = !!alcIsExtensionPresent(Device, "ALC_EXT_EFX"); ALC.EXT_EFX = !!alcIsExtensionPresent(Device, "ALC_EXT_EFX");
ALC.EXT_disconnect = !!alcIsExtensionPresent(Device, "ALC_EXT_disconnect");; ALC.EXT_disconnect = !!alcIsExtensionPresent(Device, "ALC_EXT_disconnect");;
@ -775,7 +775,7 @@ OpenALSoundRenderer::OpenALSoundRenderer()
return; return;
} }
FreeSfx = Sources; 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; WasInWater = false;
if(*snd_efx && ALC.EXT_EFX) if(*snd_efx && ALC.EXT_EFX)
@ -1735,7 +1735,7 @@ float OpenALSoundRenderer::GetAudibility(FISoundChannel *chan)
void OpenALSoundRenderer::PrintStatus() 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); getALCError(Device);
ALCint frequency, major, minor, mono, stereo; ALCint frequency, major, minor, mono, stereo;
@ -1746,10 +1746,10 @@ void OpenALSoundRenderer::PrintStatus()
alcGetIntegerv(Device, ALC_STEREO_SOURCES, 1, &stereo); alcGetIntegerv(Device, ALC_STEREO_SOURCES, 1, &stereo);
if(getALCError(Device) == AL_NO_ERROR) if(getALCError(Device) == AL_NO_ERROR)
{ {
Printf("Device sample rate: "TEXTCOLOR_BLUE"%d"TEXTCOLOR_NORMAL"hz\n", frequency); Printf("Device sample rate: " TEXTCOLOR_BLUE"%d" TEXTCOLOR_NORMAL"hz\n", frequency);
Printf("ALC Version: "TEXTCOLOR_BLUE"%d.%d\n", major, minor); Printf("ALC Version: " TEXTCOLOR_BLUE"%d.%d\n", major, minor);
Printf("ALC Extensions: "TEXTCOLOR_ORANGE"%s\n", alcGetString(Device, ALC_EXTENSIONS)); 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("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")) if(!alcIsExtensionPresent(Device, "ALC_EXT_EFX"))
Printf("EFX not found\n"); Printf("EFX not found\n");
@ -1761,14 +1761,14 @@ void OpenALSoundRenderer::PrintStatus()
alcGetIntegerv(Device, ALC_MAX_AUXILIARY_SENDS, 1, &sends); alcGetIntegerv(Device, ALC_MAX_AUXILIARY_SENDS, 1, &sends);
if(getALCError(Device) == AL_NO_ERROR) if(getALCError(Device) == AL_NO_ERROR)
{ {
Printf("EFX Version: "TEXTCOLOR_BLUE"%d.%d\n", major, minor); Printf("EFX Version: " TEXTCOLOR_BLUE"%d.%d\n", major, minor);
Printf("Auxiliary sends: "TEXTCOLOR_BLUE"%d\n", sends); Printf("Auxiliary sends: " TEXTCOLOR_BLUE"%d\n", sends);
} }
} }
Printf("Vendor: "TEXTCOLOR_ORANGE"%s\n", alGetString(AL_VENDOR)); Printf("Vendor: " TEXTCOLOR_ORANGE"%s\n", alGetString(AL_VENDOR));
Printf("Renderer: "TEXTCOLOR_ORANGE"%s\n", alGetString(AL_RENDERER)); Printf("Renderer: " TEXTCOLOR_ORANGE"%s\n", alGetString(AL_RENDERER));
Printf("Version: "TEXTCOLOR_ORANGE"%s\n", alGetString(AL_VERSION)); Printf("Version: " TEXTCOLOR_ORANGE"%s\n", alGetString(AL_VERSION));
Printf("Extensions: "TEXTCOLOR_ORANGE"%s\n", alGetString(AL_EXTENSIONS)); Printf("Extensions: " TEXTCOLOR_ORANGE"%s\n", alGetString(AL_EXTENSIONS));
getALError(); getALError();
} }
@ -1783,7 +1783,7 @@ FString OpenALSoundRenderer::GatherStats()
uint32 unused = FreeSfx.Size(); uint32 unused = FreeSfx.Size();
FString out; 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); total, used, unused, 1000/updates);
return out; return out;
} }

2
src/sound/sndfile_decoder.cpp
View file

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

1
wadsrc/static/actors/chex/chexweapons.txt
View file

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

1
wadsrc/static/mapinfo/chex.txt
View file

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

BIN
wadsrc/static/sprites/minza0.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 848 B