ref: b9f3d1b0c5f0b281660c2cc8ec08cf6999732dec
parent: 7b887272f5ff8fe1b171c43d45b67aa657002b24
author: Marc-Alexandre Espiaut <marcalexandre@member.fsf.org>
date: Tue Jun 5 10:08:07 EDT 2018
Removing useless _ROTT_ flag from rt_cfg.c
--- a/rott/rt_cfg.c
+++ b/rott/rt_cfg.c
@@ -23,8 +23,6 @@
//
//****************************************************************************
-#define _ROTT_
-
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
@@ -33,17 +31,11 @@
#include <string.h>
#include <ctype.h>
-#ifdef _ROTT_
#include "rt_def.h"
-#else
-#include "st_def.h"
-#endif
#include "rt_cfg.h"
#include "version.h"
-#ifdef _ROTT_
-
#include "scriplib.h"
#include "rt_playr.h"
#include "rt_menu.h"
@@ -62,16 +54,6 @@
#include "isr.h"
#include "fx_man.h"
#include "develop.h"
-
-#else
-
-#include "st_def.h"
-#include "rt_cfg.h"
-#include "scriplib.h"
-#include "rt_sound.h"
-#include "st_util.h"
-
-#endif
//MED
#include "memcheck.h"
@@ -140,12 +122,6 @@
int DefaultPlayerColor = 0;
byte passwordstring[20];
-#ifndef _ROTT_
-
-int fulllight = 0;
-int viewsize = 7;
-
-#endif
MacroList CommbatMacros[MAXMACROS];
char ApogeePath[256];
@@ -158,8 +134,6 @@
static char SoundName[13] = "sound.rot";
-#ifdef _ROTT_
-
static char *ConfigName = "config.rot";
static char *ScoresName = "scores.rot";
static char *ROTT = "rott.rot";
@@ -172,11 +146,6 @@
AlternateInformation BattleLevels;
char CodeName[MAXCODENAMELENGTH];
-#endif
-
-
-#ifdef _ROTT_
-
//******************************************************************************
//
// ReadScores ()
@@ -199,8 +168,6 @@
gamestate.violence = 0;
}
-#endif
-
//******************************************************************************
//
// ReadInt
@@ -329,9 +296,6 @@
stereoreversed = false;
}
-
-#ifdef _ROTT_
-
extern char pword[ 13 ];
//******************************************************************************
//
@@ -930,7 +894,6 @@
passwordstring[11]=0x23;
passwordstring[12]=0x1c;
}
-#endif
//******************************************************************************
//
@@ -971,8 +934,6 @@
Z_Free (scriptbuffer);
}
-
-#ifdef _ROTT_
ReadScores();
GetPathFromEnvironment( filename, ApogeePath, ConfigName );
@@ -1002,7 +963,6 @@
Z_Free(scriptbuffer);
}
-#endif
ConfigLoaded = true;
}
@@ -1110,8 +1070,6 @@
-#ifdef _ROTT_
-
//******************************************************************************
//
// WriteScores ()
@@ -1484,8 +1442,6 @@
close( file );
}
-#endif
-
//******************************************************************************
//
// WriteSoundConfig ()
@@ -1616,7 +1572,6 @@
WriteSoundConfig();
// Write Config, Battle and Score files
-#ifdef _ROTT_
WriteScores();
WriteBattleConfig();
@@ -2006,13 +1961,10 @@
SafeWriteString(file,&passwordtemp[0]);
close (file);
-#endif
inconfig--;
}
-#ifdef _ROTT_
-
//****************************************************************************
//
// GetAlternatePath ()
@@ -2156,6 +2108,4 @@
unlink (filename); // Delete ROTT.ROT
}
}
-
-#endif