ref: ba287ed5e02c179343eb8f2642730ce95f403f8f
parent: a0c3c62fcd25dd62d5c69353a604d3f6afbaa75b
author: Konstantinn Bonnet <[email protected]>
date: Sun Feb 21 06:33:14 EST 2016
remove localization crap and more rotten headers
--- a/act2.c
+++ b/act2.c
@@ -3787,13 +3787,7 @@
PM_UnlockMainMem ();
CA_UpLevel ();
CacheLump(LEVELEND_LUMP_START,LEVELEND_LUMP_END);
- #ifdef JAPAN
- #ifndef JAPDEMO
- CA_CacheScreen(C_LETSSEEPIC);
- #endif
- #else
Write(0,7,STR_SEEAGAIN);
- #endif
CA_DownLevel ();
PM_CheckMainMem ();
--- a/budiosod.h
+++ /dev/null
@@ -1,142 +1,0 @@
-/////////////////////////////////////////////////
-//
-// MUSE Header for .SOD
-// Created Thu Aug 13 09:25:58 1992
-//
-/////////////////////////////////////////////////
-
-#define NUMSOUNDS 81
-#define NUMSNDCHUNKS 267
-
-//
-// Sound names & indexes
-//
-typedef enum {- HITWALLSND, // 0
- MISSILEHITSND, // 1
- SELECTITEMSND, // 2
- GHOSTSIGHTSND, // 3
- MOVEGUN2SND, // 4
- MOVEGUN1SND, // 5
- NOWAYSND, // 6
- NAZIHITPLAYERSND, // 7
- MISSILEFIRESND, // 8
- PLAYERDEATHSND, // 9
- DOGDEATHSND, // 10
- ATKGATLINGSND, // 11
- GETKEYSND, // 12
- NOITEMSND, // 13
- WALK1SND, // 14
- WALK2SND, // 15
- TAKEDAMAGESND, // 16
- GAMEOVERSND, // 17
- OPENDOORSND, // 18
- CLOSEDOORSND, // 19
- DONOTHINGSND, // 20
- HALTSND, // 21
- DEATHSCREAM2SND, // 22
- ATKKNIFESND, // 23
- ATKPISTOLSND, // 24
- DEATHSCREAM3SND, // 25
- ATKMACHINEGUNSND, // 26
- HITENEMYSND, // 27
- SHOOTDOORSND, // 28
- DEATHSCREAM1SND, // 29
- GETMACHINESND, // 30
- GETAMMOSND, // 31
- SHOOTSND, // 32
- HEALTH1SND, // 33
- HEALTH2SND, // 34
- BONUS1SND, // 35
- BONUS2SND, // 36
- BONUS3SND, // 37
- GETGATLINGSND, // 38
- ESCPRESSEDSND, // 39
- LEVELDONESND, // 40
- DOGBARKSND, // 41
- ENDBONUS1SND, // 42
- ENDBONUS2SND, // 43
- BONUS1UPSND, // 44
- BONUS4SND, // 45
- PUSHWALLSND, // 46
- NOBONUSSND, // 47
- PERCENT100SND, // 48
- BOSSACTIVESND, // 49
- DEATHSCREAM4SND, // 50
- SCHUTZADSND, // 51
- AHHHGSND, // 52
- DEATHSCREAM5SND, // 53
- DEATHSCREAM7SND, // 54
- DEATHSCREAM8SND, // 55
- LEBENSND, // 56
- DEATHSCREAM6SND, // 57
- NAZIFIRESND, // 58
- BOSSFIRESND, // 59
- SSFIRESND, // 60
- SLURPIESND, // 61
- GHOSTFADESND, // 62
- DEATHSCREAM9SND, // 63
- GETAMMOBOXSND, // 64
- ANGELSIGHTSND, // 65
- SPIONSND, // 66
- NEINSOVASSND, // 67
- DOGATTACKSND, // 68
- ANGELFIRESND, // 69
- TRANSSIGHTSND, // 70
- TRANSDEATHSND, // 71
- WILHELMSIGHTSND, // 72
- WILHELMDEATHSND, // 73
- UBERDEATHSND, // 74
- KNIGHTSIGHTSND, // 75
- KNIGHTDEATHSND, // 76
- ANGELDEATHSND, // 77
- KNIGHTMISSILESND, // 78
- GETSPEARSND, // 79
- ANGELTIREDSND, // 80
- LASTSOUND
- } soundnames;
-
-//
-// Base offsets
-//
-#define STARTPCSOUNDS 0
-#define STARTADLIBSOUNDS 81
-#define STARTDIGISOUNDS 162
-#define STARTMUSIC 243
-
-//
-// Music names & indexes
-//
-typedef enum {- XFUNKIE_MUS, // 0
- DUNGEON_MUS, // 1
- XDEATH_MUS, // 2
- GETTHEM_MUS, // 3
- XTIPTOE_MUS, // 4
- GOINGAFT_MUS, // 5
- URAHERO_MUS, // 6
- XTHEEND_MUS, // 7
- NAZI_OMI_MUS, // 8
- POW_MUS, // 9
- TWELFTH_MUS, // 10
- SEARCHN_MUS, // 11
- SUSPENSE_MUS, // 12
- ZEROHOUR_MUS, // 13
- WONDERIN_MUS, // 14
- ULTIMATE_MUS, // 15
- ENDLEVEL_MUS, // 16
- XEVIL_MUS, // 17
- XJAZNAZI_MUS, // 18
- COPYPRO_MUS, // 19
- XAWARD_MUS, // 20
- XPUTIT_MUS, // 21
- XGETYOU_MUS, // 22
- XTOWER2_MUS, // 23
- LASTMUSIC
- } musicnames;
-
-/////////////////////////////////////////////////
-//
-// Thanks for playing with MUSE!
-//
-/////////////////////////////////////////////////
--- a/budiowl6.h
+++ /dev/null
@@ -1,151 +1,0 @@
-/////////////////////////////////////////////////
-//
-// MUSE Header for .WL6
-// Created Sat May 30 18:41:31 1992
-//
-/////////////////////////////////////////////////
-
-#define NUMSOUNDS 87
-#define NUMSNDCHUNKS 288
-
-//
-// Sound names & indexes
-//
-typedef enum {- HITWALLSND, // 0
- SELECTWPNSND, // 1
- SELECTITEMSND, // 2
- HEARTBEATSND, // 3
- MOVEGUN2SND, // 4
- MOVEGUN1SND, // 5
- NOWAYSND, // 6
- NAZIHITPLAYERSND, // 7
- SCHABBSTHROWSND, // 8
- PLAYERDEATHSND, // 9
- DOGDEATHSND, // 10
- ATKGATLINGSND, // 11
- GETKEYSND, // 12
- NOITEMSND, // 13
- WALK1SND, // 14
- WALK2SND, // 15
- TAKEDAMAGESND, // 16
- GAMEOVERSND, // 17
- OPENDOORSND, // 18
- CLOSEDOORSND, // 19
- DONOTHINGSND, // 20
- HALTSND, // 21
- DEATHSCREAM2SND, // 22
- ATKKNIFESND, // 23
- ATKPISTOLSND, // 24
- DEATHSCREAM3SND, // 25
- ATKMACHINEGUNSND, // 26
- HITENEMYSND, // 27
- SHOOTDOORSND, // 28
- DEATHSCREAM1SND, // 29
- GETMACHINESND, // 30
- GETAMMOSND, // 31
- SHOOTSND, // 32
- HEALTH1SND, // 33
- HEALTH2SND, // 34
- BONUS1SND, // 35
- BONUS2SND, // 36
- BONUS3SND, // 37
- GETGATLINGSND, // 38
- ESCPRESSEDSND, // 39
- LEVELDONESND, // 40
- DOGBARKSND, // 41
- ENDBONUS1SND, // 42
- ENDBONUS2SND, // 43
- BONUS1UPSND, // 44
- BONUS4SND, // 45
- PUSHWALLSND, // 46
- NOBONUSSND, // 47
- PERCENT100SND, // 48
- BOSSACTIVESND, // 49
- MUTTISND, // 50
- SCHUTZADSND, // 51
- AHHHGSND, // 52
- DIESND, // 53
- EVASND, // 54
- GUTENTAGSND, // 55
- LEBENSND, // 56
- SCHEISTSND, // 57
- NAZIFIRESND, // 58
- BOSSFIRESND, // 59
- SSFIRESND, // 60
- SLURPIESND, // 61
- TOT_HUNDSND, // 62
- MEINGOTTSND, // 63
- SCHABBSHASND, // 64
- HITLERHASND, // 65
- SPIONSND, // 66
- NEINSOVASSND, // 67
- DOGATTACKSND, // 68
- FLAMETHROWERSND, // 69
- MECHSTEPSND, // 70
- GOOBSSND, // 71
- YEAHSND, // 72
- DEATHSCREAM4SND, // 73
- DEATHSCREAM5SND, // 74
- DEATHSCREAM6SND, // 75
- DEATHSCREAM7SND, // 76
- DEATHSCREAM8SND, // 77
- DEATHSCREAM9SND, // 78
- DONNERSND, // 79
- EINESND, // 80
- ERLAUBENSND, // 81
- KEINSND, // 82
- MEINSND, // 83
- ROSESND, // 84
- MISSILEFIRESND, // 85
- MISSILEHITSND, // 86
- LASTSOUND
- } soundnames;
-
-//
-// Base offsets
-//
-#define STARTPCSOUNDS 0
-#define STARTADLIBSOUNDS 87
-#define STARTDIGISOUNDS 174
-#define STARTMUSIC 261
-
-//
-// Music names & indexes
-//
-typedef enum {- CORNER_MUS, // 0
- DUNGEON_MUS, // 1
- WARMARCH_MUS, // 2
- GETTHEM_MUS, // 3
- HEADACHE_MUS, // 4
- HITLWLTZ_MUS, // 5
- INTROCW3_MUS, // 6
- NAZI_NOR_MUS, // 7
- NAZI_OMI_MUS, // 8
- POW_MUS, // 9
- SALUTE_MUS, // 10
- SEARCHN_MUS, // 11
- SUSPENSE_MUS, // 12
- VICTORS_MUS, // 13
- WONDERIN_MUS, // 14
- FUNKYOU_MUS, // 15
- ENDLEVEL_MUS, // 16
- GOINGAFT_MUS, // 17
- PREGNANT_MUS, // 18
- ULTIMATE_MUS, // 19
- NAZI_RAP_MUS, // 20
- ZEROHOUR_MUS, // 21
- TWELFTH_MUS, // 22
- ROSTER_MUS, // 23
- URAHERO_MUS, // 24
- VICMARCH_MUS, // 25
- PACMAN_MUS, // 26
- LASTMUSIC
- } musicnames;
-
-/////////////////////////////////////////////////
-//
-// Thanks for playing with MUSE!
-//
-/////////////////////////////////////////////////
--- a/dat.h
+++ b/dat.h
@@ -1,2 +1,5 @@
+typedef short s16int;
+typedef int s32int;
+
extern u32int pal[];
extern u8int intro[];
--- a/def.h
+++ b/def.h
@@ -9,11 +9,7 @@
#include "WL_MENU.H"
-#ifdef SPANISH
-#include "SPANISH.H"
-#else
#include "FOREIGN.H"
-#endif
#ifdef SPEAR
#include "F_SPEAR.H"
--- a/game.c
+++ b/game.c
@@ -1347,9 +1347,7 @@
CheckHighScore (gamestate.score,gamestate.mapon+1);
#pragma warn -sus
- #ifndef JAPAN
_fstrcpy(MainMenu[viewscores].string,STR_VS);
- #endif
MainMenu[viewscores].routine = CP_ViewScores;
#pragma warn +sus
@@ -1357,28 +1355,6 @@
}
#endif
-#ifdef JAPDEMO
- if (gamestate.mapon == 3)
- {- died = true; // don't "get psyched!"
-
- VW_FadeOut ();
-
- ClearMemory ();
-
- CheckHighScore (gamestate.score,gamestate.mapon+1);
-
- #pragma warn -sus
- #ifndef JAPAN
- _fstrcpy(MainMenu[viewscores].string,STR_VS);
- #endif
- MainMenu[viewscores].routine = CP_ViewScores;
- #pragma warn +sus
-
- return;
- }
-#endif
-
gamestate.oldscore = gamestate.score;
#ifndef SPEAR
@@ -1441,9 +1417,7 @@
CheckHighScore (gamestate.score,gamestate.mapon+1);
#pragma warn -sus
- #ifndef JAPAN
_fstrcpy(MainMenu[viewscores].string,STR_VS);
- #endif
MainMenu[viewscores].routine = CP_ViewScores;
#pragma warn +sus
@@ -1465,9 +1439,7 @@
CheckHighScore (gamestate.score,gamestate.mapon+1);
#pragma warn -sus
- #ifndef JAPAN
_fstrcpy(MainMenu[viewscores].string,STR_VS);
- #endif
MainMenu[viewscores].routine = CP_ViewScores;
#pragma warn +sus
--- a/gfxe_sod.h
+++ /dev/null
@@ -1,53 +1,0 @@
-//////////////////////////////////////
-//
-// Graphics .H file for .SOD
-// IGRAB-ed on Fri Jul 31 18:31:00 1992
-//
-//////////////////////////////////////
-
-typedef enum {-
-
-
- ENUMEND
- } graphicnums;
-
-//
-// Data LUMPs
-//
-
-//
-// Amount of each data item
-//
-#define NUMCHUNKS 414
-#define NUMFONT 0
-#define NUMFONTM 0
-#define NUMPICS 0
-#define NUMPICM 0
-#define NUMSPRITES 0
-#define NUMTILE8 0
-#define NUMTILE8M 0
-#define NUMTILE16 144
-#define NUMTILE16M 270
-#define NUMTILE32 0
-#define NUMTILE32M 0
-#define NUMEXTERNS 0
-//
-// File offsets for data items
-//
-#define STARTFONT 0
-#define STARTFONTM 0
-#define STARTPICS 0
-#define STARTPICM 0
-#define STARTSPRITES 0
-#define STARTTILE8 0
-#define STARTTILE8M 0
-#define STARTTILE16 0
-#define STARTTILE16M 144
-#define STARTTILE32 414
-#define STARTTILE32M 414
-#define STARTEXTERNS 414
-
-//
-// Thank you for using IGRAB!
-//
--- a/gfxe_wl1.h
+++ /dev/null
@@ -1,211 +1,0 @@
-//////////////////////////////////////
-//
-// Graphics .H file for .WL1
-// IGRAB-ed on Sat May 02 02:16:56 1992
-//
-//////////////////////////////////////
-
-typedef enum {- // Lump Start
- H_BJPIC=3,
- H_CASTLEPIC, // 4
- H_KEYBOARDPIC, // 5
- H_JOYPIC, // 6
- H_MOUSEPIC, // 7
- H_BOTHPIC, // 8
- H_GAMEPADPIC, // 9
- H_HEALPIC, // 10
- H_TREASUREPIC, // 11
- H_GUNPIC, // 12
- H_KEYPIC, // 13
- H_BLAZEPIC, // 14
- H_WEAPON1234PIC, // 15
- H_WOLFLOGOPIC, // 16
- H_VISAPIC, // 17
- H_MCPIC, // 18
- H_IDLOGOPIC, // 19
- H_FAXPIC, // 20
- H_GALACTIXPIC, // 21
- H_FGODMOMPIC, // 22
- H_AUSTRALIAPIC, // 23
- H_CANADAPIC, // 24
- H_UKPIC, // 25
- // Lump Start
- C_OPTIONSPIC, // 26
- C_CURSOR1PIC, // 27
- C_CURSOR2PIC, // 28
- C_NOTSELECTEDPIC, // 29
- C_SELECTEDPIC, // 30
- C_FXTITLEPIC, // 31
- C_DIGITITLEPIC, // 32
- C_MUSICTITLEPIC, // 33
- C_MOUSELBACKPIC, // 34
- C_BABYMODEPIC, // 35
- C_EASYPIC, // 36
- C_NORMALPIC, // 37
- C_HARDPIC, // 38
- C_LOADSAVEDISKPIC, // 39
- C_DISKLOADING1PIC, // 40
- C_DISKLOADING2PIC, // 41
- C_CONTROLPIC, // 42
- C_CUSTOMIZEPIC, // 43
- C_LOADGAMEPIC, // 44
- C_SAVEGAMEPIC, // 45
- C_EPISODE1PIC, // 46
- C_EPISODE2PIC, // 47
- C_EPISODE3PIC, // 48
- C_EPISODE4PIC, // 49
- C_EPISODE5PIC, // 50
- C_EPISODE6PIC, // 51
- C_CODEPIC, // 52
- // Lump Start
- L_GUYPIC, // 53
- L_COLONPIC, // 54
- L_NUM0PIC, // 55
- L_NUM1PIC, // 56
- L_NUM2PIC, // 57
- L_NUM3PIC, // 58
- L_NUM4PIC, // 59
- L_NUM5PIC, // 60
- L_NUM6PIC, // 61
- L_NUM7PIC, // 62
- L_NUM8PIC, // 63
- L_NUM9PIC, // 64
- L_PERCENTPIC, // 65
- L_APIC, // 66
- L_BPIC, // 67
- L_CPIC, // 68
- L_DPIC, // 69
- L_EPIC, // 70
- L_FPIC, // 71
- L_GPIC, // 72
- L_HPIC, // 73
- L_IPIC, // 74
- L_JPIC, // 75
- L_KPIC, // 76
- L_LPIC, // 77
- L_MPIC, // 78
- L_NPIC, // 79
- L_OPIC, // 80
- L_PPIC, // 81
- L_QPIC, // 82
- L_RPIC, // 83
- L_SPIC, // 84
- L_TPIC, // 85
- L_UPIC, // 86
- L_VPIC, // 87
- L_WPIC, // 88
- L_XPIC, // 89
- L_YPIC, // 90
- L_ZPIC, // 91
- L_GUY2PIC, // 92
- L_BJWINSPIC, // 93
- STATUSBARPIC, // 94
- TITLEPIC, // 95
- PG13PIC, // 96
- CREDITSPIC, // 97
- HIGHSCORESPIC, // 98
- // Lump Start
- KNIFEPIC, // 99
- GUNPIC, // 100
- MACHINEGUNPIC, // 101
- GATLINGGUNPIC, // 102
- NOKEYPIC, // 103
- GOLDKEYPIC, // 104
- SILVERKEYPIC, // 105
- N_BLANKPIC, // 106
- N_0PIC, // 107
- N_1PIC, // 108
- N_2PIC, // 109
- N_3PIC, // 110
- N_4PIC, // 111
- N_5PIC, // 112
- N_6PIC, // 113
- N_7PIC, // 114
- N_8PIC, // 115
- N_9PIC, // 116
- FACE1APIC, // 117
- FACE1BPIC, // 118
- FACE1CPIC, // 119
- FACE2APIC, // 120
- FACE2BPIC, // 121
- FACE2CPIC, // 122
- FACE3APIC, // 123
- FACE3BPIC, // 124
- FACE3CPIC, // 125
- FACE4APIC, // 126
- FACE4BPIC, // 127
- FACE4CPIC, // 128
- FACE5APIC, // 129
- FACE5BPIC, // 130
- FACE5CPIC, // 131
- FACE6APIC, // 132
- FACE6BPIC, // 133
- FACE6CPIC, // 134
- FACE7APIC, // 135
- FACE7BPIC, // 136
- FACE7CPIC, // 137
- FACE8APIC, // 138
- GOTGATLINGPIC, // 139
- PAUSEDPIC, // 140
- GETPSYCHEDPIC, // 141
-
-
-
- ORDERSCREEN=557,
- ENUMEND
- } graphicnums;
-
-//
-// Data LUMPs
-//
-#define README_LUMP_START 3
-#define README_LUMP_END 25
-
-#define CONTROLS_LUMP_START 26
-#define CONTROLS_LUMP_END 52
-
-#define LEVELEND_LUMP_START 53
-#define LEVELEND_LUMP_END 93
-
-#define LATCHPICS_LUMP_START 99
-#define LATCHPICS_LUMP_END 141
-
-
-//
-// Amount of each data item
-//
-#define NUMCHUNKS 558
-#define NUMFONT 2
-#define NUMFONTM 0
-#define NUMPICS 139
-#define NUMPICM 0
-#define NUMSPRITES 0
-#define NUMTILE8 72
-#define NUMTILE8M 0
-#define NUMTILE16 144
-#define NUMTILE16M 270
-#define NUMTILE32 0
-#define NUMTILE32M 0
-#define NUMEXTERNS 1
-//
-// File offsets for data items
-//
-#define STRUCTPIC 0
-
-#define STARTFONT 1
-#define STARTFONTM 3
-#define STARTPICS 3
-#define STARTPICM 142
-#define STARTSPRITES 142
-#define STARTTILE8 142
-#define STARTTILE8M 143
-#define STARTTILE16 143
-#define STARTTILE16M 287
-#define STARTTILE32 557
-#define STARTTILE32M 557
-#define STARTEXTERNS 557
-
-//
-// Thank you for using IGRAB!
-//
--- a/gfxe_wl6.h
+++ /dev/null
@@ -1,53 +1,0 @@
-//////////////////////////////////////
-//
-// Graphics .H file for .WL6
-// IGRAB-ed on Sun Aug 09 22:17:20 1992
-//
-//////////////////////////////////////
-
-typedef enum {-
-
-
- ENUMEND
- } graphicnums;
-
-//
-// Data LUMPs
-//
-
-//
-// Amount of each data item
-//
-#define NUMCHUNKS 414
-#define NUMFONT 0
-#define NUMFONTM 0
-#define NUMPICS 0
-#define NUMPICM 0
-#define NUMSPRITES 0
-#define NUMTILE8 0
-#define NUMTILE8M 0
-#define NUMTILE16 144
-#define NUMTILE16M 270
-#define NUMTILE32 0
-#define NUMTILE32M 0
-#define NUMEXTERNS 0
-//
-// File offsets for data items
-//
-#define STARTFONT 0
-#define STARTFONTM 0
-#define STARTPICS 0
-#define STARTPICM 0
-#define STARTSPRITES 0
-#define STARTTILE8 0
-#define STARTTILE8M 0
-#define STARTTILE16 0
-#define STARTTILE16M 144
-#define STARTTILE32 414
-#define STARTTILE32M 414
-#define STARTEXTERNS 414
-
-//
-// Thank you for using IGRAB!
-//
--- a/heads.h
+++ b/heads.h
@@ -6,16 +6,6 @@
#define introscn signon
-#ifdef JAPAN
-#ifdef JAPDEMO
-#include "FOREIGN\JAPAN\GFXV_WJ1.H"
-#else
-#include "FOREIGN\JAPAN\GFXV_WJ6.H"
-#endif
-#include "AUDIOWL6.H"
-#include "MAPSWL6.H"
-#else
-
#ifndef SPEAR
#include "GFXV_WL6.H"
@@ -35,7 +25,6 @@
#endif
#endif
-#endif
//-----------------
@@ -47,8 +36,6 @@
// v1.0d1
//
-typedef short s16int;
-typedef int s32int;
#include "ID_MM.H"
#include "ID_PM.H"
--- a/inter.c
+++ b/inter.c
@@ -159,13 +159,6 @@
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);
@@ -172,23 +165,12 @@
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
-#endif
-
-#ifndef JAPDEMO
VWB_DrawPic (8,4,L_BJWINSPIC);
-#endif
-
#ifndef SPEAR
for (kr = sr = tr = sec = i = 0;i < 8;i++)
#else
@@ -242,7 +224,6 @@
Write(x,RATIOY+4,tempstr);
-#ifndef SPANISH
#ifndef UPLOAD
#ifndef SPEAR
//
@@ -264,7 +245,6 @@
}
#endif
#endif
-#endif
fontnumber = 1;
@@ -298,7 +278,6 @@
//==========================================================================
-#ifndef JAPAN
/*
==================
=
@@ -323,7 +302,6 @@
VW_FadeOut ();
}
-#endif
//==========================================================================
@@ -566,11 +544,6 @@
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
@@ -582,35 +555,19 @@
mapon < 17)
#endif
{-#ifndef JAPAN
- #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));
-#endif
- #ifdef SPANISH
- Write(30,12,parTimes[gamestate.episode*10+mapon].timestr);
- #else
Write(26,12,parTimes[gamestate.episode*10+mapon].timestr);
- #endif
//
// PRINT TIME
@@ -626,11 +583,7 @@
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));
@@ -684,11 +637,7 @@
}
- #ifdef SPANISH
- #define RATIOXX 33
- #else
#define RATIOXX 37
- #endif
//
// KILL RATIO
//
@@ -920,23 +869,6 @@
}
#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();
@@ -1263,7 +1195,6 @@
#ifndef UPLOAD
#ifndef SPEAR
-#ifndef JAPAN
////////////////////////////////////////////////////////
//
// NON-SHAREWARE NOTICE
@@ -1283,24 +1214,14 @@
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 ();
@@ -1307,7 +1228,6 @@
VW_FadeIn();
IN_Ack();
}
-#endif
#endif
#endif
--- a/main.c
+++ b/main.c
@@ -771,34 +771,18 @@
WindowW = 320;
PrintY = 190;
- #ifndef JAPAN
SETFONTCOLOR(14,4);
-
- #ifdef SPANISH
- US_CPrint ("Oprima una tecla");- #else
US_CPrint ("Press a key");- #endif
- #endif
-
if (!NoWait)
IN_Ack ();
- #ifndef JAPAN
VW_Bar (0,189,300,11,peekb(0xa000,0));
PrintY = 190;
SETFONTCOLOR(10,4);
-
- #ifdef SPANISH
- US_CPrint ("pensando...");- #else
US_CPrint ("Working...");- #endif
- #endif
-
SETFONTCOLOR(0,15);
#else
if (!NoWait)
@@ -1354,10 +1338,8 @@
ClearMemory ();
if (!*error)
{- #ifndef JAPAN
CA_CacheGrChunk (ORDERSCREEN);
screen = grsegs[ORDERSCREEN];
- #endif
WriteConfig ();
}
else
@@ -1380,10 +1362,8 @@
if (!error || !(*error))
{clrscr();
- #ifndef JAPAN
movedata ((u16int)screen,7,0xb800,0,4000);
gotoxy(1,24);
- #endif
//asm mov bh,0
//asm mov dh,23 // row
//asm mov dl,0 // collumn
@@ -1455,13 +1435,10 @@
#ifndef DEMOTEST
#ifndef UPLOAD
-
#ifndef GOODTIMES
#ifndef SPEAR
- #ifndef JAPAN
if (!NoWait)
NonShareware();
- #endif
#else
#ifndef GOODTIMES
@@ -1469,7 +1446,6 @@
CopyProtection();
#endif
#endif
-
#endif
#endif
#endif
@@ -1476,10 +1452,8 @@
StartCPMusic(INTROSONG);
-#ifndef JAPAN
if (!NoWait)
PG13 ();
-#endif
#endif
--- a/mapswlf.h
+++ /dev/null
@@ -1,16 +1,0 @@
-///////////////////////////////////////
-//
-// TED5 Map Header for WLF
-//
-///////////////////////////////////////
-
-//
-// Map Names
-//
-typedef enum {- LEVEL_ONE_MAP, // 0
- LEVEL_TWO_MAP, // 1
- LEVEL_THREE_MAP, // 2
- LEVEL_FOUR_MAP, // 3
- LASTMAP
- } mapnames;
--- a/menu.c
+++ b/menu.c
@@ -62,19 +62,6 @@
CP_itemtype far
MainMenu[]=
{-#ifdef JAPAN
- {1,"",CP_NewGame},- {1,"",CP_Sound},- {1,"",CP_Control},- {1,"",CP_LoadGame},- {0,"",CP_SaveGame},- {1,"",CP_ChangeView},- {2,"",CP_ReadThis},- {1,"",CP_ViewScores},- {1,"",0},- {1,"",0}-#else
-
{1,STR_NG,CP_NewGame}, {1,STR_SD,CP_Sound}, {1,STR_CL,CP_Control},@@ -84,13 +71,7 @@
#ifndef GOODTIMES
#ifndef SPEAR
-
- #ifdef SPANISH
- {2,"Ve esto!",CP_ReadThis},- #else
{2,"Read This!",CP_ReadThis},- #endif
-
#endif
#endif
@@ -97,25 +78,10 @@
{1,STR_VS,CP_ViewScores}, {1,STR_BD,0}, {1,STR_QT,0}-#endif
},
far 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},@@ -128,19 +94,10 @@
{0,"",0}, {1,STR_NONE,0}, {1,STR_ALSB,0}-#endif
},
far CtlMenu[]=
{-#ifdef JAPAN
- {0,"",0},- {0,"",0},- {0,"",0},- {0,"",0},- {0,"",MouseSensitivity},- {1,"",CustomControls}-#else
{0,STR_MOUSEEN,0}, {0,STR_JOYEN,0}, {0,STR_PORT2,0},@@ -147,7 +104,6 @@
{0,STR_GAMEPAD,0}, {0,STR_SENS,MouseSensitivity}, {1,STR_CUSTOM,CustomControls}-#endif
},
#pragma warn +sus
@@ -155,54 +111,6 @@
#ifndef SPEAR
far 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},
- {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},@@ -220,8 +128,6 @@
{0,"",0}, {3,"Episode 6\n""Confrontation",0}
- #endif
-#endif
},
#endif
@@ -228,17 +134,10 @@
far 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
},
far LSMenu[]=
@@ -517,9 +416,7 @@
{#pragma warn -sus
MainMenu[viewscores].routine = NULL;
- #ifndef JAPAN
_fstrcpy(MainMenu[viewscores].string,STR_EG);
- #endif
#pragma warn +sus
}
@@ -538,9 +435,6 @@
//
void DrawMainMenu(void)
{-#ifdef JAPAN
- CA_CacheScreen(S_OPTIONSPIC);
-#else
ClearMScreen();
VWB_DrawPic(112,184,C_MOUSELBACKPIC);
@@ -547,12 +441,7 @@
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
-#endif
//
// CHANGE "GAME" AND "DEMO"
@@ -559,40 +448,12 @@
//
if (ingame)
{- #ifndef JAPAN
-
- #ifdef SPANISH
- _fstrcpy(&MainMenu[backtodemo].string,STR_GAME);
- #else
_fstrcpy(&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
- _fstrcpy(&MainMenu[backtodemo].string,STR_BD);
- #else
_fstrcpy(&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;
}
@@ -658,11 +519,7 @@
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;
@@ -820,15 +677,7 @@
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
{s16int i;
@@ -863,11 +712,7 @@
////////////////////////////////////////////////////////////////////
s16int CP_EndGame(void)
{-#ifdef JAPAN
- if (!GetYorN(7,8,C_JAPQUITPIC))
-#else
if (!Confirm(ENDGAMESTR))
-#endif
return 0;
pickquick = gamestate.lives = 0;
@@ -876,9 +721,7 @@
#pragma warn -sus
MainMenu[savegame].active = 0;
MainMenu[viewscores].routine=CP_ViewScores;
- #ifndef JAPAN
_fstrcpy(MainMenu[viewscores].string,STR_VS);
- #endif
#pragma warn +sus
return 1;
@@ -974,11 +817,7 @@
// ALREADY IN A GAME?
//
if (ingame)
- #ifdef JAPAN
- if (!GetYorN(7,8,C_JAPNEWGAMEPIC))
- #else
if (!Confirm(CURGAME))
- #endif
{MenuFadeOut();
return;
@@ -1051,9 +890,6 @@
{s16int i;
-#ifdef JAPAN
- CA_CacheScreen(S_EPISODEPIC);
-#else
ClearMScreen();
VWB_DrawPic(112,184,C_MOUSELBACKPIC);
@@ -1061,12 +897,7 @@
SETFONTCOLOR(READHCOLOR,BKGDCOLOR);
PrintY=2;
WindowX=0;
- #ifdef SPANISH
- US_CPrint("Cual episodio jugar?");- #else
US_CPrint("Which episode to play?");- #endif
-#endif
SETFONTCOLOR(TEXTCOLOR,BKGDCOLOR);
DrawMenu(&NewEitems,&NewEmenu[0]);
@@ -1086,9 +917,6 @@
//
void DrawNewGame(void)
{-#ifdef JAPAN
- CA_CacheScreen(S_SKILLPIC);
-#else
ClearMScreen();
VWB_DrawPic(112,184,C_MOUSELBACKPIC);
@@ -1097,17 +925,12 @@
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
DrawWindow(NM_X-5,NM_Y-10,NM_W,NM_H,BKGDCOLOR);
-#endif
DrawMenu(&NewItems,&NewMenu[0]);
DrawNewGameDiff(NewItems.curpos);
@@ -1253,10 +1076,6 @@
{s16int i,on;
-
-#ifdef JAPAN
- CA_CacheScreen(S_SOUNDPIC);
-#else
//
// DRAW SOUND MENU
//
@@ -1266,7 +1085,6 @@
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!
@@ -1286,18 +1104,12 @@
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
@@ -1585,11 +1397,7 @@
// OVERWRITE EXISTING SAVEGAME?
//
if (SaveGamesAvail[which])
- #ifdef JAPAN
- if (!GetYorN(7,8,C_JAPSAVEOVERPIC))
- #else
if (!Confirm(GAMESVD))
- #endif
{DrawLoadSaveScreen(1);
continue;
@@ -1671,9 +1479,6 @@
- #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);
@@ -1688,7 +1493,6 @@
US_Print(STR_MOVEJOY);
SETFONTCOLOR(BKGDCOLOR,TEXTCOLOR);
US_Print(" "STR_ESCEXIT);- #endif
VW_UpdateScreen();
do
@@ -1707,9 +1511,6 @@
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);
@@ -1722,7 +1523,6 @@
US_Print(STR_MOVEJOY2);
SETFONTCOLOR(BKGDCOLOR,TEXTCOLOR);
US_Print(" "STR_ESCEXIT);- #endif
VW_UpdateScreen();
do
@@ -1834,16 +1634,9 @@
//
void DrawMouseSens(void)
{-#ifdef JAPAN
- CA_CacheScreen(S_MOUSESENSPIC);
-#else
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;
@@ -1852,20 +1645,11 @@
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
-#endif
VWB_Bar(60,97,200,10,TEXTCOLOR);
DrawOutline(60,97,200,10,0,HIGHLIGHT);
@@ -1963,16 +1747,11 @@
{s16int 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);
@@ -2426,27 +2205,6 @@
{s16int 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;
@@ -2470,16 +2228,6 @@
#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;
@@ -2488,7 +2236,6 @@
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);
@@ -2511,16 +2258,6 @@
#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;
@@ -2529,7 +2266,6 @@
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");@@ -2545,16 +2281,6 @@
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;
@@ -2563,7 +2289,6 @@
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");@@ -2573,16 +2298,6 @@
// 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;
@@ -2591,10 +2306,8 @@
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);
-#endif
//
// PICK STARTING POINT IN MENU
//
@@ -2813,11 +2526,6 @@
//
void DrawChangeView(s16int view)
{-#ifdef JAPAN
- CA_CacheScreen(S_CHANGEPIC);
-
- ShowViewSize(view);
-#else
VWB_Bar(0,160,320,40,VIEWCOLOR);
ShowViewSize(view);
@@ -2829,7 +2537,6 @@
US_CPrint(STR_SIZE1"\n");
US_CPrint(STR_SIZE2"\n");
US_CPrint(STR_SIZE3);
-#endif
VW_UpdateScreen();
MenuFadeIn();
@@ -2845,18 +2552,7 @@
{s16int 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();
SD_MusicOff();
@@ -3627,24 +3323,8 @@
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;
@@ -3652,7 +3332,6 @@
}
while(Keyboard[sc_Y] || Keyboard[sc_N] || Keyboard[sc_Escape]);
- #endif
IN_ClearKeysDown();
SD_PlaySound(whichsnd[xit]);
@@ -3659,65 +3338,8 @@
return xit;
}
-#ifdef JAPAN
////////////////////////////////////////////////////////////////////
//
-// DRAW MESSAGE & GET Y OR N
-//
-////////////////////////////////////////////////////////////////////
-s16int GetYorN(s16int x,s16int y,s16int pic)
-{- s16int 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
//
////////////////////////////////////////////////////////////////////
@@ -3882,36 +3504,7 @@
void CheckForEpisodes(void)
{struct ffblk f;
-
//
-// JAPANESE VERSION
-//
-#ifdef JAPAN
-#ifdef JAPDEMO
- if (!findfirst("*.WJ1",&f,FA_ARCH))- {- strcpy(extension,"WJ1");
-#else
- if (!findfirst("*.WJ6",&f,FA_ARCH))- {- strcpy(extension,"WJ6");
-#endif
- strcat(configname,extension);
- strcat(SaveName,extension);
- strcat(PageFileName,extension);
- strcat(audioname,extension);
- strcat(demoname,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
-
-//
// ENGLISH
//
#ifndef UPLOAD
@@ -3981,6 +3574,5 @@
strcat(helpfilename,extension);
#endif
strcat(endfilename,extension);
-#endif
#endif
}
--- a/piclist.h
+++ /dev/null
@@ -1,36 +1,0 @@
-//////////////////////////////////////
-//
-// Graphics .H file for .WL1
-// IGRAB-ed on Sat May 02 02:32:49 1992
-//
-//////////////////////////////////////
-
-typedef enum {- // Lump Start
- H_BJPIC=3,
- H_CASTLEPIC, // 4
- H_KEYBOARDPIC, // 5
- H_JOYPIC, // 6
- H_MOUSEPIC, // 7
- H_BOTHPIC, // 8
- H_GAMEPADPIC, // 9
- H_HEALPIC, // 10
- H_TREASUREPIC, // 11
- H_GUNPIC, // 12
- H_KEYPIC, // 13
- H_BLAZEPIC, // 14
- H_WEAPON1234PIC, // 15
- H_WOLFLOGOPIC, // 16
- H_VISAPIC, // 17
- H_MCPIC, // 18
- H_IDLOGOPIC, // 19
- H_FAXPIC, // 20
- H_GALACTIXPIC, // 21
- H_FGODMOMPIC, // 22
- H_AUSTRALIAPIC, // 23
- H_CANADAPIC, // 24
- H_UKPIC, // 25
- H_TOPWINDOWPIC, // 26
- H_LEFTWINDOWPIC, // 27
- H_RIGHTWINDOWPIC, // 28
- H_BOTTOMINFOPIC, // 29
--- a/spanish.h
+++ /dev/null
@@ -1,112 +1,0 @@
-#define QUITSUR "Estas seguro que quieres\n"\
- "parar este gran juego?"
-
-#define CURGAME "Ahora estas en\n"\
- "un juego. Si continuas\n"\
- "borras el juego viejo. O.K.?"
-
-#define GAMESVD "Ya hay un juego\n"\
- "guardado en esta posicion.\n"\
- "sobre-escribir?"
-
-#define ENDGAMESTR "Estas seguro que quieres\n"\
- "terminar el juego que\n"\
- "estas jugando? (S o N):"
-
-#define STR_NG "Juego nuevo"
-#define STR_SD "Sonido"
-#define STR_CL "Control"
-#define STR_LG "Cargar juego"
-#define STR_SG "Guardar juego"
-#define STR_CV "Cambiar vista"
-#define STR_VS "Ver anotacion"
-#define STR_EG "Abandonar"
-#define STR_BD "Regresar al demo"
-#define STR_QT "Parar"
-
-#define STR_LOADING "Cargando"
-#define STR_SAVING "Guardando"
-
-#define STR_GAME "Regresar, jugar"
-#define STR_DEMO "Regresar al Demo"
-#define STR_LGC "Cargar juego llamado\n\""
-#define STR_EMPTY "vacio"
-#define STR_CALIB "Calibrar"
-#define STR_JOYST "Joystick"
-#define STR_MOVEJOY "Mover joystick a\n"\
- "arriba izq y\n"\
- "oprimir boton 0\n"
-#define STR_MOVEJOY2 "Mover joystick a\n"\
- "abajo derecha y\n"\
- "oprimir boton 1\n"
-#define STR_ESCEXIT "ESC para salir"
-#define STR_NONE "Ninguno"
-#define STR_PC "P.C. bocina"
-#define STR_ALSB "AdLib/Sound Blaster"
-#define STR_DISNEY "Disney Sound Source"
-#define STR_SB "Sound Blaster"
-
-#define STR_MOUSEEN "Raton activado"
-#define STR_JOYEN "Joystick activado"
-#define STR_PORT2 "Use joystick puerto 2"
-#define STR_GAMEPAD "Gravis Gamepad Activada"
-#define STR_SENS "Raton Sensibilidad"
-#define STR_CUSTOM "Modificar controles"
-#define STR_DADDY "Papi puedo jugar?"
-#define STR_HURTME "No me hieras."
-#define STR_BRINGEM "�Echamelos!"
-#define STR_DEATH "La muerte encarnada"
-
-#define STR_MOUSEADJ "Raton ajustar sensibilidad"
-#define STR_SLOW "Lento"
-#define STR_FAST "Rapido"
-
-#define STR_CRUN "Corre"
-#define STR_COPEN "Abre"
-#define STR_CFIRE "Fuego"
-#define STR_CSTRAFE "Ametrallar"
-
-#define STR_LEFT "Izquierda"
-#define STR_RIGHT "Derecha"
-#define STR_FRWD "Adelante"
-#define STR_BKWD "Atras"
-#define STR_THINK "Pensando"
-
-#define STR_SIZE1 "Use flechas para ajustar"
-#define STR_SIZE2 "Enter para aceptar"
-#define STR_SIZE3 "Esc para cancelar"
-
-#define STR_YOUWIN "Tu ganas"
-
-#define STR_TOTALTIME "Tiempo total"
-
-#define STR_RATKILL "Muertes %"
-#define STR_RATSECRET "Secreto %"
-#define STR_RATTREASURE "Tesoros %"
-
-#define STR_BONUS "Bono"
-#define STR_TIME "Tiempo"
-#define STR_PAR "Par"
-
-#define STR_RAT2KILL "Muertes %" // ratio = promedio
-#define STR_RAT2SECRET "Secreto %"
-#define STR_RAT2TREASURE "Tesoros %"
-
-#define STR_DEFEATED "Derrotado!"
-
-#define STR_CHEATER1 "Ahora tienes 100% salud"
-#define STR_CHEATER2 "99 balas y dos llaves"
-#define STR_CHEATER3 "Notar que has basicamente"
-#define STR_CHEATER4 "eliminado tus chances de"
-#define STR_CHEATER5 "obtener puntos altos"
-
-#define STR_NOSPACE1 "No hay suficiente espacio"
-#define STR_NOSPACE2 "en tu disco para guardar juego"
-
-#define STR_SAVECHT1 "Tu archivo para guardar juego es"
-#define STR_SAVECHT2 "diremos,\"corrupto\"."
-#define STR_SAVECHT3 "Pero te dire, sigue y"
-#define STR_SAVECHT4 "de todos modos juega"
-
-#define STR_SEEAGAIN "Veamos eso de nuevo"
-
--- a/spanver.h
+++ /dev/null
@@ -1,8 +1,0 @@
-//#define SPEAR
-#define SPANISH
-#define ARTSEXTERN
-#define DEMOSEXTERN
-//#define MYPROFILE
-//#define DEBCHECK
-#define CARMACIZED
-//#define UPLOAD
--- a/text.c
+++ b/text.c
@@ -59,7 +59,6 @@
//===========================================================================
-#ifndef JAPAN
/*
=====================
=
@@ -478,14 +477,6 @@
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);
@@ -492,7 +483,6 @@
strcat (str," of ");
py = 183;
px = 213;
- #endif
itoa (numpages,str2,10);
strcat (str,str2);
fontcolor = 0x4f; //12^BACKCOLOR;
@@ -584,9 +574,7 @@
Quit ("CacheLayoutGraphics: No ^E to terminate file!");}
-#endif
-
/*
=====================
=
@@ -595,54 +583,12 @@
=====================
*/
-#ifdef JAPAN
-void ShowArticle (s16int which)
-#else
void ShowArticle (char far *article)
-#endif
{- #ifdef JAPAN
- s16int snames[10] = { H_HELP1PIC,- H_HELP2PIC,
- H_HELP3PIC,
- H_HELP4PIC,
- H_HELP5PIC,
- H_HELP6PIC,
- H_HELP7PIC,
- H_HELP8PIC,
- H_HELP9PIC,
- H_HELP10PIC};
- s16int 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
u16int oldfontnumber;
u16int temp;
int newpage,firstpage;
- #ifdef JAPAN
- pagenum = 1;
- if (!which)
- numpages = 10;
- else
- numpages = 2;
-
- #else
-
text = article;
oldfontnumber = fontnumber;
fontnumber = 0;
@@ -649,7 +595,6 @@
CA_MarkGrChunk(STARTFONT);
VWB_Bar (0,0,320,200,BACKCOLOR);
CacheLayoutGraphics ();
- #endif
newpage = true;
firstpage = true;
@@ -659,14 +604,7 @@
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)
{@@ -687,12 +625,8 @@
case sc_LeftArrow:
if (pagenum>1)
{- #ifndef JAPAN
BackPage ();
BackPage ();
- #else
- pagenum--;
- #endif
newpage = true;
}
break;
@@ -704,9 +638,6 @@
if (pagenum<numpages)
{newpage = true;
- #ifdef JAPAN
- pagenum++;
- #endif
}
break;
}
@@ -725,7 +656,6 @@
//===========================================================================
-#ifndef JAPAN
#ifdef ARTSEXTERN
s16int endextern = T_ENDART1;
#ifndef SPEAR
@@ -734,7 +664,6 @@
#endif
char helpfilename[13] = "HELPART.",
endfilename[13] = "ENDART1.";
-#endif
/*
=================
@@ -750,20 +679,9 @@
char far *text;
uchar *layout;
-
CA_UpLevel ();
MM_SortMem ();
-#ifdef JAPAN
- ShowArticle (0);
- VW_FadeOut();
- FreeMusic ();
- CA_DownLevel ();
- MM_SortMem ();
-#else
-
-
-
#ifdef ARTSEXTERN
artnum = helpextern;
CA_CacheGrChunk (artnum);
@@ -790,7 +708,6 @@
FreeMusic ();
CA_DownLevel ();
MM_SortMem ();
-#endif
}
#endif
@@ -808,23 +725,7 @@
CA_UpLevel ();
MM_SortMem ();
-#ifdef JAPAN
- ShowArticle(gamestate.episode + 1);
- VW_FadeOut();
-
- SETFONTCOLOR(0,15);
- IN_ClearKeysDown();
- if (MousePresent)
- Mouse(MDelta); // Clear accumulated mouse movement
-
- FreeMusic ();
- CA_DownLevel ();
- MM_SortMem ();
-#else
-
-
-
#ifdef ARTSEXTERN
artnum = endextern+gamestate.episode;
CA_CacheGrChunk (artnum);
@@ -855,5 +756,4 @@
FreeMusic ();
CA_DownLevel ();
MM_SortMem ();
-#endif
}
--- a/version.h
+++ /dev/null
@@ -1,10 +1,0 @@
-//#define SPEAR
-//#define JAPAN
-#define GOODTIMES
-#define ARTSEXTERN
-#define DEMOSEXTERN
-//#define MYPROFILE
-//#define DEBCHECK
-#define CARMACIZED
-//#define UPLOAD
-
\ No newline at end of file
--- a/wlfj1ver.h
+++ /dev/null
@@ -1,9 +1,0 @@
-//#define SPEAR
-#define JAPAN
-#define JAPDEMO
-#define UPLOAD
-#define ARTSEXTERN
-#define DEMOSEXTERN
-//#define MYPROFILE
-//#define DEBCHECK
-#define CARMACIZED
--- a/wolfgtv.h
+++ b/wolfgtv.h
@@ -1,5 +1,4 @@
//#define SPEAR
-//#define JAPAN
#define GOODTIMES
#define ARTSEXTERN
#define DEMOSEXTERN
--- a/wolfjver.h
+++ /dev/null
@@ -1,8 +1,0 @@
-//#define SPEAR
-#define JAPAN
-#define ARTSEXTERN
-#define DEMOSEXTERN
-//#define MYPROFILE
-//#define DEBCHECK
-#define CARMACIZED
-//#define UPLOAD