Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove old & confusing macros #54

Merged
merged 10 commits into from
Apr 13, 2024
Merged

Remove old & confusing macros #54

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
63df9ce
Remove DELUXE, LOWCOST, WADCHECKSUM macros
erysdren Apr 10, 2024
8f59745
Remove WHEREAMI and associated dead calls
erysdren Apr 11, 2024
e3c79d7
Remove TEDLAUNCH macro
erysdren Apr 11, 2024
38fd578
Remove WEAPONCHEAT macro
erysdren Apr 11, 2024
e458ad7
Remove BATTLEINFO macro
erysdren Apr 11, 2024
8948e14
Remove BATTLECHECK macro
erysdren Apr 11, 2024
263b923
Hopefully fix indentation warning
erysdren Apr 11, 2024
2fe3801
Remove dead function W_CheckWADIntegrity()
erysdren Apr 11, 2024
02291e8
Remove unused header task_man.h
erysdren Apr 12, 2024
795f2f5
Remove rt_vh_a.h and JoyStick_Vals()
erysdren Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions rott/_w_wad.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

#define CHECKPERIOD 20


#if ( SHAREWARE == 1 )

#if ( DELUXE == 1)
#define WADCHECKSUM (54748)
#elif ( LOWCOST == 1)
#define WADCHECKSUM (12185)
#else
#define WADCHECKSUM (20567)
#endif

#else

#define WADCHECKSUM (24222)

#endif

//===============
// TYPES
//===============
Expand Down
28 changes: 0 additions & 28 deletions rott/develop.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define BATTLECHECK 0 // This should be turned off for release, on for beta
#define BATTLEINFO 0 // This should be turned off for release

#define DELUXE 0
#define LOWCOST 0

#define BNACRASHPREVENT 1 //bna added
// Flavor selection (shareware, registered, cd version, site license) has moved to the Makefile
#ifndef SHAREWARE
Expand All @@ -40,30 +37,5 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

#define TEDLAUNCH 0
#define SOFTERROR 0
#define WHEREAMI 0




#if (WHEREAMI==1)

#define wami(val) \
{ \
programlocation=val;\
}

#define waminot()
/*
{ \
programlocation=-1;\
}
*/

#else

#define wami(val)
#define waminot()

#endif

#endif
39 changes: 0 additions & 39 deletions rott/rt_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,6 @@ boolean quiet = false;

boolean DebugOk = false;

#if (WHEREAMI==1)
int programlocation=-1;
#endif

static boolean turbo;

static int NoWait;
Expand Down Expand Up @@ -401,15 +397,7 @@ void DrawRottTitle ( void )
memset (title,0,sizeof(title));

if (gamestate.Product == ROTT_SHAREWARE)
{
#if (DELUXE==1)
strcpy(title,"Lasersoft Deluxe Version");
#elif (LOWCOST==1)
strcpy(title,"Episode One");
#else
strcpy(title,"Shareware Version");
#endif
}
else if (gamestate.Product == ROTT_SUPERCD)
strcpy(title,"CD Version");
else if (gamestate.Product == ROTT_SITELICENSE)
Expand Down Expand Up @@ -622,15 +610,7 @@ void CheckCommandLineParameters( void )
printf ("Rise of the Triad (c) 1995 Apogee Software\n");
//MED
if (gamestate.Product == ROTT_SHAREWARE)
{
#if (DELUXE==1)
printf("Lasersoft Deluxe ");
#elif (LOWCOST==1)
printf("Episode One ");
#else
printf("Shareware ");
#endif
}
else if (gamestate.Product == ROTT_SUPERCD)
printf("CD ");
else if (gamestate.Product == ROTT_SITELICENSE)
Expand Down Expand Up @@ -992,8 +972,6 @@ void GameLoop (void)
{
int NextLevel;

wami(1);

while (1)
{
if ( playstate == ex_battledone )
Expand Down Expand Up @@ -1480,7 +1458,6 @@ void GameLoop (void)
;
}
}
waminot();
}

boolean CheckForQuickLoad (void )
Expand Down Expand Up @@ -1611,12 +1588,9 @@ void UpdateGameObjects ( void )
objtype * ob,*temp;
battle_status BattleStatus;

wami(2);

if (controlupdatestarted==0)
{
return;
waminot();
}

atime=GetFastTics();
Expand Down Expand Up @@ -1707,9 +1681,6 @@ void UpdateGameObjects ( void )
FX_SetReverb( min( numareatiles[ player->areanumber ] >> 1, 90 ) );
}
}

waminot();

}


Expand Down Expand Up @@ -1766,9 +1737,6 @@ void PlayLoop
boolean canquit = true;
int quittime = 0;

wami(3);


if ( (loadedgame == false) && (timelimitenabled == false) )
{
gamestate.TimeCount = 0;
Expand Down Expand Up @@ -1998,7 +1966,6 @@ void PlayLoop
}
}
}
waminot();
}

//******************************************************************************
Expand All @@ -2011,7 +1978,6 @@ void CheckRemoteRidicule ( int scancode )
{
int num=-1;

wami(4);
switch (scancode)
{
case sc_F1:
Expand Down Expand Up @@ -2056,7 +2022,6 @@ void CheckRemoteRidicule ( int scancode )
AddRemoteRidiculeCommand ( consoleplayer, MSG_DIRECTED_TO_ALL, num );
LastScan=0;
}
waminot();
}

//******************************************************************************
Expand Down Expand Up @@ -2085,8 +2050,6 @@ void PollKeyboard
{
static char autopressed = false;

wami(5);

if (demoplayback==true)
{
IN_UpdateKeyboard();
Expand Down Expand Up @@ -2391,8 +2354,6 @@ void PollKeyboard
if (Keystate[0x45] == 3)
Keystate[0x45] = 0;
}

waminot();
}

//****************************************************************************
Expand Down
4 changes: 0 additions & 4 deletions rott/rt_main.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,6 @@ void InitCharacter(void);
void ShutDown ( void );
void UpdateGameObjects ( void );

#if (WHEREAMI==1)
extern int programlocation;
#endif

extern int polltime;
extern int oldpolltime;
extern volatile int oldtime;
Expand Down
9 changes: 0 additions & 9 deletions rott/rt_net.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,8 +571,6 @@ void UpdateClientControls ( void )
else
InUCC = true;

wami(6);

lastcontrolupdatetime=GetTicCount();

if (standalone==false)
Expand Down Expand Up @@ -708,8 +706,6 @@ void UpdateClientControls ( void )
}

InUCC = false;

waminot();
}

//****************************************************************************
Expand Down Expand Up @@ -739,7 +735,6 @@ boolean PlayerInGame ( int p )
//****************************************************************************
void CheckForPacket ( void )
{
wami(7);
while (ReadPacket()==true)
{
if (badpacket==0)
Expand All @@ -749,7 +744,6 @@ void CheckForPacket ( void )
else
RequestPacket (LastCommandTime[rottcom->remotenode]+controldivisor, rottcom->remotenode, controldivisor);
}
waminot();
}


Expand Down Expand Up @@ -916,8 +910,6 @@ void PrepareLocalPacket ( void )
{
MoveType * pkt;

wami(8);

pkt=(MoveType *)NextLocalCommand();

pkt->time=controlupdatetime;
Expand All @@ -935,7 +927,6 @@ void PrepareLocalPacket ( void )
SendPacket (pkt, server);

controlupdatetime+=controldivisor;
waminot();
}


Expand Down
Loading