From 2752e9d500438f747a267df79d9bf78b07b0a69b Mon Sep 17 00:00:00 2001 From: terminx Date: Fri, 24 Apr 2009 03:29:28 +0000 Subject: [PATCH] git-svn-id: https://svn.eduke32.com/eduke32@1342 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/Makefile.deps | 2 +- polymer/eduke32/source/gamestructures.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/polymer/eduke32/Makefile.deps b/polymer/eduke32/Makefile.deps index ee6321e65..13de80fa7 100644 --- a/polymer/eduke32/Makefile.deps +++ b/polymer/eduke32/Makefile.deps @@ -7,7 +7,7 @@ $(OBJ)/anim.$o: $(SRC)/anim.c $(duke3d_h) $(SRC)/jmact/animlib.h $(OBJ)/gamedef.$o: $(SRC)/gamedef.c $(duke3d_h) $(gamedef_h) $(OBJ)/gameexec.$o: $(SRC)/gameexec.c $(SRC)/gamestructures.c $(duke3d_h) $(gamedef_h) $(OBJ)/gamestructures.$o: $(SRC)/gamestructures.c $(duke3d_h) $(gamedef_h) -$(OBJ)/gamevars.$o: $(SRC)/gamevars.c $(duke3d_h) $(gamedef_h) +$(OBJ)/gamevars.$o: $(SRC)/gamevars.c $(SRC)/gamestructures.c $(duke3d_h) $(gamedef_h) $(OBJ)/global.$o: $(SRC)/*.c $(SRC)/global.c $(duke3d_h) $(OBJ)/mdump.$o: $(SRC)/mdump.cpp $(SRC)/mdump.h $(OBJ)/menus.$o: $(SRC)/menus.c $(duke3d_h) $(SRC)/jmact/mouse.h diff --git a/polymer/eduke32/source/gamestructures.c b/polymer/eduke32/source/gamestructures.c index eea6101c4..4693fccda 100644 --- a/polymer/eduke32/source/gamestructures.c +++ b/polymer/eduke32/source/gamestructures.c @@ -4119,7 +4119,7 @@ static int32_t X_AccessSpriteX(int32_t iActor, int32_t lLabelID, int32_t lParm2) case ACTOR_XPANNING: return spriteext[iActor].xpanning; case ACTOR_YPANNING: return spriteext[iActor].ypanning; case ACTOR_HTFLAGS: return ActorExtra[iActor].flags; - case ACTOR_ALPHA: return (uint8_t)(ActorExtra[iActor].alpha*255.0f); + case ACTOR_ALPHA: return (uint8_t)(spriteext[iActor].alpha*255.0f); default: return -1; } }