Removed JAPAN (Was unable to find any evidence that a Japan demo was even

released)

src/TODO

@@ -23,10 +23,6 @@ work the same, let the input handler do it all instead
 * when viewsize is around 20, sprites end up being drawn over the border.
 maybe there are clipping bugs that will cause it to fill over the top, left, 
 and right
-* if japan versions are not to be found, remove the code 
-actually, if you look in wl_menu.c, the japan menus are empty, which means
-no text, and it would have to be that there was no offically released
-japanese version (unless the text was removed, but then why?)
 * 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
@@ -57,17 +53,17 @@ remove them
 * 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
 
 Specific:
 * memory/sound intro screen goes
   - trademarked images, only came with wolf3d 1.4's (I believe)
-* japan code goes
-  - Unable to find, doubtful if released
 * spanish code goes
   - Unable to find, doubtful if released
-* no piracy message goes
-  - I think it's a bit useless, and anyone can remove it
 * 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/id_heads.h

@@ -33,18 +33,6 @@ extern char signon;
 
 #define	introscn signon
 
-#ifdef JAPAN
-
-#ifdef JAPDEMO
-#include "FOREIGN\JAPAN\GFXV_WJ1.H"
-#else /* JAPDEMO */
-#include "FOREIGN\JAPAN\GFXV_WJ6.H"
-#endif /* JAPDEMO */
-
-#include "audiowl6.h"
-
-#else /* JAPAN */
-
 #ifndef SPEAR
 
 #ifndef UPLOAD
@@ -66,7 +54,6 @@ extern char signon;
 #endif /* SPEARDEMO */
 
 #endif /* SPEAR */
-#endif /* JAPAN */
 
 /* ---------------- */
 

src/version.h

@@ -6,46 +6,33 @@
 /* SDM = 2 */
 /* SOD = 3 */
 #ifndef WMODE
-#define WMODE 1
+#define WMODE 3
 #endif
 
 #if WMODE == 0
 /* #define SPEAR */
 /* #define SPEARDEMO */
-/* #define JAPAN */
-/* #define JAPDEMO */
 #define GOODTIMES
 #define UPLOAD
 
 #elif WMODE == 1
 /* #define SPEAR */
 /* #define SPEARDEMO */
-/* #define JAPAN */
-/* #define JAPDEMO */
 #define GOODTIMES
 /* #define UPLOAD */
 
 #elif WMODE == 2
 #define SPEAR 
 #define SPEARDEMO 
-/* #define JAPAN */
-/* #define JAPDEMO */
 #define GOODTIMES
 /* #define UPLOAD */
 
 #elif WMODE == 3
 #define SPEAR
 /* #define SPEARDEMO */
-/* #define JAPAN */
-/* #define JAPDEMO */
 #define GOODTIMES
 /* #define UPLOAD */
 
-/*
-JAPANDEMO requires UPLOAD
-SPANISH
-*/
-
 #else
 #error "please edit version.h and fix WMODE"
 #endif

src/wl_act2.c

@@ -3794,13 +3794,10 @@ void	A_StartDeathCam (objtype *ob)
 
 	CA_UpLevel ();
 	CacheLump(LEVELEND_LUMP_START,LEVELEND_LUMP_END);
-	#ifdef JAPAN
-	#ifndef JAPDEMO
-	CA_CacheScreen(C_LETSSEEPIC);
-	#endif
-	#else
+
+	/* TODO: does this also show the deathcam sprite? */
 	Write(0,7,STR_SEEAGAIN);
-	#endif
+
 	CA_DownLevel ();
 
 	VW_UpdateScreen ();

src/wl_game.c

@@ -1317,30 +1317,8 @@ startplayloop:
 
 				CheckHighScore (gamestate.score,gamestate.mapon+1);
 
-				#ifndef JAPAN
 				strcpy(MainMenu[viewscores].string,STR_VS);
-				#endif
-				MainMenu[viewscores].routine = CP_ViewScores;
-
-				return;
-			}
-#endif
-
-#ifdef JAPDEMO
-			if (gamestate.mapon == 3)
-			{
-				died = true;			// don't "get psyched!"
-
-				VW_FadeOut ();
-
-				ClearMemory ();
-
-				CheckHighScore (gamestate.score,gamestate.mapon+1);
-
-				#ifndef JAPAN
-				strcpy(MainMenu[viewscores].string,STR_VS);
-				#endif
-				MainMenu[viewscores].routine = CP_ViewScores;
+				MainMenu[viewscores].routine = (void *)CP_ViewScores;
 
 				return;
 			}
@@ -1407,9 +1385,7 @@ startplayloop:
 
 			CheckHighScore (gamestate.score,gamestate.mapon+1);
 
-			#ifndef JAPAN
 			strcpy(MainMenu[viewscores].string,STR_VS);
-			#endif
 			MainMenu[viewscores].routine = (void *)CP_ViewScores;
 
 			return;
