* Moved sound/music items to Sounds.c

* Initial software gtk+ version
* Stub for glx version
* Added GPL Header to all source files
* Cleaned up TODO

macsrc/Burger.c

-/**********************************
+/*
+Copyright (C) 1992-1994 Id Software, Inc.
 
-	Burger library for the Macintosh.
-	Use Think.c or Code Warrior to compile.
-	Use SMART linking to link in just what you need
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
 
-**********************************/
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
 
 #include "wolfdef.h"		/* Get the prototypes */
 #include <string.h>
@@ -29,70 +40,6 @@ Word SystemState=3;
 
 #define BRGR 0x42524752
 
-/**********************************
-
-	Sound sub-system
-
-**********************************/
-
-/**********************************
-
-	Shut down the sound
-
-**********************************/
-
-void SoundOff(void)
-{
-	PlaySound(0);
-}
-
-/**********************************
-
-	Play a sound resource
-
-**********************************/
-
-void PlaySound(Word SoundNum)
-{
-	if (SoundNum) {
-		SoundNum+=127;
-		if (SoundNum&0x8000) {		/* Mono sound */
-			EndSound(SoundNum&0x7fff);
-		}
-		BeginSound(SoundNum&0x7fff,11127<<17L);
-	} else {
-		EndAllSound();
-	}
-}
-
-/**********************************
-
-	Stop playing a sound resource
-
-**********************************/
-
-void StopSound(Word SoundNum)
-{
-	EndSound(SoundNum+127);
-}
-
-static Word LastSong = -1;
-
-void PlaySong(Word Song)
-{
-	if (Song) {
-		if (SystemState&MusicActive) {
-			if (Song!=LastSong) {
-				BeginSongLooped(Song);	
-				LastSong = Song;
-			}
-			return;
-		}
-	} 
-	EndSong();
-	LastSong = -1;
-}
-
 /**********************************
 
 	Graphics subsystem
@@ -200,143 +147,6 @@ void DrawXMShape(Word x,Word y,void *ShapePtr)
 	DrawMShape(x,y,&ShapePtr2[2]);
 }
 
-/**********************************
-
-	Erase a masked shape
-
-**********************************/
-
-void EraseMBShape(Word x,Word y, void *ShapePtr, void *BackPtr)
-{
-	unsigned char *ScreenPtr;
-	unsigned char *Screenad;
-	unsigned char *Backad;
-	unsigned char *BackPtr2;
-	unsigned char *MaskPtr;
-	Word Width;
-	Word Height;
-	Word Width2;
-
-	MaskPtr = ShapePtr;		/* Get the pointer to the mask */
-	Width = sMSB(MaskPtr[1]);		/* Get the width of the shape */
-	Height = sMSB(MaskPtr[3]);	/* Get the height of the shape */
-	MaskPtr = &MaskPtr[(Width*Height)+4];	/* Index to the mask */
-							/* Point to the screen */
-	ScreenPtr = (unsigned char *) &VideoPointer[YTable[y]+x];
-	BackPtr2 = BackPtr;
-	BackPtr2 = &BackPtr2[(y*SCREENWIDTH)+x];	/* Index to the erase buffer */
-	do {
-		Width2 = Width;		/* Init width count */
-		Screenad = ScreenPtr;
-		Backad = BackPtr2;
-		do {
-			if (!*MaskPtr++) {
-				*Screenad = *Backad;
-			}
-			++Screenad;
-			++Backad;
-		} while (--Width2);
-		ScreenPtr +=VideoWidth;
-		BackPtr2 += SCREENWIDTH;
-	} while (--Height);
-}
-
-/**********************************
-
-	Test for a shape collision
-
-**********************************/
-
-Word TestMShape(Word x,Word y,void *ShapePtr)
-{
-	unsigned char *ScreenPtr;
-	unsigned char *Screenad;
-	unsigned char *MaskPtr;
-	unsigned char *ShapePtr2;
-	Word Width;
-	Word Height;
-	Word Width2;
-
-	ShapePtr2 = ShapePtr;
-	Width = sMSB(ShapePtr2[0]);
-	Height = sMSB(ShapePtr2[1]);
-	ShapePtr2 +=2;
-	MaskPtr = &ShapePtr2[Width*Height];
-	ScreenPtr = (unsigned char *) &VideoPointer[YTable[y]+x];
-	do {
-		Width2 = Width;
-		Screenad = ScreenPtr;
-		do {
-			if (!*MaskPtr++) {
-				if (*Screenad != *ShapePtr2) {
-					return 1;
-				}
-			}
-			++ShapePtr2;
-			++Screenad;
-		} while (--Width2);
-		ScreenPtr +=VideoWidth;
-	} while (--Height);
-	return 0;
-}
-
-/**********************************
-
-	Test for a masked shape collision
-
-**********************************/
-
-Word TestMBShape(Word x,Word y,void *ShapePtr,void *BackPtr)
-{
-	unsigned char *ScreenPtr;
-	unsigned char *Screenad;
-	unsigned char *Backad;
-	unsigned char *BackPtr2;
-	unsigned char *MaskPtr;
-	Word Width;
-	Word Height;
-	Word Width2;
-
-	MaskPtr = ShapePtr;		/* Get the pointer to the mask */
-	Width = sMSB(MaskPtr[0]);		/* Get the width of the shape */
-	Height = sMSB(MaskPtr[1]);	/* Get the height of the shape */
-	MaskPtr = &MaskPtr[(Width*Height)+2];	/* Index to the mask */
-							/* Point to the screen */
-	ScreenPtr = (unsigned char *) &VideoPointer[YTable[y]+x];
-	BackPtr2 = BackPtr;
-	BackPtr2 = &BackPtr2[(y*SCREENWIDTH)+x];	/* Index to the erase buffer */
-	do {
-		Width2 = Width;		/* Init width count */
-		Screenad = ScreenPtr;
-		Backad = BackPtr2;
-		do {
-			if (!*MaskPtr++) {
-				if (*Screenad != *Backad) {
-					return 1;
-				}
-			}
-			++Screenad;
-			++Backad;
-		} while (--Width2);
-		ScreenPtr +=VideoWidth;
-		BackPtr2 += SCREENWIDTH;
-	} while (--Height);
-	return 0;
-}
-
-/**********************************
-
-	Show a full screen picture
-
-**********************************/
-
-void ShowPic(Word PicNum)
-{
-	DrawShape(0,0,LoadAResource(PicNum));	/* Load the resource and show it */
-	ReleaseAResource(PicNum);			/* Release it */
-	BlastScreen();
-}
-
 /**********************************
 
 	Clear the screen to a specific color
@@ -359,152 +169,6 @@ void ClearTheScreen(Word Color)
 	} while (--y);
 }
 
-/**********************************
-
-	Draw a text string
-
-**********************************/
-
-void DrawAString(char *TextPtr)
-{
-	while (TextPtr[0]) {		/* At the end of the string? */
-		DrawAChar(TextPtr[0]);	/* Draw the char */
-		++TextPtr;			/* Continue */
-	}
-}
-
-/**********************************
-
-	Set the X/Y to the font system
-
-**********************************/
-
-void SetFontXY (Word x,Word y)
-{
-	FontX = x;
-	FontY = y;
-}
-
-/**********************************
-
-	Make color zero invisible
-
-**********************************/
-
-void FontUseMask(void)
-{
-	FontInvisible = 0;
-	FontSetColor(0,0);
-}
-
-/**********************************
-
-	Make color zero a valid color
-
-**********************************/
-
-void FontUseZero(void)
-{
-	FontInvisible = -1;
-	FontSetColor(0,BLACK);
-}
-
-/**********************************
-
-	Set the color entry for the font
-
-**********************************/
-
-void FontSetColor(Word Num,Word Color)
-{
-	FontOrMask[Num] = Color;
-}
-
-/**********************************
-
-	Install a font into memory
-
-**********************************/
-
-typedef struct FontStruct {
-	unsigned short FHeight;
-	unsigned short FLast;
-	unsigned short FFirst;
-	unsigned char FData;
-} FontStruct;
-
-void InstallAFont(Word FontNum)
-{
-	FontStruct *FPtr;
-
-	if (FontLoaded) {
-		if (FontLoaded == FontNum) {
-			return;
-		}
-		ReleaseAResource(FontLoaded);
-	}
-	FontLoaded = FontNum;
-	FPtr = LoadAResource(FontNum);
-	FontHeight = SwapUShort(FPtr->FHeight);
-	FontLast = SwapUShort(FPtr->FLast);
-	FontFirst = SwapUShort(FPtr->FFirst);
-	FontWidths = &FPtr->FData;
-	FontPtr = &FontWidths[FontLast];
-}
-
-/**********************************
-
-	Draw a char to the screen
-
-**********************************/
-
-void DrawAChar(Word Letter)
-{
-	Word XWidth;
-	Word Offset;
-	Word Width;
-	Word Height;
-	int Width2;
-	unsigned char *Font;
-	unsigned char *ScreenPtr;
-	unsigned char *Screenad;
-	unsigned char *FontOr;
-	Word Temp;
-	Word Temp2;
-
-	Letter -= FontFirst;		/* Offset from the first entry */
-	if (Letter>=FontLast) {		/* In the font? */
-		return;					/* Exit then! */
-	}
-	XWidth = FontWidths[Letter];	/* Get the pixel width of the entry */
-	Width = (XWidth-1)/2;
-	Font = &FontPtr[Letter*2];
-	Offset = (Font[1]*256) + Font[0];
-	Font = &FontPtr[Offset];
-	ScreenPtr = (unsigned char *) &VideoPointer[YTable[FontY]+FontX];
-	FontX+=XWidth;
-	Height = FontHeight;
-	FontOr = &FontOrMask[0];
-
-	do {
-		Screenad = ScreenPtr;
-		Width2 = Width;
-		do {
-			Temp = *Font++;
-			Temp2 = Temp>>4;
-			if (Temp2 != FontInvisible) {
-				Screenad[0] = FontOr[Temp2];
-			}
-			Temp &= 0x0f;
-			if (Temp != FontInvisible) {
-				Screenad[1] = FontOr[Temp];
-			}
-			Screenad+=2;		/* Next address */
-		} while(--Width2>=0);
-		ScreenPtr += VideoWidth;
-	} while (--Height);
-}
-
 /**********************************
 
 	Palette Manager
@@ -672,11 +336,52 @@ void DLZSS(Byte *Dest,Byte *Src,LongWord Length)
 			++Dest;
 			--Length;
 		} else {
-			/* TODO - sounds have this line the other way around */
 			RunCount = (Word) Src[0] | ((Word) Src[1]<<8);
 			Fun = 0x1000-(RunCount&0xfff);
 			BackPtr = Dest-Fun;
 			RunCount = ((RunCount>>12) & 0x0f) + 3;
