Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

The MUSEUM_MODULE define is unnecessary.

This commit is contained in:
Enno Rehling 2017-12-09 21:06:44 +01:00
parent ffbc9596d7
commit 4e12ff536a
6 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/eressea.c
View File

@ -16,9 +16,7 @@
#include <kernel/config.h> #include <kernel/config.h>
#include <util/log.h> #include <util/log.h>
#if MUSEUM_MODULE
#include <modules/museum.h> #include <modules/museum.h>
#endif
#include <triggers/triggers.h> #include <triggers/triggers.h>
#include <util/language.h> #include <util/language.h>
#include <util/functions.h> #include <util/functions.h>
@ -41,6 +39,7 @@
void game_done(void) void game_done(void)
{ {
#undef CLEANUP_CODE
#ifdef CLEANUP_CODE #ifdef CLEANUP_CODE
/* Diese Routine enfernt allen allokierten Speicher wieder. Das ist nur /* Diese Routine enfernt allen allokierten Speicher wieder. Das ist nur
* zum Debugging interessant, wenn man Leak Detection hat, und nach * zum Debugging interessant, wenn man Leak Detection hat, und nach
@ -78,9 +77,7 @@ void game_init(void)
register_names(); register_names();
register_resources(); register_resources();
register_itemfunctions(); register_itemfunctions();
#if MUSEUM_MODULE
register_museum(); register_museum();
#endif
wormholes_register(); wormholes_register();
register_weapons(); register_weapons();

6
src/give.c
View File

@ -239,12 +239,6 @@ struct order *ord)
change_reservation(dest, item2resource(itype), r); change_reservation(dest, item2resource(itype), r);
} }
#endif #endif
#endif
#if MUSEUM_MODULE && defined(TODO)
/* TODO: use a trigger for the museum warden! */
if (a_find(dest->attribs, &at_warden)) {
warden_add_give(src, dest, itype, delta);
}
#endif #endif
} }
else { else {

2
src/gmtool.c
View File

@ -24,9 +24,7 @@
#include <modules/xmas.h> #include <modules/xmas.h>
#include <modules/gmcmd.h> #include <modules/gmcmd.h>
#if MUSEUM_MODULE
#include <modules/museum.h> #include <modules/museum.h>
#endif
#include <modules/autoseed.h> #include <modules/autoseed.h>
#include <kernel/building.h> #include <kernel/building.h>

3
src/modules/museum.c
View File

@ -20,7 +20,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <kernel/config.h> #include <kernel/config.h>
#if MUSEUM_MODULE
#include "museum.h" #include "museum.h"
/* kernel includes */ /* kernel includes */
@ -502,5 +501,3 @@ void register_museum(void)
register_item_use(use_museumkey, "use_questkey1"); register_item_use(use_museumkey, "use_questkey1");
register_item_use(use_museumkey, "use_questkey2"); register_item_use(use_museumkey, "use_questkey2");
} }
#endif

4
src/modules/museum.h
View File

@ -20,10 +20,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define HEADER_MUSEUM_H #define HEADER_MUSEUM_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif
#if MUSEUM_MODULE == 0
#error "must define MUSEUM_MODULE to use this module"
#endif #endif
extern struct attrib_type at_warden; extern struct attrib_type at_warden;

6
src/settings.h
View File

@ -24,12 +24,6 @@
#define ROW_FACTOR 3 /* factor for combat row advancement rule */ #define ROW_FACTOR 3 /* factor for combat row advancement rule */
/* optional game components. TODO: These should either be
* configuration variables (XML), script extensions (lua),
* or both. We don't want separate binaries for different games
*/
#define MUSEUM_MODULE 1
/* TODO: move these settings to settings.h or into configuration files */ /* TODO: move these settings to settings.h or into configuration files */
#define TREESIZE (8) /* space used by trees (in #peasants) */ #define TREESIZE (8) /* space used by trees (in #peasants) */
#define PEASANTFORCE 0.75 /* Chance einer Vermehrung trotz 90% Auslastung */ #define PEASANTFORCE 0.75 /* Chance einer Vermehrung trotz 90% Auslastung */