@@ -1429,9 +1405,7 @@ startplayloop:
 
 			CheckHighScore (gamestate.score,gamestate.mapon+1);
 
-			#ifndef JAPAN
 			strcpy(MainMenu[viewscores].string,STR_VS);
-			#endif
 			MainMenu[viewscores].routine = (void *)CP_ViewScores;
 
 			return;

src/wl_inter.c

@@ -156,13 +156,7 @@ void Victory (void)
 
 
 	VWB_Bar (0,0,320,200-STATUSLINES,127);
-#ifdef JAPAN
-#ifndef JAPDEMO
-	CA_CacheGrChunk(C_ENDRATIOSPIC);
-	VWB_DrawPic(0,0,C_ENDRATIOSPIC);
-	UNCACHEGRCHUNK(C_ENDRATIOSPIC);
-#endif
-#else
+
 	Write(18,2,STR_YOUWIN);
 
 	Write(TIMEX,TIMEY-2,STR_TOTALTIME);
@@ -179,12 +173,7 @@ void Victory (void)
 	Write(RATIOX,  RATIOY+4,STR_RATTREASURE);
 	#endif
 
-#endif
-
-#ifndef JAPDEMO
 	VWB_DrawPic (8,4,L_BJWINSPIC);
-#endif
-
 
 #ifndef SPEAR
 	for (kr = sr = tr = sec = i = 0;i < 8;i++)
@@ -295,7 +284,6 @@ void Victory (void)
 
 //==========================================================================
 
