Skip to content

W
wolf3d
Commit 4e962545 authored by Steven Fuller's avatar Steven Fuller
Browse files
Options

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

released)
parent 82883df5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 571 deletions
src/TODO
View file @ 4e962545
......@@ -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
View file @ 4e962545
......@@ -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
View file @ 4e962545
......@@ -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
View file @ 4e962545
......@@ -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
View file @ 4e962545
......@@ -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
View file @ 4e962545
......@@ -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
View file @ 4e962545
......@@ -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
CopyProtection();
#endif
#endif
#endif
#endif
#if !defined(GOODTIMES) && defined(SPEAR) && !defined(SPEARDEMO)
CopyProtection();
#endif
#endif
StartCPMusic(INTROSONG);
#ifndef JAPAN
if (!NoWait)
PG13 ();
#endif
while (1)
{
......
src/wl_menu.c
View file @ 4e962545
This diff is collapsed.
src/wl_menu.h
View file @ 4e962545
......@@ -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
View file @ 4e962545
......@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment