Fixed bug in wl_text (tried to free a ptr on its own instead of calling

uncache)

src/Makefile

 CC = gcc
-#CFLAGS = -O6 -fomit-frame-pointer -ffast-math -funroll-loops -mpentiumpro -mcpu=pentiumpro -march=pentiumpro 
-CFLAGS = -g -Wall
+CFLAGS = -O6 -fomit-frame-pointer -ffast-math -funroll-loops -mpentiumpro -mcpu=pentiumpro -march=pentiumpro 
+#CFLAGS = -g -Wall
 #CFLAGS = -g
 #CFLAGS = -Os
 OBJS = objs.o misc.o id_ca.o id_sd.o id_vh.o id_us.o \

src/NOTES

@@ -3,3 +3,6 @@ Just some random facts/thoughts/ideas/musings:
 Wolfenstein 3D was originally planned to be a much more complex game. ...
 ... lots of unused code ... possibly from previous projects and incarnations
 of wolf3d.
+
+1.4 of Wolfenstein 3D (full) had a Read Me! option. The text still exists in
+the data file, but all the graphics are off.

src/TODO

@@ -69,6 +69,8 @@ idea is that different <outputs> can share some drivers, unlike video
 * check filehandling (ex, file missing, bad file type, and such)
 PlayDemoFromFile specifically
 * make sure all infinite loops are found (looping around Keyboard)
+* deathcam went by too fast, and right before the fizzlefade was being done
+on the border
 
 Specific:
 * memory/sound intro screen goes

src/version.h

@@ -6,7 +6,7 @@
 /* SDM = 2 */
 /* SOD = 3 */
 #ifndef WMODE
-#define WMODE 2
+#define WMODE 1
 #endif
 
 #if WMODE == 0

src/wl_main.c

@@ -1187,11 +1187,15 @@ void Quit(char *error)
 
 void DemoLoop (void)
 {
+	static int LastDemo;
+	
 	int i;
 //
 // main game cycle
 //
 
+	LastDemo = 0;
+	
 	#if !defined(GOODTIMES) && defined(SPEAR) && !defined(SPEARDEMO)
 		CopyProtection();
 	#endif

src/wl_menu.h

@@ -130,7 +130,7 @@ int  Confirm(char *string);
 void Message(char *string);
 void CheckPause(void);
 void ShootSnd(void);
-void CheckSecretMissions(void);
+void FreeMusic(void);
 void BossKey(void);
 
 void DrawGun(CP_iteminfo *item_i,CP_itemtype *items,int x,int *y,int which,int basey,void (*routine)(int w));

src/wl_play.c

@@ -590,8 +590,6 @@ void CheckKeys (void)
 
 	scan = LastScan;
 
-
-	#ifdef SPEAR
 	//
 	// SECRET CHEAT CODE: TAB-G-F10
 	//
@@ -617,8 +615,6 @@ void CheckKeys (void)
 		IN_ClearKeysDown();
 		return;
 	}
-	#endif
-
 
 	//
 	// SECRET CHEAT CODE: 'MLI'
@@ -660,17 +656,10 @@ void CheckKeys (void)
 	//
 	// OPEN UP DEBUG KEYS
 	//
-#ifndef SPEAR
-	if (Keyboard[sc_BackSpace] &&
-		Keyboard[sc_LShift] &&
-		Keyboard[sc_Alt] &&
-		MS_CheckParm("goobers"))
-#else
 	if (Keyboard[sc_BackSpace] &&
 		Keyboard[sc_LShift] &&
 		Keyboard[sc_Alt] &&
 		MS_CheckParm("debugmode"))
-#endif
 	{
 	 ClearMemory ();
 	 CA_CacheGrChunk (STARTFONT+1);

src/wl_text.c

@@ -347,12 +347,11 @@ void HandleCtrls (void)
 =====================
 */
 
-void HandleWord (void)
+void HandleWord()
 {
 	char words[WORDLIMIT];
-	int i, wordindex;
-	word wwidth,wheight,newpos;
-
+	int wordindex;
+	word wwidth, wheight, newpos;
 
 	//
 	// copy the next word into words[]
@@ -591,10 +590,9 @@ void CacheLayoutGraphics (void)
 =====================
 */
 
-void ShowArticle (char *article)
+void ShowArticle(char *article)
 {
 	unsigned	oldfontnumber;
-	unsigned	temp;
 	boolean 	newpage,firstpage;
 
 
@@ -651,10 +649,8 @@ void ShowArticle (char *article)
 			break;
 		}
 
-		#ifndef SPEAR
 		if (Keyboard[sc_Tab] && Keyboard[sc_P] && MS_CheckParm("goobers"))
 			PicturePause();
-		#endif
 
 	} while (LastScan != sc_Escape);
 
@@ -679,10 +675,8 @@ int helpextern = T_HELPART;
 */
 void HelpScreens (void)
 {
-	int			artnum;
+	int artnum;
 	char *text;
-	memptr		layout;
-
 
 	CA_UpLevel ();
 	MM_SortMem ();
@@ -694,13 +688,13 @@ void HelpScreens (void)
 
 	ShowArticle (text);
 
-	MM_FreePtr (&grsegs[artnum]);
-
+	CA_UnCacheGrChunk(artnum);
+	
 	VW_FadeOut();
 
-	FreeMusic ();
-	CA_DownLevel ();
-	MM_SortMem ();
+	FreeMusic();
+	CA_DownLevel();
+	MM_SortMem();
 }
 
 //
@@ -708,10 +702,8 @@ void HelpScreens (void)
 //
 void EndText (void)
 {
-	int			artnum;
+	int artnum;
 	char *text;
-	memptr		layout;
-
 
 	ClearMemory ();
 
@@ -725,15 +717,15 @@ void EndText (void)
 
 	ShowArticle (text);
 
-	MM_FreePtr (&grsegs[artnum]);
-
+	CA_UnCacheGrChunk(artnum);
+	
 	VW_FadeOut();
 	SETFONTCOLOR(0,15);
 	IN_ClearKeysDown();
 
-	FreeMusic ();
-	CA_DownLevel ();
-	MM_SortMem ();
+	FreeMusic();
+	CA_DownLevel();
+	MM_SortMem();
 }
 
 #endif