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

small formal corrections

This commit is contained in:
Philipp Dreher 2015-11-02 17:58:14 +01:00
parent 96ccb046ab
commit 30dce18697
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/spells/flyingship.c
View File

@ -9,6 +9,9 @@
#include <kernel/messages.h> #include <kernel/messages.h>
#include <kernel/region.h> #include <kernel/region.h>
#include <kernel/unit.h> #include <kernel/unit.h>
#include <kernel/ship.h>
#include <magic.h>
#include <spells/shipcurse.h> #include <spells/shipcurse.h>

8
src/spells/flyingship.h
View File

@ -3,18 +3,14 @@
#ifndef FLYINGSHIP_H #ifndef FLYINGSHIP_H
#define FLYINGSHIP_H #define FLYINGSHIP_H
#include "magic.h"
#include <kernel/ship.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
int sp_flying_ship(castorder * co); int sp_flying_ship(struct castorder * co);
void register_flyingship(void); void register_flyingship(void);
bool flying_ship(const ship * sh); bool flying_ship(const struct ship * sh);
int levitate_ship(struct ship *sh, struct unit *mage, double power, int levitate_ship(struct ship *sh, struct unit *mage, double power,
int duration); int duration);

7
src/spells/flyingship.test.c
View File

@ -7,6 +7,8 @@
#include <kernel/unit.h> #include <kernel/unit.h>
#include <kernel/ship.h> #include <kernel/ship.h>
#include <magic.h>
#include <CuTest.h> #include <CuTest.h>
#include <tests.h> #include <tests.h>
#include <assert.h> #include <assert.h>
@ -17,8 +19,6 @@ static void test_flyingship(CuTest * tc)
spellparameter par; spellparameter par;
spllprm par_data; spllprm par_data;
spllprm *par_data_ptr = &par_data; spllprm *par_data_ptr = &par_data;
par.param = &par_data_ptr;
par_data.typ = SPP_SHIP;
region *r; region *r;
faction *f; faction *f;
@ -26,6 +26,9 @@ static void test_flyingship(CuTest * tc)
ship_type *shipType1, *shipType2; ship_type *shipType1, *shipType2;
ship *sh1, *sh2; ship *sh1, *sh2;
par.param = &par_data_ptr;
par_data.typ = SPP_SHIP;
test_cleanup(); test_cleanup();
test_create_world(); test_create_world();