Minor cleanup

macsrc/Burger.c

@@ -11,6 +11,17 @@
 #include <stdio.h>
 
 
+Word FontX;
+Word FontY;
+unsigned char *FontPtr; 
+unsigned char *FontWidths;
+Word FontHeight;
+Word FontFirst; 
+Word FontLast;
+Word FontLoaded; 
+Word FontInvisible;
+unsigned char FontOrMask[16];
+
 /**********************************
 
 	Sound sub-system
@@ -513,39 +524,6 @@ Byte CurrentPal[768];
 
 void SetAPalettePtr(unsigned char *PalPtr)
 {
-	CTabHandle ColorHandle;		/* Handle to the main palette */
-	Handle PalHand;			/* Handle to palette */
-	Word i;					/* Temp */
-	CSpecArray *Colors;		/* Pointer to color array */
-	GDHandle OldDevice;
-	
-	memcpy(CurrentPal,PalPtr,768);
-	ColorHandle = MainColorHandle;
-	HLock((Handle) ColorHandle);
-	Colors = &(*ColorHandle)->ctTable;
-	++Colors;		/* Go to color #0 */
-	i = 1;			/* Skip color #0 */
-	PalPtr+=3;
-	do {			/* Fill in all the color entries */
-		Colors[0]->rgb.red = (Word) (PalPtr[0]<<8) | PalPtr[0];
-		Colors[0]->rgb.green = (Word) (PalPtr[1]<<8) | PalPtr[1];
-		Colors[0]->rgb.blue = (Word) (PalPtr[2]<<8) | PalPtr[2];
-		if (!Colors[0]->rgb.blue) {
-			Colors[0]->rgb.blue = 0x0101;
-		}
-	    PalPtr+=3;
-	    ++Colors;
-	} while (++i<255);	/* All done? */
-	OldDevice = GetGDevice();
-	SetGDevice(gMainGDH);
-	SetEntries(0,255-1,(*ColorHandle)->ctTable);	/* Set the color entries */
-	PalHand = (Handle) (**(*GameGWorld).portPixMap).pmTable;
-	PtrToXHand(*ColorHandle,PalHand,8+(8*256));
-	PalHand = (Handle) (**(*GameWindow).portPixMap).pmTable;
-	PtrToXHand(*ColorHandle,PalHand,8+(8*256));
-	HUnlock((Handle)ColorHandle);	/* Release the main handle */
-	MakeITable(0,0,0);				/* Create the proper color table */
-	SetGDevice(OldDevice);
 }
 
 /**********************************

macsrc/WolfIO.c

@@ -210,8 +210,6 @@ void IO_DrawStatusBar(void)
 	
 **********************************/
 
-#ifndef __APPLEIIGS__		/* Done in assembly on the IIgs version */
-#ifndef __3DO__
 void IO_ClearViewBuffer(void)
 {
 	unsigned char *Screenad;
@@ -241,8 +239,6 @@ void IO_ClearViewBuffer(void)
 		Screenad+=VideoWidth;
 	} while (--Count);
 }
-#endif
-#endif
 
 /**********************************
 

macsrc/wolfdef.h

@@ -66,22 +66,12 @@ typedef unsigned short ufixed_t;	/* 8.8 unsigned fixed point number */
 #define	ANGLE90		0x4000		/* Use a 0x10000 angle range */
 #define	ANGLE180	0x8000		/* Use a 0x10000 angle range */
 
-#ifdef __MAC__
-#define	SCREENWIDTH	MacWidth		/* Size of the offscreen buffer */
-#define SCREENHEIGHT MacHeight	/* Height of the offscreen buffer */
-#define VIEWHEIGHT MacViewHeight		/* Height of the viewing area */
-Word ScaleX(Word x);		/* Scale factor for 320 mode points projected to SCREEN */
-Word ScaleY(Word y);
-extern Word MacWidth;
-extern Word MacHeight;
-extern Word MacViewHeight;
-#else
 #define	SCREENWIDTH	320		/* Size of the offscreen buffer */
 #define SCREENHEIGHT 200	/* Height of the offscreen buffer */
 #define VIEWHEIGHT 160		/* Height of the viewing area */
 #define ScaleX(x) x		/* Scale factor for 320 mode points projected to SCREEN */
 #define ScaleY(y) y
-#endif
+
 #define	CENTERY	(VIEWHEIGHT/2)	/* Center of the viewing area */
 #define	CENTERX	(SCREENWIDTH/2)	/* Center of the viewing area */
 
@@ -227,10 +217,8 @@ enum {BSPTOP,BSPBOTTOM,BSPLEFT,BSPRIGHT};	/* BSP quadrants */
 
 typedef struct {
 	unsigned short codeofs[WALLHEIGHT+1];		/* Entry to the code for sprites */
-#ifndef __APPLEIIGS__
 	Byte FixA1[WALLHEIGHT+1];		/* A1 adjust for the screen */
 	Byte Pad[1];			/* Long word align it... */
-#endif
 	Byte code[1];					/* Scaler code */
 } t_compscale;