From b93695279c7dc85899e7471d39e3537c3cfb70b4 Mon Sep 17 00:00:00 2001
From: TimeServ <timeserv@users.sourceforge.net>
Date: Sun, 8 May 2005 03:41:24 +0000
Subject: [PATCH] prerel, sw fix

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@990 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 engine/client/console.c   | 18 +-----------------
 engine/client/modelgen.h  |  2 +-
 engine/common/bspfile.h   |  2 +-
 engine/common/particles.h |  1 -
 engine/gl/gl_alias.c      |  1 +
 engine/gl/gl_model.c      |  3 ++-
 engine/server/svmodel.c   |  8 ++++----
 engine/sw/sw_model.c      |  3 ++-
 8 files changed, 12 insertions(+), 26 deletions(-)

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 ; i<rows ; i++, y-=8, row--)
 	{
@@ -1201,9 +1194,6 @@ void Con_DrawConsole (int lines, qboolean noback)
 	progresstext = NULL;
 	progresspercent = 0;
 	
-	if (qglGetError())
-		return;
-
 	// draw the download bar
 	// figure out width
 	if (cls.downloadmethod)
@@ -1271,15 +1261,9 @@ void Con_DrawConsole (int lines, qboolean noback)
 		Draw_ColouredCharacter ((n+1+x)*8, y, (unsigned char)'\x83' | M_COLOR_WHITE);
 	}
 	
-	if (qglGetError())
-		return;
-
 // draw the input prompt, user text, and cursor if desired
 	Con_DrawInput ();
 
-	
-	if (qglGetError())
-		return;
 }
 
 
diff --git a/engine/client/modelgen.h b/engine/client/modelgen.h
index e49fced96..0f3603825 100644
--- a/engine/client/modelgen.h
+++ b/engine/client/modelgen.h
@@ -52,7 +52,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 typedef enum {ST_SYNC=0, ST_RAND } synctype_t;
 #endif
 
-typedef enum { ALIAS_SINGLE=0, ALIAS_GROUP } aliasframetype_t;
+typedef enum { ALIAS_SINGLE=0, ALIAS_GROUP, ALIAS_GROUP_SWAPPED=16777216 } aliasframetype_t;
 
 typedef enum { ALIAS_SKIN_SINGLE=0, ALIAS_SKIN_GROUP } aliasskintype_t;
 
diff --git a/engine/common/bspfile.h b/engine/common/bspfile.h
index d370a7bc4..3012df180 100644
--- a/engine/common/bspfile.h
+++ b/engine/common/bspfile.h
@@ -52,7 +52,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 //=============================================================================
 
-
+#define BSPVERSIONPREREL 28
 #define BSPVERSION	29
 //HalfLife support
 #define BSPVERSIONHL	30
diff --git a/engine/common/particles.h b/engine/common/particles.h
index cf7d0c3fb..8affa0a33 100644
--- a/engine/common/particles.h
+++ b/engine/common/particles.h
@@ -2,7 +2,6 @@
 #define _PARTICLES_H_
 
 extern int pt_explosion,
-	pt_emp,
 	pt_pointfile,
 	pt_entityparticles,
 	pt_darkfield,
diff --git a/engine/gl/gl_alias.c b/engine/gl/gl_alias.c
index 0a6f1e152..2d6ee519c 100644
--- a/engine/gl/gl_alias.c
+++ b/engine/gl/gl_alias.c
@@ -1925,6 +1925,7 @@ static void *Q1_LoadFrameGroup (daliasframetype_t *pframetype, int *seamremaps)
 			pframetype = (daliasframetype_t *)&pinframe[pq1inmodel->numverts];
 			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;