ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2025-01-10 03:51:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #106 from QBall147/master

Browse source 
bspc fix-up for quakelive
This commit is contained in:
Timothee "TTimo" Besset 2012-07-31 10:11:15 -07:00
commit c43c3d968f
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/quake3/bspc/deps/qcommon/cm_load.c
View file

@ -623,7 +623,7 @@ void CM_LoadMap( const char *name, qboolean clientload, int *checksum ) {
((int *)&header)[i] = LittleLong ( ((int *)&header)[i]); ((int *)&header)[i] = LittleLong ( ((int *)&header)[i]);
} }
if ( header.version != BSP_VERSION ) { if ( header.version != BSP_VERSION && header.version != BSP_VERSION_QL ) {
Com_Error (ERR_DROP, "CM_LoadMap: %s has wrong version number (%i should be %i)" Com_Error (ERR_DROP, "CM_LoadMap: %s has wrong version number (%i should be %i)"
, name, header.version, BSP_VERSION ); , name, header.version, BSP_VERSION );
} }

2
tools/quake3/bspc/deps/qcommon/qfiles.h
View file

@ -404,7 +404,7 @@ typedef struct {
// little-endian "IBSP" // little-endian "IBSP"
#define BSP_VERSION 46 #define BSP_VERSION 46
#define BSP_VERSION_QL 47 // for quakelive :ss
// there shouldn't be any problem with increasing these values at the // there shouldn't be any problem with increasing these values at the
// expense of more memory allocation in the utilities // expense of more memory allocation in the utilities

2
tools/quake3/bspc/map.c
View file

@ -1220,7 +1220,7 @@ int LoadMapFromBSP(struct quakefile_s *qf)
Q3_FreeMaxBSP(); Q3_FreeMaxBSP();
} //end if } //end if
//Quake3 BSP file //Quake3 BSP file
if (idheader.ident == Q3_BSP_IDENT && idheader.version == Q3_BSP_VERSION) else if (idheader.ident == Q3_BSP_IDENT && idheader.version == Q3_BSP_VERSION)
{ {
ResetMapLoading(); ResetMapLoading();
Q3_LoadMapFromBSP(qf); Q3_LoadMapFromBSP(qf);