-#ifndef JAPAN
 /*
 ==================
 =
@@ -320,7 +308,6 @@ void PG13 (void)
 
 	VW_FadeOut ();
 }
-#endif
 
 
 //==========================================================================
@@ -562,11 +549,6 @@ void LevelCompleted (void)
 	IN_ClearKeysDown();
 	IN_StartAck();
 
-#ifdef JAPAN
-	CA_CacheGrChunk(C_INTERMISSIONPIC);
-	VWB_DrawPic(0,0,C_INTERMISSIONPIC);
-	UNCACHEGRCHUNK(C_INTERMISSIONPIC);
-#endif
 	VWB_DrawPic(0,16,L_GUYPIC);
 
 #ifndef SPEAR
@@ -578,7 +560,6 @@ void LevelCompleted (void)
 		mapon < 17)
 #endif
 	{
-#ifndef JAPAN
 	 #ifdef SPANISH
 	 Write(14,2,"piso\ncompletado");
 	 #else
@@ -600,7 +581,6 @@ void LevelCompleted (void)
 	 #endif
 
 	 Write(26,2,itoa(gamestate.mapon+1,tempstr,10));
-#endif
 
 	 #ifdef SPANISH
 	 Write(30,12,parTimes[gamestate.episode*10+mapon].timestr);
@@ -916,23 +896,6 @@ void LevelCompleted (void)
 	}
 #endif
 
-#ifdef JAPDEMO
-	if (gamestate.mapon == 3)
-	{
-		SD_PlaySound (BONUS1UPSND);
-
-		CA_CacheGrChunk (STARTFONT+1);
-		Message ("This concludes your demo\n"
-				 "of Wolfenstein 3-D! Now,\n"
-				 "go to your local software\n"
-				 "store and buy it!");
-		UNCACHEGRCHUNK (STARTFONT+1);
-
-		IN_ClearKeysDown();
-		IN_Ack();
-	}
-#endif
-
 	#ifndef SPEAR
 	if (Keyboard[sc_P] && MS_CheckParm("goobers"))
 		PicturePause();
@@ -1242,57 +1205,6 @@ void	CheckHighScore (long score,word other)
 
 }
 
-
-#ifndef UPLOAD
-#ifndef SPEAR
-#ifndef JAPAN
-////////////////////////////////////////////////////////
-//
-// NON-SHAREWARE NOTICE
-//
-////////////////////////////////////////////////////////
-void NonShareware(void)
-{
-	VW_FadeOut();
-
-	ClearMScreen();
-	DrawStripes(10);
-
-	CA_CacheGrChunk(STARTFONT+1);
-	fontnumber = 1;
-
-	SETFONTCOLOR(READHCOLOR,BKGDCOLOR);
-	PrintX=110;
-	PrintY=15;
-
-	#ifdef SPANISH
-	US_Print("Atencion");
-	#else
-	US_Print("Attention");
-	#endif
-
-	SETFONTCOLOR(HIGHLIGHT,BKGDCOLOR);
-	WindowX=PrintX=40;
-	PrintY=60;
-	#ifdef SPANISH
-	US_Print("Este juego NO es gratis y\n");
-	US_Print("NO es Shareware; favor de\n");
-	US_Print("no distribuirlo.\n\n");
-	#else
-	US_Print("This game is NOT shareware.\n");
-	US_Print("Please do not distribute it.\n");
-	US_Print("Thanks.\n\n");
-	#endif
-	US_Print("        Id Software\n");
-
-	VW_UpdateScreen ();
-	VW_FadeIn();
-	IN_Ack();
-}
-#endif
-#endif
-#endif
-
 #ifdef SPEAR
 #ifndef SPEARDEMO
 ////////////////////////////////////////////////////////

src/wl_main.c

@@ -664,7 +664,6 @@ void FinishSignon (void)
 	WindowW = 320;
 	PrintY = 190;
 
-	#ifndef JAPAN
 	SETFONTCOLOR(14,4);
 
 	#ifdef SPANISH
@@ -673,12 +672,9 @@ void FinishSignon (void)
 	US_CPrint ("Press a key");
 	#endif
 
-	#endif
-
 	if (!NoWait)
 		IN_Ack ();
 
-	#ifndef JAPAN
 	VW_Bar (0,189,300,11,*gfxbuf);
 
 	PrintY = 190;
@@ -690,8 +686,6 @@ void FinishSignon (void)
 	US_CPrint ("Working...");
 	#endif
 
-	#endif
-
 	SETFONTCOLOR(0,15);
 #else
 	if (!NoWait)
@@ -1167,10 +1161,8 @@ void Quit (char *error)
 
 	if (!*error)
 	{
-	 #ifndef JAPAN
 	 CA_CacheGrChunk(ORDERSCREEN);
 	 screen = grsegs[ORDERSCREEN];
-	 #endif
 	 WriteConfig ();
 	}
 	else
@@ -1203,10 +1195,8 @@ void Quit (char *error)
 	if (!error || !(*error))
 	{
 		clrscr();
-		#ifndef JAPAN
 		movedata ((unsigned)screen,7,0xb800,0,4000);
 		gotoxy(1,24);
-		#endif
 	}
 #endif
 
@@ -1234,30 +1224,15 @@ void DemoLoop (void)
 
 	#ifndef UPLOAD
 
-		#ifndef GOODTIMES
-		#ifndef SPEAR
-		#ifndef JAPAN
-		if (!NoWait)
-			NonShareware();
-		#endif
-		#else
-
-			#ifndef GOODTIMES
-			#ifndef SPEARDEMO
+	#if !defined(GOODTIMES) && defined(SPEAR) && !defined(SPEARDEMO)
 		CopyProtection();
 	#endif
 	#endif
 
-		#endif
-		#endif
-	#endif
-
 	StartCPMusic(INTROSONG);
 
-#ifndef JAPAN
 	if (!NoWait)
 		PG13 ();
-#endif
 
 	while (1)
 	{

src/wl_menu.c

@@ -64,19 +64,6 @@ CP_iteminfo
 CP_itemtype 
 MainMenu[]=
 {
-#ifdef JAPAN
-	{1,"",(void *)CP_NewGame},
-	{1,"",(void *)CP_Sound},
-	{1,"",(void *)CP_Control},
-	{1,"",(void *)CP_LoadGame},
-	{0,"",(void *)CP_SaveGame},
-	{1,"",(void *)CP_ChangeView},
-	{2,"",(void *)CP_ReadThis},
-	{1,"",(void *)CP_ViewScores},
-	{1,"",0},
-	{1,"",0}
-#else
-
 	{1,STR_NG,(void *)CP_NewGame},
 	{1,STR_SD,(void *)CP_Sound},
 	{1,STR_CL,(void *)CP_Control},
@@ -99,25 +86,10 @@ MainMenu[]=
 	{1,STR_VS,(void *)CP_ViewScores},
 	{1,STR_BD,0},
 	{1,STR_QT,0}
-#endif
 },
 
 SndMenu[]=
 {
-#ifdef JAPAN
-	{1,"",0},
-	{1,"",0},
-	{1,"",0},
-	{0,"",0},
-	{0,"",0},
-	{1,"",0},
-	{1,"",0},
-	{1,"",0},
-	{0,"",0},
-	{0,"",0},
-	{1,"",0},
-	{1,"",0},
-#else
 	{1,STR_NONE,0},
 	{1,STR_PC,0},
 	{1,STR_ALSB,0},
@@ -130,60 +102,21 @@ SndMenu[]=
 	{0,"",0},
 	{1,STR_NONE,0},
 	{1,STR_ALSB,0}
-#endif
 },
 
 CtlMenu[]=
 {
-#ifdef JAPAN
-	{0,"",0},
-	{0,"",0},
-	{0,"",0},
-	{0,"",0},
-	{0,"",(void *)MouseSensitivity},
-	{1,"",(void *)CustomControls}
-#else
 	{0,STR_MOUSEEN,0},
 	{0,STR_JOYEN,0},
 	{0,STR_PORT2,0},
 	{0,STR_GAMEPAD,0},
 	{0,STR_SENS,(void *)MouseSensitivity},
 	{1,STR_CUSTOM,(void *)CustomControls}
-#endif
 },
 
 #ifndef SPEAR
 NewEmenu[]=
 {
-#ifdef JAPAN
-#ifdef JAPDEMO
-	{1,"",0},
-	{0,"",0},
-	{0,"",0},
-	{0,"",0},
-	{0,"",0},
-	{0,"",0},
-	{0,"",0},
-	{0,"",0},
-	{0,"",0},
-	{0,"",0},
-	{0,"",0},
-	{0,"",0},
-#else
-	{1,"",0},
-	{0,"",0},
-	{1,"",0},
-	{0,"",0},
-	{1,"",0},
-	{0,"",0},
-	{1,"",0},
-	{0,"",0},
-	{1,"",0},
-	{0,"",0},
-	{1,"",0},
-	{0,"",0}
-#endif
-#else
 	#ifdef SPANISH
 	{1,"Episodio 1\n"
 	   "Fuga desde Wolfenstein",0},
@@ -221,24 +154,16 @@ NewEmenu[]=
 	{3,"Episode 6\n"
 		  "Confrontation",0}
 	#endif
-#endif
 },
 #endif
 
 
 NewMenu[]=
 {
-#ifdef JAPAN
-	{1,"",0},
-	{1,"",0},
-	{1,"",0},
-	{1,"",0}
-#else
 	{1,STR_DADDY,0},
 	{1,STR_HURTME,0},
 	{1,STR_BRINGEM,0},
 	{1,STR_DEATH,0}
-#endif
 },
 
 LSMenu[]=
@@ -516,9 +441,7 @@ void US_ControlPanel(byte scancode)
 	if (startgame || loadedgame)
 	{
 		MainMenu[viewscores].routine = NULL;
-		#ifndef JAPAN
 		strcpy(MainMenu[viewscores].string,STR_EG);
-		#endif
 	}
 
 	// RETURN/START GAME EXECUTION
@@ -536,9 +459,6 @@ void US_ControlPanel(byte scancode)
 //
 void DrawMainMenu(void)
 {
-#ifdef JAPAN
-	CA_CacheScreen(S_OPTIONSPIC);
-#else
 	ClearMScreen();
 
 	VWB_DrawPic(112,184,C_MOUSELBACKPIC);
@@ -550,14 +470,12 @@ void DrawMainMenu(void)
 	#else
 	DrawWindow(MENU_X-8,MENU_Y-3,MENU_W,MENU_H,BKGDCOLOR);
 	#endif
-#endif
 
 	//
 	// CHANGE "GAME" AND "DEMO"
 	//
 	if (ingame)
 	{
-		#ifndef JAPAN
 
 		#ifdef SPANISH
 		strcpy(&MainMenu[backtodemo].string,STR_GAME);
@@ -565,32 +483,16 @@ void DrawMainMenu(void)
 		strcpy(&MainMenu[backtodemo].string[8],STR_GAME);
 		#endif
 
-		#else
-		CA_CacheGrChunk(C_MRETGAMEPIC);
-		VWB_DrawPic(12*8,20*8,C_MRETGAMEPIC);
-		UNCACHEGRCHUNK(C_MRETGAMEPIC);
-		CA_CacheGrChunk(C_MENDGAMEPIC);
-		VWB_DrawPic(12*8,18*8,C_MENDGAMEPIC);
-		UNCACHEGRCHUNK(C_MENDGAMEPIC);
-		#endif
 		MainMenu[backtodemo].active=2;
 	}
 	else
 	{
-		#ifndef JAPAN
 		#ifdef SPANISH
 		strcpy(&MainMenu[backtodemo].string,STR_BD);
 		#else
 		strcpy(&MainMenu[backtodemo].string[8],STR_DEMO);
 		#endif
-		#else
-		CA_CacheGrChunk(C_MRETDEMOPIC);
-		VWB_DrawPic(12*8,20*8,C_MRETDEMOPIC);
-		UNCACHEGRCHUNK(C_MRETDEMOPIC);
-		CA_CacheGrChunk(C_MSCORESPIC);
-		VWB_DrawPic(12*8,18*8,C_MSCORESPIC);
-		UNCACHEGRCHUNK(C_MSCORESPIC);
-		#endif
+
 		MainMenu[backtodemo].active=1;
 	}
 
@@ -641,11 +543,7 @@ int CP_CheckQuick(unsigned scancode)
 			CA_CacheGrChunk(STARTFONT+1);
 
 			WindowH=160;
-			#ifdef JAPAN
-			if (GetYorN(7,8,C_JAPQUITPIC))
-			#else
 			if (Confirm(ENDGAMESTR))
-			#endif
 			{
 				playstate = ex_died;
 				pickquick = gamestate.lives = 0;
@@ -796,15 +694,11 @@ int CP_CheckQuick(unsigned scancode)
 			WindowX=WindowY=0;
 			WindowW=320;
 			WindowH=160;
-			#ifdef JAPAN
-			if (GetYorN(7,8,C_QUITMSGPIC))
-			#else
 				#ifdef SPANISH
 			if (Confirm(ENDGAMESTR))
 				#else
 			if (Confirm(endStrings[(US_RndT()&0x7)+(US_RndT()&1)]))
 				#endif
-			#endif
 			{
 				VW_UpdateScreen();
 				SD_MusicOff();
@@ -831,11 +725,7 @@ int CP_CheckQuick(unsigned scancode)
 ////////////////////////////////////////////////////////////////////
 int CP_EndGame(void)
 {
-#ifdef JAPAN
-	if (!GetYorN(7,8,C_JAPQUITPIC))
-#else
 	if (!Confirm(ENDGAMESTR))
-#endif
 		return 0;
 
 	pickquick = gamestate.lives = 0;
@@ -843,9 +733,7 @@ int CP_EndGame(void)
 
 	MainMenu[savegame].active = 0;
 	MainMenu[viewscores].routine= (void *)CP_ViewScores;
-	#ifndef JAPAN
 	strcpy(MainMenu[viewscores].string,STR_VS);
-	#endif
 
 	return 1;
 }
@@ -940,11 +828,7 @@ firstpart:
 	// ALREADY IN A GAME?
 	//
 	if (ingame)
-		#ifdef JAPAN
-		if (!GetYorN(7,8,C_JAPNEWGAMEPIC))
-		#else
 		if (!Confirm(CURGAME))
-		#endif
 		{
 			MenuFadeOut();
 			return;
@@ -1017,9 +901,6 @@ void DrawNewEpisode(void)
 {
 	int i;
 
-#ifdef JAPAN
-	CA_CacheScreen(S_EPISODEPIC);
-#else
 	ClearMScreen();
 	VWB_DrawPic(112,184,C_MOUSELBACKPIC);
 
@@ -1032,7 +913,6 @@ void DrawNewEpisode(void)
 	#else
 	US_CPrint("Which episode to play?");
 	#endif
-#endif
 
 	SETFONTCOLOR(TEXTCOLOR,BKGDCOLOR);
 	DrawMenu(&NewEitems,&NewEmenu[0]);
@@ -1052,9 +932,6 @@ void DrawNewEpisode(void)
 //
 void DrawNewGame(void)
 {
-#ifdef JAPAN
-	CA_CacheScreen(S_SKILLPIC);
-#else
 	ClearMScreen();
 	VWB_DrawPic(112,184,C_MOUSELBACKPIC);
 
@@ -1073,7 +950,6 @@ void DrawNewGame(void)
 #endif
 
 	DrawWindow(NM_X-5,NM_Y-10,NM_W,NM_H,BKGDCOLOR);
-#endif
 
 	DrawMenu(&NewItems,&NewMenu[0]);
 	DrawNewGameDiff(NewItems.curpos);
@@ -1219,10 +1095,6 @@ void DrawSoundMenu(void)
 {
 	int i,on;
 
-
-#ifdef JAPAN
-	CA_CacheScreen(S_SOUNDPIC);
-#else
 	//
 	// DRAW SOUND MENU
 	//
@@ -1232,7 +1104,6 @@ void DrawSoundMenu(void)
 	DrawWindow(SM_X-8,SM_Y1-3,SM_W,SM_H1,BKGDCOLOR);
 	DrawWindow(SM_X-8,SM_Y2-3,SM_W,SM_H2,BKGDCOLOR);
 	DrawWindow(SM_X-8,SM_Y3-3,SM_W,SM_H3,BKGDCOLOR);
-#endif
 
 	//
 	// IF NO ADLIB, NON-CHOOSENESS!
@@ -1252,18 +1123,12 @@ void DrawSoundMenu(void)
 		SndMenu[5].active=0;
 
 	DrawMenu(&SndItems,&SndMenu[0]);
-#ifndef JAPAN
 	VWB_DrawPic(100,SM_Y1-20,C_FXTITLEPIC);
 	VWB_DrawPic(100,SM_Y2-20,C_DIGITITLEPIC);
 	VWB_DrawPic(100,SM_Y3-20,C_MUSICTITLEPIC);
-#endif
 
 	for (i=0;i<SndItems.amount;i++)
-#ifdef JAPAN
-		if (i!=3 && i!=4 && i!=8 && i!=9)
-#else
 		if (SndMenu[i].string[0])
-#endif
 		{
 			//
 			// DRAW SELECTED/NOT SELECTED GRAPHIC BUTTONS
@@ -1551,11 +1416,7 @@ int CP_SaveGame(int quick)
 			// OVERWRITE EXISTING SAVEGAME?
 			//
 			if (SaveGamesAvail[which]) {
-				#ifdef JAPAN
-				if (!GetYorN(7,8,C_JAPSAVEOVERPIC))
-				#else
 				if (!Confirm(GAMESVD))
-				#endif
 				{
 					DrawLoadSaveScreen(1);
 					continue;
@@ -1635,9 +1496,6 @@ int CalibrateJoystick(void)
 
 	word xmin,ymin,xmax,ymax,jb;
 
-	#ifdef JAPAN
-	VWB_DrawPic(CALX,CALY,C_JOY0PIC);
-	#else
 	DrawWindow(CALX-5,CALY-5,CALW,CALH,TEXTCOLOR);
 	DrawOutline(CALX-5,CALY-5,CALW,CALH,0,HIGHLIGHT);
 	SETFONTCOLOR(0,TEXTCOLOR);
@@ -1652,7 +1510,7 @@ int CalibrateJoystick(void)
 	US_Print(STR_MOVEJOY);
 	SETFONTCOLOR(BKGDCOLOR,TEXTCOLOR);
 	US_Print("   "STR_ESCEXIT);
-	#endif
+
 	VW_UpdateScreen();
 
 	do
@@ -1671,9 +1529,6 @@ int CalibrateJoystick(void)
 	IN_GetJoyAbs(joystickport, &xmin, &ymin);
 
 
-	#ifdef JAPAN
-	VWB_DrawPic(CALX,CALY,C_JOY1PIC);
-	#else
 	DrawWindow(CALX-5,CALY-5,CALW,CALH,TEXTCOLOR);
 	DrawOutline(CALX-5,CALY-5,CALW,CALH,0,HIGHLIGHT);
 	SETFONTCOLOR(0,TEXTCOLOR);
@@ -1686,7 +1541,7 @@ int CalibrateJoystick(void)
 	US_Print(STR_MOVEJOY2);
 	SETFONTCOLOR(BKGDCOLOR,TEXTCOLOR);
 	US_Print("   "STR_ESCEXIT);
-	#endif
+
 	VW_UpdateScreen();
 
 	do
@@ -1792,9 +1647,6 @@ void CP_Control(void)
 //
 void DrawMouseSens(void)
 {
-#ifdef JAPAN
-	CA_CacheScreen(S_MOUSESENSPIC);
-#else
 	ClearMScreen();
 	VWB_DrawPic(112,184,C_MOUSELBACKPIC);
 	#ifdef SPANISH
@@ -1823,7 +1675,6 @@ void DrawMouseSens(void)
 	PrintX=269;
 	US_Print(STR_FAST);
 	#endif
-#endif
 
 	VWB_Bar(60,97,200,10,TEXTCOLOR);
 	DrawOutline(60,97,200,10,0,HIGHLIGHT);
@@ -1924,15 +1775,12 @@ void DrawCtlScreen(void)
  int i,x,y;
 
 
-#ifdef JAPAN
-	CA_CacheScreen(S_CONTROLPIC);
-#else
  ClearMScreen();
  DrawStripes(10);
  VWB_DrawPic(80,0,C_CONTROLPIC);
  VWB_DrawPic(112,184,C_MOUSELBACKPIC);
  DrawWindow(CTL_X-8,CTL_Y-5,CTL_W,CTL_H,BKGDCOLOR);
-#endif
+
  WindowX=0;
  WindowW=320;
  SETFONTCOLOR(TEXTCOLOR,BKGDCOLOR);
@@ -2385,27 +2233,6 @@ void DrawCustomScreen(void)
 {
 	int i;
 
-
-#ifdef JAPAN
-	CA_CacheScreen(S_CUSTOMPIC);
-	fontnumber=1;
-
-	PrintX=CST_START;
-	PrintY = CST_Y+26;
-	DrawCustMouse(0);
-
-	PrintX=CST_START;
-	US_Print("\n\n\n");
-	DrawCustJoy(0);
-
-	PrintX=CST_START;
-	US_Print("\n\n\n");
-	DrawCustKeybd(0);
-
-	PrintX=CST_START;
-	US_Print("\n\n\n");
-	DrawCustKeys(0);
-#else
 	ClearMScreen();
 	WindowX=0;
 	WindowW=320;
@@ -2553,7 +2380,7 @@ void DrawCustomScreen(void)
 	#endif
 	DrawWindow(5,PrintY-1,310,13,BKGDCOLOR);
 	DrawCustKeys(0);
-#endif
+
 	//
 	// PICK STARTING POINT IN MENU
 	//
@@ -2772,11 +2599,6 @@ void CP_ChangeView(void)
 //
 void DrawChangeView(int view)
 {
-#ifdef JAPAN
-	CA_CacheScreen(S_CHANGEPIC);
-
-	ShowViewSize(view);
-#else
 	VWB_Bar(0,160,320,40,VIEWCOLOR);
 	ShowViewSize(view);
 
@@ -2788,7 +2610,7 @@ void DrawChangeView(int view)
 	US_CPrint(STR_SIZE1"\n");
 	US_CPrint(STR_SIZE2"\n");
 	US_CPrint(STR_SIZE3);
-#endif
+
 	VW_UpdateScreen();
 
 	MenuFadeIn();
@@ -2805,16 +2627,10 @@ void CP_Quit(void)
 	int i;
 
 
-	#ifdef JAPAN
-	if (GetYorN(7,11,C_QUITMSGPIC))
-	#else
-
 	#ifdef SPANISH
 	if (Confirm(ENDGAMESTR))
 	#else
 	if (Confirm(endStrings[(US_RndT()&0x7)+(US_RndT()&1)]))
-	#endif
-
 	#endif
 	{
 		VW_UpdateScreen();
@@ -3494,63 +3310,6 @@ int Confirm(char *string)
 	return xit;
 }
 
-#ifdef JAPAN
-////////////////////////////////////////////////////////////////////
-//
-// DRAW MESSAGE & GET Y OR N
-//
-////////////////////////////////////////////////////////////////////
-int GetYorN(int x,int y,int pic)
-{
-	int xit=0,whichsnd[2]={ESCPRESSEDSND,SHOOTSND};
-
-
-	CA_CacheGrChunk(pic);
-	VWB_DrawPic(x * 8,y * 8,pic);
-	UNCACHEGRCHUNK(pic);
-	VW_UpdateScreen();
-	IN_ClearKeysDown();
-
-	do
-	{
-		#ifndef SPEAR
-		if (Keyboard[sc_Tab] && Keyboard[sc_P] && MS_CheckParm("goobers"))
-			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])
-	{
-		xit=1;
-		ShootSnd();
-	}
-
-	while(Keyboard[sc_Y] || Keyboard[sc_N] || Keyboard[sc_Escape]);
-	#endif
-
-	IN_ClearKeysDown();
-	SD_PlaySound(whichsnd[xit]);
-	return xit;
-}
-#endif
-
-
 ////////////////////////////////////////////////////////////////////
 //
 // PRINT A MESSAGE IN A WINDOW
@@ -3708,33 +3467,6 @@ void CheckForEpisodes(void)
 {
 #if 0 /* DOS VERSION */
 	struct ffblk f;
