Removed SPANISH (No evidence that an actual Spanish version of the game was

released)

src/Makefile

@@ -29,3 +29,5 @@ clean:
 
 distclean: clean
 	rm -rf *~ DEADJOE
+
+forced: distclean wolf3d

src/TODO

@@ -24,8 +24,6 @@ work the same, let the input handler do it all instead
 maybe there are clipping bugs that will cause it to fill over the top, left, 
 and right
 * remove DEMOEXTERN, and add ability to play demos from commandline 
-* remove SPANISH code (and spanish.h)? honestly i would rather have a german
-version than a spanish version
 * remove GOODTIMES (the piracy message is somewhat worthless)
 * then consider removing the SOD manual check
 * Use either US_CheckParm or MS_CheckParm.
@@ -50,20 +48,16 @@ data in vga memory. so figure it out, fix it, and remove
 just call a different function (most are left from the update block code)
 remove them
 * implement fizzlefade, and get that last pixel!
-* remove the time verification code (in wl_inter.c)
 * fix wl_debug.c, lots of junk code..
 * change the current parameter handling code to something like getopt
 * urgent: fix input (event handling), so that it makes sense
+* wl_menu.c does loops on Keyboard.  should call id_in functions instead
 
 Specific:
 * memory/sound intro screen goes
   - trademarked images, only came with wolf3d 1.4's (I believe)
-* spanish code goes
-  - Unable to find, doubtful if released
 * copy protection goes
   - Who needs a manual to look at the source?
-* time verification code goes
-  - The contest was killed before it was started.
 * put event handling in id_in.c
   - Most loops which take too long call some input function and can place a
     function call in the rest of the loops

src/version.h

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

src/wl_def.h

@@ -4,12 +4,7 @@
 #include "id_heads.h"
 
 #include "wl_menu.h"
-
-#ifdef SPANISH
-#include "spanish.h"
-#else
 #include "foreign.h"
-#endif
 
 #ifdef SPEAR
 #include "f_spear.h"

src/wl_inter.c

@@ -150,11 +150,6 @@ void Victory (void)
 	CacheLump(LEVELEND_LUMP_START,LEVELEND_LUMP_END);
 	CA_CacheGrChunk(STARTFONT);
 
-#ifndef SPEAR
-	CA_CacheGrChunk(C_TIMECODEPIC);
-#endif
-
-
 	VWB_Bar (0,0,320,200-STATUSLINES,127);
 
 	Write(18,2,STR_YOUWIN);
@@ -163,15 +158,9 @@ void Victory (void)
 
 	Write(12,RATIOY-2,"averages");
 
-	#ifdef SPANISH
-	Write(RATIOX+2,  RATIOY,      STR_RATKILL);
-	Write(RATIOX+2,  RATIOY+2,  STR_RATSECRET);
-	Write(RATIOX+2,  RATIOY+4,STR_RATTREASURE);
-	#else
 	Write(RATIOX+8,RATIOY,      STR_RATKILL);
 	Write(RATIOX+4,RATIOY+2,  STR_RATSECRET);
 	Write(RATIOX,  RATIOY+4,STR_RATTREASURE);
-	#endif
 
 	VWB_DrawPic (8,4,L_BJWINSPIC);
 
@@ -227,32 +216,6 @@ void Victory (void)
 	x=RATIOX+24-strlen(tempstr)*2;
 	Write(x,RATIOY+4,tempstr);
 
-
-#ifndef SPANISH
-#ifndef UPLOAD
-#ifndef SPEAR
-	//
-	// TOTAL TIME VERIFICATION CODE
-	//
-	if (gamestate.difficulty>=gd_medium)
-	{
-		VWB_DrawPic (30*8,TIMEY*8,C_TIMECODEPIC);
-		fontnumber = 0;
-		fontcolor = READHCOLOR;
-		PrintX = 30*8-3;
-		PrintY = TIMEY*8+8;
-		PrintX+=4;
-		tempstr[0] = (((min/10)^(min%10))^0xa)+'A';
-		tempstr[1] = (((sec/10)^(sec%10))^0xa)+'A';
-		tempstr[2] = (tempstr[0]^tempstr[1])+'A';
-		tempstr[3] = 0;
-		US_Print(tempstr);
-	}
-#endif
-#endif
-#endif
-
-
 	fontnumber = 1;
 
 	VW_UpdateScreen ();
