dhewm/dhewm3
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3.git synced 2024-11-29 23:51:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Restore C++98 compatibility (NULL instead of nullptr)

Browse source 
and print a message when libcurl has been found
This commit is contained in:
Daniel Gibson 2021-07-17 18:24:46 +02:00
parent 4d12093a54
commit 06ff49c6b6
6 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
neo/CMakeLists.txt
View file

@ -184,6 +184,7 @@ find_package(CURL QUIET)
if(CURL_FOUND) if(CURL_FOUND)
set(ID_ENABLE_CURL ON) set(ID_ENABLE_CURL ON)
include_directories(${CURL_INCLUDE_DIR}) include_directories(${CURL_INCLUDE_DIR})
message(STATUS "libcurl found and enabled")
else() else()
message(WARNING "libcurl not found, server downloads won't be available (apart from that dhewm3 will work)") message(WARNING "libcurl not found, server downloads won't be available (apart from that dhewm3 will work)")
set(ID_ENABLE_CURL OFF) set(ID_ENABLE_CURL OFF)

2
neo/d3xp/Game_local.cpp
View file

@ -305,7 +305,7 @@ void idGameLocal::Clear( void ) {
static bool ( *updateDebuggerFnPtr )( idInterpreter *interpreter, idProgram *program, int instructionPointer ) = NULL; static bool ( *updateDebuggerFnPtr )( idInterpreter *interpreter, idProgram *program, int instructionPointer ) = NULL;
bool updateGameDebugger( idInterpreter *interpreter, idProgram *program, int instructionPointer ) { bool updateGameDebugger( idInterpreter *interpreter, idProgram *program, int instructionPointer ) {
bool ret = false; bool ret = false;
if ( interpreter != nullptr && program != nullptr ) { if ( interpreter != NULL && program != NULL ) {
ret = updateDebuggerFnPtr ? updateDebuggerFnPtr( interpreter , program, instructionPointer ) : false; ret = updateDebuggerFnPtr ? updateDebuggerFnPtr( interpreter , program, instructionPointer ) : false;
} }
return ret; return ret;

2
neo/game/Game_local.cpp
View file

@ -273,7 +273,7 @@ bool IsDoom3DemoVersion()
static bool ( *updateDebuggerFnPtr )( idInterpreter *interpreter, idProgram *program, int instructionPointer ) = NULL; static bool ( *updateDebuggerFnPtr )( idInterpreter *interpreter, idProgram *program, int instructionPointer ) = NULL;
bool updateGameDebugger( idInterpreter *interpreter, idProgram *program, int instructionPointer ) { bool updateGameDebugger( idInterpreter *interpreter, idProgram *program, int instructionPointer ) {
bool ret = false; bool ret = false;
if ( interpreter != nullptr && program != nullptr ) { if ( interpreter != NULL && program != NULL ) {
ret = updateDebuggerFnPtr ? updateDebuggerFnPtr( interpreter, program, instructionPointer ) : false; ret = updateDebuggerFnPtr ? updateDebuggerFnPtr( interpreter, program, instructionPointer ) : false;
} }
return ret; return ret;

1
neo/sound/snd_system.cpp
View file

@ -29,6 +29,7 @@ If you have questions concerning this license or the applicable additional terms
#include "sys/platform.h" #include "sys/platform.h"
#include "sound/snd_local.h" #include "sound/snd_local.h"
#include <limits.h>
#ifdef ID_DEDICATED #ifdef ID_DEDICATED
idCVar idSoundSystemLocal::s_noSound( "s_noSound", "1", CVAR_SOUND | CVAR_BOOL | CVAR_ROM, "" ); idCVar idSoundSystemLocal::s_noSound( "s_noSound", "1", CVAR_SOUND | CVAR_BOOL | CVAR_ROM, "" );

3
neo/sys/events.cpp
View file

@ -59,7 +59,8 @@ If you have questions concerning this license or the applicable additional terms
#define SDLK_PRINTSCREEN SDLK_PRINT #define SDLK_PRINTSCREEN SDLK_PRINT
#endif #endif
static const char *kbdNames[] = { // NOTE: g++-4.7 doesn't like when this is static (for idCmdSystem::ArgCompletion_String<kbdNames>)
const char *kbdNames[] = {
#if SDL_VERSION_ATLEAST(2, 0, 0) // auto-detection is only available for SDL2 #if SDL_VERSION_ATLEAST(2, 0, 0) // auto-detection is only available for SDL2
"auto", "auto",
#endif #endif

10
neo/tools/debugger/DebuggerServer.cpp
View file

@ -187,13 +187,13 @@ bool rvDebuggerServer::ProcessMessages ( void )
case DBMSG_CONNECT: case DBMSG_CONNECT:
mConnected = true; mConnected = true;
SendMessage ( DBMSG_CONNECTED ); SendMessage ( DBMSG_CONNECTED );
HandleInspectScripts ( nullptr ); HandleInspectScripts ( NULL );
com_editors |= EDITOR_DEBUGGER; com_editors |= EDITOR_DEBUGGER;
break; break;
case DBMSG_CONNECTED: case DBMSG_CONNECTED:
mConnected = true; mConnected = true;
HandleInspectScripts( nullptr ); HandleInspectScripts( NULL );
com_editors |= EDITOR_DEBUGGER; com_editors |= EDITOR_DEBUGGER;
break; break;
@ -555,7 +555,7 @@ void rvDebuggerServer::CheckBreakpoints ( idInterpreter* interpreter, idProgram*
// See if we are supposed to break on the next script line // See if we are supposed to break on the next script line
if ( mBreakNext ) if ( mBreakNext )
{ {
HandleInspectScripts(nullptr); HandleInspectScripts(NULL);
Break ( interpreter, program, instructionPointer ); Break ( interpreter, program, instructionPointer );
return; return;
} }
@ -574,7 +574,7 @@ void rvDebuggerServer::CheckBreakpoints ( idInterpreter* interpreter, idProgram*
// See if we are supposed to break on the next line // See if we are supposed to break on the next line
if ( mBreakStepInto ) if ( mBreakStepInto )
{ {
HandleInspectScripts(nullptr); HandleInspectScripts(NULL);
// Break // Break
Break ( interpreter, program, instructionPointer ); Break ( interpreter, program, instructionPointer );
return; return;
@ -625,7 +625,7 @@ void rvDebuggerServer::CheckBreakpoints ( idInterpreter* interpreter, idProgram*
// Pop out of the critical section so we dont get stuck // Pop out of the critical section so we dont get stuck
SDL_UnlockMutex( mCriticalSection ); SDL_UnlockMutex( mCriticalSection );
HandleInspectScripts(nullptr); HandleInspectScripts(NULL);
// We hit a breakpoint, so break // We hit a breakpoint, so break
Break ( interpreter, program, instructionPointer ); Break ( interpreter, program, instructionPointer );