Added DP_SV_WRITEUNTERMINATEDSTRING extension

[xonotic/darkplaces.git] / menu.c

diff --git a/menu.c b/menu.c
index a3b37a6290e7c0972d9184f3fe04dd6ed5b69fb9..bf03a1192b25a657c8748486d258f2d3858ad9bf 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -819,7 +819,7 @@ int         loadable[MAX_SAVEGAMES];
 
 void M_ScanSaves (void)
 {
-       size_t  i, j, len;
+       int             i, j, len;
        char    name[MAX_OSPATH];
        char    buf[SAVEGAME_COMMENT_LENGTH + 256];
        const char *t;
@@ -3676,7 +3676,7 @@ gamelevels_t openquartzgame = {"OpenQuartz", openquartzlevels, openquartzepisode
 
 typedef struct
 {
-       int gameid;
+       gamemode_t gameid;
        gamelevels_t *notregistered;
        gamelevels_t *registered;
 }
@@ -4612,6 +4612,7 @@ void MR_SetRouting (qboolean forceold);
 
 void MP_Error(const char *format, ...)
 {
+       static qboolean processingError = false;
        char errorstring[4096];
        va_list argptr;
 
@@ -4620,7 +4621,13 @@ void MP_Error(const char *format, ...)
        va_end (argptr);
        Con_Printf( "Menu_Error: %s\n", errorstring );
 
-       PRVM_Crash();
+       if( !processingError ) {
+               processingError = true;
+               PRVM_Crash();
+               processingError = false;
+       } else {
+               Con_Printf( "Menu_Error: Recursive call to MP_Error (from PRVM_Crash)!\n" );
+       }
 
        // fall back to the normal menu