X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=model_sprite.c;h=acfac9f5a27cf8c8fd820a9989bd713e01070503;hp=d21d88ff97da2ebd5667a074e3896473934bb0d2;hb=HEAD;hpb=feb22f39c2c1a481b8c7a2364767b6402d5d94a1

diff --git a/model_sprite.c b/model_sprite.c
index d21d88ff..7e96f676 100644
--- a/model_sprite.c
+++ b/model_sprite.c
@@ -90,16 +90,16 @@ extern cvar_t gl_texturecompression_sprites;
 
 static void Mod_Sprite_SharedSetup(const unsigned char *datapointer, int version, const unsigned int *palette, qbool additive)
 {
-	int					i, j, groupframes, realframes, x, y, origin[2], width, height;
-	qbool			fullbright;
-	dspriteframetype_t	*pinframetype;
-	dspriteframe_t		*pinframe;
-	dspritegroup_t		*pingroup;
-	dspriteinterval_t	*pinintervals;
-	skinframe_t			*skinframe;
-	float				modelradius, interval;
-	char				name[MAX_QPATH], fogname[MAX_QPATH];
-	const void			*startframes;
+	int                 i, j, groupframes, realframes, x, y, origin[2], width, height;
+	qbool               fullbright;
+	dspriteframetype_t  pinframetype;
+	dspriteframe_t      pinframe;
+	dspritegroup_t      pingroup;
+	dspriteinterval_t   pinintervals;
+	skinframe_t         *skinframe;
+	float               modelradius, interval;
+	char                name[MAX_QPATH], fogname[MAX_QPATH];
+	const void          *startframes;
 	int                 texflags = (r_mipsprites.integer ? TEXF_MIPMAP : 0) | ((gl_texturecompression.integer && gl_texturecompression_sprites.integer) ? TEXF_COMPRESS : 0) | TEXF_ISSPRITE | TEXF_PICMIP | TEXF_ALPHA | TEXF_CLAMP;
 	modelradius = 0;
 
@@ -114,33 +114,34 @@ static void Mod_Sprite_SharedSetup(const unsigned char *datapointer, int version
 
 //
 // load the frames
+// bones_was_here: memcpy() used here to prevent misaligned access with struct-based parsing
 //
 	startframes = datapointer;
 	realframes = 0;
 	for (i = 0;i < loadmodel->numframes;i++)
 	{
-		pinframetype = (dspriteframetype_t *)datapointer;
+		memcpy(&pinframetype, datapointer, sizeof(dspriteframetype_t));
 		datapointer += sizeof(dspriteframetype_t);
 
-		if (LittleLong (pinframetype->type) == SPR_SINGLE)
+		if (LittleLong (pinframetype.type) == SPR_SINGLE)
 			groupframes = 1;
 		else
 		{
-			pingroup = (dspritegroup_t *)datapointer;
+			memcpy(&pingroup, datapointer, sizeof(dspritegroup_t));
 			datapointer += sizeof(dspritegroup_t);
 
-			groupframes = LittleLong(pingroup->numframes);
+			groupframes = LittleLong(pingroup.numframes);
 
 			datapointer += sizeof(dspriteinterval_t) * groupframes;
 		}
 
 		for (j = 0;j < groupframes;j++)
 		{
-			pinframe = (dspriteframe_t *)datapointer;
+			memcpy(&pinframe, datapointer, sizeof(dspriteframe_t));
 			if (version == SPRITE32_VERSION)
-				datapointer += sizeof(dspriteframe_t) + LittleLong(pinframe->width) * LittleLong(pinframe->height) * 4;
+				datapointer += sizeof(dspriteframe_t) + LittleLong(pinframe.width) * LittleLong(pinframe.height) * 4;
 			else //if (version == SPRITE_VERSION || version == SPRITEHL_VERSION)
-				datapointer += sizeof(dspriteframe_t) + LittleLong(pinframe->width) * LittleLong(pinframe->height);
+				datapointer += sizeof(dspriteframe_t) + LittleLong(pinframe.width) * LittleLong(pinframe.height);
 		}
 		realframes += groupframes;
 	}
@@ -155,25 +156,25 @@ static void Mod_Sprite_SharedSetup(const unsigned char *datapointer, int version
 	realframes = 0;
 	for (i = 0;i < loadmodel->numframes;i++)
 	{
-		pinframetype = (dspriteframetype_t *)datapointer;
+		memcpy(&pinframetype, datapointer, sizeof(dspriteframetype_t));
 		datapointer += sizeof(dspriteframetype_t);
 
-		if (LittleLong (pinframetype->type) == SPR_SINGLE)
+		if (LittleLong (pinframetype.type) == SPR_SINGLE)
 		{
 			groupframes = 1;
 			interval = 0.1f;
 		}
 		else
 		{
-			pingroup = (dspritegroup_t *)datapointer;
+			memcpy(&pingroup, datapointer, sizeof(dspritegroup_t));
 			datapointer += sizeof(dspritegroup_t);
 
-			groupframes = LittleLong(pingroup->numframes);
+			groupframes = LittleLong(pingroup.numframes);
 
-			pinintervals = (dspriteinterval_t *)datapointer;
+			memcpy(&pinintervals, datapointer, sizeof(dspriteinterval_t));
 			datapointer += sizeof(dspriteinterval_t) * groupframes;
 
-			interval = LittleFloat(pinintervals[0].interval);
+			interval = LittleFloat(pinintervals.interval);
 			if (interval < 0.01f)
 				Host_Error("Mod_Sprite_SharedSetup: invalid interval");
 		}
@@ -186,13 +187,13 @@ static void Mod_Sprite_SharedSetup(const unsigned char *datapointer, int version
 
 		for (j = 0;j < groupframes;j++)
 		{
-			pinframe = (dspriteframe_t *)datapointer;
+			memcpy(&pinframe, datapointer, sizeof(dspriteframe_t));
 			datapointer += sizeof(dspriteframe_t);
 
-			origin[0] = LittleLong (pinframe->origin[0]);
-			origin[1] = LittleLong (pinframe->origin[1]);
-			width = LittleLong (pinframe->width);
-			height = LittleLong (pinframe->height);
+			origin[0] = LittleLong (pinframe.origin[0]);
+			origin[1] = LittleLong (pinframe.origin[1]);
+			width = LittleLong (pinframe.width);
+			height = LittleLong (pinframe.height);
 
 			loadmodel->sprite.sprdata_frames[realframes].left = origin[0];
 			loadmodel->sprite.sprdata_frames[realframes].right = origin[0] + width;
@@ -274,11 +275,9 @@ void Mod_IDSP_Load(model_t *mod, void *buffer, void *bufferend)
 
 	loadmodel->type = mod_sprite;
 
-	loadmodel->DrawSky = NULL;
 	loadmodel->Draw = R_Model_Sprite_Draw;
 	loadmodel->DrawDepth = NULL;
 	loadmodel->DrawLight = NULL;
-	loadmodel->DrawAddWaterPlanes = NULL;
 
 	version = LittleLong(((dsprite_t *)buffer)->version);
 	if (version == SPRITE_VERSION || version == SPRITE32_VERSION)
@@ -389,11 +388,9 @@ void Mod_IDS2_Load(model_t *mod, void *buffer, void *bufferend)
 
 	loadmodel->type = mod_sprite;
 
-	loadmodel->DrawSky = NULL;
 	loadmodel->Draw = R_Model_Sprite_Draw;
 	loadmodel->DrawDepth = NULL;
 	loadmodel->DrawLight = NULL;
-	loadmodel->DrawAddWaterPlanes = NULL;
 
 	pinqsprite = (dsprite2_t *)buffer;