x86_64 fixes.

src/id_ca.c

@@ -33,8 +33,8 @@ char extension[5];
 #define afilename "audiot."
 #define pfilename "vswap."
 
-static long *grstarts;	/* array of offsets in vgagraph */
-static long *audiostarts; /* array of offsets in audiot */
+static int32_t *grstarts;	/* array of offsets in vgagraph */
+static int32_t *audiostarts; /* array of offsets in audiot */
 
 static huffnode grhuffman[256];
 

src/sd_comm.h

@@ -34,7 +34,7 @@ extern word SD_SoundPlaying();
 
 extern void SD_SetDigiDevice(SDSMode);
 
-void PlaySoundLocGlobal(word s, int id, fixed gx, fixed gy);
+void PlaySoundLocGlobal(word s, intptr_t id, fixed gx, fixed gy);
 void UpdateSoundLoc(fixed x, fixed y, int angle);
 
 

src/sd_null.c

@@ -129,7 +129,7 @@ void SD_StartMusic(int music)
 	SD_MusicOff();
 }
 
-void PlaySoundLocGlobal(word s, int id, fixed gx,fixed gy)
+void PlaySoundLocGlobal(word s, intptr_t id, fixed gx,fixed gy)
 {
 	SD_PlaySound(s);
 }

src/sd_oss.c

@@ -552,7 +552,7 @@ static void SetSoundLoc(fixed gx, fixed gy)
 ==========================
 */
 
-void PlaySoundLocGlobal(word s, int id, fixed gx, fixed gy)
+void PlaySoundLocGlobal(word s, intptr_t id, fixed gx, fixed gy)
 {
 	SetSoundLoc(gx, gy);
 	

src/wl_def.h

@@ -741,8 +741,8 @@ void DrawPlayBorder();
 void DrawPlayBorderSides();
 void DrawStatusBar();
 
-#define	PlaySoundLocTile(s,tx,ty)	PlaySoundLocGlobal(s,(int)((tx<<6)|(ty)), (tx << TILESHIFT) + (1 << (TILESHIFT - 1)), (ty << TILESHIFT) + (1L << (TILESHIFT - 1)))
-#define	PlaySoundLocActor(s,ob)		PlaySoundLocGlobal(s,(int)ob,(ob)->x,(ob)->y)
+#define	PlaySoundLocTile(s,tx,ty)	PlaySoundLocGlobal(s,(intptr_t)((tx<<6)|(ty)), (tx << TILESHIFT) + (1 << (TILESHIFT - 1)), (ty << TILESHIFT) + (1L << (TILESHIFT - 1)))
+#define	PlaySoundLocActor(s,ob)		PlaySoundLocGlobal(s,(intptr_t)ob,(ob)->x,(ob)->y)
 
 /*
 =============================================================================