@@ -267,9 +230,6 @@ void Victory (void)
 
 	VW_FadeOut ();
 
-#ifndef SPEAR
-	UNCACHEGRCHUNK(C_TIMECODEPIC);
-#endif
 	UnCacheLump(LEVELEND_LUMP_START,LEVELEND_LUMP_END);
 
 #ifndef SPEAR
@@ -560,33 +520,19 @@ void LevelCompleted (void)
 		mapon < 17)
 #endif
 	{
-	 #ifdef SPANISH
-	 Write(14,2,"piso\ncompletado");
-	 #else
 	 Write(14,2,"floor\ncompleted");
-	 #endif
 
 	 Write(14,7,STR_BONUS"     0");
 	 Write(16,10,STR_TIME);
 	 Write(16,12,STR_PAR);
 
-	 #ifdef SPANISH
-	 Write(11,14,    STR_RAT2KILL);
-	 Write(11,16,  STR_RAT2SECRET);
-	 Write(11,18,STR_RAT2TREASURE);
-	 #else
 	 Write(9,14,    STR_RAT2KILL);
 	 Write(5,16,  STR_RAT2SECRET);
 	 Write(1,18,STR_RAT2TREASURE);
-	 #endif
 
 	 Write(26,2,itoa(gamestate.mapon+1,tempstr,10));
 
-	 #ifdef SPANISH
-	 Write(30,12,parTimes[gamestate.episode*10+mapon].timestr);
-	 #else
 	 Write(26,12,parTimes[gamestate.episode*10+mapon].timestr);
-	 #endif
 
 	 //
 	 // PRINT TIME
@@ -602,11 +548,7 @@ void LevelCompleted (void)
 	 min=sec/60;
 	 sec%=60;
 
-	 #ifdef SPANISH
-	 i=30*8;
-	 #else
 	 i=26*8;
-	 #endif
 	 VWB_DrawPic(i,10*8,L_NUM0PIC+(min/10));
 	 i+=2*8;
 	 VWB_DrawPic(i,10*8,L_NUM0PIC+(min%10));
@@ -660,11 +602,7 @@ void LevelCompleted (void)
 	 }
 
 
-	 #ifdef SPANISH
-	 #define RATIOXX		33
-	 #else
 	 #define RATIOXX		37
-	 #endif
 	 //
 	 // KILL RATIO
 	 //

src/wl_main.c

@@ -666,11 +666,7 @@ void FinishSignon (void)
 
 	SETFONTCOLOR(14,4);
 
-	#ifdef SPANISH
-	US_CPrint ("Oprima una tecla");
-	#else
 	US_CPrint ("Press a key");
-	#endif
 
 	if (!NoWait)
 		IN_Ack ();
@@ -680,11 +676,7 @@ void FinishSignon (void)
 	PrintY = 190;
 	SETFONTCOLOR(10,4);
 
-	#ifdef SPANISH
-	US_CPrint ("pensando...");
-	#else
 	US_CPrint ("Working...");
-	#endif
 
 	SETFONTCOLOR(0,15);
 #else

src/wl_menu.c

@@ -74,11 +74,7 @@ MainMenu[]=
 #ifndef GOODTIMES
 #ifndef SPEAR
 
-	#ifdef SPANISH
-	{2,"Ve esto!",(void *)CP_ReadThis},
-	#else
 	{2,"Read This!",(void *)CP_ReadThis},
-	#endif
 
 #endif
 #endif
