refactoring

Author: hogsy

CMakeLists.txt

@@ -58,7 +58,6 @@ add_executable(hrotte
         rott/cin_evnt.c
         rott/cin_glob.c
         rott/cin_main.c
-        rott/cin_util.c
         rott/dosutil.c
         rott/dukemusc.c
         rott/engine.c

rott/_rt_swft.h

@@ -19,7 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "cin_glob.h"
-#include "cin_util.h"
 #include "cin_def.h"
 #include "cin_main.h"
 #include "f_scale.h"
@@ -271,7 +270,7 @@ void DrawFlic( flicevent * flic ) {
 
 	curpal = SafeMalloc( 768 );
 
-	CinematicGetPalette( curpal );
+	VL_GetPalette( curpal );
 
 	DrawFadeout();
 
@@ -297,7 +296,7 @@ void DrawFlic( flicevent * flic ) {
 	VL_SetVGAPlaneMode ();
 #endif
 
-	CinematicSetPalette( curpal );
+	VL_SetPalette( curpal );
 
 	SafeFree( curpal );
 	GetCinematicTics();
@@ -573,7 +572,7 @@ void DrawPalette( paletteevent * event ) {
 
 	pal = W_CacheLumpName( event->name, PU_CACHE, CvtNull, 1 );
 	XFlipPage();
-	CinematicSetPalette( pal );
+	VL_SetPalette( pal );
 }
 
 /*
@@ -603,13 +602,13 @@ void DrawFadeout( void ) {
 	byte newpal[768];
 	int i, j;
 
-	CinematicGetPalette( &origpal[0] );
+	VL_GetPalette( &origpal[0] );
 	for ( j = 0; j < FADEOUTTIME; j++ ) {
 		for ( i = 0; i < 768; i++ ) {
-			newpal[i] = (origpal[i] * (FADEOUTTIME - j - 1)) / FADEOUTTIME;
+			newpal[i] = ( origpal[i] * ( FADEOUTTIME - j - 1 )) / FADEOUTTIME;
 		}
 		WaitVBL();
-		CinematicSetPalette( &newpal[0] );
+		VL_SetPalette( &newpal[0] );
 		CinematicDelay();
 	}
 	VL_ClearVideo( 0 );

rott/cin_efct.c

@@ -905,29 +905,6 @@ void IN_Startup( void ) {
 		spaceballenabled = true;
 	}
 
-	if (( checkcyberman || checkassassin ) && ( swiftstatus = SWIFT_Initialize())) {
-		int dynamic;
-
-		if ( checkcyberman ) {
-			CybermanPresent = swiftstatus;
-			cybermanenabled = true;
-		} else if ( checkassassin ) {
-			AssassinPresent = checkassassin & swiftstatus;
-			assassinenabled = true;
-		}
-
-		dynamic = SWIFT_GetDynamicDeviceData();
-
-		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;
 }
 
@@ -969,9 +946,6 @@ void IN_Shutdown( void ) {
 	for ( i = 0; i < MaxJoys; i++ )
 		INL_ShutJoy( i );
 
-	if ( CybermanPresent || AssassinPresent )
-		SWIFT_Terminate();
-
 	CloseSpaceBall();
 
 	IN_Started = false;

rott/cin_util.c

@@ -25,21 +25,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 //
 //****************************************************************************
 
-
-#include <stddef.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef DOS
-#include <dos.h>
-#endif
-
 #include "rt_def.h"
 #include "rt_swift.h"
-#include "_rt_swft.h"
-//MED
-#include "memcheck.h"
 
 #ifdef DOS
 
@@ -397,16 +385,6 @@ void far *allocDOS (unsigned nbytes, short *pseg, short *psel)
 
 /* 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;
 }

rott/cin_util.h

@@ -34,21 +34,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 //
 //***************************************************************************
 
-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.

rott/rt_in.c

@@ -60,13 +60,7 @@ void SetRottScreenRes( int Width, int Height ) {
 		dTopYZANGLELIMIT = ( 90 * FINEANGLES / 360 );
 	}
 
-	//dYZANGLELIMIT = (12*FINEANGLES/360);
-	//#define YZANGLELIMIT  (12*FINEANGLES/360)//bna--(30*FINEANGLES/360)
-
-	//#define TopYZANGLELIMIT  (44*FINEANGLES/360)//bna added
-
 //	GetCurrentDirectory(sizeof(ApogeePath),ApogeePath);// curent directory name
-
 }
 
 //----------------------------------------------------------------------