From: havoc Date: Fri, 21 Oct 2005 05:23:37 +0000 (+0000) Subject: fix an int->enum conversion error with g++ on big endian systems X-Git-Tag: xonotic-v0.1.0preview~4537 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=8ba97159796cbbab3a88e2230f62adc8d422b5ce fix an int->enum conversion error with g++ on big endian systems git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5746 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/model_alias.c b/model_alias.c index f14739e0..16e0235d 100644 --- a/model_alias.c +++ b/model_alias.c @@ -499,7 +499,7 @@ void Mod_IDP0_Load(model_t *mod, void *buffer, void *bufferend) BOUNDI(loadmodel->meshlist[0]->num_triangles,0,65536); loadmodel->numframes = LittleLong(pinmodel->numframes); BOUNDI(loadmodel->numframes,0,65536); - loadmodel->synctype = LittleLong (pinmodel->synctype); + loadmodel->synctype = (synctype_t)LittleLong (pinmodel->synctype); BOUNDI(loadmodel->synctype,0,2); loadmodel->flags = LittleLong (pinmodel->flags); diff --git a/model_sprite.c b/model_sprite.c index 835623e0..b6c69c27 100644 --- a/model_sprite.c +++ b/model_sprite.c @@ -230,7 +230,7 @@ void Mod_IDSP_Load(model_t *mod, void *buffer, void *bufferend) loadmodel->numframes = LittleLong (pinqsprite->numframes); loadmodel->sprite.sprnum_type = LittleLong (pinqsprite->type); - loadmodel->synctype = LittleLong (pinqsprite->synctype); + loadmodel->synctype = (synctype_t)LittleLong (pinqsprite->synctype); Mod_Sprite_SharedSetup(datapointer, LittleLong (pinqsprite->version), palette_complete, palette_alpha); } @@ -246,7 +246,7 @@ void Mod_IDSP_Load(model_t *mod, void *buffer, void *bufferend) loadmodel->numframes = LittleLong (pinhlsprite->numframes); loadmodel->sprite.sprnum_type = LittleLong (pinhlsprite->type); - loadmodel->synctype = LittleLong (pinhlsprite->synctype); + loadmodel->synctype = (synctype_t)LittleLong (pinhlsprite->synctype); rendermode = pinhlsprite->rendermode; in = datapointer;