-
-//
-// JAPANESE VERSION
-//
-#ifdef JAPAN
-#ifdef JAPDEMO
-	if (!findfirst("*.WJ1",&f,FA_ARCH))
-	{
-		strcpy(extension,"WJ1");
-#else /* JAPDEMO */
-	if (!findfirst("*.WJ6",&f,FA_ARCH))
-	{
-		strcpy(extension,"WJ6");
-#endif /* JAPDEMO */
-		strcat(configname,extension);
-		strcat(SaveName,extension);
-		strcat(PageFileName,extension);
-		EpisodeSelect[1] =
-		EpisodeSelect[2] =
-		EpisodeSelect[3] =
-		EpisodeSelect[4] =
-		EpisodeSelect[5] = 1;
-	}
-	else
-		Quit("NO JAPANESE WOLFENSTEIN 3-D DATA FILES to be found!");
-#else /* JAPAN */
-
 //
 // ENGLISH
 //
@@ -3767,8 +3499,6 @@ void CheckForEpisodes(void)
 #endif /* SPEAR */
 #endif /* UPLOAD */
 
-
-
 #ifdef SPEAR
 #ifndef SPEARDEMO
 	if (!findfirst("*.SOD",&f,FA_ARCH))
@@ -3794,39 +3524,13 @@ void CheckForEpisodes(void)
 	else
 		Quit("NO WOLFENSTEIN 3-D DATA FILES to be found!");
 #endif /* SPEAR */
-#endif /* JAPAN */
 
 	strcat(configname,extension);
 	strcat(SaveName,extension);
 	strcat(PageFileName,extension);
 
 #else
-
 	glob_t globbuf;
-//
-// JAPANESE VERSION
-//
-#ifdef JAPAN
-#ifdef JAPDEMO
-	if (glob("*.wj1", 0, NULL, &globbuf) == 0) {
-		strcpy(extension, "wj1");
-#else /* JAPDEMO */
-	if (glob("*.wj6", 0, NULL, &globbuf) == 0) {
-		strcpy(extension, "wj6");
-#endif /* JAPDEMO */
-		strcat(configname,extension);
-		strcat(SaveName,extension);
-		strcat(PageFileName,extension);
-		EpisodeSelect[1] =
-		EpisodeSelect[2] =
-		EpisodeSelect[3] =
-		EpisodeSelect[4] =
-		EpisodeSelect[5] = 1;
-	}
-	else
-		Quit("NO JAPANESE WOLFENSTEIN 3-D DATA FILES to be found!");
-#else /* JAPAN */
-
 //
 // ENGLISH
 //
@@ -3876,7 +3580,6 @@ void CheckForEpisodes(void)
 	else
 		Quit("NO WOLFENSTEIN 3-D DATA FILES to be found!");
 #endif /* SPEAR */
-#endif /* JAPAN */
 
 	strcat(configname,extension);
 	strcat(SaveName,extension);

src/wl_menu.h

@@ -221,7 +221,6 @@ typedef struct {
 extern LRstruct LevelRatios[];
 
 void Write (int x,int y,char *string);
-void NonShareware(void);
 int GetYorN(int x,int y,int pic);
 
 #else

src/wl_text.c

@@ -59,7 +59,6 @@ boolean		layoutdone;
 
 //===========================================================================
 
-#ifndef JAPAN
 /*
 =====================
 =
@@ -592,8 +591,6 @@ void CacheLayoutGraphics (void)
 
 	Quit ("CacheLayoutGraphics: No ^E to terminate file!");
 }
-#endif
-
 
 /*
 =====================
@@ -603,53 +600,12 @@ void CacheLayoutGraphics (void)
 =====================
 */
 
-#ifdef JAPAN
-void ShowArticle (int which)
-#else
 void ShowArticle (char *article)
-#endif
 {
-	#ifdef JAPAN
-	int		snames[10] = {	H_HELP1PIC,
-							H_HELP2PIC,
-							H_HELP3PIC,
-							H_HELP4PIC,
-							H_HELP5PIC,
-							H_HELP6PIC,
-							H_HELP7PIC,
-							H_HELP8PIC,
-							H_HELP9PIC,
-							H_HELP10PIC};
-	int		enames[14] = {
-							0,0,
-							#ifndef JAPDEMO
-							C_ENDGAME1APIC,
-							C_ENDGAME1BPIC,
-							C_ENDGAME2APIC,
-							C_ENDGAME2BPIC,
-							C_ENDGAME3APIC,
-							C_ENDGAME3BPIC,
-							C_ENDGAME4APIC,
-							C_ENDGAME4BPIC,
-							C_ENDGAME5APIC,
-							C_ENDGAME5BPIC,
-							C_ENDGAME6APIC,
-							C_ENDGAME6BPIC
-							#endif
-							};
-	#endif
 	unsigned	oldfontnumber;
 	unsigned	temp;
 	boolean 	newpage,firstpage;
 
-	#ifdef JAPAN
-	pagenum = 1;
-	if (!which)
-		numpages = 10;
-	else
-		numpages = 2;
-
-	#else
 
 	text = article;
 	oldfontnumber = fontnumber;
@@ -658,7 +614,6 @@ void ShowArticle (char *article)
 	CA_CacheGrChunk(STARTFONT);
 	VWB_Bar (0,0,320,200,BACKCOLOR);
 	CacheLayoutGraphics ();
-	#endif
 
 	newpage = true;
 	firstpage = true;
@@ -668,14 +623,7 @@ void ShowArticle (char *article)
 		if (newpage)
 		{
 			newpage = false;
-			#ifdef JAPAN
-			if (!which)
-				CA_CacheScreen(snames[pagenum - 1]);
-			else
-				CA_CacheScreen(enames[which*2 + pagenum - 1]);
-			#else
 			PageLayout (true);
-			#endif
 			VW_UpdateScreen ();
 			if (firstpage)
 			{
@@ -696,12 +644,8 @@ void ShowArticle (char *article)
 		case sc_LeftArrow:
 			if (pagenum>1)
 			{
-				#ifndef JAPAN
 				BackPage ();
 				BackPage ();
-				#else
-				pagenum--;
-				#endif
 				newpage = true;
 			}
 			break;
@@ -713,9 +657,6 @@ void ShowArticle (char *article)
 			if (pagenum<numpages)
 			{
 				newpage = true;
-				#ifdef JAPAN
-				pagenum++;
-				#endif
 			}
 			break;
 		}
@@ -734,12 +675,10 @@ void ShowArticle (char *article)
 
 //===========================================================================
 
-#ifndef JAPAN
 int 	endextern = T_ENDART1;
 #ifndef SPEAR
 int		helpextern = T_HELPART;
 #endif
-#endif
 
 /*
 =================
@@ -757,13 +696,6 @@ void HelpScreens (void)
 
 	CA_UpLevel ();
 	MM_SortMem ();
-#ifdef JAPAN
-	ShowArticle (0);
-	VW_FadeOut();
-	FreeMusic ();
-	CA_DownLevel ();
-	MM_SortMem ();
-#else
 
 	artnum = helpextern;
 	CA_CacheGrChunk (artnum);
@@ -779,7 +711,6 @@ void HelpScreens (void)
 	FreeMusic ();
 	CA_DownLevel ();
 	MM_SortMem ();
-#endif
 }
 
 //
@@ -796,18 +727,6 @@ void EndText (void)
 
 	CA_UpLevel ();
 	MM_SortMem ();
-#ifdef JAPAN
-	ShowArticle(gamestate.episode + 1);
-
-	VW_FadeOut();
-
-	SETFONTCOLOR(0,15);
-	IN_ClearKeysDown();
-
-	FreeMusic ();
-	CA_DownLevel ();
-	MM_SortMem ();
-#else
 
 	artnum = endextern+gamestate.episode;
 	CA_CacheGrChunk (artnum);
@@ -825,7 +744,6 @@ void EndText (void)
 	FreeMusic ();
 	CA_DownLevel ();
 	MM_SortMem ();
-#endif
 }
 
 #endif