+			if (Length >= RunCount) {
+				Length -= RunCount;
+			} else {
+				RunCount = Length;
+				Length = 0;
+			}
+			while (RunCount--) {
+				*Dest++ = *BackPtr++;
+			}
+			Src+=2;
+		}
+		BitBucket>>=1;
+		if (BitBucket==1) {
+			BitBucket = (Word)Src[0] | 0x100;
+			++Src;
+		}
+	} while (Length);
+}
+
+void DLZSSSound(Byte *Dest,Byte *Src,LongWord Length)
+{
+	Word BitBucket;
+	Word RunCount;
+	Word Fun;
+	Byte *BackPtr;
+	
+	if (!Length) {
+		return;
+	}
+	BitBucket = (Word) Src[0] | 0x100;
+	++Src;
+	do {
+		if (BitBucket&1) {
+			Dest[0] = Src[0];
+			++Src;
+			++Dest;
+			--Length;
+		} else {
+			RunCount = (Word) Src[1] | ((Word) Src[0]<<8);
+			Fun = 0x1000-(RunCount&0xfff);
+			BackPtr = Dest-Fun;
+			RunCount = ((RunCount>>12) & 0x0f) + 3;
 			if (Length >= RunCount) {
 				Length -= RunCount;
 			} else {
@@ -703,15 +408,8 @@ void DLZSS(Byte *Dest,Byte *Src,LongWord Length)
 
 **********************************/
 
-/* TODO - cheap way to find MSB problems */
-#include <sys/types.h>
-#include <signal.h>
-              
 void *AllocSomeMem(LongWord Size)
 {
-	if (Size > 5000000)
-		kill(getpid(), SIGSEGV);
-		
 	return (void *)malloc(Size);
 }
 

macsrc/Data.c

+/*
+Copyright (C) 1992-1994 Id Software, Inc.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #include "wolfdef.h"
 
 /**********************************

macsrc/Doors.c

+/*
+Copyright (C) 1992-1994 Id Software, Inc.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #include "wolfdef.h"
 #include <string.h>
 

macsrc/EnMove.c

+/*
+Copyright (C) 1992-1994 Id Software, Inc.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 /* enmove.c*/
 #include "wolfdef.h"
 

macsrc/EnThink.c

+/*
+Copyright (C) 1992-1994 Id Software, Inc.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #include "wolfdef.h"
 
 /**********************************

macsrc/InterMis.c

+/*
+Copyright (C) 1992-1994 Id Software, Inc.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #include "wolfdef.h"
 #include <string.h>
 #include <stdlib.h>

macsrc/Intro.c

+/*
+Copyright (C) 1992-1994 Id Software, Inc.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #include "wolfdef.h"
 #include <ctype.h>
 #include <stdlib.h>

macsrc/Level.c

+/*
+Copyright (C) 1992-1994 Id Software, Inc.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #include "wolfdef.h"
 #include <string.h>
 

macsrc/Main.c

+/*
+Copyright (C) 1992-1994 Id Software, Inc.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #include "wolfdef.h"
 #include <string.h>
 #include <stdlib.h>

macsrc/Makefile

@@ -3,18 +3,19 @@ CC = gcc
 #CFLAGS = -Wall -O6 -fomit-frame-pointer -ffast-math -funroll-loops -mpentiumpro -mcpu=pentiumpro -march=pentiumpro 
 #CFLAGS = -g -Wall -O6 -fomit-frame-pointer -ffast-math -funroll-loops -mpentiumpro -mcpu=pentiumpro -march=pentiumpro 
 #CFLAGS = -g -Wall
-#CFLAGS = -g -DNOVGA
+#CFLAGS = -g -Wall -ansi -pedantic
 CFLAGS = -g
 #CFLAGS = -Os -g
 #CFLAGS = -g -Wall -I/home/relnev/cvs/oal/include
 
 OBJS =  Data.o Doors.o EnMove.o EnThink.o Intro.o Level.o \
-	Missiles.o Music.o PlMove.o PlStuff.o PlThink.o PushWall.o \
+	Missiles.o Sounds.o PlMove.o PlStuff.o PlThink.o PushWall.o \
 	RefBsp.o RefSprite.o Refresh.o Refresh2.o Sight.o Main.o \
 	StateDef.o WolfMain.o WolfIO.o InterMis.o Burger.o stub.o res.o
 SOBJS = $(OBJS) vi_svga.o
 XOBJS = $(OBJS) vi_xlib.o
-GOBJS = $(OBJS)
+GOBJS = $(OBJS) vi_gtk.o
+GLOBJS = $(OBJS) vi_glx.o
 
 LFLAGS = -lm 
 #LFLAGS = -lm -L/home/relnev/cvs/oal/linux/src -lopenal -lpthread -ldl
@@ -24,22 +25,26 @@ LFLAGS = -lm
 SLFLAGS = $(LFLAGS) -lvga
 #XLFLAGS = $(LFLAGS) -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lXxf86dga
 XLFLAGS = $(LFLAGS) -L/usr/X11R6/lib -lX11
-GLFLAGS = $(LFLAGS) -L/usr/X11R6/lib -lX11 -lXext -lGL
+GLFLAGS = $(LFLAGS) `gtk-config --libs` # -L/usr/X11R6/lib -lX11 -lXi -lXext -lgdk -lgtk 
+GLLFLAGS = $(LFLAGS) -L/usr/X11R6/lib -lX11 -lXext -lGL
 
 NASM = nasm
 
 .SUFFIXES: .asm
 
-#all:	swolf3d xwolf3d gwolf3d
-all:	swolf3d xwolf3d
+all:	swolf3d xwolf3d gwolf3d glwolf3d
 
 $(SOBJS): Sounds.h  Sprites.h  States.h  Wolf.h  burger.h  wolfdef.h
 $(XOBJS): Sounds.h  Sprites.h  States.h  Wolf.h  burger.h  wolfdef.h
 $(GOBJS): Sounds.h  Sprites.h  States.h  Wolf.h  burger.h  wolfdef.h
+$(GLOBJS): Sounds.h  Sprites.h  States.h  Wolf.h  burger.h  wolfdef.h
 
 .asm.o:
 	$(NASM) -f elf -o $@ $<
 
+vi_gtk.o: vi_gtk.c
+	gcc -c vi_gtk.c $(CFLAGS) `gtk-config --cflags`
+
 swolf3d: $(SOBJS)
 	gcc -o swolf3d $(SOBJS) $(SLFLAGS) 
 
@@ -49,11 +54,14 @@ xwolf3d: $(XOBJS)
 gwolf3d: $(GOBJS)
 	gcc -o gwolf3d $(GOBJS) $(GLFLAGS)
 
+glwolf3d: $(GLOBJS)
+	gcc -o glwolf3d $(GLOBJS) $(GLLFLAGS)
+
 clean:
-	rm -rf swolf3d xwolf3d gwolf3d *.o
+	rm -rf swolf3d xwolf3d gwolf3d glwolf3d *.o
 
 distclean: clean
-	rm -rf *~ DEADJOE
+	rm -rf core *~ DEADJOE
 
 forced: distclean all
 	rm -rf *.o

macsrc/Missiles.c

+/*
+Copyright (C) 1992-1994 Id Software, Inc.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #include "wolfdef.h"
 
 /**********************************

macsrc/Music.c

-#include "wolfdef.h"
-
-/**********************************
-
-	Stop the current song from playing
-
-**********************************/
-
-void StopSong(void)
-{
-	PlaySong(0);
-}
-
-/**********************************
-
-	Play a new song
-	
-**********************************/
-
-void StartSong(Word songnum)
-{
-	PlaySong(songnum);			/* Stop the previous song (If any) */
-}

macsrc/PlMove.c

+/*
+Copyright (C) 1992-1994 Id Software, Inc.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #include "wolfdef.h"
 
 /**********************************

macsrc/PlStuff.c

+/*
+Copyright (C) 1992-1994 Id Software, Inc.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #include "wolfdef.h"
 
 /**********************************

macsrc/PlThink.c

+/*
+Copyright (C) 1992-1994 Id Software, Inc.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #include "wolfdef.h"
 
 #define SHOTRATE 6

macsrc/PushWall.c

+/*
+Copyright (C) 1992-1994 Id Software, Inc.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #include "wolfdef.h"
 
 #define PWALLSPEED 4		/* Micropixels per 60th of a second */

macsrc/RefBsp.c

+/*
+Copyright (C) 1992-1994 Id Software, Inc.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #include "wolfdef.h"
 
 static Word checkcoord[11][4] = {	/* Indexs to the bspcoord table */

macsrc/RefSprite.c

+/*
+Copyright (C) 1992-1994 Id Software, Inc.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #include "wolfdef.h"
 #include <string.h>
 

macsrc/Refresh.c

+/*
+Copyright (C) 1992-1994 Id Software, Inc.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #include "wolfdef.h"
 #include <string.h>
 #include <math.h>

macsrc/Refresh2.c

+/*
+Copyright (C) 1992-1994 Id Software, Inc.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #include "wolfdef.h"
 #include <stdlib.h>
 

macsrc/Sight.c

+/*
+Copyright (C) 1992-1994 Id Software, Inc.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #include "wolfdef.h"
 
 /**********************************

macsrc/Sounds.c

+/*
+Copyright (C) 1992-1994 Id Software, Inc.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include "wolfdef.h"
+
+/**********************************
+
+	Stop the current song from playing
+
+**********************************/
+
+void StopSong(void)
+{
+	PlaySong(0);
+}
+
+/**********************************
+
+	Play a new song
+	
+**********************************/
+
+void StartSong(Word songnum)
+{
+	PlaySong(songnum);		/* Stop the previous song (If any) */
+}
+
+void FreeSong()
+{
+}
+
+void BeginSongLooped(Song)
+{
+}
+
+void EndSong()
+{
+}
+
+void BeginSound(short int theID, long theRate)
+{
+}
+
+void EndSound(short int theID)
+{
+}
+
+void EndAllSound(void)
+{
+}
+
+
+/**********************************
+
+	Sound sub-system
+
+**********************************/
+
+/**********************************
+
+	Shut down the sound
+
+**********************************/
+
+void SoundOff(void)
+{
+	PlaySound(0);
+}
+
+/**********************************
+
+	Play a sound resource
+
+**********************************/
+
+void PlaySound(Word SoundNum)
+{
+	if (SoundNum) {
+		SoundNum+=127;
+		if (SoundNum&0x8000) {		/* Mono sound */
+			EndSound(SoundNum&0x7fff);
+		}
+		BeginSound(SoundNum&0x7fff,11127<<17L);
+	} else {
+		EndAllSound();
+	}
+}
+
+/**********************************
+
+	Stop playing a sound resource
+
+**********************************/
+
+void StopSound(Word SoundNum)
+{
+	EndSound(SoundNum+127);
+}
+
+static Word LastSong = -1;
+
+void PlaySong(Word Song)
+{
+	if (Song) {
+		if (SystemState&MusicActive) {
+			if (Song!=LastSong) {
+				BeginSongLooped(Song);	
+				LastSong = Song;
+			}
+			return;
+		}
+	} 
+	EndSong();
+	LastSong = -1;
+}

macsrc/Sounds.h

+/*
+Copyright (C) 1992-1994 Id Software, Inc.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 /* generated by sndlink.exe */
 
 enum {

macsrc/Sprites.h

+/*
+Copyright (C) 1992-1994 Id Software, Inc.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 /* generated by sprgrab */
 
 enum {

macsrc/StateDef.c

+/*
+Copyright (C) 1992-1994 Id Software, Inc.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #include "wolfdef.h"
 
 state_t states[NUMSTATES] = {

macsrc/States.h

+/*
+Copyright (C) 1992-1994 Id Software, Inc.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 /* generated by statescr*/
 
 typedef enum {

macsrc/TODO

-* remove NOVGA when other ports are added. NOVGA is a hack for using
-ElectricFence (since svgalib doesn't work too well with it)
+TODO:
+* Correct copyrights
+- vi_ are mostly mine, with portions based on the original code
+- move stuff out of stub.c to more proper places
+* Pause key
+* SVGAlib Hack:
+- Require 320x200x256
+- If user requests a gamemode which SVGAlib says it does not support, fail
+- If SVGAlib does not support 512x384x256, allow the user to pan around 
+  with the keypad arrow keys.
+
+BUGS:
 * drawing seems like its imprecise, stationary sprites move back and forth,
 and walls 'swim' when you move around, or sprites pop into different sizes
 when are far enough and get closer/farther away
-* Word is 16bit damnit, wonder why in the MAC version its 32bits?!
-* How about adding red/white shifts (from PC wolf3d)? 
 * it crashes somewhere, no reason why...
 #0  0x804fa55 in DrawXMShape (x=128, y=96, ShapePtr=0x8c8c8c8c) at
 Burger.c:198
 But what is trashing GameShapes's memory?
 I don't think GameShapes itself is being ran over, just the memory allocated
 to it...
-* Pause key
-* menu type stuff in svgalib version (would use the Fx keys to save game
-etc, text menus for options?)
-* when saving/loading games, run them through htons/etc.
 * added an 'and' hack to lines 33 and 50 in RefBsp.c  Not sure if this causes
 any problems (value was overflowing finetangent...)
 
-* forget about major svgalib support?
+MISC:
+
+IDEAS:
+* Menu Keys
+- ESC: Quit
+- F1:  Help
+- XXX: Load Game
+- XXX: Load Previously Loaded Game
+- XXX: Save Game
+- XXX: Save Game to Previously used File
+- XXX: Options
+
+* How about adding red/white shifts (from PC wolf3d)? So screen changes
+color when you are hit or pick up items.
+
+* when saving/loading games, run them through htons/etc.

macsrc/Wolf.h

-#define	MyMenuBar	128				/* application's menu bar */
+/*
+Copyright (C) 1992-1994 Id Software, Inc.
 
-#define	rAboutAlert	128				/* about alert */
-#define	rUserAlert	129				/* error user alert */
-#define AskSizeWin	130				/* Ask for screen size window */ 
-#define NewGameWin	131				/* Choose difficulty */
-#define Not607Win	132				/* Not system 6.0.7 or later */
-#define NotColorWin	133				/* No color */
-#define Not32QDWin	134				/* Not Quickdraw 32 */
-#define SlowWarnWin	135				/* Your machine is slow */
-#define SpeedTipsWin 136			/* Hints on speed */
-#define ShareWareWin 137			/* Pay us $$$ */
-#define GoSlowWin 138				/* You are not in 8 bit color mode */
-#define EndGameWin 139				/* You won the shareware version */
-#define LowMemWin 140				/* You are dangerously low on memory */
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
 
-/* kSysEnvironsVersion is passed to SysEnvirons to tell it which version of the
-   SysEnvRec we understand. */
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
 
-#define	kSysEnvironsVersion		1
+See the GNU General Public License for more details.
 
-/* kOSEvent is the event number of the suspend/resume and mouse-moved events sent
-   by MultiFinder. Once we determine that an event is an osEvent, we look at the
-   high byte of the message sent to determine which kind it is. To differentiate
-   suspend and resume events we check the resumeMask bit. */
-
-#define	kOSEvent				app4Evt	/* event used by MultiFinder */
-#define	kSuspendResumeMessage	1		/* high byte of suspend/resume event message */
-#define	kResumeMask				1		/* bit of message field for resume vs. suspend */
-#define	kMouseMovedMessage		0xFA	/* high byte of mouse-moved event message */
-#define	kNoEvents				0		/* no events mask */
-
-/* The following constants are used to identify menus and their items. The menu IDs
-   have an "m" prefix and the item numbers within each menu have an "i" prefix. */
-
-#define	mApple					128		/* Apple menu */
-#define	iAbout					1
-#define iSpeedHint				2
-#define iShareWare				3
-
-#define	mFile	129		/* File menu */
-#define	iNew		1
-#define	iOpen	2
-#define	iClose	4
-#define	iSave	5
-#define	iSaveAs	6
-#define	iQuit	8
-
-#define	mEdit	130		/* Edit menu */
-#define	iUndo	1
-#define	iCut		3
-#define	iCopy	4
-#define	iPaste	5
-#define	iClear	6
-
-#define	mOptions	131		/* Game menu */
-#define	iSound	1
-#define	iMusic	2
-#define iScreenSize 3
-#define iGovenor 4
-#define iMouseControl 5
-#define iUseQuickDraw 6
-
-/*	1.01 - kTopLeft - This is for positioning the Disk Initialization dialogs. */
-
-#define kDITop	0x0050
-#define kDILeft	0x0070
-/* kExtremeNeg and kExtremePos are used to set up wide open rectangles and regions. */
-
-#define kExtremeNeg				-32768
-#define kExtremePos				32767 - 1 /* required to address an old region bug */
-
-/* these #defines are used to set enable/disable flags of a menu */
-
-#define AllItems	0b1111111111111111111111111111111	/* 31 flags */
-#define NoItems	0b0000000000000000000000000000000
-#define MenuItem1	0b0000000000000000000000000000001
-#define MenuItem2	0b0000000000000000000000000000010
-#define MenuItem3	0b0000000000000000000000000000100
-#define MenuItem4	0b0000000000000000000000000001000
-#define MenuItem5	0b0000000000000000000000000010000
-#define MenuItem6	0b0000000000000000000000000100000
-#define MenuItem7	0b0000000000000000000000001000000
-#define MenuItem8	0b0000000000000000000000010000000
-#define MenuItem9	0b0000000000000000000000100000000
-#define MenuItem10	0b0000000000000000000001000000000
-#define MenuItem11	0b0000000000000000000010000000000
-#define MenuItem12	0b0000000000000000000100000000000
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
 
 /* Burger resources */
 

macsrc/WolfIO.c

+/*
+Copyright (C) 1992-1994 Id Software, Inc.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #include "wolfdef.h"
 #include <string.h>
 

macsrc/WolfMain.c

+/*
+Copyright (C) 1992-1994 Id Software, Inc.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #include "wolfdef.h"
 #include <string.h>
 

macsrc/burger.h

+/*
+Copyright (C) 1992-1994 Id Software, Inc.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#ifndef __BURGER_H__
+#define __BURGER_H__
+
 typedef unsigned int Word;
 typedef unsigned long LongWord;
 typedef unsigned char Byte;
@@ -24,23 +46,14 @@ typedef unsigned short int SWord;
 #define SfxActive 1
 #define MusicActive 2
 
-#define VideoSize 64000
-#define SetAuxType(x,y)
-#define SetFileType(x,y)
-
 extern unsigned char *VideoPointer;
-extern Word KeyModifiers;
-extern Word ScanCode;
-extern Word KilledSong;
 extern Word SystemState;
 extern Word VideoWidth;
 extern LongWord LastTick;
 extern LongWord YTable[480];
 
 void DLZSS(Byte *Dest, Byte *Src,LongWord Length);
-LongWord SwapLong(LongWord Val);
 unsigned short SwapUShort(unsigned short Val);
-short SwapShort(short Val);
 
 void WaitTick(void);
 void WaitTicks(Word TickCount);
@@ -50,8 +63,6 @@ LongWord ReadTick(void);
 void *AllocSomeMem(LongWord Size);
 void FreeSomeMem(void *MemPtr);
 
-Word GetAKey(void);
-Word AllKeysUp(void);
 Word WaitKey(void);
 void FlushKeys(void);
 
@@ -61,25 +72,11 @@ void StopSound(Word SndNum);
 void PlaySong(Word SongNum);
 
 void ClearTheScreen(Word Color);
-void ShowPic(Word PicNum);
 
 void InitYTable(void);
-void InstallAFont(Word FontNum);
-void FontUseMask(void);
-void FontUseZero(void);
-void SetFontXY(Word x,Word y);
-void FontSetColor(Word Index,Word Color);
-void DrawAString(char *TextPtr);
-void DrawAChar(Word Letter);
-void ultoa(LongWord Val,char *TextPtr);
-Word GetRandom(Word Range);
-void Randomize(void);
 void DrawShape(Word x,Word y,void *ShapePtr);
 void DrawXMShape(Word x,Word y,void *ShapePtr);
 void DrawMShape(Word x,Word y,void *ShapePtr);
-void EraseMBShape(Word x,Word y, void *ShapePtr,void *BackPtr);
-Word TestMShape(Word x,Word y,void *ShapePtr);
-Word TestMBShape(Word x,Word y,void *ShapePtr,void *BackPtr);
 
 void SetAPalette(Word PalNum);
 void SetAPalettePtr(unsigned char *PalPtr);
@@ -93,3 +90,5 @@ void KillAResource(Word RezNum);
 void *LoadAResource2(Word RezNum,LongWord Type);
 void ReleaseAResource2(Word RezNum,LongWord Type);
 void KillAResource2(Word RezNum,LongWord Type);
+
+#endif

macsrc/res.c

+/*
+Copyright (C) 2000 Steven Fuller <relnev@atdot.org>
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -123,7 +142,6 @@ void *LoadAResource2(Word RezNum, LongWord Type)
 	}
 	
 	fprintf(stderr, "ERROR (LoadAResource2): %ld/%d was not found!\n", Type, RezNum);
-	AllocSomeMem(666666666); /* TODO: hack! */
 	exit(EXIT_FAILURE);
 }
 
@@ -141,7 +159,6 @@ void ReleaseAResource2(Word RezNum, LongWord Type)
 		c = c->next;
 	}
 	fprintf(stderr, "ERROR (ReleaseAResource2): %ld/%d was not found!\n", Type, RezNum);
-	AllocSomeMem(666666666); /* TODO: hack! */
 	exit(EXIT_FAILURE);
 }
 

macsrc/stub.c

+/*
+Copyright (C) 1992-1994 Id Software, Inc.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #include <sys/time.h>
 #include <unistd.h>
 
@@ -400,30 +419,6 @@ Word WaitTicksEvent(Word Time)
 	return RetVal;
 }
 
-void FreeSong()
-{
-}
-
-void BeginSongLooped(Song)
-{
-}
-
-void EndSong()
-{
-}
-
-void BeginSound(short int theID, long theRate)
-{
-}
-
-void EndSound(short int theID)
-{
-}
-
-void EndAllSound(void)
-{
-}
-
 void FinishLoadGame(void)
 {
 }

macsrc/vi_svga.c

+/*
+Copyright (C) 1992-1994 Id Software, Inc.
+Copyright (C) 2000 Steven Fuller <relnev@atdot.org>
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -29,10 +49,10 @@ int main(int argc, char *argv[])
 	InitData();
 	
 	NewGameWindow(0); /* 320x200 */
-//#ifndef NOVGA
+
 	keyboard_init(); /* keyboard must be init'd after vga_setmode .. */
 	keyboard_seteventhandler(keyboard_handler);
-//#endif	
+
 	ClearTheScreen(BLACK);
 	BlastScreen();
 	

macsrc/vi_xlib.c

+/*
+Copyright (C) 1992-1994 Id Software, Inc.
+Copyright (C) 2000 Steven Fuller <relnev@atdot.org>
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -121,8 +141,8 @@ void Quit(char *str)
 {	
 	FreeResources();
 	
-	if (gfxbuf)
-		free(gfxbuf);
+	if (img)
+		XDestroyImage(img);
 	
 	if (str && *str) {
 		fprintf(stderr, "%s\n", str);
@@ -188,7 +208,7 @@ Word NewGameWindow(Word NewVidSize)
 		exit(EXIT_FAILURE);
 	}
 	
-	if (gfxbuf) {
+	if (img) {
 		XDestroyImage(img);
 		/* free(gfxbuf); */
 	}

macsrc/wolfdef.h

+/*
+Copyright (C) 1992-1994 Id Software, Inc.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #ifndef __WOLFDEF__
 #define __WOLFDEF__
 
@@ -111,16 +130,16 @@ Word ScaleY(Word y);
 
 #define JOYPAD_B	0x8000
 #define JOYPAD_Y	0x4000
-#define JOYPAD_SELECT 0x2000
-#define JOYPAD_START 0x1000
-#define JOYPAD_UP	0x800
-#define JOYPAD_DN	0x400
-#define JOYPAD_LFT	0x200
-#define JOYPAD_RGT	0x100
-#define JOYPAD_A	0x80
-#define JOYPAD_X	0x40
-#define JOYPAD_TL	0x20
-#define JOYPAD_TR	0x10
+#define JOYPAD_SELECT	0x2000
+#define JOYPAD_START	0x1000
+#define JOYPAD_UP	0x0800
+#define JOYPAD_DN	0x0400
+#define JOYPAD_LFT	0x0200
+#define JOYPAD_RGT	0x0100
+#define JOYPAD_A	0x0080
+#define JOYPAD_X	0x0040
+#define JOYPAD_TL	0x0020
+#define JOYPAD_TR	0x0010
 
 /**********************************