diff --git a/engine/client/console.c b/engine/client/console.c index 78c168466..8f51a0084 100644 --- a/engine/client/console.c +++ b/engine/client/console.c @@ -1150,15 +1150,10 @@ void Con_DrawConsole (int lines, qboolean noback) QT_Update(); #endif - if (qglGetError()) - return; - // draw the background if (!noback) Draw_ConsoleBackground (lines); - if (qglGetError()) - return; // draw the text con_current->vislines = lines; @@ -1178,9 +1173,7 @@ void Con_DrawConsole (int lines, qboolean noback) rows--; } - if (qglGetError()) - return; - + row = curcon->display; for (i=0 ; inumverts]; break; case ALIAS_GROUP: + case ALIAS_GROUP_SWAPPED: // prerelease ingroup = (daliasgroup_t *)(pframetype+1); pose = (galiaspose_t *)Hunk_Alloc(LittleLong(ingroup->numframes)*(sizeof(galiaspose_t) + sizeof(vec3_t)*2*galias->numverts)); diff --git a/engine/gl/gl_model.c b/engine/gl/gl_model.c index 2a82eb43b..1b842c7a7 100644 --- a/engine/gl/gl_model.c +++ b/engine/gl/gl_model.c @@ -669,6 +669,7 @@ couldntload: case 30: //hl case 29: //q1 + case 28: GLMod_LoadBrushModel (mod, buf); break; #ifdef ZYMOTICMODELS @@ -2546,7 +2547,7 @@ void GLMod_LoadBrushModel (model_t *mod, void *buffer) i = LittleLong (header->version); - if (i == BSPVERSION) + if (i == BSPVERSION || i == BSPVERSIONPREREL) loadmodel->fromgame = fg_quake; else if (i == BSPVERSIONHL) //halflife support loadmodel->fromgame = fg_halflife; diff --git a/engine/server/svmodel.c b/engine/server/svmodel.c index c518dcc80..faffdf419 100644 --- a/engine/server/svmodel.c +++ b/engine/server/svmodel.c @@ -276,9 +276,9 @@ model_t *Mod_LoadModel (model_t *mod, qboolean crash) break; #endif - - case 29: - case 30: + case BSPVERSIONPREREL: + case BSPVERSION: + case BSPVERSIONHL: Mod_LoadBrushModel (mod, buf); break; @@ -1224,7 +1224,7 @@ void Mod_LoadBrushModel (model_t *mod, void *buffer) i = LittleLong (header->version); - if (i == BSPVERSION) + if (i == BSPVERSION || i == BSPVERSIONPREREL) loadmodel->fromgame = fg_quake; else if (i == BSPVERSIONHL) loadmodel->fromgame = fg_halflife; diff --git a/engine/sw/sw_model.c b/engine/sw/sw_model.c index 071f331dc..c47855d9b 100644 --- a/engine/sw/sw_model.c +++ b/engine/sw/sw_model.c @@ -398,6 +398,7 @@ model_t *SWMod_LoadModel (model_t *mod, qboolean crash) case BSPVERSIONHL: case BSPVERSION: //hmm. + case BSPVERSIONPREREL: SWMod_LoadBrushModel (mod, buf); break; @@ -1887,7 +1888,7 @@ void SWMod_LoadBrushModel (model_t *mod, void *buffer) i = LittleLong (header->version); - if (i == BSPVERSION) + if (i == BSPVERSION || i == BSPVERSIONPREREL) loadmodel->fromgame = fg_quake; else if (i == BSPVERSIONHL) loadmodel->fromgame = fg_halflife;