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

Merge branch 'feature/travis-migration' into develop

This commit is contained in:
Enno Rehling 2015-07-12 15:04:57 +02:00
parent cc263ed6c8 21a81bd307
commit 18d82b38ea
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/kernel/curse.h
View File

@ -26,6 +26,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
extern "C" { extern "C" {
#endif #endif
struct curse;
struct curse_type;
/* Sprueche in der struct region und auf Einheiten, Schiffen oder Burgen /* Sprueche in der struct region und auf Einheiten, Schiffen oder Burgen
* (struct attribute) * (struct attribute)
*/ */

8
src/spells/borders.c
View File

@ -29,7 +29,7 @@ typedef struct wallcurse {
connection *wall; connection *wall;
} wallcurse; } wallcurse;
void cw_init(attrib * a) static void cw_init(attrib * a)
{ {
curse *c; curse *c;
curse_init(a); curse_init(a);
@ -37,7 +37,7 @@ void cw_init(attrib * a)
c->data.v = calloc(sizeof(wallcurse), 1); c->data.v = calloc(sizeof(wallcurse), 1);
} }
void cw_write(const attrib * a, const void *target, storage * store) static void cw_write(const attrib * a, const void *target, storage * store)
{ {
connection *b = ((wallcurse *)((curse *)a->data.v)->data.v)->wall; connection *b = ((wallcurse *)((curse *)a->data.v)->data.v)->wall;
curse_write(a, target, store); curse_write(a, target, store);
@ -86,7 +86,7 @@ static int cw_read(attrib * a, void *target, storage * store)
* Was fuer eine Wirkung hat die? * Was fuer eine Wirkung hat die?
*/ */
void wall_vigour(curse * c, double delta) static void wall_vigour(curse * c, double delta)
{ {
wallcurse *wc = (wallcurse *)c->data.v; wallcurse *wc = (wallcurse *)c->data.v;
assert(wc->buddy->vigour == c->vigour); assert(wc->buddy->vigour == c->vigour);
@ -105,7 +105,7 @@ const curse_type ct_firewall = {
wall_vigour /* change_vigour */ wall_vigour /* change_vigour */
}; };
attrib_type at_cursewall = { static attrib_type at_cursewall = {
"cursewall", "cursewall",
cw_init, cw_init,
curse_done, curse_done,