Skip to content

fix Mod_LoadMarksurfaces MAPJAMX and check sign #570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lndpj wants to merge 1 commit into from
Closed

fix Mod_LoadMarksurfaces MAPJAMX and check sign #570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 36 additions & 43 deletions Quake/gl_model.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2067,53 +2067,46 @@ Mod_LoadMarksurfaces
*/
static void Mod_LoadMarksurfaces (lump_t *l, int bsp2)
{
int i, j, count;
int *out;
if (bsp2)
{
unsigned int *in = (unsigned int *)(mod_base + l->fileofs);
int32_t i, count;
void *in = mod_base + l->fileofs;

if (l->filelen % sizeof(*in))
Host_Error ("Mod_LoadMarksurfaces: funny lump size in %s",loadmodel->name);
if (l->filelen % (bsp2 ? sizeof(int32_t) : sizeof(int16_t)))
Host_Error ("Mod_LoadMarksurfaces: funny lump size in %s",loadmodel->name);

count = l->filelen / sizeof(*in);
out = (int*)Hunk_AllocNameNoFill ( count*sizeof(*out), loadname);
count = l->filelen / (bsp2 ? sizeof(int32_t) : sizeof(int16_t));
loadmodel->marksurfaces = (int32_t*)Hunk_AllocNameNoFill ( count*sizeof(int32_t), loadname );
loadmodel->nummarksurfaces = count;

loadmodel->marksurfaces = out;
loadmodel->nummarksurfaces = count;
if (count > INT16_MAX)
Con_Warning ("%i marksurfaces exceeds standard limit of %d.\n", count, INT16_MAX);

for (i=0 ; i<count ; i++)
switch(bsp2)
{
case 0:
{
j = LittleLong(in[i]);
if (j >= loadmodel->numsurfaces)
Host_Error ("Mod_LoadMarksurfaces: bad surface number");
out[i] = j;
for (i=0 ; i<count ; i++)
{
loadmodel->marksurfaces[i] = (int32_t)(uint16_t)LittleShort(((int16_t*)in)[i]);
if ((loadmodel->marksurfaces[i] < 0) || (loadmodel->marksurfaces[i] >= loadmodel->numsurfaces))
{
Con_Warning ("%i/%i bad marksurface uint16 number: %d\n", i, count, loadmodel->marksurfaces[i]);
loadmodel->marksurfaces[i] = INT32_MAX;
}
}
break;
}
}
else
{
short *in = (short *)(mod_base + l->fileofs);

if (l->filelen % sizeof(*in))
Host_Error ("Mod_LoadMarksurfaces: funny lump size in %s",loadmodel->name);

count = l->filelen / sizeof(*in);
out = (int*)Hunk_AllocNameNoFill ( count*sizeof(*out), loadname);

loadmodel->marksurfaces = out;
loadmodel->nummarksurfaces = count;

//johnfitz -- warn mappers about exceeding old limits
if (count > 32767)
Con_DWarning ("%i marksurfaces exceeds standard limit of 32767.\n", count);
//johnfitz

for (i=0 ; i<count ; i++)
default:
{
j = (unsigned short)LittleShort(in[i]); //johnfitz -- explicit cast as unsigned short
if (j >= loadmodel->numsurfaces)
Sys_Error ("Mod_LoadMarksurfaces: bad surface number");
out[i] = j;
for (i=0 ; i<count ; i++)
{
loadmodel->marksurfaces[i] = (int32_t)LittleLong(((int32_t*)in)[i]);
if ((loadmodel->marksurfaces[i] < 0) || (loadmodel->marksurfaces[i] >= loadmodel->numsurfaces))
{
Con_Warning ("%i/%i bad marksurface int32 number: %d\n", i, count, loadmodel->marksurfaces[i]);
loadmodel->marksurfaces[i] = INT32_MAX;
}
}
break;
}
}
}
Expand Down Expand Up @@ -2676,10 +2669,10 @@ qboolean Mod_LoadMapDescription (char *desc, size_t maxchars, const char *map)

// if the entity lump is large enough we assume the map is playable
// and only try to parse the first entity (worldspawn) for the map title
if (entlump->filelen >= sizeof (buf))
if (entlump->filelen >= (int)sizeof (buf))
{
ret = true;
entlump->filelen = sizeof (buf) - 1;
entlump->filelen = (int)sizeof (buf) - 1;
}

fseek (f, entlump->fileofs - sizeof (header), SEEK_CUR);
Expand Down Expand Up @@ -5183,4 +5176,4 @@ static void Mod_LoadMD3Model (qmodel_t* mod, const char* buffer)
if (!mod->cache.data) return;
memcpy (mod->cache.data, mainhdr, total);
Hunk_FreeToLowMark (start);
}
}
63 changes: 54 additions & 9 deletions Quake/gl_model.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,25 +115,32 @@ typedef struct texture_s
#define SURF_DRAWWATER 0x2000

