Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/neo/game/Misc.cpp b/neo/game/Misc.cpp
- index bfde719..5d90d5c 100644
- --- a/neo/game/Misc.cpp
- +++ b/neo/game/Misc.cpp
- @@ -739,6 +739,8 @@ void idSpring::Spawn( void ) {
- PostEventMS( &EV_PostSpawn, 0 );
- }
- +// FIXME: add idSpring::Save() and Restore() !
- +
- /*
- ===============================================================================
- diff --git a/neo/sound/snd_local.h b/neo/sound/snd_local.h
- index 81e5d3e..68d7fda 100644
- --- a/neo/sound/snd_local.h
- +++ b/neo/sound/snd_local.h
- @@ -29,6 +29,13 @@ If you have questions concerning this license or the applicable additional terms
- #ifndef __SND_LOCAL_H__
- #define __SND_LOCAL_H__
- +#ifdef ID_DEDICATED
- +// stub-only mode: AL_API and ALC_API shouldn't refer to any dll-stuff
- +// because the implemenations are in openal_stub.cpp
- +// this is ensured by defining AL_LIBTYPE_STATIC before including the AL headers
- +#define AL_LIBTYPE_STATIC
- +#endif
- +
- #include <AL/al.h>
- #include <AL/alc.h>
- #include <AL/alext.h>
- diff --git a/neo/sys/glimp.cpp b/neo/sys/glimp.cpp
- index 34e7a66..da76c90 100644
- --- a/neo/sys/glimp.cpp
- +++ b/neo/sys/glimp.cpp
- @@ -36,6 +36,9 @@ If you have questions concerning this license or the applicable additional terms
- idCVar in_nograb("in_nograb", "0", CVAR_SYSTEM | CVAR_NOCHEAT, "prevents input grabbing");
- +// when compiling a dedicated server binary, the GLimp_* stuff from stub_gl.cpp is used instead
- +#ifndef ID_DEDICATED
- +
- static bool grabbed = false;
- #if SDL_VERSION_ATLEAST(2, 0, 0)
- @@ -287,9 +290,6 @@ GLExtension_t GLimp_ExtensionPointer(const char *name) {
- }
- void GLimp_GrabInput(int flags) {
- -#if defined(ID_DEDICATED)
- - return;
- -#else
- bool grab = flags & GRAB_ENABLE;
- if (grab && (flags & GRAB_REENABLE))
- @@ -314,5 +314,6 @@ void GLimp_GrabInput(int flags) {
- SDL_ShowCursor(flags & GRAB_HIDECURSOR ? SDL_DISABLE : SDL_ENABLE);
- SDL_WM_GrabInput(grab ? SDL_GRAB_ON : SDL_GRAB_OFF);
- #endif
- -#endif
- }
- +
- +#endif // ID_DEDICATED
- diff --git a/neo/sys/stub/openal_stub.cpp b/neo/sys/stub/openal_stub.cpp
- index 939acba..3da417b 100644
- --- a/neo/sys/stub/openal_stub.cpp
- +++ b/neo/sys/stub/openal_stub.cpp
- @@ -91,18 +91,6 @@ ALC_API const ALCchar * ALC_APIENTRY alcGetString( ALCdevice *deviceHandle, ALCe
- return NULL;
- }
- -AL_API void AL_APIENTRY alBufferData( ALuint buffer,
- - ALenum format,
- - ALvoid* data,
- - ALsizei size,
- - ALsizei freq ) { }
- -
- -AL_API void AL_APIENTRY alDeleteBuffers( ALsizei n, ALuint* buffers ) { }
- -
- -AL_API ALboolean AL_APIENTRY alIsExtensionPresent( ALubyte* fname ) {
- - return AL_FALSE;
- -}
- -
- AL_API void AL_APIENTRY alDeleteSources( ALsizei n, const ALuint* sources ) { }
- AL_API ALenum AL_APIENTRY alGetEnumValue( const ALchar* ename ) {
- @@ -118,10 +106,6 @@ ALC_API ALCcontext * ALC_APIENTRY alcCreateContext( ALCdevice *dev,
- return NULL;
- }
- -ALC_API ALCdevice * ALC_APIENTRY alcOpenDevice( ALubyte *tokstr ) {
- - return NULL;
- -}
- -
- AL_API void AL_APIENTRY alListenerfv( ALenum pname, const ALfloat* param ) { }
- AL_API void AL_APIENTRY alSourceQueueBuffers( ALuint sid, ALsizei numEntries, const ALuint *bids ) { }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement