eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

prerel, sw fix

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@990 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
TimeServ 2005-05-08 03:41:24 +00:00
parent 99b8527fff
commit b93695279c
8 changed files with 12 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
engine/client/console.c
View file

@ -1150,15 +1150,10 @@ void Con_DrawConsole (int lines, qboolean noback)
QT_Update(); QT_Update();
#endif #endif
if (qglGetError())
return;
// draw the background // draw the background
if (!noback) if (!noback)
Draw_ConsoleBackground (lines); Draw_ConsoleBackground (lines);
if (qglGetError())
return;
// draw the text // draw the text
con_current->vislines = lines; con_current->vislines = lines;
@ -1178,9 +1173,7 @@ void Con_DrawConsole (int lines, qboolean noback)
rows--; rows--;
} }
if (qglGetError())
return;
row = curcon->display; row = curcon->display;
for (i=0 ; i<rows ; i++, y-=8, row--) for (i=0 ; i<rows ; i++, y-=8, row--)
{ {
@ -1201,9 +1194,6 @@ void Con_DrawConsole (int lines, qboolean noback)
progresstext = NULL; progresstext = NULL;
progresspercent = 0; progresspercent = 0;
if (qglGetError())
return;
// draw the download bar // draw the download bar
// figure out width // figure out width
if (cls.downloadmethod) 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); 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 // draw the input prompt, user text, and cursor if desired
Con_DrawInput (); Con_DrawInput ();
if (qglGetError())
return;
} }

2
engine/client/modelgen.h
View file

@ -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; typedef enum {ST_SYNC=0, ST_RAND } synctype_t;
#endif #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; typedef enum { ALIAS_SKIN_SINGLE=0, ALIAS_SKIN_GROUP } aliasskintype_t;

2
engine/common/bspfile.h
View file

@ -52,7 +52,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//============================================================================= //=============================================================================
#define BSPVERSIONPREREL 28
#define BSPVERSION 29 #define BSPVERSION 29
//HalfLife support //HalfLife support
#define BSPVERSIONHL 30 #define BSPVERSIONHL 30

1
engine/common/particles.h
View file

@ -2,7 +2,6 @@
#define _PARTICLES_H_ #define _PARTICLES_H_
extern int pt_explosion, extern int pt_explosion,
pt_emp,
pt_pointfile, pt_pointfile,
pt_entityparticles, pt_entityparticles,
pt_darkfield, pt_darkfield,

1
engine/gl/gl_alias.c
View file

@ -1925,6 +1925,7 @@ static void *Q1_LoadFrameGroup (daliasframetype_t *pframetype, int *seamremaps)
pframetype = (daliasframetype_t *)&pinframe[pq1inmodel->numverts]; pframetype = (daliasframetype_t *)&pinframe[pq1inmodel->numverts];
break; break;
case ALIAS_GROUP: case ALIAS_GROUP:
case ALIAS_GROUP_SWAPPED: // prerelease
ingroup = (daliasgroup_t *)(pframetype+1); ingroup = (daliasgroup_t *)(pframetype+1);
pose = (galiaspose_t *)Hunk_Alloc(LittleLong(ingroup->numframes)*(sizeof(galiaspose_t) + sizeof(vec3_t)*2*galias->numverts)); pose = (galiaspose_t *)Hunk_Alloc(LittleLong(ingroup->numframes)*(sizeof(galiaspose_t) + sizeof(vec3_t)*2*galias->numverts));

3
engine/gl/gl_model.c
View file

@ -669,6 +669,7 @@ couldntload:
case 30: //hl case 30: //hl
case 29: //q1 case 29: //q1
case 28:
GLMod_LoadBrushModel (mod, buf); GLMod_LoadBrushModel (mod, buf);
break; break;
#ifdef ZYMOTICMODELS #ifdef ZYMOTICMODELS
@ -2546,7 +2547,7 @@ void GLMod_LoadBrushModel (model_t *mod, void *buffer)
i = LittleLong (header->version); i = LittleLong (header->version);
if (i == BSPVERSION) if (i == BSPVERSION || i == BSPVERSIONPREREL)
loadmodel->fromgame = fg_quake; loadmodel->fromgame = fg_quake;
else if (i == BSPVERSIONHL) //halflife support else if (i == BSPVERSIONHL) //halflife support
loadmodel->fromgame = fg_halflife; loadmodel->fromgame = fg_halflife;

8
engine/server/svmodel.c
View file

@ -276,9 +276,9 @@ model_t *Mod_LoadModel (model_t *mod, qboolean crash)
break; break;
#endif #endif
case BSPVERSIONPREREL:
case 29: case BSPVERSION:
case 30: case BSPVERSIONHL:
Mod_LoadBrushModel (mod, buf); Mod_LoadBrushModel (mod, buf);
break; break;
@ -1224,7 +1224,7 @@ void Mod_LoadBrushModel (model_t *mod, void *buffer)
i = LittleLong (header->version); i = LittleLong (header->version);
if (i == BSPVERSION) if (i == BSPVERSION || i == BSPVERSIONPREREL)
loadmodel->fromgame = fg_quake; loadmodel->fromgame = fg_quake;
else if (i == BSPVERSIONHL) else if (i == BSPVERSIONHL)
loadmodel->fromgame = fg_halflife; loadmodel->fromgame = fg_halflife;

3
engine/sw/sw_model.c
View file

@ -398,6 +398,7 @@ model_t *SWMod_LoadModel (model_t *mod, qboolean crash)
case BSPVERSIONHL: case BSPVERSIONHL:
case BSPVERSION: //hmm. case BSPVERSION: //hmm.
case BSPVERSIONPREREL:
SWMod_LoadBrushModel (mod, buf); SWMod_LoadBrushModel (mod, buf);
break; break;
@ -1887,7 +1888,7 @@ void SWMod_LoadBrushModel (model_t *mod, void *buffer)
i = LittleLong (header->version); i = LittleLong (header->version);
if (i == BSPVERSION) if (i == BSPVERSION || i == BSPVERSIONPREREL)
loadmodel->fromgame = fg_quake; loadmodel->fromgame = fg_quake;
else if (i == BSPVERSIONHL) else if (i == BSPVERSIONHL)
loadmodel->fromgame = fg_halflife; loadmodel->fromgame = fg_halflife;