// !!! if this is changed, it must be changed in asm_draw.h too !!!
#pragma pack(push,1)
typedef struct
{
unsigned int v[2];
} medge_t;
#pragma pack(pop)

#pragma pack(push,1)
typedef struct
{
float vecs[2][4];
int texnum;
int flags;
} mtexinfo_t;
#pragma pack(pop)

#pragma pack(push,1)
typedef struct glvert_s {
vec3_t pos;
float st[4];
float lmofs;
unsigned styles;
} glvert_t;
#pragma pack(pop)

#pragma pack(push,1)
typedef struct msurface_s
{
mplane_t *plane;
Expand All @@ -155,7 +162,9 @@ typedef struct msurface_s
int texturemins[2];
mtexinfo_t *texinfo;
} msurface_t;
#pragma pack(pop)

#pragma pack(push,1)
typedef struct mnode_s
{
// common with leaf
Expand All @@ -173,9 +182,9 @@ typedef struct mnode_s
unsigned int firstsurface;
unsigned int numsurfaces;
} mnode_t;
#pragma pack(pop)



#pragma pack(push,1)
typedef struct mleaf_s
{
// common with node
Expand All @@ -189,21 +198,26 @@ typedef struct mleaf_s
// leaf specific
byte *compressed_vis;

int *firstmarksurface;
int nummarksurfaces;
int32_t *firstmarksurface;
int32_t nummarksurfaces;
int key; // BSP sequence number for leaf's contents
byte ambient_sound_level[NUM_AMBIENTS];
} mleaf_t;
#pragma pack(pop)

//johnfitz -- for clipnodes>32k
#pragma pack(push,1)
typedef struct mclipnode_s
{
int planenum;
int children[2]; // negative numbers are contents
} mclipnode_t;
#pragma pack(pop)

//johnfitz

// !!! if this is changed, it must be changed in asm_i386.h too !!!
#pragma pack(push,1)
typedef struct
{
mclipnode_t *clipnodes; //johnfitz -- was dclipnode_t
Expand All @@ -213,6 +227,7 @@ typedef struct
vec3_t clip_mins;
vec3_t clip_maxs;
} hull_t;
#pragma pack(pop)