@@ -117,25 +113,6 @@ CtlMenu[]=
 #ifndef SPEAR
 NewEmenu[]=
 {
-	#ifdef SPANISH
-	{1,"Episodio 1\n"
-	   "Fuga desde Wolfenstein",0},
-	{0,"",0},
-	{3,"Episodio 2\n"
-		   "Operacion Eisenfaust",0},
-	{0,"",0},
-	{3,"Episodio 3\n"
-		   "Muere, Fuhrer, Muere!",0},
-	{0,"",0},
-	{3,"Episodio 4\n"
-		  "Un Negro Secreto",0},
-	{0,"",0},
-	{3,"Episodio 5\n"
-		  "Huellas del Loco",0},
-	{0,"",0},
-	{3,"Episodio 6\n"
-		  "Confrontacion",0}
-	#else
 	{1,"Episode 1\n"
 	   "Escape from Wolfenstein",0},
 	{0,"",0},
@@ -153,7 +130,6 @@ NewEmenu[]=
 	{0,"",0},
 	{3,"Episode 6\n"
 		  "Confrontation",0}
-	#endif
 },
 #endif
 
@@ -465,11 +441,7 @@ void DrawMainMenu(void)
 	DrawStripes(10);
 	VWB_DrawPic(84,0,C_OPTIONSPIC);
 
-	#ifdef SPANISH
-	DrawWindow(MENU_X-8,MENU_Y-3,MENU_W+8,MENU_H,BKGDCOLOR);
-	#else
 	DrawWindow(MENU_X-8,MENU_Y-3,MENU_W,MENU_H,BKGDCOLOR);
-	#endif
 
 	//
 	// CHANGE "GAME" AND "DEMO"
@@ -477,21 +449,13 @@ void DrawMainMenu(void)
 	if (ingame)
 	{
 
-		#ifdef SPANISH
-		strcpy(&MainMenu[backtodemo].string,STR_GAME);
-		#else
 		strcpy(&MainMenu[backtodemo].string[8],STR_GAME);
-		#endif
 
 		MainMenu[backtodemo].active=2;
 	}
 	else
 	{
-		#ifdef SPANISH
-		strcpy(&MainMenu[backtodemo].string,STR_BD);
-		#else
 		strcpy(&MainMenu[backtodemo].string[8],STR_DEMO);
-		#endif
 
 		MainMenu[backtodemo].active=1;
 	}
@@ -694,11 +658,7 @@ int CP_CheckQuick(unsigned scancode)
 			WindowX=WindowY=0;
 			WindowW=320;
 			WindowH=160;
-				#ifdef SPANISH
-			if (Confirm(ENDGAMESTR))
-				#else
 			if (Confirm(endStrings[(US_RndT()&0x7)+(US_RndT()&1)]))
