diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-30 21:09:40 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-30 21:09:40 +0200 |
| commit | 769030e6bd22faeb760731172c221ae801c04dcc (patch) | |
| tree | 48203426c2957d31931cd2d5db81f06c520032e2 /src/common/defines.h | |
| parent | 3179b1c83663e51dd594fbaf926d8122b355c747 (diff) | |
| parent | 23ccc8080a5283adce9f06909fc89b63d0e25452 (diff) | |
| download | manaserv-769030e6bd22faeb760731172c221ae801c04dcc.tar.gz manaserv-769030e6bd22faeb760731172c221ae801c04dcc.tar.bz2 manaserv-769030e6bd22faeb760731172c221ae801c04dcc.tar.xz manaserv-769030e6bd22faeb760731172c221ae801c04dcc.zip | |
Merge branch 'master' into lpc2012
Conflicts:
src/common/manaserv_protocol.h
src/game-server/monstermanager.cpp
Diffstat (limited to 'src/common/defines.h')
| -rw-r--r-- | src/common/defines.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/common/defines.h b/src/common/defines.h index 4ba77a1c..40be064e 100644 --- a/src/common/defines.h +++ b/src/common/defines.h @@ -30,16 +30,10 @@ #define WORLD_TICK_MS 100 // Files +#define DEFAULT_SETTINGS_FILE "settings.xml" #define DEFAULT_MAPSDB_FILE "maps.xml" #define DEFAULT_ITEMSDB_FILE "items.xml" -#define DEFAULT_EQUIPDB_FILE "equip.xml" -#define DEFAULT_SKILLSDB_FILE "skills.xml" -#define DEFAULT_ATTRIBUTEDB_FILE "attributes.xml" -#define DEFAULT_MONSTERSDB_FILE "monsters.xml" -#define DEFAULT_STATUSDB_FILE "status-effects.xml" #define DEFAULT_PERMISSION_FILE "permissions.xml" -#define DEFAULT_SPECIALSDB_FILE "specials.xml" -#define DEFAULT_EMOTESDB_FILE "emotes.xml" /** * Exit value codes are thrown back at servers exit to reflect their exit state. |