/*
==============================================================================
Expand All @@ -224,27 +239,34 @@ SPRITE MODELS


// FIXME: shorten these?
#pragma pack(push,1)
typedef struct mspriteframe_s
{
int width, height;
float up, down, left, right;
float smax, tmax; //johnfitz -- image might be padded
struct gltexture_s *gltexture;
} mspriteframe_t;
#pragma pack(pop)

#pragma pack(push,1)
typedef struct
{
int numframes;
float *intervals;
mspriteframe_t *frames[1];
} mspritegroup_t;
#pragma pack(pop)

#pragma pack(push,1)
typedef struct
{
spriteframetype_t type;
mspriteframe_t *frameptr;
} mspriteframedesc_t;
#pragma pack(pop)

#pragma pack(push,1)
typedef struct
{
int type;
Expand All @@ -253,7 +275,7 @@ typedef struct
int numframes;
mspriteframedesc_t frames[1];
} msprite_t;

#pragma pack(pop)

/*
==============================================================================
Expand All @@ -266,24 +288,31 @@ Alias models are position independent, so the cache manager can move them.

//-- from RMQEngine
// split out to keep vertex sizes down
#pragma pack(push,1)
typedef struct aliasmesh_s
{
short st[2];
unsigned short vertindex;
} aliasmesh_t;
#pragma pack(pop)

#pragma pack(push,1)
typedef struct meshxyz_s
{
byte xyz[4];
signed char normal[4];
} meshxyz_t;
#pragma pack(pop)

#pragma pack(push,1)
typedef struct meshst_s
{
float st[2];
} meshst_t;
#pragma pack(pop)
//--

#pragma pack(push,1)
typedef struct
{
int firstpose;
Expand All @@ -294,8 +323,10 @@ typedef struct
int frame;
char name[16];
} maliasframedesc_t;
#pragma pack(pop)

#define MAX_SKINS 32
#pragma pack(push,1)
typedef struct {
int ident;
int version;
Expand Down Expand Up @@ -343,9 +374,10 @@ typedef struct {
int texels[MAX_SKINS]; // only for player skins
maliasframedesc_t frames[1]; // variable sized
} aliashdr_t;

#pragma pack(pop)
static inline aliashdr_t *Mod_NextSurface (aliashdr_t *hdr) { return hdr->nextsurface ? (aliashdr_t*)((byte*)hdr + hdr->nextsurface) : NULL; }

#pragma pack(push,1)
typedef struct
{
float xyz[3];
Expand All @@ -354,21 +386,32 @@ typedef struct
uint8_t weight[4];
uint8_t idx[4];
} iqmvert_t;
#pragma pack(pop)

#pragma pack(push,1)
typedef struct
{
float mat[12];
} bonepose_t; //pose data for a single bone.
#pragma pack(pop)

#pragma pack(push,1)
typedef struct
{
int parent; //-1 for a root bone
char name[32];
bonepose_t inverse;
} boneinfo_t;
#pragma pack(pop)

#pragma pack(push,1)
typedef struct
{
uint16_t xyz[3];
uint8_t normal[2]; // spherical coords
} md3pose_t; // Total size is now 8 bytes
#pragma pack(pop)

#define MAXALIASVERTS 0x7fff //16-bit index buffer + onseam duplication
#define MAXALIASVERTS_QS 2000 //johnfitz -- was 1024
#define MAXALIASFRAMES 1024 //spike -- was 256
Expand Down Expand Up @@ -418,6 +461,7 @@ enum
MODSORT_ALIAS_ALPHATEST = 1 << (MODSORT_BITS - 1),
};

#pragma pack(push,1)
typedef struct qmodel_s
{
char name[MAX_QPATH];
Expand Down Expand Up @@ -476,13 +520,13 @@ typedef struct qmodel_s
msurface_t *surfaces;

int numsurfedges;
int *surfedges;
int *surfedges;

int numclipnodes;
mclipnode_t *clipnodes; //johnfitz -- was dclipnode_t

int nummarksurfaces;
int *marksurfaces;
int32_t nummarksurfaces;
int32_t *marksurfaces;

hull_t hulls[MAX_MAP_HULLS];

Expand Down Expand Up @@ -516,6 +560,7 @@ typedef struct qmodel_s
cache_user_t cache; // only access through Mod_Extradata

} qmodel_t;
#pragma pack(pop)

//
// MD3 structs
Expand Down
4 changes: 2 additions & 2 deletions Quake/r_brush.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ typedef struct {
int *allocated;
} chart_t;

#define MAX_SANITY_LIGHTMAPS (1u<<20)
const int MAX_SANITY_LIGHTMAPS = (1u<<20);
lightmap_t *lightmaps;
int lightmap_count;
int last_lightmap_allocated;
Expand Down Expand Up @@ -388,7 +388,7 @@ static void GL_PackLitSurfaces (void)
}

// generate offsets (prefix sum)
for (i = 0, j = 0; i < countof(bins); i++)
for (i = 0, j = 0; i < (int)countof(bins); i++)
{
int tmp = bins[i];
bins[i] = j;
Expand Down
Loading