Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #106 from QBall147/master

bspc fix-up for quakelive
  • Loading branch information...
commit c43c3d968f630e0358964d95af218644636d0e30 2 parents 06ac3b7 + 9b37f2e
Timothee "TTimo" Besset authored
2  tools/quake3/bspc/deps/qcommon/cm_load.c
View
@@ -623,7 +623,7 @@ void CM_LoadMap( const char *name, qboolean clientload, int *checksum ) {
((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)"
, name, header.version, BSP_VERSION );
}
2  tools/quake3/bspc/deps/qcommon/qfiles.h
View
@@ -404,7 +404,7 @@ typedef struct {
// little-endian "IBSP"
#define BSP_VERSION 46
-
+#define BSP_VERSION_QL 47 // for quakelive :ss
// there shouldn't be any problem with increasing these values at the
// expense of more memory allocation in the utilities
2  tools/quake3/bspc/map.c
View
@@ -1220,7 +1220,7 @@ int LoadMapFromBSP(struct quakefile_s *qf)
Q3_FreeMaxBSP();
} //end if
//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();
Q3_LoadMapFromBSP(qf);
Please sign in to comment.
Something went wrong with that request. Please try again.