diff --git a/include/options.h b/include/options.h index 6dd1b8ae..677aedef 100644 --- a/include/options.h +++ b/include/options.h @@ -40,60 +40,5 @@ #define _OPTIONS_H_ #define MAXNOC 99 -#define BLITZ - -/* #define NO_FORT_FIRE *//* Forts cannot fire */ - -#define BRIDGETOWERS /* Bridge towers are enabled */ - -#define GODNEWS /* We inform the world when deities give/take away */ - -#define LANDSPIES /* Enable the land unit type spies */ - - /* Setting BLITZ sets a couple of things. - 1. BTU's always max when you login. - 2. Changing name doesn't take any btus or $$ - enables BLITZ updates, also turns on NOFOOD, below */ - -/* #define GO_RENEW *//* Gold and Oil are renewable resources */ -/* #define GUINEA_PIGS *//* Experimental stuff not ready for prime time */ -/* #define DEFENSE_INFRA *//* Allow the improvement of defensive infrastructure */ - -/*#define MOB_ACCESS *//* Mobility updates real-time */ -/*#define TECH_POP *//* Technology costs more as population rises */ - -/*#define MARKET *//* Time-based MARKET and TRADING */ -#define LOANS /* Bail out other countries via S&L scandals */ -#define TREATIES /* Sign treaties with your friends and enemies */ - -/*#define HIDDEN*//* Hides information between players */ -/*#define LOSE_CONTACT*//* Allows contact to be lost after a few updates */ - -/* Chainsaw Mods */ -/*#define FUEL*//* Ships use fuel to move */ -/*#define TRADESHIPS*//* Use Tradeships */ -/*#define SLOW_WAR*//* Declaring war takes time */ -#define PINPOINTMISSILE /**/ -#define FALLOUT /* Enables secondary effects caused by radiation */ -#define SAIL /* A update routine to move ships */ -#define NOMOBCOST /* No mob cost for firing from ships */ -/*#define SUPER_BARS *//* Bars can't be destroyed by fire */ -#define EASY_BRIDGES /* Bridges can be built anywhere */ -#define ALL_BLEED /* Tech bleeds to everyone */ -/*#define DRNUKE*//* Need research to make nukes */ -#define NO_PLAGUE /* Plague is disabled */ -/*#define RES_POP*//* population is limited by research */ -/*#define BIG_CITY *//* allow 10x civs in 'c' sectors */ -#define INTERDICT_ATT /* interdict post-attack move in */ -#define SHOWPLANE /**/ -#define UPDATESCHED /* Used to controle update times and should always */ -#ifdef UPDATESCHED /* be used */ -#define DEMANDUPDATE /* NOTE! Depends on UPDATESCHED! Don't use without it! */ -#endif /* UPDATESCHED */ -/*#define NOFOOD*/ /**/ - -#ifdef BLITZ -#define NOFOOD /* automatically have no food for blitzes */ -#endif /* BLITZ */ #endif /* _OPTIONS_H_ */ diff --git a/src/lib/global/options.c b/src/lib/global/options.c index 6e022086..6268a925 100644 --- a/src/lib/global/options.c +++ b/src/lib/global/options.c @@ -29,216 +29,42 @@ * * Known contributors to this file: * Steve McClure, 1998 - * + * Markus Armbruster, 2005 */ -#include -#include "misc.h" -#include "options.h" #include "optlist.h" -/* there must be an easier way - but can't think of one off hand */ - -#ifdef NO_FORT_FIRE -int opt_NO_FORT_FIRE = 1; -#else -int opt_NO_FORT_FIRE = 0; -#endif - -#ifdef BRIDGETOWERS -int opt_BRIDGETOWERS = 1; -#else -int opt_BRIDGETOWERS = 0; -#endif - -#ifdef GODNEWS -int opt_GODNEWS = 1; -#else -int opt_GODNEWS = 0; -#endif - -#ifdef TREATIES -int opt_TREATIES = 1; -#else -int opt_TREATIES = 0; -#endif - -#ifdef GO_RENEW -int opt_GO_RENEW = 1; -#else -int opt_GO_RENEW = 0; -#endif - -#ifdef GUINEA_PIGS -int opt_GUINEA_PIGS = 1; -#else -int opt_GUINEA_PIGS = 0; -#endif - -#ifdef DEFENSE_INFRA -int opt_DEFENSE_INFRA = 1; -#else -int opt_DEFENSE_INFRA = 0; -#endif - -#ifdef LANDSPIES -int opt_LANDSPIES = 1; -#else -int opt_LANDSPIES = 0; -#endif - -#ifdef MOB_ACCESS -int opt_MOB_ACCESS = 1; -#else -int opt_MOB_ACCESS = 0; -#endif - -#ifdef LOANS -int opt_LOANS = 1; -#else -int opt_LOANS = 0; -#endif - -#ifdef MARKET -int opt_MARKET = 1; -#else -int opt_MARKET = 0; -#endif - -#ifdef NOFOOD -int opt_NOFOOD = 1; -#else -int opt_NOFOOD = 0; -#endif - -#ifdef BLITZ -int opt_BLITZ = 1; -#else -int opt_BLITZ = 0; -#endif - -#ifdef HIDDEN -int opt_HIDDEN = 1; -#else -int opt_HIDDEN = 0; -#endif - -#ifdef LOSE_CONTACT -int opt_LOSE_CONTACT = 1; -#else -int opt_LOSE_CONTACT = 0; -#endif - -#ifdef FUEL -int opt_FUEL = 1; -#else -int opt_FUEL = 0; -#endif - -#ifdef TRADESHIPS -int opt_TRADESHIPS = 1; -#else -int opt_TRADESHIPS = 0; -#endif - -#ifdef NOMOBCOST -int opt_NOMOBCOST = 1; -#else -int opt_NOMOBCOST = 0; -#endif - -#ifdef SUPER_BARS -int opt_SUPER_BARS = 1; -#else -int opt_SUPER_BARS = 0; -#endif - -#ifdef EASY_BRIDGES -int opt_EASY_BRIDGES = 1; -#else -int opt_EASY_BRIDGES = 0; -#endif - -#ifdef ALL_BLEED int opt_ALL_BLEED = 1; -#else -int opt_ALL_BLEED = 0; -#endif - -#ifdef DRNUKE -int opt_DRNUKE = 1; -#else -int opt_DRNUKE = 0; -#endif - -#ifdef SLOW_WAR -int opt_SLOW_WAR = 1; -#else -int opt_SLOW_WAR = 0; -#endif - -#ifdef NO_PLAGUE -int opt_NO_PLAGUE = 1; -#else -int opt_NO_PLAGUE = 0; -#endif - -#ifdef RES_POP -int opt_RES_POP = 1; -#else -int opt_RES_POP = 0; -#endif - -#ifdef SHOWPLANE -int opt_SHOWPLANE = 1; -#else -int opt_SHOWPLANE = 0; -#endif - -#ifdef PINPOINTMISSILE -int opt_PINPOINTMISSILE = 1; -#else -int opt_PINPOINTMISSILE = 0; -#endif - -#ifdef FALLOUT -int opt_FALLOUT = 1; -#else -int opt_FALLOUT = 0; -#endif - -#ifdef SAIL -int opt_SAIL = 1; -#else -int opt_SAIL = 0; -#endif - -#ifdef UPDATESCHED -int opt_UPDATESCHED = 1; -#else -int opt_UPDATESCHED = 0; -#endif - -#ifdef DEMANDUPDATE -int opt_DEMANDUPDATE = 1; -#else -int opt_DEMANDUPDATE = 0; -#endif - -#ifdef BIG_CITY -int opt_BIG_CITY = 1; -#else int opt_BIG_CITY = 0; -#endif - -#ifdef INTERDICT_ATT +int opt_BLITZ = 1; +int opt_BRIDGETOWERS = 1; +int opt_DEFENSE_INFRA = 0; +int opt_DEMANDUPDATE = 1; +int opt_DRNUKE = 0; +int opt_EASY_BRIDGES = 1; +int opt_FALLOUT = 1; +int opt_FUEL = 0; +int opt_GODNEWS = 1; +int opt_GO_RENEW = 0; +int opt_GUINEA_PIGS = 0; +int opt_HIDDEN = 0; int opt_INTERDICT_ATT = 1; -#else -int opt_INTERDICT_ATT = 0; -#endif - -#ifdef TECH_POP -int opt_TECH_POP = 1; -#else +int opt_LANDSPIES = 1; +int opt_LOANS = 1; +int opt_LOSE_CONTACT = 0; +int opt_MARKET = 0; +int opt_MOB_ACCESS = 0; +int opt_NOFOOD = 1; +int opt_NOMOBCOST = 1; +int opt_NO_FORT_FIRE = 0; +int opt_NO_PLAGUE = 1; +int opt_PINPOINTMISSILE = 1; +int opt_RES_POP = 0; +int opt_SAIL = 1; +int opt_SHOWPLANE = 1; +int opt_SLOW_WAR = 0; +int opt_SUPER_BARS = 0; int opt_TECH_POP = 0; -#endif +int opt_TRADESHIPS = 0; +int opt_TREATIES = 1; +int opt_UPDATESCHED = 1;