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

compilation fix, disable catapult damage code.

Browse source
This commit is contained in:
Enno Rehling 2018-02-25 14:54:45 +01:00
parent 7b01581302
commit a286cb45f1
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gmtool.h
View file

@ -41,8 +41,6 @@ extern "C" {
void make_block(int x, int y, int radius, const struct terrain_type *terrain); void make_block(int x, int y, int radius, const struct terrain_type *terrain);
void seed_players(struct newfaction **players, bool new_island); void seed_players(struct newfaction **players, bool new_island);
int wxborder(WINDOW *win);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

2
src/gmtool_structs.h
View file

@ -90,6 +90,8 @@ extern "C" {
#define TWIDTH 2 /* width of tile */ #define TWIDTH 2 /* width of tile */
#define THEIGHT 1 /* height of tile */ #define THEIGHT 1 /* height of tile */
int wxborder(WINDOW *win);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

4
src/items/weapons.c
View file

@ -138,14 +138,16 @@ int *casualties)
/* If battle succeeds */ /* If battle succeeds */
if (hits(*at, dt, wp)) { if (hits(*at, dt, wp)) {
d += terminate(dt, *at, AT_STANDARD, wp->type->damage[0], true); d += terminate(dt, *at, AT_STANDARD, wp->type->damage[0], true);
/* CATAPULT_STRUCTURAL_DAMAGE
if (dt.fighter->unit->building && rng_int() % 100 < 5) { if (dt.fighter->unit->building && rng_int() % 100 < 5) {
double dmg = config_get_flt("rules.building.damage.catapult", 1); double dmg = config_get_flt("rules.building.damage.catapult", 1);
damage_building(b, dt.fighter->unit->building, dmg); damage_building(b, dt.fighter->unit->building, dmg);
} }
else if (dt.fighter->unit->ship && rng_int() % 100 < 5) { else if (dt.fighter->unit->ship && rng_int() % 100 < 5) {
double dmg = config_get_flt("rules.ship.damage.catapult", 0.01); double dmg = config_get_flt("rules.ship.damage.catapult", 0.01);
damage_ship(dt.fighter->unit->ship, dmg) damage_ship(dt.fighter->unit->ship, dmg);
} }
*/
} }
} }