cpmadevs/cnq3
0
0
Fork 0
mirror of https://bitbucket.org/CPMADevs/cnq3 synced 2025-02-17 01:11:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed demo playback abortion crashing when the "nextdemo" cvar was set to play a demo

Browse source 
also no longer breaking when stopping demo playback because it's annoying as hell
This commit is contained in:
myT 2018-12-08 00:13:45 +01:00
parent 4a848e7b6a
commit 55ae7645b1
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog.txt
View file

@ -16,6 +16,8 @@ add: /toggle can now accept a value sequence (2 or more entries) to loop through
chg: on Windows, the upper limit of open stdio file handles was raised from 512 to 2048 chg: on Windows, the upper limit of open stdio file handles was raised from 512 to 2048
fix: aborting demo playback would crash when the "nextdemo" cvar was set to play a demo
fix: no longer feeding cs commands that came from a previous gamestate to cgame fix: no longer feeding cs commands that came from a previous gamestate to cgame
example: "/map cpm22" -> "/cv map cpm25" -> elevator sound was broken example: "/map cpm22" -> "/cv map cpm25" -> elevator sound was broken

9
code/qcommon/common.cpp
View file

@ -273,9 +273,8 @@ void QDECL Com_ErrorExt( int code, int module, qbool realError, const char *fmt,
#if defined(_WIN32) && defined(_DEBUG) #if defined(_WIN32) && defined(_DEBUG)
if ( code != ERR_DISCONNECT && code != ERR_NEED_CD ) { if ( code != ERR_DISCONNECT && code != ERR_NEED_CD ) {
if ((!com_noErrorInterrupt || !com_noErrorInterrupt->integer) && IsDebuggerPresent()) { if ( realError && (!com_noErrorInterrupt || !com_noErrorInterrupt->integer) && IsDebuggerPresent() )
__debugbreak(); __debugbreak();
}
} }
#endif #endif
@ -293,7 +292,7 @@ void QDECL Com_ErrorExt( int code, int module, qbool realError, const char *fmt,
com_errorEntered = qfalse; com_errorEntered = qfalse;
longjmp (abortframe, -1); longjmp (abortframe, -1);
} else if ( code == ERR_DROP || code == ERR_DISCONNECT ) { } else if ( code == ERR_DROP || code == ERR_DISCONNECT ) {
if (realError) if ( realError )
Com_Printf( "********************\nERROR: %s\n********************\n", com_errorMessage ); Com_Printf( "********************\nERROR: %s\n********************\n", com_errorMessage );
else else
Com_Printf( "ERROR: %s\n", com_errorMessage ); Com_Printf( "ERROR: %s\n", com_errorMessage );
@ -301,11 +300,11 @@ void QDECL Com_ErrorExt( int code, int module, qbool realError, const char *fmt,
#ifndef DEDICATED #ifndef DEDICATED
const qbool demo = CL_DemoPlaying(); const qbool demo = CL_DemoPlaying();
CL_Disconnect( qtrue ); CL_Disconnect( qtrue );
if ( demo )
CL_NextDemo();
CL_FlushMemory(); // shuts down the VMs and starts them back up CL_FlushMemory(); // shuts down the VMs and starts them back up
if ( realError ) if ( realError )
CL_ForwardUIError( code == ERR_DROP ? EXT_ERRLEV_DROP : EXT_ERRLEV_DISC, module, com_errorMessage ); CL_ForwardUIError( code == ERR_DROP ? EXT_ERRLEV_DROP : EXT_ERRLEV_DISC, module, com_errorMessage );
else if ( demo )
CL_NextDemo();
#endif #endif
com_errorEntered = qfalse; com_errorEntered = qfalse;
longjmp (abortframe, -1); longjmp (abortframe, -1);