From: sajt Date: Sat, 10 Sep 2005 10:07:25 +0000 (+0000) Subject: Rename dhullinfo_t to hullinfo_t, fix byte->qbyte. More fixes later! Don't complain... X-Git-Tag: xonotic-v0.1.0preview~4571 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ed90aa6c4030e69afb8cb659540519af9fb30a9c;p=xonotic%2Fdarkplaces.git Rename dhullinfo_t to hullinfo_t, fix byte->qbyte. More fixes later! Don't complain if this crashes your Sun supercomputer! git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5707 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/bspfile.h b/bspfile.h index 730fbde4..c9697b36 100644 --- a/bspfile.h +++ b/bspfile.h @@ -60,7 +60,7 @@ typedef struct int numhulls; int filehulls; float hullsizes[MAX_MAP_HULLS][2][3]; -} dhullinfo_t; +} hullinfo_t; typedef struct { diff --git a/model_brush.c b/model_brush.c index 3d5e5953..505e7656 100644 --- a/model_brush.c +++ b/model_brush.c @@ -1562,13 +1562,13 @@ static void Mod_Q1BSP_LoadVertexes(lump_t *l) } } -static void Mod_Q1BSP_LoadSubmodels(lump_t *l, dhullinfo_t *hullinfo) +static void Mod_Q1BSP_LoadSubmodels(lump_t *l, hullinfo_t *hullinfo) { - byte *index; + qbyte *index; dmodel_t *out; int i, j, count; - index = (byte *)(mod_base + l->fileofs); + index = (qbyte *)(mod_base + l->fileofs); if (l->filelen % (48+4*hullinfo->filehulls)) Host_Error ("Mod_Q1BSP_LoadSubmodels: funny lump size in %s", loadmodel->name); @@ -2121,7 +2121,7 @@ static void Mod_Q1BSP_LoadLeafs(lump_t *l) } } -static void Mod_Q1BSP_LoadClipnodes(lump_t *l, dhullinfo_t *hullinfo) +static void Mod_Q1BSP_LoadClipnodes(lump_t *l, hullinfo_t *hullinfo) { dclipnode_t *in, *out; int i, count; @@ -2896,7 +2896,7 @@ void Mod_Q1BSP_Load(model_t *mod, void *buffer, void *bufferend) msurface_t *surface; int numshadowmeshtriangles; dheader_t _header; - dhullinfo_t hullinfo; + hullinfo_t hullinfo; mod->type = mod_brushq1;