Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BUG 2117: BEZAHLE NICHT in E2 #619

Merged
merged 6 commits into from Dec 31, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion conf/e2/config.json
Expand Up @@ -5,7 +5,6 @@
"e2/terrains.json"
],
"disabled": [
"pay",
"jsreport"
],
"settings": {
Expand Down
1 change: 0 additions & 1 deletion src/CMakeLists.txt
Expand Up @@ -114,7 +114,6 @@ set (ERESSEA_SRC
magic.c
market.c
morale.c
monster.c
randenc.c
renumber.c
volcano.c
Expand Down
2 changes: 1 addition & 1 deletion src/battle.c
Expand Up @@ -23,7 +23,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "chaos.h"
#include "guard.h"
#include "laws.h"
#include "monster.h"
#include "monsters.h"
#include "move.h"
#include "skill.h"

Expand Down
1 change: 0 additions & 1 deletion src/bind_monsters.c
@@ -1,6 +1,5 @@
#include <platform.h>
#include "spells/shipcurse.h"
#include "monster.h"
#include "monsters.h"

#include <kernel/equipment.h>
Expand Down
2 changes: 1 addition & 1 deletion src/bindings.c
Expand Up @@ -54,7 +54,7 @@ without prior permission by the authors of Eressea.
#include "summary.h"
#include "teleport.h"
#include "laws.h"
#include "monster.h"
#include "monsters.h"
#include "market.h"

#include <modules/autoseed.h>
Expand Down
2 changes: 1 addition & 1 deletion src/chaos.c
Expand Up @@ -19,7 +19,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <platform.h>
#include <kernel/config.h>
#include "chaos.h"
#include "monster.h"
#include "monsters.h"
#include "move.h"

#include <kernel/building.h>
Expand Down
2 changes: 1 addition & 1 deletion src/economy.c
Expand Up @@ -31,7 +31,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "spy.h"
#include "study.h"
#include "move.h"
#include "monster.h"
#include "monsters.h"
#include "morale.h"
#include "reports.h"
#include "calendar.h"
Expand Down
2 changes: 1 addition & 1 deletion src/guard.c
Expand Up @@ -21,7 +21,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <kernel/config.h>
#include "guard.h"
#include "laws.h"
#include "monster.h"
#include "monsters.h"

#include <kernel/ally.h>
#include <kernel/unit.h>
Expand Down
2 changes: 1 addition & 1 deletion src/guard.test.c
Expand Up @@ -2,7 +2,7 @@

#include "guard.h"
#include "laws.h"
#include "monster.h"
#include "monsters.h"

#include <kernel/config.h>
#include <kernel/faction.h>
Expand Down
2 changes: 1 addition & 1 deletion src/kernel/faction.test.c
Expand Up @@ -10,7 +10,7 @@
#include <util/language.h>
#include <util/password.h>

#include "monster.h"
#include "monsters.h"
#include <CuTest.h>
#include <tests.h>
#include <quicklist.h>
Expand Down
2 changes: 1 addition & 1 deletion src/laws.c
Expand Up @@ -29,7 +29,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "keyword.h"
#include "market.h"
#include "morale.h"
#include "monster.h"
#include "monsters.h"
#include "move.h"
#include "randenc.h"
#include "renumber.h"
Expand Down
2 changes: 1 addition & 1 deletion src/laws.test.c
Expand Up @@ -2,7 +2,7 @@
#include "laws.h"
#include "battle.h"
#include "guard.h"
#include "monster.h"
#include "monsters.h"

#include <kernel/ally.h>
#include <kernel/config.h>
Expand Down
224 changes: 0 additions & 224 deletions src/monster.c

This file was deleted.

39 changes: 0 additions & 39 deletions src/monster.h

This file was deleted.