diff --git a/polymer/eduke32/Makefile.deps b/polymer/eduke32/Makefile.deps index c84994a4b..299f1889a 100644 --- a/polymer/eduke32/Makefile.deps +++ b/polymer/eduke32/Makefile.deps @@ -29,7 +29,7 @@ duke3d_h=\ gamedef_h=$(SRC)/gamedef.h $(SRC)/gameexec.h $(SRC)/gamevars.h -$(OBJ)/game.$o: $(SRC)/game.c $(SRC)/jmact/scriplib.h $(duke3d_h) $(INC)/osdfuncs.h $(INC)/osdcmds.h $(INC)/grpscan.h $(INC)/demo.h +$(OBJ)/game.$o: $(SRC)/game.c $(SRC)/jmact/scriplib.h $(duke3d_h) $(INC)/osdfuncs.h $(INC)/osdcmds.h $(INC)/grpscan.h $(INC)/demo.h $(EINC)/hightile.h $(OBJ)/actors.$o: $(SRC)/actors.c $(duke3d_h) $(OBJ)/anim.$o: $(SRC)/anim.c $(duke3d_h) $(SRC)/jmact/animlib.h $(SRC)/animvpx.h $(OBJ)/demo.$o: $(SRC)/demo.c $(duke3d_h) diff --git a/polymer/eduke32/build/include/build.h b/polymer/eduke32/build/include/build.h index 106a3f0ad..e5e6d294b 100644 --- a/polymer/eduke32/build/include/build.h +++ b/polymer/eduke32/build/include/build.h @@ -320,7 +320,7 @@ EXTERN int16_t headsectbunch[2][YAX_MAXBUNCHES], nextsectbunch[2][MAXSECTORS]; EXTERN int16_t numsectors, numwalls; EXTERN char display_mirror; -EXTERN /*volatile*/ int32_t totalclock; +EXTERN int32_t totalclock; EXTERN int32_t numframes, randomseed; EXTERN int16_t sintable[2048]; EXTERN uint8_t palette[768]; @@ -496,7 +496,7 @@ TILE VARIABLES: NUMTILES - the number of tiles found TILES.DAT. TILESIZX[MAXTILES] - simply the x-dimension of the tile number. TILESIZY[MAXTILES] - simply the y-dimension of the tile number. - WALOFF[MAXTILES] - the actual 32-bit offset pointing to the top-left + WALOFF[MAXTILES] - the actual address pointing to the top-left corner of the tile. PICANM[MAXTILES] - flags for animating the tile. diff --git a/polymer/eduke32/build/src/engine.c b/polymer/eduke32/build/src/engine.c index de48991a7..b722bd7c4 100644 --- a/polymer/eduke32/build/src/engine.c +++ b/polymer/eduke32/build/src/engine.c @@ -4595,6 +4595,7 @@ static void drawalls(int32_t bunch) } } + //DRAW WALLS SECTION! for (z=bunchfirst[bunch]; z>=0; z=p2[z]) { diff --git a/polymer/eduke32/source/savegame.h b/polymer/eduke32/source/savegame.h index 5ff2d2987..7b8673705 100644 --- a/polymer/eduke32/source/savegame.h +++ b/polymer/eduke32/source/savegame.h @@ -27,17 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define SV_MINOR_VER 2 #pragma pack(push,1) -# if 0 -struct savehead_ -{ - char name[21]; - int32_t byteversion; - int32_t numplr,volnum,levnum,plrskl; - char boardfn[BMAX_PATH]; -}; -# endif - - typedef struct { char headerstr[11]; diff --git a/polymer/eduke32/source/sounds.c b/polymer/eduke32/source/sounds.c index d80d268fc..fec31e93a 100644 --- a/polymer/eduke32/source/sounds.c +++ b/polymer/eduke32/source/sounds.c @@ -295,7 +295,8 @@ void S_Cleanup(void) return; } - Bmemcpy(ldq, (void *)dq, sizeof(int32_t) *(ldnum = dnum)); + ldnum = dnum; + Bmemcpy(ldq, (void *)dq, ldnum*sizeof(int32_t)); dnum = 0; mutex_unlock(&s_mutex); @@ -372,7 +373,7 @@ int32_t S_LoadSound(uint32_t num) g_soundlocks[num] = 200; allocache((intptr_t *)&g_sounds[num].ptr, l, (char *)&g_soundlocks[num]); - l = kread(fp, g_sounds[num].ptr , l); + l = kread(fp, g_sounds[num].ptr, l); kclose(fp); return l;