-				#endif
 			{
 				VW_UpdateScreen();
 				SD_MusicOff();
@@ -908,11 +868,7 @@ void DrawNewEpisode(void)
 	SETFONTCOLOR(READHCOLOR,BKGDCOLOR);
 	PrintY=2;
 	WindowX=0;
-	#ifdef SPANISH
-	US_CPrint("Cual episodio jugar?");
-	#else
 	US_CPrint("Which episode to play?");
-	#endif
 
 	SETFONTCOLOR(TEXTCOLOR,BKGDCOLOR);
 	DrawMenu(&NewEitems,&NewEmenu[0]);
@@ -940,11 +896,7 @@ void DrawNewGame(void)
 	PrintY=NM_Y-32;
 
 #ifndef SPEAR
-	#ifdef SPANISH
-	US_Print("Eres macho?");
-	#else
 	US_Print("How tough are you?");
-	#endif
 #else
 	VWB_DrawPic (PrintX,PrintY,C_HOWTOUGHPIC);
 #endif
@@ -1649,11 +1601,7 @@ void DrawMouseSens(void)
 {
 	ClearMScreen();
 	VWB_DrawPic(112,184,C_MOUSELBACKPIC);
-	#ifdef SPANISH
-	DrawWindow(10,80,300,43,BKGDCOLOR);
-	#else
 	DrawWindow(10,80,300,30,BKGDCOLOR);
-	#endif
 
 	WindowX=0;
 	WindowW=320;
@@ -1662,19 +1610,11 @@ void DrawMouseSens(void)
 	US_CPrint(STR_MOUSEADJ);
 
 	SETFONTCOLOR(TEXTCOLOR,BKGDCOLOR);
-	#ifdef SPANISH
-	PrintX=14;
-	PrintY=95+13;
-	US_Print(STR_SLOW);
-	PrintX=252;
-	US_Print(STR_FAST);
-	#else
 	PrintX=14;
 	PrintY=95;
 	US_Print(STR_SLOW);
 	PrintX=269;
 	US_Print(STR_FAST);
-	#endif
 
 	VWB_Bar(60,97,200,10,TEXTCOLOR);
 	DrawOutline(60,97,200,10,0,HIGHLIGHT);
@@ -2256,16 +2196,6 @@ void DrawCustomScreen(void)
 #endif
 
 	SETFONTCOLOR(TEXTCOLOR,BKGDCOLOR);
-	#ifdef SPANISH
-	PrintX=CST_START-16;
-	US_Print(STR_CRUN);
-	PrintX=CST_START-16+CST_SPC*1;
-	US_Print(STR_COPEN);
-	PrintX=CST_START-16+CST_SPC*2;
-	US_Print(STR_CFIRE);
-	PrintX=CST_START-16+CST_SPC*3;
-	US_Print(STR_CSTRAFE"\n");
-	#else
 	PrintX=CST_START;
 	US_Print(STR_CRUN);
 	PrintX=CST_START+CST_SPC*1;
@@ -2274,7 +2204,6 @@ void DrawCustomScreen(void)
 	US_Print(STR_CFIRE);
 	PrintX=CST_START+CST_SPC*3;
 	US_Print(STR_CSTRAFE"\n");
-	#endif
 
 	DrawWindow(5,PrintY-1,310,13,BKGDCOLOR);
 	DrawCustMouse(0);
@@ -2297,16 +2226,6 @@ void DrawCustomScreen(void)
 #endif
 
 	SETFONTCOLOR(TEXTCOLOR,BKGDCOLOR);
-	#ifdef SPANISH
-	PrintX=CST_START-16;
-	US_Print(STR_CRUN);
-	PrintX=CST_START-16+CST_SPC*1;
-	US_Print(STR_COPEN);
-	PrintX=CST_START-16+CST_SPC*2;
-	US_Print(STR_CFIRE);
-	PrintX=CST_START-16+CST_SPC*3;
-	US_Print(STR_CSTRAFE"\n");
-	#else
 	PrintX=CST_START;
 	US_Print(STR_CRUN);
 	PrintX=CST_START+CST_SPC*1;
@@ -2315,7 +2234,7 @@ void DrawCustomScreen(void)
 	US_Print(STR_CFIRE);
 	PrintX=CST_START+CST_SPC*3;
 	US_Print(STR_CSTRAFE"\n");
-	#endif
+
 	DrawWindow(5,PrintY-1,310,13,BKGDCOLOR);
 	DrawCustJoy(0);
 	US_Print("\n");
@@ -2331,16 +2250,6 @@ void DrawCustomScreen(void)
 	PrintY += 13;
 #endif
 	SETFONTCOLOR(TEXTCOLOR,BKGDCOLOR);
-	#ifdef SPANISH
-	PrintX=CST_START-16;
-	US_Print(STR_CRUN);
-	PrintX=CST_START-16+CST_SPC*1;
-	US_Print(STR_COPEN);
-	PrintX=CST_START-16+CST_SPC*2;
-	US_Print(STR_CFIRE);
-	PrintX=CST_START-16+CST_SPC*3;
-	US_Print(STR_CSTRAFE"\n");
-	#else
 	PrintX=CST_START;
 	US_Print(STR_CRUN);
 	PrintX=CST_START+CST_SPC*1;
@@ -2349,7 +2258,7 @@ void DrawCustomScreen(void)
 	US_Print(STR_CFIRE);
 	PrintX=CST_START+CST_SPC*3;
 	US_Print(STR_CSTRAFE"\n");
-	#endif
+
 	DrawWindow(5,PrintY-1,310,13,BKGDCOLOR);
 	DrawCustKeybd(0);
 	US_Print("\n");
@@ -2359,16 +2268,6 @@ void DrawCustomScreen(void)
 	// KEYBOARD MOVE KEYS
 	//
 	SETFONTCOLOR(TEXTCOLOR,BKGDCOLOR);
-	#ifdef SPANISH
-	PrintX=4;
-	US_Print(STR_LEFT);
-	US_Print("/");
-	US_Print(STR_RIGHT);
-	US_Print("/");
-	US_Print(STR_FRWD);
-	US_Print("/");
-	US_Print(STR_BKWD"\n");
-	#else
 	PrintX=CST_START;
 	US_Print(STR_LEFT);
 	PrintX=CST_START+CST_SPC*1;
@@ -2377,7 +2276,7 @@ void DrawCustomScreen(void)
 	US_Print(STR_FRWD);
 	PrintX=CST_START+CST_SPC*3;
 	US_Print(STR_BKWD"\n");
-	#endif
+
 	DrawWindow(5,PrintY-1,310,13,BKGDCOLOR);
 	DrawCustKeys(0);
 
@@ -2627,11 +2526,7 @@ void CP_Quit(void)
 	int i;
 
 
-	#ifdef SPANISH
-	if (Confirm(ENDGAMESTR))
-	#else
 	if (Confirm(endStrings[(US_RndT()&0x7)+(US_RndT()&1)]))
-	#endif
 	{
 		VW_UpdateScreen();
 		SD_MusicOff();
@@ -3279,22 +3174,7 @@ int Confirm(char *string)
 			PicturePause();
 		#endif
 
-	#ifdef SPANISH
-	} while(!Keyboard[sc_S] && !Keyboard[sc_N] && !Keyboard[sc_Escape]);
-	#else
 	} while(!Keyboard[sc_Y] && !Keyboard[sc_N] && !Keyboard[sc_Escape]);
-	#endif
-
-	#ifdef SPANISH
-	if (Keyboard[sc_S])
-	{
-		xit=1;
-		ShootSnd();
-	}
-
-	while(Keyboard[sc_S] || Keyboard[sc_N] || Keyboard[sc_Escape]);
-
-	#else
 
 	if (Keyboard[sc_Y])
 	{
@@ -3303,7 +3183,6 @@ int Confirm(char *string)
 	}
 
 	while(Keyboard[sc_Y] || Keyboard[sc_N] || Keyboard[sc_Escape]);
-	#endif
 
 	IN_ClearKeysDown();
 	SD_PlaySound(whichsnd[xit]);

src/wl_text.c

@@ -476,21 +476,12 @@ void PageLayout (boolean shownumber)
 
 	if (shownumber)
 	{
-		#ifdef SPANISH
-		strcpy (str,"Hoja ");
-		itoa (pagenum,str2,10);
-		strcat (str,str2);
-		strcat (str," de ");
-		py = 183;
-		px = 208;
-		#else
 		strcpy (str,"pg ");
 		itoa (pagenum,str2,10);
 		strcat (str,str2);
 		strcat (str," of ");
 		py = 183;
 		px = 213;
-		#endif
 		itoa (numpages,str2,10);
 		strcat (str,str2);
 		fontcolor = 0x4f; 			   //12^BACKCOLOR;