ref: d26ab94fd6e78dd22e60bc7bd91b136dee44614a
parent: 6f86f7e12ea750f6e02fb0d5e0b969e1bcc4994e
parent: 5da9806dc4009addbb5dbe5ee3c50944807e31a0
author: LTCHIPS <ltchips994@gmail.com>
date: Mon Jun 11 17:05:06 EDT 2018
Merge pull request #7 from marespiaut/old_controllers Removing old obsolete controllers code
--- a/src/Makefile
+++ b/src/Makefile
@@ -65,12 +65,10 @@
OBJS += rt_rand.o
OBJS += rt_scale.o
OBJS += rt_sound.o
-OBJS += rt_spbal.o
OBJS += rt_sqrt.o
OBJS += rt_stat.o
OBJS += rt_state.o
OBJS += rt_str.o
-OBJS += rt_swift.o
OBJS += rt_ted.o
OBJS += rt_util.o
OBJS += rt_view.o
--- a/src/_rt_spba.h
+++ /dev/null
@@ -1,27 +1,0 @@
-/*
-Copyright (C) 1994-1995 Apogee Software, Ltd.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-*/
-#ifndef _rt_spba_private
-#define _rt_spba_private
-
-#define SGN(x) (x>0 ? 1 : -1)
-
-#define NUMSPACEBALLBUTTONS 6
-
-#endif
--- a/src/_rt_swft.h
+++ /dev/null
@@ -1,24 +1,0 @@
-/*
-Copyright (C) 1994-1995 Apogee Software, Ltd.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-*/
-#ifndef _rt_swift_private
-#define _rt_swift_private
-
-#endif
-
--- a/src/rt_actor.c
+++ b/src/rt_actor.c
@@ -42,7 +42,6 @@
#include "rt_util.h"
#include "rt_rand.h"
#include "rt_menu.h"
-#include "rt_swift.h"
#include "_rt_acto.h"
#include "rt_cfg.h"
#include "rt_floor.h"
@@ -10945,8 +10944,6 @@
if (ob==player)
{damagecount += damage;
- if (cybermanenabled)
- SWIFT_TactileFeedback (10*damage, 15, 15);
if ( SHOW_BOTTOM_STATUS_BAR() )
DrawBarHealth (false);
}
--- a/src/rt_cfg.c
+++ b/src/rt_cfg.c
@@ -104,9 +104,6 @@
int NumVoices = 4;
int NumChannels = 1;
int NumBits = 8;
-boolean cybermanenabled = false;
-boolean assassinenabled = false;
-boolean spaceballenabled = false;
boolean AutoDetailOn = true;
int DoubleClickSpeed = 20;
boolean BobbinOn = true;
@@ -602,15 +599,6 @@
ConvertStringToPasswordString ( &name[0] );
}
- if (!CybermanPresent)
- cybermanenabled = false;
-
- if (!AssassinPresent)
- assassinenabled = false;
-
- if (!SpaceBallPresent)
- spaceballenabled = false;
-
if (!MousePresent)
mouseenabled = false;
@@ -1771,20 +1759,6 @@
SafeWriteString(file,"; Threshold of Mouse and Joystick\n");
SafeWriteString(file,"; (smallest) 1 - 15 (largest)\n");
WriteParameter(file,"Threshold ",threshold);
-
- // Write in Cyberman Enabled
-
-// SafeWriteString(file,"\n;\n");
-// SafeWriteString(file,"; 1 - Cyberman Enabled\n");
-// SafeWriteString(file,"; 0 - Cyberman Disabled\n");
-// WriteParameter(file,"CybermanEnabled ",cybermanenabled);
-
- // Write in Spaceball Enabled
-
-// SafeWriteString(file,"\n;\n");
-// SafeWriteString(file,"; 1 - Spaceball Enabled\n");
-// SafeWriteString(file,"; 0 - Spaceball Disabled\n");
-// WriteParameter(file,"SpaceballEnabled ",spaceballenabled);
// Write in Auto Detail
--- a/src/rt_cfg.h
+++ b/src/rt_cfg.h
@@ -52,9 +52,6 @@
extern int NumChannels;
extern int NumBits;
extern boolean stereoreversed;
-extern boolean cybermanenabled;
-extern boolean assassinenabled;
-extern boolean spaceballenabled;
extern boolean AutoDetailOn;
extern int DoubleClickSpeed;
extern int fulllight;
--- a/src/rt_def.h
+++ b/src/rt_def.h
@@ -264,32 +264,6 @@
#define ANGLEBITS 16
#define ANGLEFRACMAX (FINEANGLES<<ANGLEBITS)
-
-//***************************************************************************
-//
-// SWIFT Constants
-//
-//***************************************************************************
-
-//
-// device type codes, returned in deviceType field (SWIFT_StaticData)
-//
-#define SWIFT_DEV_NONE 0
-#define SWIFT_DEV_CYBERMAN 1
-
-//
-// Dynamic device data
-//
-#define SDD_EXTERNAL_POWER_CONNECTED 1
-#define SDD_EXTERNAL_POWER_TOO_HIGH 2
-
-#define AX(r) ((r).x.eax)
-#define BX(r) ((r).x.ebx)
-#define CX(r) ((r).x.ecx)
-#define DX(r) ((r).x.edx)
-#define SI(r) ((r).x.esi)
-#define DI(r) ((r).x.edi)
-
//***************************************************************************
//
// Global Types
--- a/src/rt_in.c
+++ b/src/rt_in.c
@@ -29,13 +29,11 @@
#endif
#include "rt_main.h"
-#include "rt_spbal.h"
#include "rt_def.h"
#include "rt_in.h"
#include "_rt_in.h"
#include "isr.h"
#include "rt_util.h"
-#include "rt_swift.h"
#include "rt_vh_a.h"
#include "rt_cfg.h"
#include "rt_msg.h"
@@ -66,9 +64,6 @@
// configuration variables
//
-boolean SpaceBallPresent;
-boolean CybermanPresent;
-boolean AssassinPresent;
boolean MousePresent;
boolean JoysPresent[MaxJoys];
boolean JoyPadPresent = 0;
@@ -155,7 +150,7 @@
int (far *function_ptr)();
-static char *ParmStrings[] = {"nojoys","nomouse","spaceball","cyberman","assassin",NULL};+static char *ParmStrings[] = {"nojoys","nomouse",NULL};#if USE_SDL
@@ -751,11 +746,7 @@
void IN_Startup (void)
{boolean checkjoys,
- checkmouse,
- checkcyberman,
- checkspaceball,
- swiftstatus,
- checkassassin;
+ checkmouse;
word i;
@@ -884,12 +875,6 @@
checkjoys = true;
checkmouse = true;
- checkcyberman = false;
- checkassassin = false;
- checkspaceball = false;
- SpaceBallPresent = false;
- CybermanPresent = false;
- AssassinPresent = false;
for (i = 1; i < _argc; i++)
{@@ -902,20 +887,6 @@
case 1:
checkmouse = false;
break;
-
- case 2:
- checkspaceball = true;
- break;
-
- case 3:
- checkcyberman = true;
- checkmouse = false;
- break;
-
- case 4:
- checkassassin = true;
- checkmouse = false;
- break;
}
}
@@ -939,35 +910,6 @@
}
}
- if (checkspaceball)
- {- OpenSpaceBall ();
- spaceballenabled=true;
- }
-
- if ((checkcyberman || checkassassin) && (swiftstatus = SWIFT_Initialize ()))
- {- if (checkcyberman)
- {- CybermanPresent = swiftstatus;
- cybermanenabled = true;
- }
- else if (checkassassin)
- {- AssassinPresent = checkassassin & swiftstatus;
- assassinenabled = true;
- }
-
- SWIFT_TactileFeedback (40, 20, 20);
-
- if (SWIFT_GetDynamicDeviceData () == 2)
- Error ("SWIFT ERROR : External Power too high!\n");-
- SWIFT_TactileFeedback (100, 10, 10);
- if (!quiet)
- printf("IN_Startup: Swift Device Present\n");- }
-
IN_Started = true;
}
@@ -994,11 +936,6 @@
for (i = 0; i < MaxJoys; i++)
INL_ShutJoy(i);
- if (CybermanPresent || AssassinPresent)
- SWIFT_Terminate ();
-
- CloseSpaceBall ();
-
IN_Started = false;
}
@@ -1132,11 +1069,6 @@
buttons = IN_JoyButtons () << 4;
buttons |= IN_GetMouseButtons();
-
- if (SpaceBallPresent && spaceballenabled)
- {- buttons |= GetSpaceBallButtons ();
- }
for (i=0; i<8; i++,buttons>>=1)
if (buttons&1)
--- a/src/rt_in.h
+++ b/src/rt_in.h
@@ -152,9 +152,6 @@
extern JoystickDef JoyDefs[];
extern ControlType Controls[MAXPLAYERS]; */
-extern boolean SpaceBallPresent;
-extern boolean CybermanPresent;
-extern boolean AssassinPresent;
extern char LastASCII;
extern volatile int LastScan;
--- a/src/rt_main.c
+++ b/src/rt_main.c
@@ -511,11 +511,8 @@
printf (" FILE - used to load Extern WAD files\n"); printf (" - next parameter is WAD filename\n");#endif
- printf (" SPACEBALL - Enable check for Spaceball.\n"); printf (" NOJOYS - Disable check for joystick.\n"); printf (" NOMOUSE - Disable check for mouse.\n");- printf (" CYBERMAN - Enable check for Cyberman.\n");- printf (" ASSASSIN - Enable check for Wingman Assassin.\n"); printf (" VER - Version number.\n"); printf (" MAPSTATS - Dump Map statistics to ERROR.\n"); printf (" TILESTATS - Dump Tile statistics to ERROR.\n");--- a/src/rt_map.c
+++ b/src/rt_map.c
@@ -44,7 +44,6 @@
#include "rt_floor.h"
#include "engine.h"
#include "develop.h"
-#include "rt_spbal.h"
#include "rt_menu.h"
#include "rt_net.h"
#include "rt_str.h"
@@ -857,10 +856,6 @@
while (Keyboard[sc_Tab])
IN_UpdateKeyboard ();
- if (SpaceBallPresent && spaceballenabled)
- {- while (GetSpaceBallButtons()) ;
- }
x=(cx-(xscale>>1))<<16;
y=(cy-(yscale>>1))<<16;
@@ -881,11 +876,6 @@
else
quitkey=sc_Escape;
done=true;
- }
- if (SpaceBallPresent && spaceballenabled)
- {- if (GetSpaceBallButtons()!=0)
- done=true;
}
if ( Keyboard[ sc_Home ] )
{--- a/src/rt_menu.c
+++ b/src/rt_menu.c
@@ -66,7 +66,6 @@
#include "modexlib.h"
#include "rt_msg.h"
#include "rt_net.h"
-#include "rt_spbal.h"
#include "rt_scale.h"
#include "rt_battl.h"
@@ -342,8 +341,6 @@
JOYENABLE,
USEPORT2,
PADENABLE,
- SPACEBALLENABLE,
- CYBERMANENABLE,
THRESSENS,
MOUSESENS,
CUSTOMIZE
@@ -418,14 +415,12 @@
"JOYSTICK ENABLED",
"USE JOYSTICK PORT 2",
"GAMEPAD ENABLED",
- "SPACEBALL ENABLED",
- "CYBERMAN ENABLED",
"ADJUST THRESHOLD",
"MOUSE SENSITIVITY",
"CUSTOMIZE CONTROLS"
};
-CP_iteminfo CtlItems = { CTL_X, MENU_Y, 9, -1, 36, CtlMenuNames, mn_largefont };+CP_iteminfo CtlItems = { CTL_X, MENU_Y, 7, -1, 36, CtlMenuNames, mn_largefont };CP_itemtype CtlMenu[] =
{ { CP_Inactive, "ctl_mic\0", 'M', NULL },@@ -432,8 +427,6 @@
{ CP_Inactive, "ctl_jen\0", 'J', NULL }, { CP_Inactive, "ctl_jp2\0", 'U', NULL }, { CP_Inactive, "ctl_gpd\0", 'G', NULL },- { CP_Inactive, "spball\0", 'S', NULL },- { CP_Inactive, "cyberman\0",'C', NULL }, { CP_Inactive, "ctl_thr\0", 'A', (menuptr)DoThreshold }, { CP_Inactive, "ctl_mse\0", 'M', (menuptr)MouseSensitivity }, { CP_Active, "ctl_cus\0", 'C', (menuptr)CP_Custom }@@ -1776,9 +1769,6 @@
if (mouseenabled)
PollMouseMove (); // Trying to kill movement
- if (cybermanenabled)
- PollCyberman ();
-
RefreshPause = true;
}
@@ -3807,16 +3797,6 @@
}
break;
- case SPACEBALLENABLE:
- spaceballenabled ^= 1;
- DrawCtlButtons ();
- break;
-
- case CYBERMANENABLE:
- cybermanenabled ^= 1;
- DrawCtlButtons ();
- break;
-
case THRESSENS:
case MOUSESENS:
case CUSTOMIZE:
@@ -4744,12 +4724,6 @@
mouseenabled = 0;
}
- if (SpaceBallPresent)
- CtlMenu[SPACEBALLENABLE].active = CP_Active;
-
- if (CybermanPresent)
- CtlMenu[CYBERMANENABLE].active = CP_Active;
-
for (x = 0; x < CtlItems.amount; x++)
{if (CtlMenu[x].active)
@@ -4798,25 +4772,6 @@
EraseMenuBufRegion (x, y, 16, 16);
DrawMenuBufItem (x, y, button_off);
}
-
- y += 14;
- if (spaceballenabled)
- DrawMenuBufItem (x, y, button_on);
- else
- {- EraseMenuBufRegion (x, y, 16, 16);
- DrawMenuBufItem (x, y, button_off);
- }
-
- y += 14;
- if (cybermanenabled)
- DrawMenuBufItem (x, y, button_on);
- else
- {- EraseMenuBufRegion (x, y, 16, 16);
- DrawMenuBufItem (x, y, button_off);
- }
-
if ((CtlItems.curpos < 0) || (!CtlMenu[CtlItems.curpos].active))
for (i = 0; i < CtlItems.amount; i++)
--- a/src/rt_playr.c
+++ b/src/rt_playr.c
@@ -42,11 +42,9 @@
#include "rt_game.h"
#include "rt_rand.h"
#include "z_zone.h"
-#include "rt_swift.h"
#include "engine.h"
#include "_rt_play.h"
#include "rt_cfg.h"
-#include "rt_spbal.h"
#include "rt_floor.h"
#include "develop.h"
#include "rt_msg.h"
@@ -150,11 +148,6 @@
int VX = 0;
int VY = 0;
-int oldcyberx = 0;
-int oldcybery = 0;
-int CYBERDEADRANGE = 6000;
-boolean CYBERLOOKUP,CYBERLOOKDOWN;
-
int leftmom = 0;
int rightmom = 0;
int lastmom = 0;
@@ -275,8 +268,6 @@
statetype s_tag = {false,CASSATT_S1,20,T_Tag,0,&s_player};-static SWIFT_3DStatus SWIFTStatus;
-
//
// curent user input
//
@@ -2535,276 +2526,8 @@
}
}
-
//******************************************************************************
//
-// PollCyberman ()
-//
-//******************************************************************************
-
-void PollCyberman (void)
-{- int i;
- int mask;
- int press;
-
- SWIFT_Get3DStatus (&SWIFTStatus);
-
- mask = 4;
- for( i = 0; i < 3; i++, mask >>= 1 )
- {- press = SWIFTStatus.buttons & mask;
-
- if ( press )
- {-// if ( ( buttonmouse[ i ] != bt_nobutton ) &&
-// ( DoubleClickCount[ i ] != 2 ) )
- if ( buttonmouse[ i ] != bt_nobutton )
- {- buttonpoll[ buttonmouse[ i ] ] = true;
- }
- }
-
- // Check double-click
- if ( buttonmouse[ i + 3 ] != bt_nobutton )
- {- if ( press )
- {- // Was the button pressed last tic?
- if ( !DoubleClickPressed[ i ] )
- {- // Yes, take note of it
- DoubleClickPressed[ i ] = true;
-
- // Is this the first click, or a really late click?
- if ( ( DoubleClickCount[ i ] == 0 ) ||
- ( GetTicCount() >= DoubleClickTimer[ i ] ) )
- {- // Yes, now wait for a second click
- DoubleClickTimer[ i ] = GetTicCount() + DoubleClickSpeed;
-
- //( tics << 5 );
- DoubleClickCount[ i ] = 1;
- }
- else
- {- // Second click
- buttonpoll[ buttonmouse[ i + 3 ] ] = true;
- DoubleClickTimer[ i ] = 0;
- DoubleClickCount[ i ] = 2;
- }
- }
- else
- {- // After second click, button remains pressed
- // until user releases it
- if ( DoubleClickCount[ i ] == 2 )
- {- buttonpoll[ buttonmouse[ i + 3 ] ] = true;
- }
- }
- }
- else
- {- if ( DoubleClickCount[ i ] == 2 )
- {- DoubleClickCount[ i ] = 0;
- }
- DoubleClickPressed[ i ] = false;
- }
- }
- }
-
- if (SWIFTStatus.pitch > 0)
- CYBERLOOKUP = true;
- else if (SWIFTStatus.pitch < 0)
- CYBERLOOKDOWN = true;
-
- if ((abs (SWIFTStatus.x)) > CYBERDEADRANGE)
- {- CX = -(SGN (SWIFTStatus.x) * (( (abs(SWIFTStatus.x)-CYBERDEADRANGE) ) << 10));
- turnheldtime += tics;
- }
- else if (SWIFTStatus.x != oldcyberx)
- {- turnheldtime += tics;
- if (SWIFTStatus.x > oldcyberx)
- CX = -(0xB8000);
- else
- CX = 0xB8000;
-
- oldcyberx = SWIFTStatus.x;
- }
- else
- CX = 0;
-
- if ((abs (SWIFTStatus.y)) > CYBERDEADRANGE)
- {- CY = SWIFTStatus.y >> 2;
- }
- else
- CY = 0;
-}
-
-//******************************************************************************
-//
-// PollAssassin ()
-//
-//******************************************************************************
-
-#define MAXRAMPS 5
-typedef struct
-{- int min;
- int factor;
-} RampType;
-void PollAssassin (void)
-{- int i;
- int mask;
- int press;
- int yaw;
- int strafeAngle;
- int acc;
- int numramps=4;
- RampType ramp[MAXRAMPS]= {- {0,280000},- {4,380000},- {10,480000},- {25,680000},-// {25,( (1<<26)/80 )}- };
-
- SWIFT_Get3DStatus (&SWIFTStatus);
-
- mask = 4;
- for( i = 0; i < 3; i++, mask >>= 1 )
- {- press = SWIFTStatus.buttons & mask;
-
- if ( press )
- {-// if ( ( buttonmouse[ i ] != bt_nobutton ) &&
-// ( DoubleClickCount[ i ] != 2 ) )
- if ( buttonmouse[ i ] != bt_nobutton )
- {- buttonpoll[ buttonmouse[ i ] ] = true;
- }
- }
-
- // Check double-click
- if ( buttonmouse[ i + 3 ] != bt_nobutton )
- {- if ( press )
- {- // Was the button pressed last tic?
- if ( !DoubleClickPressed[ i ] )
- {- // Yes, take note of it
- DoubleClickPressed[ i ] = true;
-
- // Is this the first click, or a really late click?
- if ( ( DoubleClickCount[ i ] == 0 ) ||
- ( GetTicCount() >= DoubleClickTimer[ i ] ) )
- {- // Yes, now wait for a second click
- DoubleClickTimer[ i ] = GetTicCount() + DoubleClickSpeed;
-
- //( tics << 5 );
- DoubleClickCount[ i ] = 1;
- }
- else
- {- // Second click
- buttonpoll[ buttonmouse[ i + 3 ] ] = true;
- DoubleClickTimer[ i ] = 0;
- DoubleClickCount[ i ] = 2;
- }
- }
- else
- {- // After second click, button remains pressed
- // until user releases it
- if ( DoubleClickCount[ i ] == 2 )
- {- buttonpoll[ buttonmouse[ i + 3 ] ] = true;
- }
- }
- }
- else
- {- if ( DoubleClickCount[ i ] == 2 )
- {- DoubleClickCount[ i ] = 0;
- }
- DoubleClickPressed[ i ] = false;
- }
- }
- }
-
- buttonpoll[bt_horizonup] |= ((SWIFTStatus.buttons>>7) & 1);
- buttonpoll[bt_horizondown] |= ((SWIFTStatus.buttons>>8) & 1);
-
- if ( abs(SWIFTStatus.pitch) < (20<<6) )
- {- SWIFTStatus.pitch = 0;
- }
- else
- {- SWIFTStatus.pitch -= SGN(SWIFTStatus.pitch)*(20<<6);
- }
-
- if ( abs(SWIFTStatus.pitch) > (60<<6) )
- {- buttonpoll[bt_run] = 1;
- }
-
- if ( abs(SWIFTStatus.roll) > (80<<6) )
- {- buttonpoll[bt_run] = 1;
- }
-
-
- if ( abs(SWIFTStatus.roll) < (20<<6) )
- {- SWIFTStatus.roll = 0;
- }
- else
- {- SWIFTStatus.roll -= SGN(SWIFTStatus.roll)*(20<<6);
- }
-
- strafeAngle = (player->angle - FINEANGLES/4)&(FINEANGLES-1);
-
- controlbuf[0] += -(FixedMulShift (SWIFTStatus.pitch, viewcos,16))+
- FixedMulShift (-SWIFTStatus.roll, costable[strafeAngle], 16);
-
- controlbuf[1] += FixedMulShift (SWIFTStatus.pitch, viewsin,16) -
- FixedMulShift (-SWIFTStatus.roll, sintable[strafeAngle], 16);
-
- yaw = abs(SWIFTStatus.yaw);
- acc = 0;
- for (i=0; i<numramps; i++)
- {- if (yaw > ramp[i].min)
- {- if (i>0)
- {- acc += ramp[i].min*(ramp[i].factor-ramp[i-1].factor);
- }
- }
- else
- {- i++;
- break;
- }
- }
- controlbuf[2]= SWIFTStatus.yaw * ramp[i-1].factor - acc;
-}
-
-
-//******************************************************************************
-//
// PollControls
//
// Gets user or demo input, call once each frame
@@ -2827,7 +2550,6 @@
memset (buttonpoll, 0, sizeof(buttonpoll));
controlbuf[0] = controlbuf[1] = controlbuf[2] = 0;
- CYBERLOOKUP = CYBERLOOKDOWN = false;
//if (gamestate.autorun==1)
//buttonpoll[bt_run] = true;
@@ -2851,7 +2573,7 @@
}
}
- if (mouseenabled && !cybermanenabled)
+ if (mouseenabled)
PollMouseButtons ();
if (joystickenabled)
@@ -2864,9 +2586,6 @@
if (joystickenabled)
PollJoystickMove ();
- if (cybermanenabled)
- PollCyberman ();
-
else if (mouseenabled && MousePresent)
PollMouseMove ();
@@ -2877,13 +2596,6 @@
PollMove ();
- if (spaceballenabled)
- PollSpaceBall ();
-
- else if (assassinenabled)
- PollAssassin ();
-
-
buttonbits = 0;
if (player->flags & FL_DYING) // Player has died
{@@ -4292,12 +4004,12 @@
SetPlayerHorizon(pstate,(pstate->horizon-HORIZONYZOFFSET-YZHORIZONSPEED));
}
}
- if (pstate->buttonstate[bt_lookup] || CYBERLOOKUP)
+ if (pstate->buttonstate[bt_lookup])
{if (!(ob->flags & FL_FLEET))
{dyz=YZTILTSPEED;
- if (pstate->buttonstate[bt_lookdown] || CYBERLOOKDOWN)
+ if (pstate->buttonstate[bt_lookdown])
{dyz=0;
}
@@ -4305,12 +4017,12 @@
SetNormalHorizon(ob);
}
}
- if (pstate->buttonstate[bt_lookdown] || CYBERLOOKDOWN)
+ if (pstate->buttonstate[bt_lookdown])
{if (!(ob->flags & FL_FLEET))
{dyz=-YZTILTSPEED;
- if (pstate->buttonstate[bt_lookup] || CYBERLOOKUP)
+ if (pstate->buttonstate[bt_lookup])
{dyz=0;
}
@@ -5653,11 +5365,11 @@
{- if (pstate->buttonstate[bt_lookup] || CYBERLOOKUP)
+ if (pstate->buttonstate[bt_lookup])
{ob->momentumz = -FLYINGZMOM;
}
- if (pstate->buttonstate[bt_lookdown] || CYBERLOOKDOWN)
+ if (pstate->buttonstate[bt_lookdown])
{ob->momentumz = FLYINGZMOM;
}
--- a/src/rt_playr.h
+++ b/src/rt_playr.h
@@ -97,34 +97,8 @@
attack_t attackinfo[14];
} williamdidthis;
-//
-// Interactive input status of device, returned by SWIFT_Get3DStatus
-//
-typedef struct {- short x;
- short y;
- short z;
- short pitch;
- short roll;
- short yaw;
- short buttons;
-} SWIFT_3DStatus;
-
-
-//
-// Static data about device, returned by SWIFT_GetStaticDeviceInfo
-//
typedef struct
{- unsigned char deviceType;
- unsigned char majorVersion;
- unsigned char minorVersion;
- unsigned char coordDescriptor[6];
- unsigned char reserved[1];
-} SWIFT_StaticData;
-
-typedef struct
-{int lives;
int health;
int triads;
@@ -201,10 +175,6 @@
extern williamdidthis FREE;
extern statetype s_player;
extern williamdidthis WEAPONS[MAXWEAPONS];
-extern boolean cybermanenabled;
-extern boolean spaceballenabled;
-extern boolean SpaceBallPresent;
-extern boolean CybermanPresent;
extern boolean mouseenabled;
extern boolean joystickenabled;
extern boolean joypadenabled;
@@ -243,7 +213,6 @@
void PollMouseButtons (void);
void PollJoystickButtons (void);
void PollKeyboardMove (void);
-void PollCyberman (void);
void PollMouseMove (void);
void PollJoystickMove (void);
void PollControls (void);
--- a/src/rt_spbal.c
+++ /dev/null
@@ -1,76 +1,0 @@
-/*
-Copyright (C) 1994-1995 Apogee Software, Ltd.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-*/
-#include "rt_def.h"
-#include "watcom.h"
-#include "splib.h"
-#include "rt_draw.h"
-#include "rt_playr.h"
-#include "isr.h"
-#include <stdlib.h>
-#include "rt_spbal.h"
-#include "_rt_spba.h"
-#include "sbconfig.h"
-#include "rt_main.h"
-#include "rt_map.h"
-
-#include "rt_debug.h"
-#include "rt_game.h"
-#include "rt_str.h"
-#include "rt_vid.h"
-#include "rt_playr.h"
-#include "rt_actor.h"
-#include "rt_main.h"
-#include "rt_util.h"
-#include "rt_draw.h"
-#include "rt_in.h"
-#include "z_zone.h"
-#include "rt_ted.h"
-#include "rt_view.h"
-#include "develop.h"
-#include "version.h"
-#include "scriplib.h"
-#include <stdlib.h>
-
-//MED
-#include "memcheck.h"
-
-/* This isn't of much use in Linux. */
-
-void PollSpaceBall (void)
-{- STUB_FUNCTION;
-}
-
-void OpenSpaceBall (void)
-{- STUB_FUNCTION;
-}
-
-void CloseSpaceBall (void)
-{-}
-
-unsigned GetSpaceBallButtons (void)
-{- STUB_FUNCTION;
-
- return 0;
-}
-
--- a/src/rt_spbal.h
+++ /dev/null
@@ -1,34 +1,0 @@
-/*
-Copyright (C) 1994-1995 Apogee Software, Ltd.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-*/
-//***************************************************************************
-//
-// RT_spbal.h - SpaceBall stuff
-//
-//***************************************************************************
-
-#ifndef _rt_spbal_public
-#define _rt_spbal_public
-
-
-unsigned GetSpaceBallButtons (void);
-void OpenSpaceBall (void);
-void CloseSpaceBall (void);
-void PollSpaceBall (void);
-#endif
--- a/src/rt_swift.c
+++ /dev/null
@@ -1,70 +1,0 @@
-/*
-Copyright (C) 1994-1995 Apogee Software, Ltd.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-*/
-//****************************************************************************
-//
-// RT_SWIFT.C
-//
-// SWIFT services module - for CYBERMAN use in ROTT.
-//
-//****************************************************************************
-
-
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "rt_def.h"
-#include "rt_swift.h"
-#include "_rt_swft.h"
-//MED
-#include "memcheck.h"
-
-
-/* This isn't of much use in Linux. */
-
-int SWIFT_Initialize (void)
-{- STUB_FUNCTION;
-
- return 0;
-}
-
-void SWIFT_Terminate (void)
-{- STUB_FUNCTION;
-}
-
-void SWIFT_Get3DStatus (SWIFT_3DStatus far *pstat)
-{- STUB_FUNCTION;
-}
-
-void SWIFT_TactileFeedback (int d, int on, int off)
-{- STUB_FUNCTION;
-}
-
-unsigned SWIFT_GetDynamicDeviceData (void)
-{- STUB_FUNCTION;
-
- return 0;
-}
-
--- a/src/rt_swift.h
+++ /dev/null
@@ -1,81 +1,0 @@
-/*
-Copyright (C) 1994-1995 Apogee Software, Ltd.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-*/
-#ifndef _rt_swift_public
-#define _rt_swift_public
-
-//***************************************************************************
-//
-// Public header for RT_SWIFT.C.
-//
-//***************************************************************************
-
-#include "rt_playr.h"
-
-//***************************************************************************
-//
-// PROTOTYPES
-//
-//***************************************************************************
-
-int SWIFT_Initialize (void);
-//
-// Test for presence of SWIFT extensions and SWIFT device
-// Returns 1 (TRUE) if SWIFT features are available, 0 otherwise.
-// Remember to call SWIFT_Terminate() if SWIFT_Initialize succeeds!
-//
-
-void SWIFT_Terminate (void);
-//
-// Free resources required for SWIFT support. If SWIFT_Initialize has
-// not been called, or returned FALSE, this function does nothing.
-// SWIFT_Terminate should always be called at some time after a call to
-// SWIFT_Initialize has returned TRUE.
-//
-
-int SWIFT_GetAttachedDevice (void);
-//
-// Returns the device-type code for the attached SWIFT device, if any.
-//
-
-int SWIFT_GetStaticDeviceInfo (SWIFT_StaticData far *psd);
-//
-// Reads static device data.
-//
-
-void SWIFT_Get3DStatus (SWIFT_3DStatus far *pstat);
-//
-// Read the current input state of the device.
-//
-
-void SWIFT_TactileFeedback (int d, int on, int off);
-//
-// Generates tactile feedback to user.
-// d = duration of tactile burst, in milliseconds.
-// on = motor on-time per cycle, in milliseconds.
-// off = motor off-time per cycle, in milliseconds.
-//
-
-unsigned SWIFT_GetDynamicDeviceData (void);
-//
-// Returns Dynamic Device Data word - see SDD_* above
-//
-
-
-#endif