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

Merge branch 'todo-cleanup' of github.com:ennorehling/eressea into todo-cleanup 

Conflicts:
	src/attributes/stealth.c
This commit is contained in:
Enno Rehling 2015-08-27 16:54:42 +02:00
parent 564a041b0d 66d8e3c7ba
commit 20ab40dc2b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/alchemy.test.c
View File

@ -11,6 +11,8 @@
#include <kernel/item.h> #include <kernel/item.h>
#include <kernel/region.h> #include <kernel/region.h>
#include <limits.h>
#include <CuTest.h> #include <CuTest.h>
#include "tests.h" #include "tests.h"

2
src/attributes/stealth.c
View File

@ -5,7 +5,6 @@
#include <util/attrib.h> #include <util/attrib.h>
#include <attributes/stealth.h> #include <attributes/stealth.h>
#include <assert.h>
#include <stdlib.h> #include <stdlib.h>
attrib_type at_stealth = { attrib_type at_stealth = {
@ -50,7 +49,6 @@ int u_geteffstealth(const unit *u)
int eff_stealth(const unit * u, const region * r) int eff_stealth(const unit * u, const region * r)
{ {
int e = 0; int e = 0;
/* Auf Schiffen keine Tarnung! */ /* Auf Schiffen keine Tarnung! */
if (!u->ship && skill_enabled(SK_STEALTH)) { if (!u->ship && skill_enabled(SK_STEALTH)) {
e = effskill(u, SK_STEALTH, r); e = effskill(u, SK_STEALTH, r);