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

kill autoconf.h, replace platform.h for C99 compatibility work

Browse source
This commit is contained in:
Enno Rehling 2017-01-10 16:31:05 +01:00
parent 262580f1d5
commit 8b7dae6977
139 changed files with 698 additions and 917 deletions

50
CMakeLists.txt
View file

@ -14,56 +14,6 @@ find_package (Curses)
find_package (Lua REQUIRED)
find_package (ToLua REQUIRED)
INCLUDE (CheckIncludeFiles)
INCLUDE (CheckSymbolExists)
CHECK_INCLUDE_FILES (stdbool.h HAVE_STDBOOL_H)
CHECK_INCLUDE_FILES (windows.h HAVE_WINDOWS_H)
CHECK_INCLUDE_FILES (io.h HAVE_IO_H)
CHECK_INCLUDE_FILES (strings.h HAVE_STRINGS_H)
CHECK_INCLUDE_FILES (unistd.h HAVE_UNISTD_H)
IF (HAVE_IO_H)
CHECK_SYMBOL_EXISTS (_access "io.h" HAVE__ACCESS)
ENDIF (HAVE_IO_H)
IF (HAVE_WINDOWS_H)
CHECK_SYMBOL_EXISTS (_sleep "windows.h" HAVE__SLEEP)
ENDIF(HAVE_WINDOWS_H)
IF(HAVE_STDBOOL_H)
CHECK_SYMBOL_EXISTS (_Bool "stdbool.h" HAVE__BOOL)
ENDIF(HAVE_STDBOOL_H)
IF(HAVE_UNISTD_H)
CHECK_SYMBOL_EXISTS (sleep "unistd.h" HAVE_SLEEP)
CHECK_SYMBOL_EXISTS (usleep "unistd.h" HAVE_USLEEP)
CHECK_SYMBOL_EXISTS (access "unistd.h" HAVE_ACCESS)
ENDIF(HAVE_UNISTD_H)
CHECK_SYMBOL_EXISTS (strlcpy "string.h" HAVE_STRLCPY)
CHECK_SYMBOL_EXISTS (strlcat "string.h" HAVE_STRLCAT)
CHECK_SYMBOL_EXISTS (slprintf "string.h" HAVE_SLPRINTF)
CHECK_SYMBOL_EXISTS (strcasecmp "string.h" HAVE_STRCASECMP)
CHECK_SYMBOL_EXISTS (strncasecmp "string.h" HAVE_STRNCASECMP)
CHECK_SYMBOL_EXISTS (_strlwr "string.h" HAVE__STRLWR)
CHECK_SYMBOL_EXISTS (_strcmpl "string.h" HAVE__STRCMPL)
CHECK_SYMBOL_EXISTS (_strdup "string.h" HAVE__STRDUP)
CHECK_SYMBOL_EXISTS (_stricmp "string.h" HAVE__STRICMP)
CHECK_SYMBOL_EXISTS (_memicmp "string.h" HAVE__MEMICMP)
CHECK_SYMBOL_EXISTS (strcmpl "string.h" HAVE_STRCMPL)
CHECK_SYMBOL_EXISTS (strdup "string.h" HAVE_STRDUP)
CHECK_SYMBOL_EXISTS (stricmp "string.h" HAVE_STRICMP)
CHECK_SYMBOL_EXISTS (memicmp "string.h" HAVE_MEMICMP)
CHECK_SYMBOL_EXISTS (strlwr "string.h" HAVE_STRLWR)
CHECK_SYMBOL_EXISTS (snprintf "stdio.h" HAVE_SNPRINTF)
CHECK_SYMBOL_EXISTS (_snprintf "stdio.h" HAVE__SNPRINTF)
CHECK_SYMBOL_EXISTS (mkdir "sys/stat.h" HAVE_SYS_STAT_MKDIR)
CHECK_SYMBOL_EXISTS (mkdir "direct.h" HAVE_DIRECT_MKDIR)
CHECK_SYMBOL_EXISTS (_mkdir "direct.h" HAVE_DIRECT__MKDIR)
CONFIGURE_FILE (
${CMAKE_CURRENT_SOURCE_DIR}/autoconf.h.in
${CMAKE_BINARY_DIR}/include/autoconf.h)
INCLUDE_DIRECTORIES (${CMAKE_BINARY_DIR}/include)
## skip compiler/libc detection and force cmake autoconf:
#add_definitions(-DUSE_AUTOCONF)
add_subdirectory (cutest)
add_subdirectory (cJSON)
add_subdirectory (storage)

36
autoconf.h.in
View file

@ -1,36 +0,0 @@
#pragma once
#ifndef CMAKE_AUTOCONF_H
#define CMAKE_AUTOCONF_H
#cmakedefine HAVE_STDBOOL_H 1
#cmakedefine HAVE_STRINGS_H 1
#cmakedefine HAVE_WINDOWS_H 1
#cmakedefine HAVE_IO_H 1
#cmakedefine HAVE_UNISTD_H 1
#cmakedefine HAVE__BOOL 1
#cmakedefine HAVE_STRCASECMP 1
#cmakedefine HAVE_STRNCASECMP 1
#cmakedefine HAVE__STRICMP 1
#cmakedefine HAVE_SNPRINTF 1
#cmakedefine HAVE__SNPRINTF 1
#cmakedefine HAVE_ACCESS 1
#cmakedefine HAVE__ACCESS 1
#cmakedefine HAVE_SLEEP 1
#cmakedefine HAVE_USLEEP 1
#cmakedefine HAVE__SLEEP 1
#cmakedefine HAVE_STRDUP 1
#cmakedefine HAVE__STRDUP 1
#cmakedefine HAVE_STRICMP 1
#cmakedefine HAVE__STRCMPL 1
#cmakedefine HAVE_STRCMPL 1
#cmakedefine HAVE__MEMICMP 1
#cmakedefine HAVE_MEMICMP 1
#cmakedefine HAVE__STRLWR 1
#cmakedefine HAVE_STRLWR 1
#cmakedefine HAVE_STRLCPY 1
#cmakedefine HAVE_STRLCAT 1
#cmakedefine HAVE_SLPRINTF 1
#cmakedefine HAVE_SYS_STAT_MKDIR 1
#cmakedefine HAVE_DIRECT_MKDIR 1
#cmakedefine HAVE_DIRECT__MKDIR 1
#endif

2
src/academy.c
View file

@ -35,7 +35,7 @@ bool academy_can_teach(unit *teacher, unit *student, skill_t sk) {
const struct building_type *btype = bt_find("academy");
if (active_building(teacher, btype) && active_building(student, btype)) {
int j = study_cost(student, sk);
j = _max(50, j * 2);
j = MAX(50, j * 2);
/* kann Einheit das zahlen? */
return get_pooled(student, get_resourcetype(R_SILVER), GET_DEFAULT, j) >= j;
/* sonst nehmen sie nicht am Unterricht teil */

10
src/alchemy.c
View file

@ -73,12 +73,12 @@ void herbsearch(unit * u, int max)
}
if (max)
max = _min(max, rherbs(r));
max = MIN(max, rherbs(r));
else
max = rherbs(r);
herbsfound = ntimespprob(effsk * u->number,
(double)rherbs(r) / 100.0F, -0.01F);
herbsfound = _min(herbsfound, max);
herbsfound = MIN(herbsfound, max);
rsetherbs(r, (short) (rherbs(r) - herbsfound));
if (herbsfound) {
@ -156,7 +156,7 @@ static int potion_water_of_life(unit * u, region *r, int amount) {
}
static int potion_healing(unit * u, int amount) {
u->hp = _min(unit_max_hp(u) * u->number, u->hp + 400 * amount);
u->hp = MIN(unit_max_hp(u) * u->number, u->hp + 400 * amount);
return amount;
}
@ -182,7 +182,7 @@ static int potion_power(unit *u, int amount) {
amount = use;
}
/* Verf<72>nffacht die HP von max. 10 Personen in der Einheit */
u->hp += _min(u->number, 10 * amount) * unit_max_hp(u) * 4;
u->hp += MIN(u->number, 10 * amount) * unit_max_hp(u) * 4;
return amount;
}
@ -248,7 +248,7 @@ static void free_potiondelay(attrib * a) {
static int age_potiondelay(attrib * a, void *owner)
{
potiondelay *pd = (potiondelay *)a->data.v;
unused_arg(owner);
UNUSED_ARG(owner);
pd->amount = do_potion(pd->u, pd->r, pd->ptype, pd->amount);
return AT_AGE_REMOVE;
}

8
src/attributes/dict.c
View file

@ -103,7 +103,7 @@ static int dict_read(attrib * a, void *owner, gamedata *data)
float flt;
READ_STR(store, name, sizeof(name));
dd->name = _strdup(name);
dd->name = strdup(name);
READ_INT(store, &n);
dd->type = (dict_type)n;
switch (dd->type) {
@ -122,7 +122,7 @@ static int dict_read(attrib * a, void *owner, gamedata *data)
break;
case TSTRING:
READ_STR(store, name, sizeof(name));
dd->data.str = _strdup(name);
dd->data.str = strdup(name);
break;
case TBUILDING:
result =
@ -199,7 +199,7 @@ struct attrib *dict_create(const char *name, dict_type type, variant value)
{
attrib *a = a_new(&at_dict);
dict_data *data = (dict_data *)a->data.v;
data->name = _strdup(name);
data->name = strdup(name);
dict_set(a, type, value);
return a;
@ -214,7 +214,7 @@ void dict_set(attrib * a, dict_type type, variant value)
data->type = type;
switch (type) {
case TSTRING:
data->data.str = value.v ? _strdup(value.v) : NULL;
data->data.str = value.v ? strdup(value.v) : NULL;
break;
case TINTEGER:
data->data.i = value.i;

2
src/attributes/hate.c
View file

@ -30,7 +30,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
static int verify_hate(attrib * a, void *owner)
{
unused_arg(owner);
UNUSED_ARG(owner);
if (a->data.v == NULL) {
return 0;
}

2
src/attributes/moved.c
View file

@ -27,7 +27,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
static int age_moved(attrib * a, void *owner)
{
unused_arg(owner);
UNUSED_ARG(owner);
--a->data.i;
return a->data.i > 0;
}

2
src/attributes/movement.c
View file

@ -67,7 +67,7 @@ void set_movement(attrib ** alist, int type)
static int age_speedup(attrib * a, void *owner)
{
unused_arg(owner);
UNUSED_ARG(owner);
if (a->data.sa[0] > 0) {
assert(a->data.sa[0] - a->data.sa[1] >= SHRT_MIN);
assert(a->data.sa[0] - a->data.sa[1] <= SHRT_MAX);

4
src/attributes/racename.c
View file

@ -43,7 +43,7 @@ void set_racename(attrib ** palist, const char *name)
attrib *a = a_find(*palist, &at_racename);
if (!a && name) {
a = a_add(palist, a_new(&at_racename));
a->data.v = _strdup(name);
a->data.v = strdup(name);
}
else if (a && !name) {
a_remove(palist, a);
@ -51,7 +51,7 @@ void set_racename(attrib ** palist, const char *name)
else if (a) {
if (strcmp(a->data.v, name) != 0) {
free(a->data.v);
a->data.v = _strdup(name);
a->data.v = strdup(name);
}
}
}

4
src/attributes/raceprefix.c
View file

@ -41,7 +41,7 @@ void set_prefix(attrib ** ap, const char *str)
free(a->data.v);
}
assert(a->type == &at_raceprefix);
a->data.v = _strdup(str);
a->data.v = strdup(str);
}
const char *get_prefix(attrib * a)
@ -53,7 +53,7 @@ const char *get_prefix(attrib * a)
str = (char *)a->data.v;
/* conversion of old prefixes */
if (strncmp(str, "prefix_", 7) == 0) {
((attrib *)a)->data.v = _strdup(str + 7);
((attrib *)a)->data.v = strdup(str + 7);
free(str);
str = (char *)a->data.v;
}

66
src/battle.c
View file

@ -440,7 +440,7 @@ static int get_row(const side * s, int row, const side * vs)
/* every entry in the size[] array means someone trying to defend us.
* 'retreat' is the number of rows falling.
*/
result = _max(FIRST_ROW, row - retreat);
result = MAX(FIRST_ROW, row - retreat);
return result;
}
@ -600,12 +600,12 @@ weapon_skill(const weapon_type * wtype, const unit * u, bool attacking)
if (u_race(u) == get_race(RC_ORC)) {
int sword = effskill(u, SK_MELEE, 0);
int spear = effskill(u, SK_SPEAR, 0);
skill = _max(sword, spear) - 3;
skill = MAX(sword, spear) - 3;
if (attacking) {
skill = _max(skill, u_race(u)->at_default);
skill = MAX(skill, u_race(u)->at_default);
}
else {
skill = _max(skill, u_race(u)->df_default);
skill = MAX(skill, u_race(u)->df_default);
}
}
else {
@ -685,7 +685,7 @@ static int CavalryBonus(const unit * u, troop enemy, int type)
/* only half against trolls */
if (skl > 0) {
if (type == BONUS_SKILL) {
int dmg = _min(skl, 8);
int dmg = MIN(skl, 8);
if (u_race(enemy.fighter->unit) == get_race(RC_TROLL)) {
dmg = dmg / 4;
}
@ -696,7 +696,7 @@ static int CavalryBonus(const unit * u, troop enemy, int type)
}
else {
skl = skl / 2;
return _min(skl, 4);
return MIN(skl, 4);
}
}
}
@ -1008,7 +1008,7 @@ static void vampirism(troop at, int damage)
if (gain > 0) {
int maxhp = unit_max_hp(at.fighter->unit);
at.fighter->person[at.index].hp =
_min(gain + at.fighter->person[at.index].hp, maxhp);
MIN(gain + at.fighter->person[at.index].hp, maxhp);
}
}
}
@ -1203,15 +1203,15 @@ terminate(troop dt, troop at, int type, const char *damage, bool missile)
/* TODO not sure if res could be > 1 here */
if (magic) {
da = (int)(_max(da * res, 0));
da = (int)(MAX(da * res, 0));
}
if (type != AT_COMBATSPELL && type != AT_SPELL) {
if (rule_damage & DAMAGE_CRITICAL) {
double kritchance = (sk * 3 - sd) / 200.0;
kritchance = _max(kritchance, 0.005);
kritchance = _min(0.9, kritchance);
kritchance = MAX(kritchance, 0.005);
kritchance = MIN(0.9, kritchance);
while (chance(kritchance)) {
if (bdebug) {
@ -1238,11 +1238,11 @@ terminate(troop dt, troop at, int type, const char *damage, bool missile)
/* Skilldifferenzbonus */
if (rule_damage & DAMAGE_SKILL_BONUS) {
da += _max(0, (sk - sd) / DAMAGE_QUOTIENT);
da += MAX(0, (sk - sd) / DAMAGE_QUOTIENT);
}
}
rda = _max(da - ar, 0);
rda = MAX(da - ar, 0);
if ((u_race(du)->battle_flags & BF_INV_NONMAGIC) && !magic)
rda = 0;
@ -1275,7 +1275,7 @@ terminate(troop dt, troop at, int type, const char *damage, bool missile)
}
/* gibt R<>stung +effect f<>r duration Treffer */
if (me->typ == SHIELD_ARMOR) {
rda = _max(rda - me->effect, 0);
rda = MAX(rda - me->effect, 0);
me->duration--;
}
}
@ -1474,7 +1474,7 @@ troop select_enemy(fighter * af, int minrow, int maxrow, int select)
minrow = FIGHT_ROW;
maxrow = BEHIND_ROW;
}
minrow = _max(minrow, FIGHT_ROW);
minrow = MAX(minrow, FIGHT_ROW);
enemies = count_enemies(b, af, minrow, maxrow, select);
@ -1574,7 +1574,7 @@ static troop select_opponent(battle * b, troop at, int mindist, int maxdist)
dt = select_enemy(at.fighter, FIGHT_ROW, BEHIND_ROW, SELECT_ADVANCE);
}
else {
mindist = _max(mindist, FIGHT_ROW);
mindist = MAX(mindist, FIGHT_ROW);
dt = select_enemy(at.fighter, mindist, maxdist, SELECT_ADVANCE);
}
@ -1735,7 +1735,7 @@ void do_combatmagic(battle * b, combatmagic_t was)
level = eff_spelllevel(mage, sp, level, 1);
if (sl > 0)
level = _min(sl, level);
level = MIN(sl, level);
if (level < 0) {
report_failed_spell(b, mage, sp);
free_order(ord);
@ -1822,7 +1822,7 @@ static void do_combatspell(troop at)
level = eff_spelllevel(caster, sp, fi->magic, 1);
if ((sl = get_combatspelllevel(caster, 1)) > 0)
level = _min(level, sl);
level = MIN(level, sl);
if (fumble(r, caster, sp, level)) {
report_failed_spell(b, caster, sp);
@ -2056,7 +2056,7 @@ void dazzle(battle * b, troop * td)
void damage_building(battle * b, building * bldg, int damage_abs)
{
bldg->size = _max(1, bldg->size - damage_abs);
bldg->size = MAX(1, bldg->size - damage_abs);
/* Wenn Burg, dann gucken, ob die Leute alle noch in das Geb<65>ude passen. */
@ -2332,7 +2332,7 @@ void do_regenerate(fighter * af)
while (ta.index--) {
struct person *p = af->person + ta.index;
p->hp += effskill(au, SK_STAMINA, 0);
p->hp = _min(unit_max_hp(au), p->hp);
p->hp = MIN(unit_max_hp(au), p->hp);
}
}
@ -2391,10 +2391,10 @@ double fleechance(unit * u)
if (u_race(u) == get_race(RC_HALFLING)) {
c += 0.20;
c = _min(c, 0.90);
c = MIN(c, 0.90);
}
else {
c = _min(c, 0.75);
c = MIN(c, 0.75);
}
if (a != NULL)
@ -2518,7 +2518,7 @@ static void loot_items(fighter * corpse)
float lootfactor = (float)dead / (float)u->number; /* only loot the dead! */
int maxloot = (int)((float)itm->number * lootfactor);
if (maxloot > 0) {
int i = _min(10, maxloot);
int i = MIN(10, maxloot);
for (; i != 0; --i) {
int loot = maxloot / i;
@ -2599,7 +2599,7 @@ static void battle_effects(battle * b, int dead_players)
{
region *r = b->region;
int dead_peasants =
_min(rpeasants(r), (int)(dead_players * PopulationDamage()));
MIN(rpeasants(r), (int)(dead_players * PopulationDamage()));
if (dead_peasants) {
deathcounts(r, dead_peasants + dead_players);
add_chaoscount(r, dead_peasants / 2);
@ -3092,7 +3092,7 @@ static void print_stats(battle * b)
for (s = b->sides; s != b->sides + b->nsides; ++s) {
if (!ql_empty(s->leader.fighters)) {
b->max_tactics = _max(b->max_tactics, s->leader.value);
b->max_tactics = MAX(b->max_tactics, s->leader.value);
}
}
@ -3258,7 +3258,7 @@ fighter *make_fighter(battle * b, unit * u, side * s1, bool attack)
/* change_effect wird in ageing gemacht */
/* Effekte von Artefakten */
strongmen = _min(fig->unit->number, trollbelts(u));
strongmen = MIN(fig->unit->number, trollbelts(u));
/* Hitpoints, Attack- und Defence-Boni f<>r alle Personen */
for (i = 0; i < fig->alive; i++) {
@ -3448,7 +3448,7 @@ fighter *make_fighter(battle * b, unit * u, side * s1, bool attack)
else
p_bonus += 3;
} while (rnd >= 97);
bonus = _max(p_bonus, bonus);
bonus = MAX(p_bonus, bonus);
}
tactics += bonus;
}
@ -3519,11 +3519,11 @@ static const char *simplename(region * r)
const char *cp = rname(r, default_locale);
for (i = 0; *cp && i != 16; ++i, ++cp) {
int c = *(unsigned char *)cp;
while (c && !isalpha(c) && !isxspace(c)) {
while (c && !isalpha(c) && !isspace(c)) {
++cp;
c = *(unsigned char *)cp;
}
if (isxspace(c))
if (isspace(c))
name[i] = '_';
else
name[i] = *cp;
@ -3546,10 +3546,10 @@ battle *make_battle(region * r)
bld->sizeleft = bld->size;
if (battledebug) {
char zText[MAX_PATH];
char zFilename[MAX_PATH];
char zText[4096];
char zFilename[4096];
join_path(basepath(), "battles", zText, sizeof(zText));
if (_mkdir(zText) != 0) {
if (mkdir(zText, 0777) != 0) {
log_error("could not create subdirectory for battle logs: %s", zText);
battledebug = false;
}
@ -4104,7 +4104,7 @@ static void battle_flee(battle * b)
troop dt;
int runners = 0;
/* Flucht nicht bei mehr als 600 HP. Damit Wyrme t<>tbar bleiben. */
int runhp = _min(600, (int)(0.9 + unit_max_hp(u) * hpflee(u->status)));
int runhp = MIN(600, (int)(0.9 + unit_max_hp(u) * hpflee(u->status)));
if (u->ship && fval(u->region->terrain, SEA_REGION)) {
/* keine Flucht von Schiffen auf hoher See */
@ -4147,7 +4147,7 @@ static void battle_flee(battle * b)
if (fig->person[dt.index].flags & FL_PANICED) {
ispaniced = EFFECT_PANIC_SPELL;
}
if (chance(_min(fleechance(u) + ispaniced, 0.90))) {
if (chance(MIN(fleechance(u) + ispaniced, 0.90))) {
++runners;
flee(dt);
}

1
src/battle.h
View file

@ -20,6 +20,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define H_KRNL_BATTLE
#include <kernel/types.h>
#include <stdbool.h>
#ifdef __cplusplus
extern "C" {

2
src/bind_building.c
View file

@ -92,7 +92,7 @@ static int tolua_building_set_info(lua_State * L)
const char *info = tolua_tostring(L, 2, 0);
free(self->display);
if (info)
self->display = _strdup(info);
self->display = strdup(info);
else
self->display = NULL;
return 0;

2
src/bind_dict.c
View file

@ -106,7 +106,7 @@ static int tolua_dict_set_string(lua_State * L)
attrib *a = a_find(*self, &at_dict);
variant val;
val.v = _strdup(value);
val.v = strdup(value);
for (; a && a->type == &at_dict; a = a->next) {
if (strcmp(dict_name(a), name) == 0) {

6
src/bind_gmtool.c
View file

@ -133,14 +133,14 @@ static int tolua_selected_regions(lua_State * L)
static int tolua_state_open(lua_State * L)
{
unused_arg(L);
UNUSED_ARG(L);
state_open();
return 0;
}
static int tolua_state_close(lua_State * L)
{
unused_arg(L);
UNUSED_ARG(L);
state_close(current_state);
return 0;
}
@ -188,7 +188,7 @@ static void lua_paint_info(struct window *wnd, const struct state *st)
break;
else {
size_t len = end - str;
int bytes = _min((int)len, size);
int bytes = MIN((int)len, size);
mvwaddnstr(win, line++, 1, str, bytes);
wclrtoeol(win);
str = end + 1;

2
src/bind_monsters.c
View file

@ -74,7 +74,7 @@ static int fix_familiars(struct lua_State *L)
free(mage->spellbook);
mage->spellbook = 0;
_snprintf(buffer, sizeof(buffer), "%s_familiar", u_race(u)->_name);
snprintf(buffer, sizeof(buffer), "%s_familiar", u_race(u)->_name);
eq = get_equipment(buffer);
if (eq) {
equip_unit_mask(u, eq, EQUIP_SPELLS);

2
src/bind_region.c
View file

@ -615,7 +615,7 @@ static int tolua_plane_set_name(lua_State * L)
const char *str = tolua_tostring(L, 2, 0);
free(self->name);
if (str)
self->name = _strdup(str);
self->name = strdup(str);
else
self->name = 0;
return 0;

2
src/bind_ship.c
View file

@ -94,7 +94,7 @@ static int tolua_ship_set_display(lua_State * L)
{
ship *self = (ship *)tolua_tousertype(L, 1, 0);
free(self->display);
self->display = _strdup(tolua_tostring(L, 2, 0));
self->display = strdup(tolua_tostring(L, 2, 0));
return 0;
}

2
src/bind_storage.c
View file

@ -100,7 +100,7 @@ static int tolua_storage_tostring(lua_State * L)
{
gamedata *data = (gamedata *)tolua_tousertype(L, 1, 0);
char name[64];
_snprintf(name, sizeof(name), "<gamedata %p ver=%d>", (void *)data, data->version);
snprintf(name, sizeof(name), "<gamedata %p ver=%d>", (void *)data, data->version);
lua_pushstring(L, name);
return 1;
}

10
src/building_action.c
View file

@ -93,7 +93,7 @@ lc_write(const struct attrib *a, const void *owner, struct storage *store)
const char *fname = data->fname;
const char *fparam = data->param;
unused_arg(owner);
UNUSED_ARG(owner);
WRITE_TOK(store, fname);
WRITE_TOK(store, fparam ? fparam : NULLSTRING);
}
@ -116,7 +116,7 @@ static int lc_read(struct attrib *a, void *owner, gamedata *data)
b = 0;
}
else {
bd->fname = _strdup(name);
bd->fname = strdup(name);
}
READ_TOK(store, name, sizeof(name));
if (strcmp(name, "tnnL") == 0) {
@ -127,7 +127,7 @@ static int lc_read(struct attrib *a, void *owner, gamedata *data)
if (strcmp(name, NULLSTRING) == 0)
bd->param = 0;
else {
bd->param = _strdup(name);
bd->param = strdup(name);
}
if (result == 0 && !b) {
return AT_READ_FAIL;
@ -146,8 +146,8 @@ void building_addaction(building * b, const char *fname, const char *param)
{
attrib *a = a_add(&b->attribs, a_new(&at_building_action));
building_action *data = (building_action *)a->data.v;
data->fname = _strdup(fname);
data->fname = strdup(fname);
if (param) {
data->param = _strdup(param);
data->param = strdup(param);
}
}

8
src/creport.c
View file

@ -125,7 +125,7 @@ static const char *translate(const char *key, const char *value)
}
else
t = malloc(sizeof(translation));
t->key = _strdup(key);
t->key = strdup(key);
t->value = value;
t->next = translation_table[kk];
translation_table[kk] = t;
@ -361,7 +361,7 @@ static int cr_race(variant var, char *buffer, const void *userdata)
static int cr_alliance(variant var, char *buffer, const void *userdata)
{
const alliance *al = (const alliance *)var.v;
unused_arg(userdata);
UNUSED_ARG(userdata);
if (al != NULL) {
sprintf(buffer, "%d", al->id);
}
@ -372,7 +372,7 @@ static int cr_skill(variant var, char *buffer, const void *userdata)
{
const faction *report = (const faction *)userdata;
skill_t sk = (skill_t)var.i;
unused_arg(userdata);
UNUSED_ARG(userdata);
if (sk != NOSKILL)
sprintf(buffer, "\"%s\"",
translate(mkname("skill", skillnames[sk]), skillname(sk,
@ -385,7 +385,7 @@ static int cr_skill(variant var, char *buffer, const void *userdata)
static int cr_order(variant var, char *buffer, const void *userdata)
{
order *ord = (order *)var.v;
unused_arg(userdata);
UNUSED_ARG(userdata);
if (ord != NULL) {
char cmd[ORDERSIZE];
char *wp = buffer;

64
src/economy.c
View file

@ -337,11 +337,11 @@ static int do_recruiting(recruitment * recruits, int available)
int number, dec;
double multi = 2.0 * rc->recruit_multi;
number = _min(req->qty, (int)(get / multi));
number = MIN(req->qty, (int)(get / multi));
if (rc->recruitcost) {
int afford = get_pooled(u, get_resourcetype(R_SILVER), GET_DEFAULT,
number * rc->recruitcost) / rc->recruitcost;
number = _min(number, afford);
number = MIN(number, afford);
}
if (u->number + number > UNIT_MAXSIZE) {
ADDMSG(&u->faction->msgs, msg_feedback(u, req->ord, "error_unit_size",
@ -551,7 +551,7 @@ static void recruit(unit * u, struct order *ord, request ** recruitorders)
if (recruitcost > 0) {
int pooled =
get_pooled(u, get_resourcetype(R_SILVER), GET_DEFAULT, recruitcost * n);
n = _min(n, pooled / recruitcost);
n = MIN(n, pooled / recruitcost);
}
u->wants = n;
@ -990,12 +990,12 @@ static void allocate_resource(unit * u, const resource_type * rtype, int want)
rring = get_resourcetype(R_RING_OF_NIMBLEFINGER);
if (rring) {
int dm = i_get(u->items, rring->itype);
amount += skill * _min(u->number, dm) * (roqf_factor() - 1);
amount += skill * MIN(u->number, dm) * (roqf_factor() - 1);
}
/* Schaffenstrunk: */
if ((dm = get_effect(u, oldpotiontype[P_DOMORE])) != 0) {
dm = _min(dm, u->number);
dm = MIN(dm, u->number);
change_effect(u, oldpotiontype[P_DOMORE], -dm);
amount += dm * skill; /* dm Personen produzieren doppelt */
}
@ -1091,7 +1091,7 @@ leveled_allocation(const resource_type * rtype, region * r, allocation * alist)
}
need = norders;
avail = _min(avail, norders);
avail = MIN(avail, norders);
if (need > 0) {
int use = 0;
for (al = alist; al; al = al->next)
@ -1106,7 +1106,7 @@ leveled_allocation(const resource_type * rtype, region * r, allocation * alist)
use += x;
norders -= want;
need -= x;
al->get = _min(al->want, al->get + (int)(x / al->save));
al->get = MIN(al->want, al->get + (int)(x / al->save));
}
}
if (use) {
@ -1139,7 +1139,7 @@ attrib_allocation(const resource_type * rtype, region * r, allocation * alist)
avail = 0;
}
avail = _min(avail, norders);
avail = MIN(avail, norders);
for (al = alist; al; al = al->next) {
if (avail > 0) {
int want = required(al->want, al->save);
@ -1149,7 +1149,7 @@ attrib_allocation(const resource_type * rtype, region * r, allocation * alist)
++x;
avail -= x;
norders -= want;
al->get = _min(al->want, (int)(x / al->save));
al->get = MIN(al->want, (int)(x / al->save));
if (rdata->produce) {
int use = required(al->get, al->save);
if (use)
@ -1625,7 +1625,7 @@ static void buy(unit * u, request ** buyorders, struct order *ord)
k -= a->data.i;
}
n = _min(n, k);
n = MIN(n, k);
if (!n) {
cmistake(u, ord, 102, MSG_COMMERCE);
@ -1936,7 +1936,7 @@ static bool sell(unit * u, request ** sellorders, struct order *ord)
/* Ein Händler kann nur 10 Güter pro Talentpunkt verkaufen. */
n = _min(n, u->number * 10 * effskill(u, SK_TRADE, 0));
n = MIN(n, u->number * 10 * effskill(u, SK_TRADE, 0));
if (!n) {
cmistake(u, ord, 54, MSG_COMMERCE);
@ -1966,11 +1966,11 @@ static bool sell(unit * u, request ** sellorders, struct order *ord)
if (o->type.ltype == ltype && o->unit->faction == u->faction) {
int fpool =
o->qty - get_pooled(o->unit, itype->rtype, GET_RESERVE, INT_MAX);
available -= _max(0, fpool);
available -= MAX(0, fpool);
}
}
n = _min(n, available);
n = MIN(n, available);
if (n <= 0) {
cmistake(u, ord, 264, MSG_COMMERCE);
@ -1995,7 +1995,7 @@ static bool sell(unit * u, request ** sellorders, struct order *ord)
k -= a->data.i;
}
n = _min(n, k);
n = MIN(n, k);
assert(n >= 0);
/* die Menge der verkauften Güter merken */
a->data.i += n;
@ -2052,7 +2052,7 @@ static void expandstealing(region * r, request * stealorders)
n = 10;
}
if (n > 0) {
n = _min(n, g_requests[j].unit->wants);
n = MIN(n, g_requests[j].unit->wants);
use_pooled(u, rsilver, GET_ALL, n);
g_requests[j].unit->n = n;
change_money(g_requests[j].unit, n);
@ -2106,8 +2106,8 @@ static void plant(unit * u, int raw)
return;
}
n = _min(skill * u->number, n);
n = _min(raw, n);
n = MIN(skill * u->number, n);
n = MIN(raw, n);
/* Für jedes Kraut Talent*10% Erfolgschance. */
for (i = n; i > 0; i--) {
if (rng_int() % 10 < skill)
@ -2152,14 +2152,14 @@ static void planttrees(unit * u, int raw)
}
/* wenn eine Anzahl angegeben wurde, nur soviel verbrauchen */
raw = _min(raw, skill * u->number);
raw = MIN(raw, skill * u->number);
n = get_pooled(u, rtype, GET_DEFAULT, raw);
if (n == 0) {
ADDMSG(&u->faction->msgs,
msg_feedback(u, u->thisorder, "resource_missing", "missing", rtype));
return;
}
n = _min(raw, n);
n = MIN(raw, n);
/* Für jeden Samen Talent*10% Erfolgschance. */
for (i = n; i > 0; i--) {
@ -2209,7 +2209,7 @@ static void breedtrees(unit * u, int raw)
}
/* wenn eine Anzahl angegeben wurde, nur soviel verbrauchen */
raw = _min(skill * u->number, raw);
raw = MIN(skill * u->number, raw);
n = get_pooled(u, rtype, GET_DEFAULT, raw);
/* Samen prüfen */
if (n == 0) {
@ -2217,7 +2217,7 @@ static void breedtrees(unit * u, int raw)
msg_feedback(u, u->thisorder, "resource_missing", "missing", rtype));
return;
}
n = _min(raw, n);
n = MIN(raw, n);
/* Für jeden Samen Talent*5% Erfolgschance. */
for (i = n; i > 0; i--) {
@ -2259,7 +2259,7 @@ static void breedhorses(unit * u)
}
effsk = effskill(u, SK_HORSE_TRAINING, 0);
n = u->number * effsk;
n = _min(n, horses);
n = MIN(n, horses);
for (c = 0; c < n; c++) {
if (rng_int() % 100 < effsk) {
@ -2508,7 +2508,7 @@ static void steal_cmd(unit * u, struct order *ord, request ** stealorders)
}
}
i = _min(u->number, i_get(u->items, rring->itype));
i = MIN(u->number, i_get(u->items, rring->itype));
if (i > 0) {
n *= STEALINCOME * (u->number + i * (roqf_factor() - 1));
}
@ -2530,7 +2530,7 @@ static void steal_cmd(unit * u, struct order *ord, request ** stealorders)
/* Nur soviel PRODUCEEXP wie auch tatsaechlich gemacht wurde */
produceexp(u, SK_STEALTH, _min(n, u->number));
produceexp(u, SK_STEALTH, MIN(n, u->number));
}
/* ------------------------------------------------------------- */
@ -2554,7 +2554,7 @@ static void expandentertainment(region * r)
entertaining -= o->qty;
/* Nur soviel PRODUCEEXP wie auch tatsächlich gemacht wurde */
produceexp(u, SK_ENTERTAINMENT, _min(u->n, u->number));
produceexp(u, SK_ENTERTAINMENT, MIN(u->n, u->number));
add_income(u, IC_ENTERTAIN, o->qty, u->n);
fset(u, UFL_LONGACTION | UFL_NOTMOVING);
}
@ -2605,7 +2605,7 @@ void entertain_cmd(unit * u, struct order *ord)
max_e = getuint();
if (max_e != 0) {
u->wants = _min(u->wants, max_e);
u->wants = MIN(u->wants, max_e);
}
o = nextentertainer++;
o->unit = u;
@ -2665,7 +2665,7 @@ expandwork(region * r, request * work_begin, request * work_end, int maxwork)
if (blessedharvest_ct) {
int happy =
(int)curse_geteffect(get_curse(r->attribs, blessedharvest_ct));
happy = _min(happy, jobs);
happy = MIN(happy, jobs);
earnings += happy;
}
}
@ -2819,10 +2819,10 @@ void tax_cmd(unit * u, struct order *ord, request ** taxorders)
max = INT_MAX;
}
if (!playerrace(u_race(u))) {
u->wants = _min(income(u), max);
u->wants = MIN(income(u), max);
}
else {
u->wants = _min(n * effskill(u, SK_TAXING, 0) * taxperlevel, max);
u->wants = MIN(n * effskill(u, SK_TAXING, 0) * taxperlevel, max);
}
u2 = is_guarded(r, u);
@ -2893,12 +2893,12 @@ void loot_cmd(unit * u, struct order *ord, request ** lootorders)
max = INT_MAX;
}
if (!playerrace(u_race(u))) {
u->wants = _min(income(u), max);
u->wants = MIN(income(u), max);
}
else {
/* For player start with 20 Silver +10 every 5 level of close combat skill*/
int skbonus = (_max(effskill(u, SK_MELEE, 0), effskill(u, SK_SPEAR, 0)) * 2 / 10) + 2;
u->wants = _min(n * skbonus * 10, max);
int skbonus = (MAX(effskill(u, SK_MELEE, 0), effskill(u, SK_SPEAR, 0)) * 2 / 10) + 2;
u->wants = MIN(n * skbonus * 10, max);
}
o = (request *)calloc(1, sizeof(request));

4
src/give.c
View file

@ -156,7 +156,7 @@ struct order *ord)
assert(itype != NULL);
n = get_pooled(src, item2resource(itype), GET_SLACK | GET_POOLED_SLACK, want);
n = _min(want, n);
n = MIN(want, n);
r = n;
if (dest && src->faction != dest->faction
&& src->faction->age < GiveRestriction()) {
@ -772,7 +772,7 @@ void give_cmd(unit * u, order * ord)
msg_feedback(u, ord, "race_noregroup", "race", u_race(u)));
return;
}
n = _min(u->number, n);
n = MIN(u->number, n);
msg = u2 ? give_men(n, u, u2, ord) : disband_men(n, u, ord);
if (msg) {
ADDMSG(&u->faction->msgs, msg);

6
src/give.test.c
View file

@ -244,7 +244,7 @@ static void test_give_men_requires_contact(CuTest * tc) {
CuAssertIntEquals(tc, 1, env.dst->number);
CuAssertIntEquals(tc, 1, env.src->number);
_snprintf(cmd, sizeof(cmd), "%s ALLES PERSONEN", itoa36(env.dst->no));
snprintf(cmd, sizeof(cmd), "%s ALLES PERSONEN", itoa36(env.dst->no));
ord = create_order(K_GIVE, env.f1->locale, cmd);
test_clear_messages(env.f1);
give_cmd(env.src, ord);
@ -316,7 +316,7 @@ static void test_give_cmd(CuTest * tc) {
i_change(&env.src->items, env.itype, 10);
_snprintf(cmd, sizeof(cmd), "%s 5 %s", itoa36(env.dst->no), LOC(env.f1->locale, env.itype->rtype->_name));
snprintf(cmd, sizeof(cmd), "%s 5 %s", itoa36(env.dst->no), LOC(env.f1->locale, env.itype->rtype->_name));
ord = create_order(K_GIVE, env.f1->locale, cmd);
assert(ord);
give_cmd(env.src, ord);
@ -338,7 +338,7 @@ static void test_give_herbs(CuTest * tc) {
setup_give(&env);
i_change(&env.src->items, env.itype, 10);
_snprintf(cmd, sizeof(cmd), "%s %s", itoa36(env.dst->no), LOC(env.f1->locale, parameters[P_HERBS]));
snprintf(cmd, sizeof(cmd), "%s %s", itoa36(env.dst->no), LOC(env.f1->locale, parameters[P_HERBS]));
ord = create_order(K_GIVE, env.f1->locale, cmd);
assert(ord);

4
src/gmtool.c
View file

@ -427,7 +427,7 @@ static void paint_info_region(window * wnd, const state * st)
int line = 0, maxline = getmaxy(win) - 2;
map_region *mr = cursor_region(&st->display, &st->cursor);
unused_arg(st);
UNUSED_ARG(st);
werase(win);
wxborder(win);
if (mr && mr->r) {
@ -1398,7 +1398,7 @@ int
curses_readline(struct lua_State *L, char *buffer, size_t size,
const char *prompt)
{
unused_arg(L);
UNUSED_ARG(L);
askstring(hstatus, prompt, buffer, size);
return buffer[0] != 0;
}

3
src/guard.h
View file

@ -2,6 +2,9 @@
#ifndef H_GUARD
#define H_GUARD
#include <stdbool.h>
#ifdef __cplusplus
extern "C" {
#endif

2
src/items.c
View file

@ -122,7 +122,7 @@ struct order *ord)
double force;
spell *sp = find_spell("antimagiczone");
attrib **ap = &r->attribs;
unused_arg(ord);
UNUSED_ARG(ord);
assert(sp);
/* Reduziert die Stärke jedes Spruchs um effect */

2
src/items/artrewards.c
View file

@ -45,7 +45,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
static int age_peaceimmune(attrib * a, void *owner)
{
unused_arg(owner);
UNUSED_ARG(owner);
return (--a->data.i > 0) ? AT_AGE_KEEP : AT_AGE_REMOVE;
}

4
src/items/demonseye.c
View file

@ -38,8 +38,8 @@ summon_igjarjuk(struct unit *u, const struct item_type *itype, int amount,
struct order *ord)
{
struct plane *p = rplane(u->region);
unused_arg(amount);
unused_arg(itype);
UNUSED_ARG(amount);
UNUSED_ARG(itype);
if (p != NULL) {
ADDMSG(&u->faction->msgs, msg_feedback(u, ord, "use_realworld_only", ""));
return EUNUSABLE;

4
src/items/speedsail.c
View file

@ -42,8 +42,8 @@ use_speedsail(struct unit *u, const struct item_type *itype, int amount,
struct order *ord)
{
struct plane *p = rplane(u->region);
unused_arg(amount);
unused_arg(itype);
UNUSED_ARG(amount);
UNUSED_ARG(itype);
if (p != NULL) {
ADDMSG(&u->faction->msgs, msg_feedback(u, ord, "use_realworld_only", ""));
}

2
src/items/weapons.c
View file

@ -106,7 +106,7 @@ int *casualties)
}
enemies = count_enemies(b, af, FIGHT_ROW, FIGHT_ROW, SELECT_ADVANCE);
enemies = _min(enemies, CATAPULT_ATTACKS);
enemies = MIN(enemies, CATAPULT_ATTACKS);
if (enemies == 0) {
return true; /* allow further attacks */
}

2
src/items/xerewards.c
View file

@ -72,7 +72,7 @@ struct order *ord)
}
for (i = 0; i != amount; ++i) {
sp += _max(25, max_spellpoints(u->region, u) / 2);
sp += MAX(25, max_spellpoints(u->region, u) / 2);
change_spellpoints(u, sp);
}

4
src/json.c
View file

@ -73,7 +73,7 @@ int json_export(stream * out, int flags) {
cJSON_AddItemToObject(root, "planes", json = cJSON_CreateObject());
for (p = planes; p; p = p->next) {
cJSON *data;
_snprintf(id, sizeof(id), "%d", p->id);
snprintf(id, sizeof(id), "%d", p->id);
cJSON_AddItemToObject(json, id, data = cJSON_CreateObject());
cJSON_AddNumberToObject(data, "x", p->minx);
cJSON_AddNumberToObject(data, "y", p->miny);
@ -85,7 +85,7 @@ int json_export(stream * out, int flags) {
cJSON_AddItemToObject(root, "regions", json = cJSON_CreateObject());
for (r = regions; r; r = r->next) {
cJSON *data;
_snprintf(id, sizeof(id), "%d", r->uid);
snprintf(id, sizeof(id), "%d", r->uid);
cJSON_AddItemToObject(json, id, data = cJSON_CreateObject());
cJSON_AddNumberToObject(data, "x", r->x);
cJSON_AddNumberToObject(data, "y", r->y);

4
src/kernel/alliance.c
View file

@ -82,7 +82,7 @@ alliance *new_alliance(int id, const char *name) {
al = calloc(1, sizeof(alliance));
al->id = id;
if (name) {
al->name = _strdup(name);
al->name = strdup(name);
}
else {
al->flags |= ALF_NON_ALLIED;
@ -446,7 +446,7 @@ void alliance_setname(alliance * self, const char *name)
{
free(self->name);
if (name)
self->name = _strdup(name);
self->name = strdup(name);
else
self->name = NULL;
}

6
src/kernel/ally.c
View file

@ -76,7 +76,7 @@ int AllianceAuto(void)
const char *str = config_get("alliance.auto");
value = 0;
if (str != NULL) {
char *sstr = _strdup(str);
char *sstr = strdup(str);
char *tok = strtok(sstr, " ");
while (tok) {
value |= ally_flag(tok, -1);
@ -136,7 +136,7 @@ int HelpMask(void)
if (config_changed(&config)) {
const char *str = config_get("rules.help.mask");
if (str != NULL) {
char *sstr = _strdup(str);
char *sstr = strdup(str);
char *tok = strtok(sstr, " ");
while (tok) {
rule |= ally_flag(tok, -1);
@ -156,7 +156,7 @@ static int AllianceRestricted(void)
const char *str = config_get("alliance.restricted");
int rule = 0;
if (str != NULL) {
char *sstr = _strdup(str);
char *sstr = strdup(str);
char *tok = strtok(sstr, " ");
while (tok) {
rule |= ally_flag(tok, -1);

34
src/kernel/build.c
View file

@ -123,11 +123,11 @@ static void destroy_road(unit * u, int nmax, struct order *ord)
}
road = rroad(r, d);
n = _min(n, road);
n = MIN(n, road);
if (n != 0) {
region *r2 = rconnect(r, d);
int willdo = effskill(u, SK_ROAD_BUILDING, 0) * u->number;
willdo = _min(willdo, n);
willdo = MIN(willdo, n);
if (willdo == 0) {
/* TODO: error message */
}
@ -327,7 +327,7 @@ void build_road(unit * u, int size, direction_t d)
}
if (size > 0)
left = _min(size, left);
left = MIN(size, left);
/* baumaximum anhand der rohstoffe */
if (u_race(u) == get_race(RC_STONEGOLEM)) {
n = u->number * GOLEM_STONE;
@ -339,7 +339,7 @@ void build_road(unit * u, int size, direction_t d)
return;
}
}
left = _min(n, left);
left = MIN(n, left);
/* n = maximum by skill. try to maximize it */
n = u->number * effsk;
@ -347,7 +347,7 @@ void build_road(unit * u, int size, direction_t d)
const resource_type *ring = get_resourcetype(R_RING_OF_NIMBLEFINGER);
item *itm = ring ? *i_find(&u->items, ring->itype) : 0;
if (itm != NULL && itm->number > 0) {
int rings = _min(u->number, itm->number);
int rings = MIN(u->number, itm->number);
n = n * ((roqf_factor() - 1) * rings + u->number) / u->number;
}
}
@ -355,15 +355,15 @@ void build_road(unit * u, int size, direction_t d)
int dm = get_effect(u, oldpotiontype[P_DOMORE]);
if (dm != 0) {
int todo = (left - n + effsk - 1) / effsk;
todo = _min(todo, u->number);
dm = _min(dm, todo);
todo = MIN(todo, u->number);
dm = MIN(dm, todo);
change_effect(u, oldpotiontype[P_DOMORE], -dm);
n += dm * effsk;
} /* Auswirkung Schaffenstrunk */
}
/* make minimum of possible and available: */
n = _min(left, n);
n = MIN(left, n);
/* n is now modified by several special effects, so we have to
* minimize it again to make sure the road will not grow beyond
@ -380,7 +380,7 @@ void build_road(unit * u, int size, direction_t d)
else {
use_pooled(u, get_resourcetype(R_STONE), GET_DEFAULT, n);
/* Nur soviel PRODUCEEXP wie auch tatsaechlich gemacht wurde */
produceexp(u, SK_ROAD_BUILDING, _min(n, u->number));
produceexp(u, SK_ROAD_BUILDING, MIN(n, u->number));
}
ADDMSG(&u->faction->msgs, msg_message("buildroad",
"region unit size", r, u, n));
@ -486,7 +486,7 @@ int build(unit * u, const construction * ctype, int completed, int want)
if (dm != 0) {
/* Auswirkung Schaffenstrunk */
dm = _min(dm, u->number);
dm = MIN(dm, u->number);
change_effect(u, oldpotiontype[P_DOMORE], -dm);
skills += dm * effsk;
}
@ -545,7 +545,7 @@ int build(unit * u, const construction * ctype, int completed, int want)
item *itm = ring ? *i_find(&u->items, ring->itype) : 0;
int i = itm ? itm->number : 0;
if (i > 0) {
int rings = _min(u->number, i);
int rings = MIN(u->number, i);
n = n * ((roqf_factor() - 1) * rings + u->number) / u->number;
}
}
@ -553,7 +553,7 @@ int build(unit * u, const construction * ctype, int completed, int want)
if (want < n) n = want;
if (type->maxsize > 0) {
n = _min(type->maxsize - completed, n);
n = MIN(type->maxsize - completed, n);
if (type->improvement == NULL) {
want = n;
}
@ -626,7 +626,7 @@ int build(unit * u, const construction * ctype, int completed, int want)
completed = completed + n;
}
/* Nur soviel PRODUCEEXP wie auch tatsaechlich gemacht wurde */
produceexp(u, ctype->skill, _min(made, u->number));
produceexp(u, ctype->skill, MIN(made, u->number));
return made;
}
@ -671,7 +671,7 @@ int maxbuild(const unit * u, const construction * cons)
return 0;
}
else
maximum = _min(maximum, have / need);
maximum = MIN(maximum, have / need);
}
return maximum;
}
@ -879,7 +879,7 @@ static void build_ship(unit * u, ship * sh, int want)
}
if (sh->damage && can) {
int repair = _min(sh->damage, can * DAMAGE_SCALE);
int repair = MIN(sh->damage, can * DAMAGE_SCALE);
n += repair / DAMAGE_SCALE;
if (repair % DAMAGE_SCALE)
++n;
@ -923,7 +923,7 @@ order * ord)
return;
}
if (want > 0)
want = _min(want, msize);
want = MIN(want, msize);
else
want = msize;
@ -982,7 +982,7 @@ void continue_ship(unit * u, int want)
return;
}
if (want > 0)
want = _min(want, msize);
want = MIN(want, msize);
else
want = msize;

10
src/kernel/building.c
View file

@ -127,7 +127,7 @@ building_type *bt_get_or_create(const char *name)
building_type *btype = bt_find_i(name);
if (btype == NULL) {
btype = calloc(sizeof(building_type), 1);
btype->_name = _strdup(name);
btype->_name = strdup(name);
btype->auraregen = 1.0;
btype->maxsize = -1;
btype->capacity = 1;
@ -143,7 +143,7 @@ int buildingcapacity(const building * b)
{
if (b->type->capacity >= 0) {
if (b->type->maxcapacity >= 0) {
return _min(b->type->maxcapacity, b->size * b->type->capacity);
return MIN(b->type->maxcapacity, b->size * b->type->capacity);
}
return b->size * b->type->capacity;
}
@ -420,7 +420,7 @@ building *new_building(const struct building_type * btype, region * r,
}
assert(bname);
slprintf(buffer, sizeof(buffer), "%s %s", bname, itoa36(b->no));
b->name = _strdup(bname);
b->name = strdup(bname);
return b;
}
@ -619,7 +619,7 @@ void building_setname(building * self, const char *name)
{
free(self->name);
if (name)
self->name = _strdup(name);
self->name = strdup(name);
else
self->name = NULL;
}
@ -779,7 +779,7 @@ default_wage(const region * r, const faction * f, const race * rc, int in_turn)
/* Godcurse: Income -10 */
ctype = ct_find("godcursezone");
if (ctype && curse_active(get_curse(r->attribs, ctype))) {
wage = _max(0, wage - 10);
wage = MAX(0, wage - 10);
}
/* Bei einer D<>rre verdient man nur noch ein Viertel */

2
src/kernel/building.h
View file

@ -23,6 +23,8 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <util/variant.h>
#include <stddef.h>
#include <stdbool.h>
#ifdef __cplusplus
extern "C" {
#endif

2
src/kernel/building.test.c
View file

@ -22,7 +22,7 @@ static void test_register_building(CuTest * tc)
test_cleanup();
btype = (building_type *)calloc(sizeof(building_type), 1);
btype->_name = _strdup("herp");
btype->_name = strdup("herp");
CuAssertIntEquals(tc, true, bt_changed(&cache));
CuAssertIntEquals(tc, false, bt_changed(&cache));
bt_register(btype);

13
src/kernel/config.c
View file

@ -92,6 +92,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <limits.h>
#include <time.h>
#include <errno.h>
#include <sys/stat.h>
struct settings global = {
"Eressea", /* gamename */
@ -362,7 +363,7 @@ void init_locale(struct locale *lang)
str = "gwyrrd illaun draig cerddor tybied";
}
sstr = _strdup(str);
sstr = strdup(str);
tok = strtok(sstr, " ");
while (tok) {
const char *name;
@ -473,7 +474,7 @@ int check_param(const struct param *p, const char *key, const char *searchvalue)
if (!value) {
return 0;
}
char *p_value = _strdup(value);
char *p_value = strdup(value);
const char *delimiter = " ,;";
char *v = strtok(p_value, delimiter);
@ -536,7 +537,7 @@ static const char * relpath(char *buf, size_t sz, const char *path) {
static const char *g_datadir;
const char *datapath(void)
{
static char zText[MAX_PATH];
static char zText[4096];
if (g_datadir)
return g_datadir;
return relpath(zText, sizeof(zText), "data");
@ -550,7 +551,7 @@ void set_datapath(const char *path)
static const char *g_reportdir;
const char *reportpath(void)
{
static char zText[MAX_PATH];
static char zText[4096];
if (g_reportdir)
return g_reportdir;
return relpath(zText, sizeof(zText), "reports");
@ -563,12 +564,12 @@ void set_reportpath(const char *path)
int create_directories(void) {
int err;
err = _mkdir(datapath());
err = mkdir(datapath(), 0777);
if (err) {
if (errno == EEXIST) errno = 0;
else return err;
}
err = _mkdir(reportpath());
err = mkdir(reportpath(), 0777);
if (err && errno == EEXIST) {
errno = 0;
}

1
src/kernel/config.h
View file

@ -25,6 +25,7 @@ extern "C" {
/* this should always be the first thing included after platform.h */
#include <stddef.h>
#include <stdbool.h>
#include "types.h"
struct param;

68
src/kernel/connection.c
View file

@ -131,7 +131,7 @@ static connection **get_borders_i(const region * r1, const region * r2)
int key = reg_hashkey(r1);
int k2 = reg_hashkey(r2);
key = _min(k2, key) % BORDER_MAXHASH;
key = MIN(k2, key) % BORDER_MAXHASH;
bp = &borders[key];
while (*bp) {
connection *b = *bp;
@ -258,31 +258,31 @@ void b_write(const connection * b, storage * store)
bool b_transparent(const connection * b, const struct faction *f)
{
unused_arg(b);
unused_arg(f);
UNUSED_ARG(b);
UNUSED_ARG(f);
return true;
}
bool b_opaque(const connection * b, const struct faction * f)
{
unused_arg(b);
unused_arg(f);
UNUSED_ARG(b);
UNUSED_ARG(f);
return false;
}
bool b_blockall(const connection * b, const unit * u, const region * r)
{
unused_arg(u);
unused_arg(r);
unused_arg(b);
UNUSED_ARG(u);
UNUSED_ARG(r);
UNUSED_ARG(b);
return true;
}
bool b_blocknone(const connection * b, const unit * u, const region * r)
{
unused_arg(u);
unused_arg(r);
unused_arg(b);
UNUSED_ARG(u);
UNUSED_ARG(r);
UNUSED_ARG(b);
return false;
}
@ -294,39 +294,39 @@ bool b_rvisible(const connection * b, const region * r)
bool b_fvisible(const connection * b, const struct faction * f,
const region * r)
{
unused_arg(r);
unused_arg(f);
unused_arg(b);
UNUSED_ARG(r);
UNUSED_ARG(f);
UNUSED_ARG(b);
return true;
}
bool b_uvisible(const connection * b, const unit * u)
{
unused_arg(u);
unused_arg(b);
UNUSED_ARG(u);
UNUSED_ARG(b);
return true;
}
bool b_rinvisible(const connection * b, const region * r)
{
unused_arg(r);
unused_arg(b);
UNUSED_ARG(r);
UNUSED_ARG(b);
return false;
}
bool b_finvisible(const connection * b, const struct faction * f,
const region * r)
{
unused_arg(r);
unused_arg(f);
unused_arg(b);
UNUSED_ARG(r);
UNUSED_ARG(f);
UNUSED_ARG(b);
return false;
}
bool b_uinvisible(const connection * b, const unit * u)
{
unused_arg(u);
unused_arg(b);
UNUSED_ARG(u);
UNUSED_ARG(b);
return false;
}
@ -380,9 +380,9 @@ static const char *b_namewall(const connection * b, const region * r,
{
const char *bname = "wall";
unused_arg(f);
unused_arg(r);
unused_arg(b);
UNUSED_ARG(f);
UNUSED_ARG(r);
UNUSED_ARG(b);
if (gflags & GF_ARTICLE)
bname = "a_wall";
if (gflags & GF_PURE)
@ -421,9 +421,9 @@ border_type bt_noway = {
static const char *b_namefogwall(const connection * b, const region * r,
const struct faction *f, int gflags)
{
unused_arg(f);
unused_arg(b);
unused_arg(r);
UNUSED_ARG(f);
UNUSED_ARG(b);
UNUSED_ARG(r);
if (gflags & GF_PURE)
return "fogwall";
if (gflags & GF_ARTICLE)
@ -434,7 +434,7 @@ static const char *b_namefogwall(const connection * b, const region * r,
static bool
b_blockfogwall(const connection * b, const unit * u, const region * r)
{
unused_arg(b);
UNUSED_ARG(b);
if (!u)
return true;
return (bool)(effskill(u, SK_PERCEPTION, r) > 4); /* Das ist die alte Nebelwand */
@ -459,8 +459,8 @@ static const char *b_nameillusionwall(const connection * b, const region * r,
const struct faction *f, int gflags)
{
int fno = b->data.i;
unused_arg(b);
unused_arg(r);
UNUSED_ARG(b);
UNUSED_ARG(r);
if (gflags & GF_PURE)
return (f && fno == f->no) ? "illusionwall" : "wall";
if (gflags & GF_ARTICLE) {
@ -496,7 +496,7 @@ static const char *b_nameroad(const connection * b, const region * r,
int local = (r == b->from) ? b->data.sa[0] : b->data.sa[1];
static char buffer[64];
unused_arg(f);
UNUSED_ARG(f);
if (gflags & GF_PURE)
return "road";
if (gflags & GF_ARTICLE) {
@ -512,7 +512,7 @@ static const char *b_nameroad(const connection * b, const region * r,
}
}
else {
int percent = _max(1, 100 * local / r->terrain->max_road);
int percent = MAX(1, 100 * local / r->terrain->max_road);
if (local) {
slprintf(buffer, sizeof(buffer), LOC(f->locale, mkname("border",
"a_road_percent")), percent);

2
src/kernel/connection.h
View file

@ -20,7 +20,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define H_KRNL_BORDER
#include <util/variant.h>
#include <stdbool.h>
#ifdef __cplusplus
extern "C" {
#endif

20
src/kernel/curse.c
View file

@ -109,7 +109,7 @@ int curse_age(attrib * a, void *owner)
curse *c = (curse *)a->data.v;
int result = 0;
unused_arg(owner);
UNUSED_ARG(owner);
c_clearflag(c, CURSE_ISNEW);
if (c_flags(c) & CURSE_NOAGE) {
@ -122,7 +122,7 @@ int curse_age(attrib * a, void *owner)
c->duration = 0;
}
else if (c->duration != INT_MAX) {
c->duration = _max(0, c->duration - 1);
c->duration = MAX(0, c->duration - 1);
}
return (c->duration > 0) ? AT_AGE_KEEP : AT_AGE_REMOVE;
}
@ -348,7 +348,7 @@ const curse_type *ct_find(const char *c)
return type;
}
else {
size_t k = _min(c_len, strlen(type->cname));
size_t k = MIN(c_len, strlen(type->cname));
if (!memcmp(c, type->cname, k)) {
return type;
}
@ -507,7 +507,7 @@ int get_cursedmen(unit * u, const curse * c)
cursedmen = c->data.i;
}
return _min(u->number, cursedmen);
return MIN(u->number, cursedmen);
}
/* setzt die Anzahl der betroffenen Personen auf cursedmen */
@ -596,7 +596,7 @@ curse *create_curse(unit * magician, attrib ** ap, const curse_type * ct,
/* es gibt schon eins diese Typs */
if (c && ct->mergeflags != NO_MERGE) {
if (ct->mergeflags & M_DURATION) {
c->duration = _max(c->duration, duration);
c->duration = MAX(c->duration, duration);
}
if (ct->mergeflags & M_SUMDURATION) {
c->duration += duration;
@ -605,10 +605,10 @@ curse *create_curse(unit * magician, attrib ** ap, const curse_type * ct,
c->effect += effect;
}
if (ct->mergeflags & M_MAXEFFECT) {
c->effect = _max(c->effect, effect);
c->effect = MAX(c->effect, effect);
}
if (ct->mergeflags & M_VIGOUR) {
c->vigour = _max(vigour, c->vigour);
c->vigour = MAX(vigour, c->vigour);
}
if (ct->mergeflags & M_VIGOUR_ADD) {
c->vigour = vigour + c->vigour;
@ -792,9 +792,9 @@ message *cinfo_simple(const void *obj, objtype_t typ, const struct curse * c,
{
struct message *msg;
unused_arg(typ);
unused_arg(self);
unused_arg(obj);
UNUSED_ARG(typ);
UNUSED_ARG(self);
UNUSED_ARG(obj);
msg = msg_message(mkname("curseinfo", c->type->cname), "id", c->no);
if (msg == NULL) {

2
src/kernel/curse.h
View file

@ -22,6 +22,8 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <util/variant.h>
#include "objtypes.h"
#include <stdbool.h>
#ifdef __cplusplus
extern "C" {
#endif

8
src/kernel/equipment.c
View file

@ -47,7 +47,7 @@ equipment *create_equipment(const char *eqname)
int i = eq ? strcmp(eq->name, eqname) : 1;
if (i > 0) {
eq = (equipment *)calloc(1, sizeof(equipment));
eq->name = _strdup(eqname);
eq->name = strdup(eqname);
eq->next = *eqp;
memset(eq->skills, 0, sizeof(eq->skills));
*eqp = eq;
@ -78,7 +78,7 @@ void equipment_setskill(equipment * eq, skill_t sk, const char *value)
{
if (eq != NULL) {
if (value != NULL) {
eq->skills[sk] = _strdup(value);
eq->skills[sk] = strdup(value);
}
else if (eq->skills[sk]) {
free(eq->skills[sk]);
@ -98,7 +98,7 @@ void equipment_addspell(equipment * eq, const char * name, int level)
lazy_spell *ls = malloc(sizeof(lazy_spell));
ls->sp = NULL;
ls->level = level;
ls->name = _strdup(name);
ls->name = strdup(name);
ql_push(&eq->spells, ls);
}
}
@ -115,7 +115,7 @@ equipment_setitem(equipment * eq, const item_type * itype, const char *value)
if (idata == NULL) {
idata = (itemdata *)malloc(sizeof(itemdata));
idata->itype = itype;
idata->value = _strdup(value);
idata->value = strdup(value);
idata->next = eq->items;
eq->items = idata;
}

10
src/kernel/faction.c
View file

@ -274,7 +274,7 @@ faction *addfaction(const char *email, const char *password,
fhash(f);
slprintf(buf, sizeof(buf), "%s %s", LOC(loc, "factiondefault"), itoa36(f->no));
f->name = _strdup(buf);
f->name = strdup(buf);
if (!f->race) {
log_warning("creating a faction that has no race", itoa36(f->no));
@ -523,7 +523,7 @@ void faction_setname(faction * self, const char *name)
{
free(self->name);
if (name)
self->name = _strdup(name);
self->name = strdup(name);
}
const char *faction_getemail(const faction * self)
@ -535,7 +535,7 @@ void faction_setemail(faction * self, const char *email)
{
free(self->email);
if (email)
self->email = _strdup(email);
self->email = strdup(email);
}
const char *faction_getbanner(const faction * self)
@ -547,7 +547,7 @@ void faction_setbanner(faction * self, const char *banner)
{
free(self->banner);
if (banner)
self->banner = _strdup(banner);
self->banner = strdup(banner);
}
void faction_setpassword(faction * f, const char *pwhash)
@ -555,7 +555,7 @@ void faction_setpassword(faction * f, const char *pwhash)
assert(pwhash);
// && pwhash[0] == '$');
free(f->_password);
f->_password = _strdup(pwhash);
f->_password = strdup(pwhash);
}
bool valid_race(const struct faction *f, const struct race *rc)

2
src/kernel/faction.h
View file

@ -22,6 +22,8 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "skill.h"
#include "types.h"
#include <modules/score.h>
#include <stdbool.h>
#ifdef __cplusplus
extern "C" {
#endif

4
src/kernel/group.c
View file

@ -57,8 +57,8 @@ group *new_group(faction * f, const char *name, int gid)
gp = &(*gp)->next;
*gp = g;
maxgid = _max(gid, maxgid);
g->name = _strdup(name);
maxgid = MAX(gid, maxgid);
g->name = strdup(name);
g->gid = gid;
g->nexthash = ghash[index];

24
src/kernel/item.c
View file

@ -156,7 +156,7 @@ const char *resourcename(const resource_type * rtype, int flags)
}
if (flags & NMF_PLURAL) {
static char name[64]; // FIXME: static return value
_snprintf(name, sizeof(name), "%s_p", rtype->_name);
snprintf(name, sizeof(name), "%s_p", rtype->_name);
return name;
}
return rtype->_name;
@ -186,7 +186,7 @@ resource_type *rt_get_or_create(const char *name) {
perror("resource_type allocation failed");
}
else {
rtype->_name = _strdup(name);
rtype->_name = strdup(name);
rt_register(rtype);
return rt_find(name);
}
@ -282,8 +282,8 @@ weapon_type *new_weapontype(item_type * itype,
wtype = calloc(sizeof(weapon_type), 1);
if (damage) {
wtype->damage[0] = _strdup(damage[0]);
wtype->damage[1] = _strdup(damage[1]);
wtype->damage[0] = strdup(damage[0]);
wtype->damage[1] = strdup(damage[1]);
}
wtype->defmod = defmod;
wtype->flags |= wflags;
@ -342,7 +342,7 @@ void it_set_appearance(item_type *itype, const char *appearance) {
assert(itype);
assert(itype->rtype);
if (appearance) {
itype->_appearance[0] = _strdup(appearance);
itype->_appearance[0] = strdup(appearance);
itype->_appearance[1] = strcat(strcpy((char *)malloc(strlen((char *)appearance) + 3), (char *)appearance), "_p");
} else {
itype->_appearance[0] = 0;
@ -676,9 +676,9 @@ struct order *ord)
direction_t d;
message *msg = msg_message("meow", "");
unused_arg(ord);
unused_arg(amount);
unused_arg(itype);
UNUSED_ARG(ord);
UNUSED_ARG(amount);
UNUSED_ARG(itype);
add_message(&u->region->msgs, msg);
for (d = 0; d < MAXDIRECTIONS; d++) {
@ -717,7 +717,7 @@ struct order *ord)
c = create_curse(u, &u->attribs, ct_find("skillmod"), power,
duration, effect, u->number);
c->data.i = SK_TACTICS;
unused_arg(ord);
UNUSED_ARG(ord);
}
use_pooled(u, itype->rtype, GET_DEFAULT, amount);
ADDMSG(&u->faction->msgs, msg_message("use_tacticcrystal",
@ -746,14 +746,14 @@ mod_elves_only(const unit * u, const region * r, skill_t sk, int value)
{
if (u_race(u) == get_race(RC_ELF))
return value;
unused_arg(r);
UNUSED_ARG(r);
return -118;
}
static int
mod_dwarves_only(const unit * u, const region * r, skill_t sk, int value)
{
unused_arg(r);
UNUSED_ARG(r);
if (u_race(u) == get_race(RC_DWARF) || (u_race(u)->flags & RCF_IRONGOLEM)) {
return value;
}
@ -764,7 +764,7 @@ static int heal(unit * user, int effect)
{
int req = unit_max_hp(user) * user->number - user->hp;
if (req > 0) {
req = _min(req, effect);
req = MIN(req, effect);
effect -= req;
user->hp += req;
}

12
src/kernel/jsonconf.c
View file

@ -224,7 +224,7 @@ static void json_terrain_production(cJSON *json, terrain_production *prod) {
if (dst) {
free(*dst);
assert(child->type == cJSON_String);
*dst = _strdup(child->valuestring);
*dst = strdup(child->valuestring);
}
}
}
@ -453,7 +453,7 @@ static void json_race(cJSON *json, race *rc) {
switch (child->type) {
case cJSON_String:
if (strcmp(child->string, "damage") == 0) {
rc->def_damage = _strdup(child->valuestring);
rc->def_damage = strdup(child->valuestring);
}
break;
case cJSON_Number:
@ -534,7 +534,7 @@ static void disable_feature(const char *str) {
enable_keyword(k, false);
return;
}
_snprintf(name, sizeof(name), "%s.enabled", str);
snprintf(name, sizeof(name), "%s.enabled", str);
log_info("disable feature %s\n", name);
config_set(name, "0");
}
@ -594,7 +594,7 @@ static void json_spells(cJSON *json) {
sp->fumble = (fumble_f)get_function(item->valuestring);
}
else if (strcmp(item->string, "syntax") == 0) {
sp->syntax = _strdup(item->valuestring);
sp->syntax = strdup(item->valuestring);
}
}
}
@ -796,10 +796,10 @@ static void json_settings(cJSON *json) {
else {
char value[32];
if (child->type == cJSON_Number && child->valuedouble && child->valueint<child->valuedouble) {
_snprintf(value, sizeof(value), "%f", child->valuedouble);
snprintf(value, sizeof(value), "%f", child->valuedouble);
}
else {
_snprintf(value, sizeof(value), "%d", child->valueint);
snprintf(value, sizeof(value), "%d", child->valueint);
}
config_set(child->string, value);
}

4
src/kernel/messages.c
View file

@ -212,7 +212,7 @@ caddmessage(region * r, faction * f, const char *s, msg_t mtype, int level)
{
message *m = NULL;
unused_arg(level);
UNUSED_ARG(level);
switch (mtype) {
case MSG_INCOME:
assert(f);
@ -275,7 +275,7 @@ message * msg_error(const unit * u, struct order *ord, int mno) {
message * cmistake(const unit * u, struct order *ord, int mno, int mtype)
{
message * result;
unused_arg(mtype);
UNUSED_ARG(mtype);
result = msg_error(u, ord, mno);
ADDMSG(&u->faction->msgs, result);
return result;

2
src/kernel/order.c
View file

@ -405,7 +405,7 @@ order *parse_order(const char *s, const struct locale * lang)
}
}
if (kwd != NOKEYWORD) {
while (isxspace(*(unsigned char *)sptr)) ++sptr;
while (isspace(*(unsigned char *)sptr)) ++sptr;
s = sptr;
return create_order_i(kwd, s, persistent, lang);
}

2
src/kernel/plane.c
View file

@ -234,7 +234,7 @@ plane *create_new_plane(int id, const char *name, int minx, int maxx, int miny,
pl->next = NULL;
pl->id = id;
if (name)
pl->name = _strdup(name);
pl->name = strdup(name);
pl->minx = minx;
pl->maxx = maxx;
pl->miny = miny;

10
src/kernel/pool.c
View file

@ -168,7 +168,7 @@ int count)
use = have;
else if (rtype->itype && mode & (GET_SLACK | GET_RESERVE)) {
int reserve = get_reservation(u, rtype->itype);
int slack = _max(0, have - reserve);
int slack = MAX(0, have - reserve);
if (mode & GET_RESERVE)
use = have - slack;
else if (mode & GET_SLACK)
@ -209,18 +209,18 @@ use_pooled(unit * u, const resource_type * rtype, unsigned int mode, int count)
}
if ((mode & GET_SLACK) && (mode & GET_RESERVE)) {
n = _min(use, have);
n = MIN(use, have);
}
else if (rtype->itype) {
int reserve = get_reservation(u, rtype->itype);
int slack = _max(0, have - reserve);
int slack = MAX(0, have - reserve);
if (mode & GET_RESERVE) {
n = have - slack;
n = _min(use, n);
n = MIN(use, n);
change_reservation(u, rtype->itype, -n);
}
else if (mode & GET_SLACK) {
n = _min(use, slack);
n = MIN(use, slack);
}
}
if (n > 0) {

4
src/kernel/race.c
View file

@ -241,7 +241,7 @@ race *rc_create(const char *zName)
log_error("race '%s' has an invalid name. remove spaces\n", zName);
assert(strchr(zName, ' ') == NULL);
}
rc->_name = _strdup(zName);
rc->_name = strdup(zName);
rc->precombatspell = NULL;
rc->attack[0].type = AT_COMBATSPELL;
@ -288,7 +288,7 @@ const char* rc_name(const race * rc, name_t n, char *name, size_t size) {
default: assert(!"invalid name_t enum in rc_name_s");
}
if (postfix) {
_snprintf(name, size, "race::%s%s", rc->_name, postfix);
snprintf(name, size, "race::%s%s", rc->_name, postfix);
return name;
}
return NULL;

16
src/kernel/region.c
View file

@ -138,7 +138,7 @@ int region_maxworkers(const region *r)
{
int size = production(r);
int treespace = (rtrees(r, 2) + rtrees(r, 1) / 2) * TREESIZE;
return _max(size - treespace, _min(size / 10, 200));
return MAX(size - treespace, MIN(size / 10, 200));
}
int deathcount(const region * r)
@ -403,7 +403,7 @@ koor_distance_wrap_xy(int x1, int y1, int x2, int y2, int width, int height)
int dx = x1 - x2;
int dy = y1 - y2;
int result, dist;
int mindist = _min(width, height) >> 1;
int mindist = MIN(width, height) >> 1;
/* Bei negativem dy am Ursprung spiegeln, das veraendert
* den Abstand nicht
@ -426,13 +426,13 @@ koor_distance_wrap_xy(int x1, int y1, int x2, int y2, int width, int height)
if (result <= mindist)
return result;
}
dist = _max(dx, height - dy);
dist = MAX(dx, height - dy);
if (dist >= 0 && dist < result) {
result = dist;
if (result <= mindist)
return result;
}
dist = _max(width - dx, dy);
dist = MAX(width - dx, dy);
if (dist >= 0 && dist < result)
result = dist;
return result;
@ -1215,7 +1215,7 @@ void terraform_region(region * r, const terrain_type * terrain)
if (!fval(r, RF_CHAOTIC)) {
int peasants;
peasants = (region_maxworkers(r) * (20 + dice_rand("6d10"))) / 100;
rsetpeasants(r, _max(100, peasants));
rsetpeasants(r, MAX(100, peasants));
rsetmoney(r, rpeasants(r) * ((wage(r, NULL, NULL,
INT_MAX) + 1) + rng_int() % 5));
}
@ -1395,7 +1395,7 @@ faction *update_owners(region * r)
else if (f || new_owner->faction != region_get_last_owner(r)) {
alliance *al = region_get_alliance(r);
if (al && new_owner->faction->alliance == al) {
int morale = _max(0, region_get_morale(r) - MORALE_TRANSFER);
int morale = MAX(0, region_get_morale(r) - MORALE_TRANSFER);
region_set_morale(r, morale, turn);
}
else {
@ -1418,7 +1418,7 @@ faction *update_owners(region * r)
void region_setinfo(struct region *r, const char *info)
{
free(r->display);
r->display = info ? _strdup(info) : 0;
r->display = info ? strdup(info) : 0;
}
const char *region_getinfo(const region * r)
@ -1430,7 +1430,7 @@ void region_setname(struct region *r, const char *name)
{
if (r->land) {
free(r->land->name);
r->land->name = name ? _strdup(name) : 0;
r->land->name = name ? strdup(name) : 0;
}
}

1
src/kernel/region.h
View file

@ -20,6 +20,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define H_KRNL_REGION
#include <stddef.h>
#include <stdbool.h>
#include "types.h"
#include "direction.h"

4
src/kernel/resources.c
View file

@ -111,7 +111,7 @@ static void terraform_default(struct rawmaterial *res, const region * r)
res->amount = (int)(res->amount * modifier); /* random adjustment, +/- 91% */
if (res->amount < 1)
res->amount = 1;
unused_arg(r);
UNUSED_ARG(r);
}
#ifdef RANDOM_CHANGE
@ -205,7 +205,7 @@ struct rawmaterial_type *rmt_create(const struct resource_type *rtype,
const char *name)
{
rawmaterial_type *rmtype = malloc(sizeof(rawmaterial_type));
rmtype->name = _strdup(name);
rmtype->name = strdup(name);
rmtype->rtype = rtype;
rmtype->terraform = terraform_default;
rmtype->update = NULL;

24
src/kernel/save.c
View file

@ -436,7 +436,7 @@ void read_planes(gamedata *data) {
}
pl->id = id;
READ_STR(store, name, sizeof(name));
pl->name = _strdup(name);
pl->name = strdup(name);
READ_INT(store, &pl->minx);
READ_INT(store, &pl->maxx);
READ_INT(store, &pl->miny);
@ -668,7 +668,7 @@ unit *read_unit(struct gamedata *data)
if (unicode_utf8_trim(obuf)!=0) {
log_warning("trim unit %s name to '%s'", itoa36(u->no), obuf);
}
u->_name = obuf[0] ? _strdup(obuf) : 0;
u->_name = obuf[0] ? strdup(obuf) : 0;
if (lomem) {
READ_STR(data->store, NULL, 0);
}
@ -677,7 +677,7 @@ unit *read_unit(struct gamedata *data)
if (unicode_utf8_trim(obuf)!=0) {
log_warning("trim unit %s info to '%s'", itoa36(u->no), obuf);
}
u->display = obuf[0] ? _strdup(obuf) : 0;
u->display = obuf[0] ? strdup(obuf) : 0;
}
READ_INT(data->store, &number);
set_number(u, number);
@ -933,7 +933,7 @@ static region *readregion(struct gamedata *data, int x, int y)
if (unicode_utf8_trim(name)!=0) {
log_warning("trim region %d name to '%s'", uid, name);
};
r->land->name = _strdup(name);
r->land->name = strdup(name);
}
if (r->land) {
int i;
@ -1034,7 +1034,7 @@ static region *readregion(struct gamedata *data, int x, int y)
read_items(data->store, &r->land->items);
if (data->version >= REGIONOWNER_VERSION) {
READ_INT(data->store, &n);
region_set_morale(r, _max(0, (short)n), -1);
region_set_morale(r, MAX(0, (short)n), -1);
read_owner(data, &r->land->ownership);
}
}
@ -1192,7 +1192,7 @@ static char * getpasswd(int fno) {
assert(line[slen] == '\n');
line[slen] = 0;
fclose(F);
return _strdup(line + len + 1);
return strdup(line + len + 1);
}
}
fclose(F);
@ -1285,12 +1285,12 @@ faction *read_faction(struct gamedata * data)
if (unicode_utf8_trim(name)!=0) {
log_warning("trim faction %s name to '%s'", itoa36(f->no), name);
};
f->name = _strdup(name);
f->name = strdup(name);
READ_STR(data->store, name, sizeof(name));
if (unicode_utf8_trim(name)!=0) {
log_warning("trim faction %s banner to '%s'", itoa36(f->no), name);
};
f->banner = _strdup(name);
f->banner = strdup(name);
log_debug(" - Lese Partei %s (%s)", f->name, itoa36(f->no));
@ -1528,7 +1528,7 @@ struct building *read_building(gamedata *data) {
if (unicode_utf8_trim(name)!=0) {
log_warning("trim building %s name to '%s'", itoa36(b->no), name);
}
b->name = _strdup(name);
b->name = strdup(name);
if (lomem) {
READ_STR(store, NULL, 0);
}
@ -1537,7 +1537,7 @@ struct building *read_building(gamedata *data) {
if (unicode_utf8_trim(name)!=0) {
log_warning("trim building %s info to '%s'", itoa36(b->no), name);
}
b->display = _strdup(name);
b->display = strdup(name);
}
READ_INT(store, &b->size);
READ_STR(store, name, sizeof(name));
@ -1581,7 +1581,7 @@ ship *read_ship(struct gamedata *data)
if (unicode_utf8_trim(name)!=0) {
log_warning("trim ship %s name to '%s'", itoa36(sh->no), name);
}
sh->name = _strdup(name);
sh->name = strdup(name);
if (lomem) {
READ_STR(store, NULL, 0);
}
@ -1590,7 +1590,7 @@ ship *read_ship(struct gamedata *data)
if (unicode_utf8_trim(name)!=0) {
log_warning("trim ship %s info to '%s'", itoa36(sh->no), name);
}
sh->display = _strdup(name);
sh->display = strdup(name);
}
READ_STR(store, name, sizeof(name));
sh->type = st_find(name);

8
src/kernel/save.test.c
View file

@ -91,7 +91,7 @@ static void test_readwrite_faction(CuTest * tc)
test_setup();
f = test_create_faction(0);
free(f->name);
f->name = _strdup(" Hodor ");
f->name = strdup(" Hodor ");
CuAssertStrEquals(tc, " Hodor ", f->name);
mstream_init(&data.strm);
gamedata_init(&data, &store, RELEASE_VERSION);
@ -120,7 +120,7 @@ static void test_readwrite_region(CuTest * tc)
test_setup();
r = test_create_region(0, 0, 0);
free(r->land->name);
r->land->name = _strdup(" Hodor ");
r->land->name = strdup(" Hodor ");
CuAssertStrEquals(tc, " Hodor ", r->land->name);
mstream_init(&data.strm);
gamedata_init(&data, &store, RELEASE_VERSION);
@ -150,7 +150,7 @@ static void test_readwrite_building(CuTest * tc)
r = test_create_region(0, 0, 0);
b = test_create_building(r, 0);
free(b->name);
b->name = _strdup(" Hodor ");
b->name = strdup(" Hodor ");
CuAssertStrEquals(tc, " Hodor ", b->name);
mstream_init(&data.strm);
gamedata_init(&data, &store, RELEASE_VERSION);
@ -183,7 +183,7 @@ static void test_readwrite_ship(CuTest * tc)
r = test_create_region(0, 0, 0);
sh = test_create_ship(r, 0);
free(sh->name);
sh->name = _strdup(" Hodor ");
sh->name = strdup(" Hodor ");
CuAssertStrEquals(tc, " Hodor ", sh->name);
mstream_init(&data.strm);
gamedata_init(&data, &store, RELEASE_VERSION);

10
src/kernel/ship.c
View file

@ -109,7 +109,7 @@ ship_type *st_get_or_create(const char * name) {
ship_type * st = st_find_i(name);
if (!st) {
st = (ship_type *)calloc(sizeof(ship_type), 1);
st->_name = _strdup(name);
st->_name = strdup(name);
st->storm = 1.0;
ql_push(&shiptypes, (void *)st);
}
@ -202,7 +202,7 @@ ship *new_ship(const ship_type * stype, region * r, const struct locale *lang)
}
assert(sname);
slprintf(buffer, sizeof(buffer), "%s %s", sname, itoa36(sh->no));
sh->name = _strdup(buffer);
sh->name = strdup(buffer);
shash(sh);
if (r) {
addlist(&r->ships, sh);
@ -333,8 +333,8 @@ int shipspeed(const ship * sh, const unit * u)
int crew = crew_skill(sh);
int crew_bonus = (crew / sh->type->sumskill / 2) - 1;
if (crew_bonus > 0) {
bonus = _min(bonus, crew_bonus);
bonus = _min(bonus, sh->type->range_max - sh->type->range);
bonus = MIN(bonus, crew_bonus);
bonus = MIN(bonus, sh->type->range_max - sh->type->range);
}
else {
bonus = 0;
@ -458,7 +458,7 @@ void write_ship_reference(const struct ship *sh, struct storage *store)
void ship_setname(ship * self, const char *name)
{
free(self->name);
self->name = name ? _strdup(name) : 0;
self->name = name ? strdup(name) : 0;
}
const char *ship_getname(const ship * self)

2
src/kernel/spell.c
View file

@ -78,7 +78,7 @@ spell * create_spell(const char * name, unsigned int id)
len = cb_new_kv(name, len, &sp, sizeof(sp), buffer);
if (cb_insert(&cb_spells, buffer, len) == CB_SUCCESS) {
sp->id = id ? id : hashstring(name);
sp->sname = _strdup(name);
sp->sname = strdup(name);
add_spell(&spells, sp);
return sp;
}

2
src/kernel/spellbook.c
View file

@ -16,7 +16,7 @@
spellbook * create_spellbook(const char * name)
{
spellbook *result = (spellbook *)malloc(sizeof(spellbook));
result->name = name ? _strdup(name) : 0;
result->name = name ? strdup(name) : 0;
result->spells = 0;
return result;
}

2
src/kernel/terrain.c
View file

@ -110,7 +110,7 @@ terrain_type * get_or_create_terrain(const char *name) {
if (!terrain) {
terrain = (terrain_type *)calloc(sizeof(terrain_type), 1);
if (terrain) {
terrain->_name = _strdup(name);
terrain->_name = strdup(name);
terrain->next = registered_terrains;
registered_terrains = terrain;
if (strcmp("plain", name) == 0) {

18
src/kernel/unit.c
View file

@ -123,7 +123,7 @@ unit *findunitr(const region * r, int n)
// TODO: deprecated, replace with findunit(n)
unit *findunitg(int n, const region * hint)
{
unused_arg(hint);
UNUSED_ARG(hint);
/* Abfangen von Syntaxfehlern. */
if (n <= 0)
return NULL;
@ -511,7 +511,7 @@ int a_readprivate(attrib * a, void *owner, gamedata *data)
struct storage *store = data->store;
char lbuf[DISPLAYSIZE];
READ_STR(store, lbuf, sizeof(lbuf));
a->data.v = _strdup(lbuf);
a->data.v = strdup(lbuf);
return (a->data.v) ? AT_READ_OK : AT_READ_FAIL;
}
@ -562,7 +562,7 @@ void usetprivate(unit * u, const char *str)
if (a->data.v) {
free(a->data.v);
}
a->data.v = _strdup(str);
a->data.v = strdup(str);
}
/*********************/
@ -809,8 +809,8 @@ void set_level(unit * u, skill_t sk, int value)
static int leftship_age(struct attrib *a, void *owner)
{
/* must be aged, so it doesn't affect report generation (cansee) */
unused_arg(a);
unused_arg(owner);
UNUSED_ARG(a);
UNUSED_ARG(owner);
return AT_AGE_REMOVE; /* remove me */
}
@ -1390,7 +1390,7 @@ int invisible(const unit * target, const unit * viewer)
else {
int hidden = item_invis(target);
if (hidden) {
hidden = _min(hidden, target->number);
hidden = MIN(hidden, target->number);
if (viewer) {
const resource_type *rtype = get_resourcetype(R_AMULET_OF_TRUE_SEEING);
hidden -= i_get(viewer->items, rtype->itype);
@ -1533,7 +1533,7 @@ unit *create_unit(region * r, faction * f, int number, const struct race *urace,
u->hp = unit_max_hp(u) * number;
if (dname) {
u->_name = _strdup(dname);
u->_name = strdup(dname);
}
else if (urace->generate_name || playerrace(urace)) {
name_unit(u);
@ -1640,7 +1640,7 @@ void unit_setname(unit * u, const char *name)
{
free(u->_name);
if (name && name[0])
u->_name = _strdup(name);
u->_name = strdup(name);
else
u->_name = NULL;
}
@ -1654,7 +1654,7 @@ void unit_setinfo(unit * u, const char *info)
{
free(u->display);
if (info)
u->display = _strdup(info);
u->display = strdup(info);
else
u->display = NULL;
}

14
src/kernel/unit.test.c
View file

@ -146,7 +146,7 @@ static void test_unit_name(CuTest *tc) {
test_create_world();
u = test_create_unit(test_create_faction(test_create_race("human")), findregion(0, 0));
unit_setname(u, "Hodor");
_snprintf(name, sizeof(name), "Hodor (%s)", itoa36(u->no));
snprintf(name, sizeof(name), "Hodor (%s)", itoa36(u->no));
CuAssertStrEquals(tc, name, unitname(u));
test_cleanup();
}
@ -164,12 +164,12 @@ static void test_unit_name_from_race(CuTest *tc) {
locale_setstring(lang, rc_name_s(u->_race, NAME_SINGULAR), "Mensch");
locale_setstring(lang, rc_name_s(u->_race, NAME_PLURAL), "Menschen");
_snprintf(name, sizeof(name), "Mensch (%s)", itoa36(u->no));
snprintf(name, sizeof(name), "Mensch (%s)", itoa36(u->no));
CuAssertStrEquals(tc, name, unitname(u));
CuAssertStrEquals(tc, "Mensch", unit_getname(u));
u->number = 2;
_snprintf(name, sizeof(name), "Menschen (%s)", itoa36(u->no));
snprintf(name, sizeof(name), "Menschen (%s)", itoa36(u->no));
CuAssertStrEquals(tc, name, unitname(u));
CuAssertStrEquals(tc, "Menschen", unit_getname(u));
@ -243,9 +243,9 @@ static void test_default_name(CuTest *tc) {
}
static int cb_skillmod(const unit *u, const region *r, skill_t sk, int level) {
unused_arg(u);
unused_arg(r);
unused_arg(sk);
UNUSED_ARG(u);
UNUSED_ARG(r);
UNUSED_ARG(sk);
return level + 3;
}
@ -398,7 +398,7 @@ static void test_unit_description(CuTest *tc) {
u = test_create_unit(test_create_faction(rc), test_create_region(0,0,0));
CuAssertPtrEquals(tc, 0, u->display);
CuAssertStrEquals(tc, 0, u_description(u, u->faction->locale));
u->display = _strdup("Hodor");
u->display = strdup("Hodor");
CuAssertStrEquals(tc, "Hodor", u_description(u, NULL));
CuAssertStrEquals(tc, "Hodor", u_description(u, u->faction->locale));
test_cleanup();

24
src/kernel/xmlreader.c
View file

@ -94,8 +94,8 @@ static xmlChar *xml_cleanup_string(xmlChar * str)
while (*read) {
/* eat leading whitespace */
if (*read && isxspace(*read)) {
while (*read && isxspace(*read)) {
if (*read && isspace(*read)) {
while (*read && isspace(*read)) {
++read;
}
*write++ = ' ';
@ -379,7 +379,7 @@ static int parse_calendar(xmlDocPtr doc)
first_turn = xml_ivalue(calendar, "start", first_turn);
if (propValue) {
free(agename);
agename = _strdup(mkname("calendar", (const char *)propValue));
agename = strdup(mkname("calendar", (const char *)propValue));
xmlFree(propValue);
}
@ -398,7 +398,7 @@ static int parse_calendar(xmlDocPtr doc)
xmlNodePtr week = nsetWeeks->nodeTab[i];
xmlChar *propValue = xmlGetProp(week, BAD_CAST "name");
if (propValue) {
weeknames[i] = _strdup(mkname("calendar", (const char *)propValue));
weeknames[i] = strdup(mkname("calendar", (const char *)propValue));
weeknames2[i] = malloc(strlen(weeknames[i]) + 3);
sprintf(weeknames2[i], "%s_d", weeknames[i]);
xmlFree(propValue);
@ -421,7 +421,7 @@ static int parse_calendar(xmlDocPtr doc)
xmlChar *propValue = xmlGetProp(season, BAD_CAST "name");
if (propValue) {
seasonnames[i] =
_strdup(mkname("calendar", (const char *)propValue));
strdup(mkname("calendar", (const char *)propValue));
xmlFree(propValue);
}
}
@ -451,7 +451,7 @@ static int parse_calendar(xmlDocPtr doc)
xmlFree(newyear);
newyear = NULL;
}
monthnames[i] = _strdup(mkname("calendar", (const char *)propValue));
monthnames[i] = strdup(mkname("calendar", (const char *)propValue));
xmlFree(propValue);
}
if (nsetSeasons) {
@ -663,7 +663,7 @@ static weapon_type *xml_readweapon(xmlXPathContextPtr xpath, item_type * itype)
xmlFree(propValue);
propValue = xmlGetProp(node, BAD_CAST "value");
wtype->damage[pos] = _strdup((const char *)propValue); // TODO: this is a memory leak
wtype->damage[pos] = strdup((const char *)propValue); // TODO: this is a memory leak
if (k == 0)
wtype->damage[1 - pos] = wtype->damage[pos];
xmlFree(propValue);
@ -1426,13 +1426,13 @@ static int parse_spells(xmlDocPtr doc)
propValue = xmlGetProp(node, BAD_CAST "parameters");
if (propValue) {
sp->parameter = _strdup((const char *)propValue);
sp->parameter = strdup((const char *)propValue);
xmlFree(propValue);
}
propValue = xmlGetProp(node, BAD_CAST "syntax");
if (propValue) {
sp->syntax = _strdup((const char *)propValue);
sp->syntax = strdup((const char *)propValue);
xmlFree(propValue);
}
#ifdef TODO /* no longer need it, spellbooks! */
@ -1628,7 +1628,7 @@ static int parse_races(xmlDocPtr doc)
propValue = xmlGetProp(node, BAD_CAST "damage");
assert(propValue != NULL);
rc->def_damage = _strdup((const char *)propValue);
rc->def_damage = strdup((const char *)propValue);
xmlFree(propValue);
rc->magres = (float)xml_fvalue(node, "magres", rc->magres);
@ -1869,7 +1869,7 @@ static int parse_races(xmlDocPtr doc)
propValue = xmlGetProp(node, BAD_CAST "damage");
if (propValue != NULL) {
attack->data.dice = _strdup((const char *)propValue);
attack->data.dice = strdup((const char *)propValue);
xmlFree(propValue);
}
else {
@ -1932,7 +1932,7 @@ static int parse_messages(xmlDocPtr doc)
(const char *)propType);
xmlFree(propName);
xmlFree(propType);
argv[k] = _strdup(zBuffer);
argv[k] = strdup(zBuffer);
}
argv[result->nodesetval->nodeNr] = NULL;
}

86
src/laws.c
View file

@ -209,7 +209,7 @@ static void live(region * r)
}
/* bestes Talent raussuchen */
if (sb != NULL) {
int weeks = _min(effect, u->number);
int weeks = MIN(effect, u->number);
reduce_skill(u, sb, weeks);
ADDMSG(&u->faction->msgs, msg_message("dumbeffect",
"unit weeks skill", u, weeks, (skill_t)sb->id));
@ -267,7 +267,7 @@ static void calculate_emigration(region * r)
int max_emigration = MAX_EMIGRATION(rp2 - maxp2);
if (max_emigration > 0) {
max_emigration = _min(max_emigration, max_immigrants);
max_emigration = MIN(max_emigration, max_immigrants);
r->land->newpeasants += max_emigration;
rc->land->newpeasants -= max_emigration;
max_immigrants -= max_emigration;
@ -318,7 +318,7 @@ int peasant_luck_effect(int peasants, int luck, int maxp, double variance)
double mean;
if (luck == 0) return 0;
mean = peasant_luck_factor() * peasant_growth_factor() * _min(luck, peasants);
mean = peasant_luck_factor() * peasant_growth_factor() * MIN(luck, peasants);
mean *= ((peasants / (double)maxp < .9) ? 1 : PEASANTFORCE);
births = RAND_ROUND(normalvariate(mean, variance * mean));
@ -357,7 +357,7 @@ static void peasants(region * r)
/* Alle werden satt, oder halt soviele für die es auch Geld gibt */
satiated = _min(peasants, money / maintenance_cost(NULL));
satiated = MIN(peasants, money / maintenance_cost(NULL));
rsetmoney(r, money - satiated * maintenance_cost(NULL));
/* Von denjenigen, die nicht satt geworden sind, verhungert der
@ -366,7 +366,7 @@ static void peasants(region * r)
/* Es verhungert maximal die unterernährten Bevölkerung. */
n = _min(peasants - satiated, rpeasants(r));
n = MIN(peasants - satiated, rpeasants(r));
dead += (int)(0.5 + n * PEASANT_STARVATION_CHANCE);
if (dead > 0) {
@ -447,7 +447,7 @@ static void horses(region * r)
/* Logistisches Wachstum, Optimum bei halbem Maximalbesatz. */
maxhorses = region_maxworkers(r) / 10;
maxhorses = _max(0, maxhorses);
maxhorses = MAX(0, maxhorses);
horses = rhorses(r);
if (horses > 0) {
if (is_cursed(r->attribs, C_CURSED_BY_THE_GODS, 0)) {
@ -481,7 +481,7 @@ static void horses(region * r)
if (r2 && fval(r2->terrain, WALK_INTO)) {
int pt = (rhorses(r) * HORSEMOVE) / 100;
pt = (int)normalvariate(pt, pt / 4.0);
pt = _max(0, pt);
pt = MAX(0, pt);
if (fval(r2, RF_MIGRATION))
rsethorses(r2, rhorses(r2) + pt);
else {
@ -594,7 +594,7 @@ growing_trees(region * r, const int current_season, const int last_weeks_season)
a = a_find(r->attribs, &at_germs);
if (a && last_weeks_season == SEASON_SPRING) {
/* ungekeimte Samen bleiben erhalten, Sprößlinge wachsen */
sprout = _min(a->data.sa[1], rtrees(r, 1));
sprout = MIN(a->data.sa[1], rtrees(r, 1));
/* aus dem gesamt Sprößlingepool abziehen */
rsettrees(r, 1, rtrees(r, 1) - sprout);
/* zu den Bäumen hinzufügen */
@ -614,7 +614,7 @@ growing_trees(region * r, const int current_season, const int last_weeks_season)
/* Grundchance 1.0% */
/* Jeder Elf in der Region erhöht die Chance marginal */
elves = _min(elves, production(r) / 8);
elves = MIN(elves, production(r) / 8);
if (elves) {
seedchance += 1.0 - pow(0.99999, elves * RESOURCE_QUANTITY);
}
@ -680,7 +680,7 @@ growing_trees(region * r, const int current_season, const int last_weeks_season)
/* Raubbau abfangen, es dürfen nie mehr Samen wachsen, als aktuell
* in der Region sind */
seeds = _min(a->data.sa[0], rtrees(r, 0));
seeds = MIN(a->data.sa[0], rtrees(r, 0));
sprout = 0;
for (i = 0; i < seeds; i++) {
@ -700,7 +700,7 @@ growing_trees(region * r, const int current_season, const int last_weeks_season)
* der Region entfernt werden können, da Jungbäume in der gleichen
* Runde nachwachsen, wir also nicht mehr zwischen diesjährigen und
* 'alten' Jungbäumen unterscheiden könnten */
sprout = _min(a->data.sa[1], rtrees(r, 1));
sprout = MIN(a->data.sa[1], rtrees(r, 1));
grownup_trees = 0;
for (i = 0; i < sprout; i++) {
@ -740,7 +740,7 @@ void immigration(void)
for (r = regions; r; r = r->next) {
if (r->land && r->land->newpeasants) {
int rp = rpeasants(r) + r->land->newpeasants;
rsetpeasants(r, _max(0, rp));
rsetpeasants(r, MAX(0, rp));
}
/* Genereate some (0-6 depending on the income) peasants out of nothing */
/* if less than 50 are in the region and there is space and no monster or demon units in the region */
@ -843,7 +843,7 @@ void demographics(void)
calculate_emigration(r);
peasants(r);
if (r->age > 20) {
double mwp = _max(region_maxworkers(r), 1);
double mwp = MAX(region_maxworkers(r), 1);
double prob =
pow(rpeasants(r) / (mwp * wage(r, NULL, NULL, turn) * 0.13), 4.0)
* PLAGUE_CHANCE;
@ -1280,7 +1280,7 @@ static void remove_idle_players(void)
}
log_info(" - beseitige Spieler, die sich nach der Anmeldung nicht gemeldet haben...");
age = calloc(_max(4, turn + 1), sizeof(int));
age = calloc(MAX(4, turn + 1), sizeof(int));
for (fp = &factions; *fp;) {
faction *f = *fp;
if (!is_monsters(f)) {
@ -1621,7 +1621,7 @@ int display_cmd(unit * u, struct order *ord)
free(*s);
if (s2) {
*s = _strdup(s2);
*s = strdup(s2);
if (strlen(s2) >= DISPLAYSIZE) {
(*s)[DISPLAYSIZE] = 0;
}
@ -1665,7 +1665,7 @@ static int rename_cmd(unit * u, order * ord, char **s, const char *s2)
unicode_utf8_trim(name);
free(*s);
*s = _strdup(name);
*s = strdup(name);
return 0;
}
@ -2154,7 +2154,7 @@ int banner_cmd(unit * u, struct order *ord)
const char * s = getstrtoken();
free(u->faction->banner);
u->faction->banner = s ? _strdup(s) : 0;
u->faction->banner = s ? strdup(s) : 0;
add_message(&u->faction->msgs, msg_message("changebanner", "value",
u->faction->banner));
@ -2356,23 +2356,23 @@ static void display_race(unit * u, const race * rc)
}
}
if (rc->battle_flags & BF_EQUIPMENT) {
if (wrptr(&bufp, &size, _snprintf(bufp, size, " %s", LOC(f->locale, "stat_equipment"))) != 0)
if (wrptr(&bufp, &size, snprintf(bufp, size, " %s", LOC(f->locale, "stat_equipment"))) != 0)
WARN_STATIC_BUFFER();
}
if (rc->battle_flags & BF_RES_PIERCE) {
if (wrptr(&bufp, &size, _snprintf(bufp, size, " %s", LOC(f->locale, "stat_pierce"))) != 0)
if (wrptr(&bufp, &size, snprintf(bufp, size, " %s", LOC(f->locale, "stat_pierce"))) != 0)
WARN_STATIC_BUFFER();
}
if (rc->battle_flags & BF_RES_CUT) {
if (wrptr(&bufp, &size, _snprintf(bufp, size, " %s", LOC(f->locale, "stat_cut"))) != 0)
if (wrptr(&bufp, &size, snprintf(bufp, size, " %s", LOC(f->locale, "stat_cut"))) != 0)
WARN_STATIC_BUFFER();
}
if (rc->battle_flags & BF_RES_BASH) {
if (wrptr(&bufp, &size, _snprintf(bufp, size, " %s", LOC(f->locale, "stat_bash"))) != 0)
if (wrptr(&bufp, &size, snprintf(bufp, size, " %s", LOC(f->locale, "stat_bash"))) != 0)
WARN_STATIC_BUFFER();
}
if (wrptr(&bufp, &size, _snprintf(bufp, size, " %d %s", at_count, LOC(f->locale, (at_count == 1) ? "stat_attack" : "stat_attacks"))) != 0)
if (wrptr(&bufp, &size, snprintf(bufp, size, " %d %s", at_count, LOC(f->locale, (at_count == 1) ? "stat_attack" : "stat_attacks"))) != 0)
WARN_STATIC_BUFFER();
for (a = 0; a < RACE_ATTACKS; a++) {
@ -2385,12 +2385,12 @@ static void display_race(unit * u, const race * rc)
switch (rc->attack[a].type) {
case AT_STANDARD:
bytes =
(size_t)_snprintf(bufp, size, "%s (%s)",
(size_t)snprintf(bufp, size, "%s (%s)",
LOC(f->locale, "attack_standard"), rc->def_damage);
break;
case AT_NATURAL:
bytes =
(size_t)_snprintf(bufp, size, "%s (%s)",
(size_t)snprintf(bufp, size, "%s (%s)",
LOC(f->locale, "attack_natural"), rc->attack[a].data.dice);
break;
case AT_SPELL:
@ -2398,11 +2398,11 @@ static void display_race(unit * u, const race * rc)
case AT_DRAIN_ST:
case AT_DRAIN_EXP:
case AT_DAZZLE:
bytes = (size_t)_snprintf(bufp, size, "%s", LOC(f->locale, "attack_magical"));
bytes = (size_t)snprintf(bufp, size, "%s", LOC(f->locale, "attack_magical"));
break;
case AT_STRUCTURAL:
bytes =
(size_t)_snprintf(bufp, size, "%s (%s)",
(size_t)snprintf(bufp, size, "%s (%s)",
LOC(f->locale, "attack_structural"), rc->attack[a].data.dice);
break;
default:
@ -2670,7 +2670,7 @@ int combatspell_cmd(unit * u, struct order *ord)
if (findparam(s, u->faction->locale) == P_LEVEL) {
/* Merken, setzen kommt erst später */
level = getint();
level = _max(0, level);
level = MAX(0, level);
s = gettoken(token, sizeof(token));
}
@ -2903,14 +2903,14 @@ static void age_stonecircle(building *b) {
float effect = 100;
/* the mage reactivates the circle */
c = create_curse(mage, &rt->attribs, ct_astralblock,
(float)_max(1, sk), _max(1, sk / 2), effect, 0);
(float)MAX(1, sk), MAX(1, sk / 2), effect, 0);
ADDMSG(&r->msgs,
msg_message("astralshield_activate", "region unit", r, mage));
}
else {
int sk = effskill(mage, SK_MAGIC, 0);
c->duration = _max(c->duration, sk / 2);
c->vigour = _max(c->vigour, (float)sk);
c->duration = MAX(c->duration, sk / 2);
c->vigour = MAX(c->vigour, (float)sk);
}
}
}
@ -2955,12 +2955,12 @@ static void ageing(void)
/* Goliathwasser */
int i = get_effect(u, oldpotiontype[P_STRONG]);
if (i > 0) {
change_effect(u, oldpotiontype[P_STRONG], -1 * _min(u->number, i));
change_effect(u, oldpotiontype[P_STRONG], -1 * MIN(u->number, i));
}
/* Berserkerblut */
i = get_effect(u, oldpotiontype[P_BERSERK]);
if (i > 0) {
change_effect(u, oldpotiontype[P_BERSERK], -1 * _min(u->number, i));
change_effect(u, oldpotiontype[P_BERSERK], -1 * MIN(u->number, i));
}
if (is_cursed(u->attribs, C_OLDRACE, 0)) {
@ -3034,7 +3034,7 @@ static int maxunits(const faction * f)
if (flimit == 0) {
return alimit;
}
return _min(alimit, flimit);
return MIN(alimit, flimit);
}
int checkunitnumber(const faction * f, int add)
@ -3130,7 +3130,7 @@ void new_units(void)
s = gettoken(token, sizeof(token));
if (s && s[0]) {
name = _strdup(s);
name = strdup(s);
}
u2 = create_unit(r, u->faction, 0, u->faction->race, alias, name, u);
if (name != NULL)
@ -3361,7 +3361,7 @@ void monthly_healing(void)
p *= heal_factor(u);
if (u->hp < umhp) {
double maxheal = _max(u->number, umhp / 20.0);
double maxheal = MAX(u->number, umhp / 20.0);
int addhp;
if (active_building(u, bt_find("inn"))) {
p *= 1.5;
@ -3376,7 +3376,7 @@ void monthly_healing(void)
++addhp;
/* Aufaddieren der geheilten HP. */
u->hp = _min(u->hp + addhp, umhp);
u->hp = MIN(u->hp + addhp, umhp);
/* soll man an negativer regeneration sterben können? */
assert(u->hp > 0);
@ -3701,7 +3701,7 @@ int claim_cmd(unit * u, struct order *ord)
if (itype) {
item **iclaim = i_find(&u->faction->items, itype);
if (iclaim && *iclaim) {
n = _min(n, (*iclaim)->number);
n = MIN(n, (*iclaim)->number);
i_change(iclaim, itype, -n);
i_change(&u->items, itype, n);
}
@ -3962,7 +3962,7 @@ int armedmen(const unit * u, bool siege_weapons)
if (n >= u->number)
break;
}
n = _min(n, u->number);
n = MIN(n, u->number);
}
}
return n;
@ -3998,9 +3998,9 @@ int siege_cmd(unit * u, order * ord)
rt_catapult = rt_find("catapult");
d = i_get(u->items, rt_catapult->itype);
d = _min(u->number, d);
d = MIN(u->number, d);
pooled = get_pooled(u, rt_catapultammo, GET_DEFAULT, d);
d = _min(pooled, d);
d = MIN(pooled, d);
if (effskill(u, SK_CATAPULT, 0) >= 1) {
katapultiere = d;
d *= effskill(u, SK_CATAPULT, 0);
@ -4027,11 +4027,11 @@ int siege_cmd(unit * u, order * ord)
* einheiten wieder abgesucht werden muessen! */
usetsiege(u, b);
b->besieged += _max(bewaffnete, katapultiere);
b->besieged += MAX(bewaffnete, katapultiere);
/* definitiver schaden eingeschraenkt */
d = _min(d, b->size - 1);
d = MIN(d, b->size - 1);
/* meldung, schaden anrichten */
if (d && !curse_active(get_curse(b->attribs, magicwalls_ct))) {
@ -4270,7 +4270,7 @@ void processorders(void)
void update_subscriptions(void)
{
FILE *F;
char zText[MAX_PATH];
char zText[4096];
join_path(basepath(), "subscriptions", zText, sizeof(zText));
F = fopen(zText, "r");

1
src/laws.h
View file

@ -20,6 +20,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define H_GC_LAWS
#include <kernel/types.h>
#include <stdbool.h>
#ifdef __cplusplus
extern "C" {

2
src/laws.test.c
View file

@ -531,7 +531,7 @@ static void test_pay_cmd_other_building(CuTest *tc) {
config_set("rules.region_owner_pay_building", "lighthouse");
update_owners(b->region);
_snprintf(cmd, sizeof(cmd), "NOT %s", itoa36(b->no));
snprintf(cmd, sizeof(cmd), "NOT %s", itoa36(b->no));
ord = create_order(K_PAY, f->locale, cmd);
assert(ord);
CuAssertPtrEquals(tc, fix.u1, building_owner(b));

4
src/lighthouse.c
View file

@ -83,8 +83,8 @@ int lighthouse_range(const building * b, const faction * f)
}
else if (f == NULL || u->faction == f) {
int sk = effskill(u, SK_PERCEPTION, 0) / 3;
d = _max(d, sk);
d = _min(maxd, d);
d = MAX(d, sk);
d = MIN(maxd, d);
if (d == maxd)
break;
}

2
src/lighthouse.h
View file

@ -19,6 +19,8 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef LIGHTHOUSE_H
#define LIGHTHOUSE_H
#include <stdbool.h>
#ifdef __cplusplus
extern "C" {
#endif

2
src/listbox.c
View file

@ -27,7 +27,7 @@ insert_selection(list_selection ** p_sel, list_selection * prev,
const char *str, void *payload)
{
list_selection *sel = calloc(sizeof(list_selection), 1);
sel->str = _strdup(str);
sel->str = strdup(str);
sel->data = payload;
if (*p_sel) {
list_selection *s;

42
src/magic.c
View file

@ -118,7 +118,7 @@ static double MagicPower(double force)
if (force > 0) {
const char *str = config_get("magic.power");
double value = str ? atof(str) : 1.0;
return _max(value * force, 1.0f);
return MAX(value * force, 1.0f);
}
return 0;
}
@ -146,7 +146,7 @@ static void
a_writeicastle(const attrib * a, const void *owner, struct storage *store)
{
icastle_data *data = (icastle_data *)a->data.v;
unused_arg(owner);
UNUSED_ARG(owner);
WRITE_TOK(store, data->type->_name);
WRITE_INT(store, data->time);
}
@ -543,7 +543,7 @@ int get_combatspelllevel(const unit * u, int nr)
assert(nr < MAXCOMBATSPELLS);
if (m) {
int level = effskill(u, SK_MAGIC, 0);
return _min(m->combatspells[nr].level, level);
return MIN(m->combatspells[nr].level, level);
}
return -1;
}
@ -679,7 +679,7 @@ int change_spellpoints(unit * u, int mp)
}
/* verhindere negative Magiepunkte */
sp = _max(m->spellpoints + mp, 0);
sp = MAX(m->spellpoints + mp, 0);
m->spellpoints = sp;
return sp;
@ -739,7 +739,7 @@ int max_spellpoints(const region * r, const unit * u)
if (n > 0) {
msp = (msp * n) / 100;
}
return _max((int)msp, 0);
return MAX((int)msp, 0);
}
int change_maxspellpoints(unit * u, int csp)
@ -774,7 +774,7 @@ int countspells(unit * u, int step)
count = m->spellcount + step;
/* negative Werte abfangen. */
m->spellcount = _max(0, count);
m->spellcount = MAX(0, count);
return m->spellcount;
}
@ -867,7 +867,7 @@ int eff_spelllevel(unit * u, const spell * sp, int cast_level, int range)
}
else if (sp->components[k].cost == SPC_LEVEL) {
costtyp = SPC_LEVEL;
cast_level = _min(cast_level, maxlevel);
cast_level = MIN(cast_level, maxlevel);
/* bei Typ Linear müssen die Kosten in Höhe der Stufe vorhanden
* sein, ansonsten schlägt der Spruch fehl */
}
@ -885,7 +885,7 @@ int eff_spelllevel(unit * u, const spell * sp, int cast_level, int range)
if (sb) {
spellbook_entry * sbe = spellbook_get(sb, sp);
if (sbe) {
return _min(cast_level, sbe->level);
return MIN(cast_level, sbe->level);
}
}
log_error("spell %s is not in the spellbook for %s\n", sp->sname, unitname(u));
@ -1103,7 +1103,7 @@ spellpower(region * r, unit * u, const spell * sp, int cast_level, struct order
}
}
}
return _max(force, 0);
return MAX(force, 0);
}
/* ------------------------------------------------------------- */
@ -1278,8 +1278,8 @@ target_resists_magic(unit * magician, void *obj, int objtyp, int t_bonus)
break;
}
probability = _max(0.02, probability + t_bonus * 0.01);
probability = _min(0.98, probability);
probability = MAX(0.02, probability + t_bonus * 0.01);
probability = MIN(0.98, probability);
/* gibt true, wenn die Zufallszahl kleiner als die chance ist und
* false, wenn sie gleich oder größer ist, dh je größer die
@ -1421,7 +1421,7 @@ static void do_fumble(castorder * co)
case 2:
/* temporary skill loss */
duration = _max(rng_int() % level / 2, 2);
duration = MAX(rng_int() % level / 2, 2);
effect = level / -2.0;
c = create_curse(u, &u->attribs, ct_find("skillmod"), level,
duration, effect, 1);
@ -1529,14 +1529,14 @@ void regenerate_aura(void)
reg_aura -= regen;
if (chance(reg_aura))
++regen;
regen = _max(1, regen);
regen = _min((auramax - aura), regen);
regen = MAX(1, regen);
regen = MIN((auramax - aura), regen);
aura += regen;
ADDMSG(&u->faction->msgs, msg_message("regenaura",
"unit region amount", u, r, regen));
}
set_spellpoints(u, _min(aura, auramax));
set_spellpoints(u, MIN(aura, auramax));
}
}
}
@ -1853,7 +1853,7 @@ static int addparam_string(const char *const param[], spllprm ** spobjp)
spobj->flag = 0;
spobj->typ = SPP_STRING;
spobj->data.xs = _strdup(param[0]);
spobj->data.xs = strdup(param[0]);
return 1;
}
@ -2428,7 +2428,7 @@ static int age_unit(attrib * a, void *owner)
/* if unit is gone or dead, remove the attribute */
{
unit *u = (unit *)a->data.v;
unused_arg(owner);
UNUSED_ARG(owner);
return (u != NULL && u->number > 0) ? AT_AGE_KEEP : AT_AGE_REMOVE;
}
@ -2567,7 +2567,7 @@ static castorder *cast_cmd(unit * u, order * ord)
/* für Syntax ' STUFE x REGION y z ' */
if (param == P_LEVEL) {
int p = getint();
level = _min(p, level);
level = MIN(p, level);
if (level < 1) {
/* Fehler "Das macht wenig Sinn" */
syntax_error(u, ord);
@ -2597,7 +2597,7 @@ static castorder *cast_cmd(unit * u, order * ord)
* hier nach REGION nochmal auf STUFE prüfen */
if (param == P_LEVEL) {
int p = getint();
level = _min(p, level);
level = MIN(p, level);
if (level < 1) {
/* Fehler "Das macht wenig Sinn" */
syntax_error(u, ord);
@ -2728,7 +2728,7 @@ static castorder *cast_cmd(unit * u, order * ord)
* löschen, zaubern kann er noch */
range *= 2;
set_order(&caster->thisorder, NULL);
level = _min(level, effskill(caster, SK_MAGIC, 0) / 2);
level = MIN(level, effskill(caster, SK_MAGIC, 0) / 2);
}
}
/* Weitere Argumente zusammenbasteln */
@ -2751,7 +2751,7 @@ static castorder *cast_cmd(unit * u, order * ord)
break;
}
}
params[p++] = _strdup(s);
params[p++] = strdup(s);
}
params[p] = 0;
args =

1
src/magic.h
View file

@ -20,6 +20,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define H_KRNL_MAGIC
#include <kernel/types.h>
#include <stdbool.h>
#ifdef __cplusplus
extern "C" {

2
src/market.test.c
View file

@ -46,7 +46,7 @@ static void test_market_curse(CuTest * tc)
config_set("rules.region_owners", "1");
btype = (building_type *)calloc(1, sizeof(building_type));
btype->_name = _strdup("market");
btype->_name = strdup("market");
bt_register(btype);
terrain = get_terrain("plain");

14
src/modules/arena.c
View file

@ -99,9 +99,9 @@ order * ord)
if (u->building != arena_tower(u->faction->magiegebiet) && leave_fail(u)) {
return -1;
}
unused_arg(amount);
unused_arg(ord);
unused_arg(itype);
UNUSED_ARG(amount);
UNUSED_ARG(ord);
UNUSED_ARG(itype);
assert(!"not implemented");
return 0;
}
@ -120,9 +120,9 @@ enter_arena(unit * u, const item_type * itype, int amount, order * ord)
region *r = u->region;
unit *u2;
int fee = 2000;
unused_arg(ord);
unused_arg(amount);
unused_arg(itype);
UNUSED_ARG(ord);
UNUSED_ARG(amount);
UNUSED_ARG(itype);
if (u->faction->score > fee * 5) {
score_t score = u->faction->score / 5;
if (score < INT_MAX) {
@ -212,7 +212,7 @@ static int caldera_handle(trigger * t, void *data)
else {
log_error("could not perform caldera::handle()\n");
}
unused_arg(data);
UNUSED_ARG(data);
return 0;
}

10
src/modules/autoseed.c
View file

@ -199,7 +199,7 @@ newfaction *read_newfactions(const char *filename)
free(nf);
continue;
}
nf->password = _strdup(password);
nf->password = strdup(password);
nf->race = rc_find(race);
nf->subscription = subscription;
if (alliances != NULL) {
@ -962,8 +962,8 @@ int build_island_e3(newfaction ** players, int x, int y, int numfactions, int mi
q = region_quality(r, rn);
if (q >= MIN_QUALITY && nfactions < numfactions && *players) {
starting_region(players, r, rn);
minq = _min(minq, q);
maxq = _max(maxq, q);
minq = MIN(minq, q);
maxq = MAX(maxq, q);
++nfactions;
}
}
@ -977,8 +977,8 @@ int build_island_e3(newfaction ** players, int x, int y, int numfactions, int mi
q = region_quality(r, rn);
if (q >= MIN_QUALITY * 4 / 3 && nfactions < numfactions && *players) {
starting_region(players, r, rn);
minq = _min(minq, q);
maxq = _max(maxq, q);
minq = MIN(minq, q);
maxq = MAX(maxq, q);
++nfactions;
}
}

8
src/modules/museum.c
View file

@ -310,7 +310,7 @@ order * ord)
unit *warden = findunit(atoi36("mwar"));
int unit_cookie;
unused_arg(amount);
UNUSED_ARG(amount);
/* Prüfen ob in Eingangshalle */
if (u->region->x != 9525 || u->region->y != 9525) {
@ -365,7 +365,7 @@ order * ord)
region *r = u->region;
plane *pl = rplane(r);
unused_arg(amount);
UNUSED_ARG(amount);
/* Pruefen ob in normaler Plane und nur eine Person */
if (pl != get_homeplane()) {
@ -417,8 +417,8 @@ static const char *b_namequestportal(const connection * b, const region * r,
{
const char *bname;
int lock = b->data.i;
unused_arg(b);
unused_arg(r);
UNUSED_ARG(b);
UNUSED_ARG(r);
if (gflags & GF_ARTICLE) {
if (lock > 0) {

2
src/modules/score.c
View file

@ -67,7 +67,7 @@ void score(void)
region *r;
faction *fc;
score_t allscores = 0;
char path[MAX_PATH];
char path[4096];
for (fc = factions; fc; fc = fc->next)
fc->score = 0;

16
src/monsters.c
View file

@ -100,7 +100,7 @@ static void reduce_weight(unit * u)
int horses = get_resource(u, get_resourcetype(R_HORSE));
if (horses > 0) {
horses = _min(horses, (u->number * 2));
horses = MIN(horses, (u->number * 2));
change_resource(u, get_resourcetype(R_HORSE), -horses);
}
@ -129,7 +129,7 @@ static void reduce_weight(unit * u)
if (itype->weight >= 10 && itype->rtype->wtype == 0
&& itype->rtype->atype == 0) {
if (itype->capacity < itype->weight) {
int reduce = _min(itm->number, -((capacity - weight) / itype->weight));
int reduce = MIN(itm->number, -((capacity - weight) / itype->weight));
give_peasants(u, itm->type, reduce);
weight -= reduce * itype->weight;
}
@ -144,7 +144,7 @@ static void reduce_weight(unit * u)
const item_type *itype = itm->type;
weight += itm->number * itype->weight;
if (itype->capacity < itype->weight) {
int reduce = _min(itm->number, -((capacity - weight) / itype->weight));
int reduce = MIN(itm->number, -((capacity - weight) / itype->weight));
give_peasants(u, itm->type, reduce);
weight -= reduce * itype->weight;
}
@ -1027,7 +1027,7 @@ static void eaten_by_monster(unit * u)
n = (int)(n * multi);
if (n > 0) {
n = lovar(n);
n = _min(rpeasants(u->region), n);
n = MIN(rpeasants(u->region), n);
if (n > 0) {
deathcounts(u->region, n);
@ -1047,7 +1047,7 @@ static void absorbed_by_monster(unit * u)
if (n > 0) {
n = lovar(n);
n = _min(rpeasants(u->region), n);
n = MIN(rpeasants(u->region), n);
if (n > 0) {
rsetpeasants(u->region, rpeasants(u->region) - n);
scale_number(u, u->number + n);
@ -1062,7 +1062,7 @@ static int scareaway(region * r, int anzahl)
int n, p, diff = 0, emigrants[MAXDIRECTIONS];
direction_t d;
anzahl = _min(_max(1, anzahl), rpeasants(r));
anzahl = MIN(MAX(1, anzahl), rpeasants(r));
/* Wandern am Ende der Woche (normal) oder wegen Monster. Die
* Wanderung wird erst am Ende von demographics () ausgefuehrt.
@ -1074,7 +1074,7 @@ static int scareaway(region * r, int anzahl)
p = rpeasants(r);
assert(p >= 0 && anzahl >= 0);
for (n = _min(p, anzahl); n; n--) {
for (n = MIN(p, anzahl); n; n--) {
direction_t dir = (direction_t)(rng_int() % MAXDIRECTIONS);
region *rc = rconnect(r, dir);
@ -1102,7 +1102,7 @@ static void scared_by_monster(unit * u)
}
if (n > 0) {
n = lovar(n);
n = _min(rpeasants(u->region), n);
n = MIN(rpeasants(u->region), n);
if (n > 0) {
n = scareaway(u->region, n);
if (n > 0) {

2
src/morale.c
View file

@ -73,7 +73,7 @@ void morale_update(region *r) {
void morale_change(region *r, int value) {
int morale = region_get_morale(r);
if (morale > 0) {
morale = _max(0, morale - value);
morale = MAX(0, morale - value);
region_set_morale(r, morale, turn);
}
}

24
src/move.c
View file

@ -151,8 +151,8 @@ static void shiptrail_finalize(attrib * a)
static int shiptrail_age(attrib * a, void *owner)
{
traveldir *t = (traveldir *)(a->data.v);
unused_arg(owner);
(void)owner;
t->age--;
return (t->age > 0) ? AT_AGE_KEEP : AT_AGE_REMOVE;
}
@ -267,12 +267,12 @@ static int ridingcapacity(unit * u)
** tragen nichts (siehe walkingcapacity). Ein Wagen zählt nur, wenn er
** von zwei Pferden gezogen wird */
animals = _min(animals, effskill(u, SK_RIDING, 0) * u->number * 2);
animals = MIN(animals, effskill(u, SK_RIDING, 0) * u->number * 2);
if (fval(u_race(u), RCF_HORSE))
animals += u->number;
/* maximal diese Pferde können zum Ziehen benutzt werden */
vehicles = _min(animals / HORSESNEEDED, vehicles);
vehicles = MIN(animals / HORSESNEEDED, vehicles);
return vehicles * vcap + animals * acap;
}
@ -291,7 +291,7 @@ int walkingcapacity(const struct unit *u)
/* Das Gewicht, welches die Pferde tragen, plus das Gewicht, welches
* die Leute tragen */
pferde_fuer_wagen = _min(animals, effskill(u, SK_RIDING, 0) * u->number * 4);
pferde_fuer_wagen = MIN(animals, effskill(u, SK_RIDING, 0) * u->number * 4);
if (fval(u_race(u), RCF_HORSE)) {
animals += u->number;
people = 0;
@ -301,7 +301,7 @@ int walkingcapacity(const struct unit *u)
}
/* maximal diese Pferde können zum Ziehen benutzt werden */
wagen_mit_pferden = _min(vehicles, pferde_fuer_wagen / HORSESNEEDED);
wagen_mit_pferden = MIN(vehicles, pferde_fuer_wagen / HORSESNEEDED);
n = wagen_mit_pferden * vcap;
@ -311,7 +311,7 @@ int walkingcapacity(const struct unit *u)
wagen_ohne_pferde = vehicles - wagen_mit_pferden;
/* Genug Trolle, um die Restwagen zu ziehen? */
wagen_mit_trollen = _min(u->number / 4, wagen_ohne_pferde);
wagen_mit_trollen = MIN(u->number / 4, wagen_ohne_pferde);
/* Wagenkapazität hinzuzählen */
n += wagen_mit_trollen * vcap;
@ -335,7 +335,7 @@ int walkingcapacity(const struct unit *u)
int belts = i_get(u->items, rbelt->itype);
if (belts) {
int multi = config_get_int("rules.trollbelt.multiplier", STRENGTHMULTIPLIER);
n += _min(people, belts) * (multi - 1) * u_race(u)->capacity;
n += MIN(people, belts) * (multi - 1) * u_race(u)->capacity;
}
}
@ -366,7 +366,7 @@ static int canwalk(unit * u)
effsk = effskill(u, SK_RIDING, 0);
maxwagen = effsk * u->number * 2;
if (u_race(u) == get_race(RC_TROLL)) {
maxwagen = _max(maxwagen, u->number / 4);
maxwagen = MAX(maxwagen, u->number / 4);
}
maxpferde = effsk * u->number * 4 + u->number;
@ -505,7 +505,7 @@ static double overload(const region * r, ship * sh)
double ovl = n / (double)sh->type->cargo;
if (mcabins)
ovl = _max(ovl, p / (double)mcabins);
ovl = MAX(ovl, p / (double)mcabins);
return ovl;
}
}
@ -752,7 +752,7 @@ double damage_overload(double overload)
badness = overload - overload_worse();
if (badness >= 0) {
assert(overload_worst() > overload_worse() || !"overload.worst must be > overload.worse");
damage += _min(badness, overload_worst() - overload_worse()) *
damage += MIN(badness, overload_worst() - overload_worse()) *
(overload_max_damage() - damage) /
(overload_worst() - overload_worse());
}
@ -946,7 +946,7 @@ static unit *bewegung_blockiert_von(unit * reisender, region * r)
guard_count += u->number;
double prob_u = (sk - stealth) * skill_prob;
/* amulet counts at most once */
prob_u += _min(1, _min(u->number, i_get(u->items, ramulet->itype))) * amulet_prob;
prob_u += MIN(1, MIN(u->number, i_get(u->items, ramulet->itype))) * amulet_prob;
if (u->building && (u->building->type == castle_bt) && u == building_owner(u->building))
prob_u += castle_prob*buildingeffsize(u->building, 0);
if (prob_u >= prob) {
@ -1985,7 +1985,7 @@ static void sail(unit * u, order * ord, region_list ** routep, bool drifting)
const luxury_type *ltype = resource2luxury(itm->type->rtype);
if (ltype != NULL && itm->number > 0) {
int st = itm->number * effskill(harbourmaster, SK_TRADE, 0) / 50;
st = _min(itm->number, st);
st = MIN(itm->number, st);
if (st > 0) {
i_change(&u2->items, itm->type, -st);

5
src/move.h
View file

@ -16,11 +16,12 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
**/
#include "direction.h"
#include <stdbool.h>
#ifndef H_KRNL_MOVEMENT
#define H_KRNL_MOVEMENT
#include "direction.h"
#ifdef __cplusplus
extern "C" {
#endif

6
src/names.c
View file

@ -365,7 +365,7 @@ static void dracoid_name(unit * u)
size_t sz;
/* ignore u */
unused_arg(u);
UNUSED_ARG(u);
/* Wieviele Mittelteile? */
mid_syllabels = rng_int() % 4;
@ -425,8 +425,8 @@ const char *abkz(const char *s, char *buf, size_t buflen, size_t maxchars)
}
}
/* Buchstaben pro Teilkürzel = _max(1,max/AnzWort) */
bpt = (c > 0) ? _max(1, maxchars / c) : 1;
/* Buchstaben pro Teilkürzel = MAX(1,max/AnzWort) */
bpt = (c > 0) ? MAX(1, maxchars / c) : 1;
/* Einzelne Wörter anspringen und jeweils die ersten BpT kopieren */

180
src/platform.h
View file

@ -1,179 +1,15 @@
/*
Copyright (c) 1998-2015, Enno Rehling <enno@eressea.de>
Katja Zedel <katze@felidae.kn-bremen.de
Christian Schlittchen <corwin@amber.kn-bremen.de>
#pragma once
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.
#ifndef UNILIB_H
#define UNILIB_H
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
**/
#ifndef PLATFORM_H
#define PLATFORM_H
#ifdef NDEBUG
#define LOMEM
#ifndef MAX_PATH
# define MAX_PATH 4096
#endif
// enable X/Open 7 extensions (like strdup):
#ifndef _XOPEN_SOURCE
#define _XOPEN_SOURCE 700
#endif
#define UNUSED_ARG(a) (void)(a)
// enable bsd string extensions, since glibc 2.12 (_BSD_SOURCE is dead):
#ifndef _POSIX_C_SOURCE
#define _POSIX_C_SOURCE 200809L
#endif
#ifndef USE_AUTOCONF
#define USE_AUTOCONF
#ifdef _MSC_VER
#undef USE_AUTOCONF
#define HAVE_STDBOOL_H
#define HAVE_DIRECT__MKDIR
#define HAVE__ACCESS
#define VC_EXTRALEAN
#define WIN32_LEAN_AND_MEAN
#pragma warning(push)
#pragma warning(disable:4820 4255 4668)
# include <windows.h>
# include <io.h>
#pragma warning(pop)
# undef MOUSE_MOVED
# define STDIO_CP 1252 /* log.c, convert to console character set */
# pragma warning (disable: 4201 4214 4514 4115 4711)
#if _MSC_VER >= 1900
# pragma warning(disable: 4710)
/* warning C4710: function not inlined */
# pragma warning(disable: 4456)
/* warning C4456 : declaration of <name> hides previous local declaration */
# pragma warning(disable: 4457)
/* warning C4457: declaration of <name> hides function parameter */
# pragma warning(disable: 4459)
/* warning C4459: declaration of <name> hides global declaration */
#endif
# pragma warning(disable: 4056)
/* warning C4056: overflow in floating point constant arithmetic */
# pragma warning(disable: 4201)
/* warning C4201: nonstandard extension used : nameless struct/union */
# pragma warning(disable: 4214)
/* warning C4214: nonstandard extension used : bit field types other than int */
# pragma warning(disable: 4100)
/* warning C4100: <name> : unreferenced formal parameter */
# pragma warning(disable: 4996)
/* <name> is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' */
# pragma warning(disable: 4668)
/* <type>: <num> bytes padding after data member <member> */
# pragma warning(disable: 4820)
/* warning C4100: <name> was declared deprecated */
#ifndef _CRT_SECURE_NO_DEPRECATE
#define _CRT_SECURE_NO_DEPRECATE
#endif
/*
* http://msdn2.microsoft.com/en-us/library/ms235505(VS.80).aspx
* Defining _CRT_DISABLE_PERFCRIT_LOCKS forces all I/O operations to assume a
* single-threaded I/O model and use the _nolock forms of the functions.
*/
#ifndef _CRT_DISABLE_PERFCRIT_LOCKS
#define _CRT_DISABLE_PERFCRIT_LOCKS
#endif
#elif __GNUC__
#undef USE_AUTOCONF
#define HAVE_SNPRINTF
#define HAVE_SYS_STAT_MKDIR
#define HAVE_STRDUP
#define HAVE_UNISTD_H
#endif
#endif
#ifdef USE_AUTOCONF
// unknown toolchain, using autoconf
#include <autoconf.h>
#endif
#define unused_arg (void)
#define iswxspace(c) (c==160 || iswspace(c))
#define isxspace(c) (c==160 || isspace(c))
#define TOLUA_CAST (char*)
#if !defined(MAX_PATH)
#if defined(PATH_MAX)
# define MAX_PATH PATH_MAX
#else
# define MAX_PATH 256
#endif
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#if defined(HAVE_STDBOOL_H)
# include <stdbool.h>
#else
# ifndef HAVE__BOOL
# ifdef __cplusplus
typedef bool _Bool;
# else
typedef unsigned char _Bool;
# endif
# endif
# define bool _Bool
# define false 0
# define true 1
# define __bool_true_false_are_defined 1
#endif
#ifndef HAVE__ACCESS
#ifdef HAVE_ACCESS
#define _access(path, mode) access(path, mode)
#endif
#endif
#if defined(HAVE_DIRECT__MKDIR)
#include <direct.h>
#elif defined(HAVE_DIRECT_MKDIR)
#include <direct.h>
#define _mkdir(a) mkdir(a)
#elif defined(HAVE_SYS_STAT_MKDIR)
#include <sys/stat.h>
#define _mkdir(a) mkdir(a, 0777)
#endif
#ifndef _min
#define _min(a,b) ((a) < (b) ? (a) : (b))
#endif
#ifndef _max
#define _max(a,b) ((a) > (b) ? (a) : (b))
#endif
#if !defined(HAVE__STRDUP)
#if defined(HAVE_STRDUP)
#undef _strdup
#define _strdup strdup
#endif
#endif
#if !defined(HAVE__SNPRINTF)
#if defined(HAVE_SNPRINTF)
#define _snprintf snprintf
#endif
#endif
#define MIN(a, b) (((a) < (b)) ? (a) : (b))
#define MAX(a, b) (((a) > (b)) ? (a) : (b))
#endif

2
src/prefix.c
View file

@ -30,7 +30,7 @@ int add_raceprefix(const char *prefix)
race_prefixes = tmp;
size *= 2;
}
race_prefixes[next++] = _strdup(prefix);
race_prefixes[next++] = strdup(prefix);
race_prefixes[next] = NULL;
return 0;
}

2
src/races/dragons.c
View file

@ -22,7 +22,7 @@
/* util includes */
#include <util/rng.h>
#define age_chance(a,b,p) (_max(0,a-b)*p)
#define age_chance(a,b,p) (MAX(0,a-b)*p)
#define DRAGONAGE 27
#define WYRMAGE 68

2
src/races/races.c
View file

@ -42,7 +42,7 @@ static void oldfamiliars(unit * u)
char fname[64];
/* these familiars have no special skills.
*/
_snprintf(fname, sizeof(fname), "%s_familiar", u_race(u)->_name);
snprintf(fname, sizeof(fname), "%s_familiar", u_race(u)->_name);
create_mage(u, M_GRAY);
equip_unit(u, get_equipment(fname));
}

8
src/races/zombies.c
View file

@ -33,7 +33,7 @@
#define UNDEAD_BREAKUP 25 /* chance dafuer */
#define UNDEAD_BREAKUP_FRACTION (25+rng_int()%70) /* anteil der weg geht */
#define age_chance(a,b,p) (_max(0,a-b)*p)
#define age_chance(a,b,p) (MAX(0,a-b)*p)
void make_undead_unit(unit * u)
{
@ -70,7 +70,7 @@ void age_undead(unit * u)
void age_skeleton(unit * u)
{
if (is_monsters(u->faction) && rng_int() % 100 < age_chance(u->age, 27, 1)) {
int n = _max(1, u->number / 2);
int n = MAX(1, u->number / 2);
double q = (double)u->hp / (double)(unit_max_hp(u) * u->number);
u_setrace(u, get_race(RC_SKELETON_LORD));
u->irace = NULL;
@ -82,7 +82,7 @@ void age_skeleton(unit * u)
void age_zombie(unit * u)
{
if (is_monsters(u->faction) && rng_int() % 100 < age_chance(u->age, 27, 1)) {
int n = _max(1, u->number / 2);
int n = MAX(1, u->number / 2);
double q = (double)u->hp / (double)(unit_max_hp(u) * u->number);
u_setrace(u, get_race(RC_ZOMBIE_LORD));
u->irace = NULL;
@ -94,7 +94,7 @@ void age_zombie(unit * u)
void age_ghoul(unit * u)
{
if (is_monsters(u->faction) && rng_int() % 100 < age_chance(u->age, 27, 1)) {
int n = _max(1, u->number / 2);
int n = MAX(1, u->number / 2);
double q = (double)u->hp / (double)(unit_max_hp(u) * u->number);
u_setrace(u, get_race(RC_GHOUL_LORD));
u->irace = NULL;

4
src/randenc.c
View file

@ -785,7 +785,7 @@ static void rotting_herbs(void)
if (fval(itm->type, ITF_HERB)) {
double nv = normalvariate(k, k / 4);
int inv = (int)nv;
int delta = _min(n, inv);
int delta = MIN(n, inv);
if (!i_change(itmp, itm->type, -delta)) {
continue;
}
@ -814,7 +814,7 @@ void randomevents(void)
while (*blist) {
building *b = *blist;
if (fval(b->type, BTF_DECAY) && !building_owner(b)) {
b->size -= _max(1, (b->size * 20) / 100);
b->size -= MAX(1, (b->size * 20) / 100);
if (b->size == 0) {
remove_building(blist, r->buildings);
}

80
src/report.c
View file

@ -269,17 +269,17 @@ void nr_spell_syntax(struct stream *out, spellbook_entry * sbe, const struct loc
/* Reihenfolge beachten: Erst REGION, dann STUFE! */
if (sp->sptyp & FARCASTING) {
bytes = _snprintf(bufp, size, " [%s x y]", LOC(lang, parameters[P_REGION]));
bytes = snprintf(bufp, size, " [%s x y]", LOC(lang, parameters[P_REGION]));
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
}
if (sp->sptyp & SPELLLEVEL) {
bytes = _snprintf(bufp, size, " [%s n]", LOC(lang, parameters[P_LEVEL]));
bytes = snprintf(bufp, size, " [%s n]", LOC(lang, parameters[P_LEVEL]));
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
}
bytes = (int)_snprintf(bufp, size, " \"%s\"", spell_name(sp, lang));
bytes = (int)snprintf(bufp, size, " \"%s\"", spell_name(sp, lang));
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
@ -305,12 +305,12 @@ void nr_spell_syntax(struct stream *out, spellbook_entry * sbe, const struct loc
if (cp == 'u') {
targetp = targets + 1;
locp = LOC(lang, targetp->vars);
bytes = (int)_snprintf(bufp, size, " <%s>", locp);
bytes = (int)snprintf(bufp, size, " <%s>", locp);
if (*params == '+') {
++params;
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
bytes = (int)_snprintf(bufp, size, " [<%s> ...]", locp);
bytes = (int)snprintf(bufp, size, " [<%s> ...]", locp);
}
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
@ -318,12 +318,12 @@ void nr_spell_syntax(struct stream *out, spellbook_entry * sbe, const struct loc
else if (cp == 's') {
targetp = targets + 2;
locp = LOC(lang, targetp->vars);
bytes = (int)_snprintf(bufp, size, " <%s>", locp);
bytes = (int)snprintf(bufp, size, " <%s>", locp);
if (*params == '+') {
++params;
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
bytes = (int)_snprintf(bufp, size, " [<%s> ...]", locp);
bytes = (int)snprintf(bufp, size, " [<%s> ...]", locp);
}
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
@ -342,12 +342,12 @@ void nr_spell_syntax(struct stream *out, spellbook_entry * sbe, const struct loc
else if (cp == 'b') {
targetp = targets + 3;
locp = LOC(lang, targetp->vars);
bytes = (int)_snprintf(bufp, size, " <%s>", locp);
bytes = (int)snprintf(bufp, size, " <%s>", locp);
if (*params == '+') {
++params;
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
bytes = (int)_snprintf(bufp, size, " [<%s> ...]", locp);
bytes = (int)snprintf(bufp, size, " [<%s> ...]", locp);
}
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
@ -382,17 +382,17 @@ void nr_spell_syntax(struct stream *out, spellbook_entry * sbe, const struct loc
if (targetp->param && targetp->vars) {
locp = LOC(lang, targetp->vars);
bytes =
(int)_snprintf(bufp, size, " %s <%s>", parameters[targetp->param],
(int)snprintf(bufp, size, " %s <%s>", parameters[targetp->param],
locp);
if (multi) {
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
bytes = (int)_snprintf(bufp, size, " [<%s> ...]", locp);
bytes = (int)snprintf(bufp, size, " [<%s> ...]", locp);
}
}
else {
bytes =
(int)_snprintf(bufp, size, " %s", parameters[targetp->param]);
(int)snprintf(bufp, size, " %s", parameters[targetp->param]);
}
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
@ -422,10 +422,10 @@ void nr_spell_syntax(struct stream *out, spellbook_entry * sbe, const struct loc
}
if (*params == '?') {
++params;
bytes = (int)_snprintf(bufp, size, " [<%s>]", locp);
bytes = (int)snprintf(bufp, size, " [<%s>]", locp);
}
else {
bytes = (int)_snprintf(bufp, size, " <%s>", locp);
bytes = (int)snprintf(bufp, size, " <%s>", locp);
}
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
@ -494,18 +494,18 @@ void nr_spell(struct stream *out, spellbook_entry * sbe, const struct locale *la
bufp = buf;
if (sp->sptyp & SPELLLEVEL) {
bytes =
_snprintf(bufp, size, " %d %s", itemanz, LOC(lang, resourcename(rtype,
snprintf(bufp, size, " %d %s", itemanz, LOC(lang, resourcename(rtype,
itemanz != 1)));
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
if (costtyp == SPC_LEVEL || costtyp == SPC_LINEAR) {
bytes = _snprintf(bufp, size, " * %s", LOC(lang, "nr_level"));
bytes = snprintf(bufp, size, " * %s", LOC(lang, "nr_level"));
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
}
}
else {
bytes = _snprintf(bufp, size, "%d %s", itemanz, LOC(lang, resourcename(rtype, itemanz != 1)));
bytes = snprintf(bufp, size, "%d %s", itemanz, LOC(lang, resourcename(rtype, itemanz != 1)));
if (wrptr(&bufp, &size, bytes) != 0) {
WARN_STATIC_BUFFER();
}
@ -929,7 +929,7 @@ static void describe(struct stream *out, const region * r, faction * f)
}
if (!e) {
e = calloc(sizeof(struct edge), 1);
e->name = _strdup(name);
e->name = strdup(name);
e->transparent = transparent;
e->next = edges;
edges = e;
@ -945,13 +945,13 @@ static void describe(struct stream *out, const region * r, faction * f)
WARN_STATIC_BUFFER();
if (r->seen.mode == seen_travel) {
bytes = _snprintf(bufp, size, " (%s)", LOC(f->locale, "see_travel"));
bytes = snprintf(bufp, size, " (%s)", LOC(f->locale, "see_travel"));
}
else if (r->seen.mode == seen_neighbour) {
bytes = _snprintf(bufp, size, " (%s)", LOC(f->locale, "see_neighbour"));
bytes = snprintf(bufp, size, " (%s)", LOC(f->locale, "see_neighbour"));
}
else if (r->seen.mode == seen_lighthouse) {
bytes = _snprintf(bufp, size, " (%s)", LOC(f->locale, "see_lighthouse"));
bytes = snprintf(bufp, size, " (%s)", LOC(f->locale, "see_lighthouse"));
}
else {
bytes = 0;
@ -974,7 +974,7 @@ static void describe(struct stream *out, const region * r, faction * f)
saplings = rtrees(r, 1);
if (production(r)) {
if (trees > 0 || saplings > 0) {
bytes = _snprintf(bufp, size, ", %d/%d ", trees, saplings);
bytes = snprintf(bufp, size, ", %d/%d ", trees, saplings);
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
@ -1004,7 +1004,7 @@ static void describe(struct stream *out, const region * r, faction * f)
for (n = 0; n < numresults; ++n) {
if (result[n].number >= 0 && result[n].level >= 0) {
bytes = _snprintf(bufp, size, ", %d %s/%d", result[n].number,
bytes = snprintf(bufp, size, ", %d %s/%d", result[n].number,
LOC(f->locale, result[n].name), result[n].level);
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
@ -1015,14 +1015,14 @@ static void describe(struct stream *out, const region * r, faction * f)
/* peasants & silver */
if (rpeasants(r)) {
int n = rpeasants(r);
bytes = _snprintf(bufp, size, ", %d", n);
bytes = snprintf(bufp, size, ", %d", n);
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
if (r->land->ownership) {
const char *str =
LOC(f->locale, mkname("morale", itoa10(region_get_morale(r))));
bytes = _snprintf(bufp, size, " %s", str);
bytes = snprintf(bufp, size, " %s", str);
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
}
@ -1041,7 +1041,7 @@ static void describe(struct stream *out, const region * r, faction * f)
}
}
if (rmoney(r) && r->seen.mode >= seen_travel) {
bytes = _snprintf(bufp, size, ", %d ", rmoney(r));
bytes = snprintf(bufp, size, ", %d ", rmoney(r));
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
bytes =
@ -1053,7 +1053,7 @@ static void describe(struct stream *out, const region * r, faction * f)
/* Pferde */
if (rhorses(r)) {
bytes = _snprintf(bufp, size, ", %d ", rhorses(r));
bytes = snprintf(bufp, size, ", %d ", rhorses(r));
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
bytes =
@ -1141,7 +1141,7 @@ static void describe(struct stream *out, const region * r, faction * f)
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
f_regionid(r2, f, regname, sizeof(regname));
bytes = _snprintf(bufp, size, trailinto(r2, f->locale), regname);
bytes = snprintf(bufp, size, trailinto(r2, f->locale), regname);
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
}
@ -1453,7 +1453,7 @@ report_template(const char *filename, report_context * ctx, const char *bom)
bufp = buf;
size = sizeof(buf) - 1;
bytes = _snprintf(bufp, size, "%s %s; %s [%d,%d$",
bytes = snprintf(bufp, size, "%s %s; %s [%d,%d$",
LOC(u->faction->locale, parameters[P_UNIT]),
itoa36(u->no), unit_getname(u), u->number, get_money(u));
if (wrptr(&bufp, &size, bytes) != 0)
@ -1631,7 +1631,7 @@ static void allies(struct stream *out, const faction * f)
if (f->allies) {
int bytes;
size_t size = sizeof(buf);
bytes = _snprintf(buf, size, "%s ", LOC(f->locale, "faction_help"));
bytes = snprintf(buf, size, "%s ", LOC(f->locale, "faction_help"));
size -= bytes;
show_allies(f, f->allies, buf + bytes, size);
paragraph(out, buf, 0, 0, 0);
@ -1642,7 +1642,7 @@ static void allies(struct stream *out, const faction * f)
if (g->allies) {
int bytes;
size_t size = sizeof(buf);
bytes = _snprintf(buf, size, "%s %s ", g->name, LOC(f->locale, "group_help"));
bytes = snprintf(buf, size, "%s %s ", g->name, LOC(f->locale, "group_help"));
size -= bytes;
show_allies(f, g->allies, buf + bytes, size);
paragraph(out, buf, 0, 0, 0);
@ -1781,12 +1781,12 @@ nr_ship(struct stream *out, const region *r, const ship * sh, const faction * f,
getshipweight(sh, &n, &p);
n = (n + 99) / 100; /* 1 Silber = 1 GE */
bytes = _snprintf(bufp, size, "%s, %s, (%d/%d)", shipname(sh),
bytes = snprintf(bufp, size, "%s, %s, (%d/%d)", shipname(sh),
LOC(f->locale, sh->type->_name), n, shipcapacity(sh) / 100);
}
else {
bytes =
_snprintf(bufp, size, "%s, %s", shipname(sh), LOC(f->locale,
snprintf(bufp, size, "%s, %s", shipname(sh), LOC(f->locale,
sh->type->_name));
}
if (wrptr(&bufp, &size, bytes) != 0)
@ -1794,7 +1794,7 @@ nr_ship(struct stream *out, const region *r, const ship * sh, const faction * f,
assert(sh->type->construction->improvement == NULL); /* sonst ist construction::size nicht ship_type::maxsize */
if (sh->size != sh->type->construction->maxsize) {
bytes = _snprintf(bufp, size, ", %s (%d/%d)",
bytes = snprintf(bufp, size, ", %s (%d/%d)",
LOC(f->locale, "nr_undercons"), sh->size,
sh->type->construction->maxsize);
if (wrptr(&bufp, &size, bytes) != 0)
@ -1803,7 +1803,7 @@ nr_ship(struct stream *out, const region *r, const ship * sh, const faction * f,
if (sh->damage) {
int percent = ship_damage_percent(sh);
bytes =
_snprintf(bufp, size, ", %d%% %s", percent, LOC(f->locale, "nr_damaged"));
snprintf(bufp, size, ", %d%% %s", percent, LOC(f->locale, "nr_damaged"));
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
}
@ -1852,7 +1852,7 @@ nr_building(struct stream *out, const region *r, const building *b, const factio
lang = f->locale;
newline(out);
bytes =
_snprintf(bufp, size, "%s, %s %d, ", buildingname(b), LOC(lang,
snprintf(bufp, size, "%s, %s %d, ", buildingname(b), LOC(lang,
"nr_size"), b->size);
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
@ -1867,7 +1867,7 @@ nr_building(struct stream *out, const region *r, const building *b, const factio
if (owner && owner->faction == f) {
/* illusion. report real type */
name = LOC(lang, bname);
bytes = _snprintf(bufp, size, " (%s)", name);
bytes = snprintf(bufp, size, " (%s)", name);
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
}
@ -2168,7 +2168,7 @@ report_plaintext(const char *filename, report_context * ctx,
bufp = buf;
size = sizeof(buf) - 1;
bytes = _snprintf(buf, size, "%s:", LOC(f->locale, "nr_options"));
bytes = snprintf(buf, size, "%s:", LOC(f->locale, "nr_options"));
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
for (op = 0; op != MAXOPTIONS; op++) {
@ -2220,14 +2220,14 @@ report_plaintext(const char *filename, report_context * ctx,
newline(out);
centre(out, LOC(f->locale, pname), true);
_snprintf(buf, sizeof(buf), "%s %d", LOC(f->locale, "nr_level"),
snprintf(buf, sizeof(buf), "%s %d", LOC(f->locale, "nr_level"),
ptype->level);
centre(out, buf, true);
newline(out);
bufp = buf;
size = sizeof(buf) - 1;
bytes = _snprintf(bufp, size, "%s: ", LOC(f->locale, "nr_herbsrequired"));
bytes = snprintf(bufp, size, "%s: ", LOC(f->locale, "nr_herbsrequired"));
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();

6
src/report.test.c
View file

@ -140,7 +140,7 @@ static void cleanup_spell_fixture(spell_fixture *spf) {
static void set_parameter(spell_fixture spell, char *value) {
free(spell.sp->parameter);
spell.sp->parameter = _strdup(value);
spell.sp->parameter = strdup(value);
}
static void check_spell_syntax(CuTest *tc, char *msg, spell_fixture *spell, char *syntax) {
@ -211,14 +211,14 @@ static void test_write_spell_syntax(CuTest *tc) {
set_parameter(spell, "bc");
free(spell.sp->syntax);
spell.sp->syntax = _strdup("hodor");
spell.sp->syntax = strdup("hodor");
check_spell_syntax(tc, "bc hodor", &spell, " ZAUBERE \"Testzauber\" <bnr> <Hodor>");
free(spell.sp->syntax);
spell.sp->syntax = 0;
set_parameter(spell, "c?");
free(spell.sp->syntax);
spell.sp->syntax = _strdup("hodor");
spell.sp->syntax = strdup("hodor");
check_spell_syntax(tc, "c?", &spell, " ZAUBERE \"Testzauber\" [<Hodor>]");
free(spell.sp->syntax);
spell.sp->syntax = 0;

44
src/reports.c
View file

@ -529,7 +529,7 @@ size_t size)
if (a_otherfaction && alliedunit(u, f, HELP_FSTEALTH)) {
faction *f = get_otherfaction(a_otherfaction);
int result =
_snprintf(bufp, size, ", %s (%s)", factionname(f),
snprintf(bufp, size, ", %s (%s)", factionname(f),
factionname(u->faction));
if (wrptr(&bufp, &size, result) != 0)
WARN_STATIC_BUFFER();
@ -544,7 +544,7 @@ size_t size)
bufp = STRLCPY(bufp, ", ", size);
if (wrptr(&bufp, &size, _snprintf(bufp, size, "%d ", u->number)))
if (wrptr(&bufp, &size, snprintf(bufp, size, "%d ", u->number)))
WARN_STATIC_BUFFER();
pzTmp = get_racename(u->attribs);
@ -641,7 +641,7 @@ size_t size)
bufp = STRLCPY(bufp, ", ", size);
if (!dh) {
result = _snprintf(bufp, size, "%s: ", LOC(f->locale, "nr_inventory"));
result = snprintf(bufp, size, "%s: ", LOC(f->locale, "nr_inventory"));
if (wrptr(&bufp, &size, result) != 0)
WARN_STATIC_BUFFER();
dh = 1;
@ -650,7 +650,7 @@ size_t size)
bufp = STRLCPY(bufp, ic, size);
}
else {
if (wrptr(&bufp, &size, _snprintf(bufp, size, "%d %s", in, ic)))
if (wrptr(&bufp, &size, snprintf(bufp, size, "%d %s", in, ic)))
WARN_STATIC_BUFFER();
}
}
@ -661,7 +661,7 @@ size_t size)
if (book) {
quicklist *ql = book->spells;
int qi, header, maxlevel = effskill(u, SK_MAGIC, 0);
int result = _snprintf(bufp, size, ". Aura %d/%d", get_spellpoints(u), max_spellpoints(u->region, u));
int result = snprintf(bufp, size, ". Aura %d/%d", get_spellpoints(u), max_spellpoints(u->region, u));
if (wrptr(&bufp, &size, result) != 0) {
WARN_STATIC_BUFFER();
}
@ -671,7 +671,7 @@ size_t size)
if (sbe->level <= maxlevel) {
int result = 0;
if (!header) {
result = _snprintf(bufp, size, ", %s: ", LOC(f->locale, "nr_spells"));
result = snprintf(bufp, size, ", %s: ", LOC(f->locale, "nr_spells"));
header = 1;
}
else {
@ -690,7 +690,7 @@ size_t size)
}
if (i != MAXCOMBATSPELLS) {
int result =
_snprintf(bufp, size, ", %s: ", LOC(f->locale, "nr_combatspells"));
snprintf(bufp, size, ", %s: ", LOC(f->locale, "nr_combatspells"));
if (wrptr(&bufp, &size, result) != 0)
WARN_STATIC_BUFFER();
@ -708,7 +708,7 @@ size_t size)
int sl = get_combatspelllevel(u, i);
bufp = STRLCPY(bufp, spell_name(sp, u->faction->locale), size);
if (sl > 0) {
result = _snprintf(bufp, size, " (%d)", sl);
result = snprintf(bufp, size, " (%d)", sl);
if (wrptr(&bufp, &size, result) != 0)
WARN_STATIC_BUFFER();
}
@ -819,13 +819,13 @@ const struct unit * u, struct skill * sv, int *dh, int days)
if (sv->id == SK_STEALTH && fval(u, UFL_STEALTH)) {
i = u_geteffstealth(u);
if (i >= 0) {
if (wrptr(&bufp, &size, _snprintf(bufp, size, "%d/", i)) != 0)
if (wrptr(&bufp, &size, snprintf(bufp, size, "%d/", i)) != 0)
WARN_STATIC_BUFFER();
}
}
effsk = eff_skill(u, sv, 0);
if (wrptr(&bufp, &size, _snprintf(bufp, size, "%d", effsk)) != 0)
if (wrptr(&bufp, &size, snprintf(bufp, size, "%d", effsk)) != 0)
WARN_STATIC_BUFFER();
if (u->faction->options & want(O_SHOWSKCHANGE)) {
@ -836,11 +836,11 @@ const struct unit * u, struct skill * sv, int *dh, int days)
oldeff = sv->old + get_modifier(u, sv->id, sv->old, u->region, false);
}
oldeff = _max(0, oldeff);
oldeff = MAX(0, oldeff);
diff = effsk - oldeff;
if (diff != 0) {
if (wrptr(&bufp, &size, _snprintf(bufp, size, " (%s%d)", (diff > 0) ? "+" : "", diff)) != 0)
if (wrptr(&bufp, &size, snprintf(bufp, size, " (%s%d)", (diff > 0) ? "+" : "", diff)) != 0)
WARN_STATIC_BUFFER();
}
}
@ -877,7 +877,7 @@ void split_paragraph(strlist ** SP, const char *s, unsigned int indent, unsigned
firstline = false;
}
if (!cut) {
cut = s + _min(len, REPORTWIDTH);
cut = s + MIN(len, REPORTWIDTH);
}
memcpy(buf + indent, s, cut - s);
buf[indent + (cut - s)] = 0;
@ -1412,7 +1412,7 @@ int write_reports(faction * f, time_t ltime)
int error = 0;
do {
char filename[32];
char path[MAX_PATH];
char path[4096];
sprintf(filename, "%d-%s.%s", turn, itoa36(f->no),
rtype->extension);
join_path(reportpath(), filename, path, sizeof(path));
@ -1482,7 +1482,7 @@ int reports(void)
FILE *mailit;
time_t ltime = time(NULL);
int retval = 0;
char path[MAX_PATH];
char path[4096];
const char * rpath = reportpath();
log_info("Writing reports for turn %d:", turn);
@ -1509,7 +1509,7 @@ int reports(void)
static variant var_copy_string(variant x)
{
x.v = x.v ? _strdup((const char *)x.v) : 0;
x.v = x.v ? strdup((const char *)x.v) : 0;
return x;
}
@ -1613,7 +1613,7 @@ f_regionid(const region * r, const faction * f, char *buffer, size_t size)
pnormalize(&nx, &ny, pl);
adjust_coordinates(f, &nx, &ny, pl);
len = strlcpy(buffer, rname(r, f ? f->locale : 0), size);
_snprintf(buffer + len, size - len, " (%d,%d%s%s)", nx, ny, named ? "," : "", (named) ? name : "");
snprintf(buffer + len, size - len, " (%d,%d%s%s)", nx, ny, named ? "," : "", (named) ? name : "");
buffer[size - 1] = 0;
len = strlen(buffer);
}
@ -1864,7 +1864,7 @@ static void eval_order(struct opstack **stack, const void *userdata)
size_t len;
variant var;
unused_arg(userdata);
UNUSED_ARG(userdata);
write_order(ord, buf, sizeof(buf));
len = strlen(buf);
var.v = strcpy(balloc(len + 1), buf);
@ -1884,7 +1884,7 @@ static void eval_resources(struct opstack **stack, const void *userdata)
while (res != NULL && size > 4) {
const char *rname =
resourcename(res->type, (res->number != 1) ? NMF_PLURAL : 0);
int result = _snprintf(bufp, size, "%d %s", res->number, LOC(lang, rname));
int result = snprintf(bufp, size, "%d %s", res->number, LOC(lang, rname));
if (wrptr(&bufp, &size, result) != 0 || size < sizeof(buf) / 2) {
WARN_STATIC_BUFFER();
break;
@ -1948,7 +1948,7 @@ static void eval_trail(struct opstack **stack, const void *userdata)
variant var;
char *bufp = buf;
#ifdef _SECURECRT_ERRCODE_VALUES_DEFINED
/* stupid MS broke _snprintf */
/* stupid MS broke snprintf */
int eold = errno;
#endif
@ -1959,7 +1959,7 @@ static void eval_trail(struct opstack **stack, const void *userdata)
const char *trail = trailinto(r, lang);
const char *rn = f_regionid_s(r, report);
if (wrptr(&bufp, &size, _snprintf(bufp, size, trail, rn)) != 0)
if (wrptr(&bufp, &size, snprintf(bufp, size, trail, rn)) != 0)
WARN_STATIC_BUFFER();
if (i + 2 < end) {
@ -2015,7 +2015,7 @@ static void eval_int36(struct opstack **stack, const void *userdata)
var.v = strcpy(balloc(len + 1), c);
opush(stack, var);
unused_arg(userdata);
UNUSED_ARG(userdata);
}
/*** END MESSAGE RENDERING ***/

2
src/skill.h
View file

@ -3,7 +3,7 @@
#ifndef H_SKILL_H
#define H_SKILL_H
#include <platform.h>
#include <stdbool.h>
struct locale;
typedef enum {

103
src/spells.c
View file

@ -60,6 +60,7 @@
#include <util/assert.h>
#include <util/attrib.h>
#include <util/base36.h>
#include <util/bsdstring.h>
#include <util/event.h>
#include <util/gamedata.h>
#include <util/language.h>
@ -149,7 +150,7 @@ static void magicanalyse_region(region * r, unit * mage, double force)
* mehr als 100% probability und damit immer ein Erfolg. */
probability = curse_chance(c, force);
mon = c->duration + (rng_int() % 10) - 5;
mon = _max(1, mon);
mon = MAX(1, mon);
found = true;
if (chance(probability)) { /* Analyse geglueckt */
@ -190,7 +191,7 @@ static void magicanalyse_unit(unit * u, unit * mage, double force)
* mehr als 100% probability und damit immer ein Erfolg. */
probability = curse_chance(c, force);
mon = c->duration + (rng_int() % 10) - 5;
mon = _max(1, mon);
mon = MAX(1, mon);
if (chance(probability)) { /* Analyse geglueckt */
if (c_flags(c) & CURSE_NOAGE) {
@ -231,7 +232,7 @@ static void magicanalyse_building(building * b, unit * mage, double force)
* mehr als 100% probability und damit immer ein Erfolg. */
probability = curse_chance(c, force);
mon = c->duration + (rng_int() % 10) - 5;
mon = _max(1, mon);
mon = MAX(1, mon);
if (chance(probability)) { /* Analyse geglueckt */
if (c_flags(c) & CURSE_NOAGE) {
@ -272,7 +273,7 @@ static void magicanalyse_ship(ship * sh, unit * mage, double force)
* mehr als 100% probability und damit immer ein Erfolg. */
probability = curse_chance(c, force);
mon = c->duration + (rng_int() % 10) - 5;
mon = _max(1, mon);
mon = MAX(1, mon);
if (chance(probability)) { /* Analyse geglueckt */
if (c_flags(c) & CURSE_NOAGE) {
@ -704,7 +705,7 @@ static int sp_destroy_magic(castorder * co)
"unit region command", mage, mage->region, co->order));
}
return _max(succ, 1);
return MAX(succ, 1);
}
/* ------------------------------------------------------------- */
@ -773,7 +774,7 @@ static int sp_transferaura(castorder * co)
return 0;
}
gain = _min(aura, scm_src->spellpoints) / multi;
gain = MIN(aura, scm_src->spellpoints) / multi;
scm_src->spellpoints -= gain * multi;
scm_dst->spellpoints += gain;
@ -912,7 +913,7 @@ static int sp_summonent(castorder * co)
return 0;
}
ents = _min((int)(power * power), rtrees(r, 2));
ents = MIN((int)(power * power), rtrees(r, 2));
u = create_unit(r, mage->faction, ents, get_race(RC_TREEMAN), 0, NULL, mage);
@ -1304,7 +1305,7 @@ static int sp_rosthauch(castorder * co)
for (; iweapon != NULL; iweapon = iweapon->next) {
item **ip = i_find(&u->items, iweapon->type);
if (*ip) {
float chance = (float)_min((*ip)->number, force);
float chance = (float)MIN((*ip)->number, force);
if (iweapon->chance < 1.0) {
chance *= iweapon->chance;
}
@ -1343,7 +1344,7 @@ static int sp_rosthauch(castorder * co)
* unguenstigsten Fall kann pro Stufe nur eine Waffe verzaubert werden,
* darum wird hier nur fuer alle Faelle in denen noch weniger Waffen
* betroffen wurden ein Kostennachlass gegeben */
return _min(success, cast_level);
return MIN(success, cast_level);
}
/* ------------------------------------------------------------- */
@ -1373,7 +1374,7 @@ static int sp_kaelteschutz(castorder * co)
unit *mage = co->magician.u;
int cast_level = co->level;
double force = co->force;
int duration = _max(cast_level, (int)force) + 1;
int duration = MAX(cast_level, (int)force) + 1;
spellparameter *pa = co->par;
double effect;
@ -2137,8 +2138,8 @@ static int sp_drought(castorder * co)
*/
c = get_curse(r->attribs, ct_find("drought"));
if (c) {
c->vigour = _max(c->vigour, power);
c->duration = _max(c->duration, (int)power);
c->vigour = MAX(c->vigour, power);
c->duration = MAX(c->duration, (int)power);
}
else {
double effect = 4.0;
@ -2335,8 +2336,8 @@ static int sp_earthquake(castorder * co)
if (burg->size != 0 && !is_cursed(burg->attribs, C_MAGICWALLS, 0)) {
/* Magieresistenz */
if (!target_resists_magic(mage, burg, TYP_BUILDING, 0)) {
kaputt = _min(10 * cast_level, burg->size / 4);
kaputt = _max(kaputt, 1);
kaputt = MIN(10 * cast_level, burg->size / 4);
kaputt = MAX(kaputt, 1);
burg->size -= kaputt;
if (burg->size == 0) {
/* TODO: sollten die Insassen nicht Schaden nehmen? */
@ -2501,7 +2502,7 @@ static int sp_forest_fire(castorder * co)
* das Zaubern. Patzer werden warscheinlicher.
* Jeder Zauber muss erst gegen den Wiederstand des Fluchs gezaubert
* werden und schwaecht dessen Antimagiewiederstand um 1.
* Wirkt _max(Stufe(Magier) - Stufe(Ziel), rand(3)) Wochen
* Wirkt MAX(Stufe(Magier) - Stufe(Ziel), rand(3)) Wochen
* Patzer:
* Magier wird selbst betroffen
*
@ -2529,7 +2530,7 @@ static int sp_fumblecurse(castorder * co)
rx = rng_int() % 3;
sx = cast_level - effskill(target, SK_MAGIC, 0);
duration = _max(sx, rx) + 1;
duration = MAX(sx, rx) + 1;
effect = force / 2;
c = create_curse(mage, &target->attribs, ct_find("fumble"),
@ -2695,8 +2696,8 @@ static int sp_firewall(castorder * co)
}
else {
fd = (wall_data *)b->data.v;
fd->force = (int)_max(fd->force, force / 2 + 0.5);
fd->countdown = _max(fd->countdown, cast_level + 1);
fd->force = (int)MAX(fd->force, force / 2 + 0.5);
fd->countdown = MAX(fd->countdown, cast_level + 1);
}
/* melden, 1x pro Partei */
@ -2938,7 +2939,7 @@ attrib_type at_deathcloud_compat = {
* Ruestung wirkt nicht
* Patzer:
* Magier geraet in den Staub und verliert zufaellige Zahl von HP bis
* auf _max(hp,2)
* auf MAX(hp,2)
* Besonderheiten:
* Nicht als curse implementiert, was schlecht ist - man kann dadurch
* kein dispell machen. Wegen fix unter Zeitdruck erstmal nicht zu
@ -3361,7 +3362,7 @@ static int sp_summonundead(castorder * co)
return 0;
}
undead = _min(deathcount(r), 2 + lovar(force));
undead = MIN(deathcount(r), 2 + lovar(force));
if (cast_level <= 8) {
race = get_race(RC_SKELETON);
@ -3409,7 +3410,7 @@ static int sp_auraleak(castorder * co)
int cast_level = co->level;
message *msg;
lost = _min(0.95, cast_level * 0.05);
lost = MIN(0.95, cast_level * 0.05);
for (u = r->units; u; u = u->next) {
if (is_mage(u)) {
@ -3792,8 +3793,8 @@ static int sp_raisepeasantmob(castorder * co)
anteil = 6 + (rng_int() % 4);
n = rpeasants(r) * anteil / 10;
n = _max(0, n);
n = _min(n, rpeasants(r));
n = MAX(0, n);
n = MIN(n, rpeasants(r));
if (n <= 0) {
report_failure(mage, co->order);
@ -4032,13 +4033,13 @@ static int sp_recruit(castorder * co)
n = (pow(force, 1.6) * 100) / f->race->recruitcost;
if (rc->recruit_multi > 0) {
double multp = (double)maxp / rc->recruit_multi;
n = _min(multp, n);
n = _max(n, 1);
n = MIN(multp, n);
n = MAX(n, 1);
rsetpeasants(r, maxp - (int)(n * rc->recruit_multi));
}
else {
n = _min(maxp, n);
n = _max(n, 1);
n = MIN(maxp, n);
n = MAX(n, 1);
rsetpeasants(r, maxp - (int)n);
}
@ -4083,13 +4084,13 @@ static int sp_bigrecruit(castorder * co)
n = (int)force + lovar((force * force * 1000) / (float)f->race->recruitcost);
if (f->race == get_race(RC_ORC)) {
n = _min(2 * maxp, n);
n = _max(n, 1);
n = MIN(2 * maxp, n);
n = MAX(n, 1);
rsetpeasants(r, maxp - (n + 1) / 2);
}
else {
n = _min(maxp, n);
n = _max(n, 1);
n = MIN(maxp, n);
n = MAX(n, 1);
rsetpeasants(r, maxp - n);
}
@ -4178,7 +4179,7 @@ static int sp_pump(castorder * co)
* Betoert eine Einheit, so das sie ihm den groe<EFBFBD>ten Teil ihres Bargelds
* und 50% ihres Besitzes schenkt. Sie behaelt jedoch immer soviel, wie
* sie zum ueberleben braucht. Wirkt gegen Magieresistenz.
* _min(Stufe*1000$, u->money - maintenace)
* MIN(Stufe*1000$, u->money - maintenace)
* Von jedem Item wird 50% abgerundet ermittelt und uebergeben. Dazu
* kommt Itemzahl%2 mit 50% chance
*
@ -4215,8 +4216,8 @@ static int sp_seduce(castorder * co)
int loot;
if (itm->type->rtype == rsilver) {
loot =
_min(cast_level * 1000, get_money(target) - (maintenance_cost(target)));
loot = _max(loot, 0);
MIN(cast_level * 1000, get_money(target) - (maintenance_cost(target)));
loot = MAX(loot, 0);
}
else {
loot = itm->number / 2;
@ -4224,7 +4225,7 @@ static int sp_seduce(castorder * co)
loot += rng_int() % 2;
}
if (loot > 0) {
loot = _min(loot, (int)(force * 5));
loot = MIN(loot, (int)(force * 5));
}
}
if (loot > 0) {
@ -4341,7 +4342,7 @@ static int sp_headache(castorder * co)
}
if (smax != NULL) {
/* wirkt auf maximal 10 Personen */
unsigned int change = _min(10, target->number) * (rng_uint() % 2 + 1) / target->number;
unsigned int change = MIN(10, target->number) * (rng_uint() % 2 + 1) / target->number;
reduce_skill(target, smax, change);
}
set_order(&target->thisorder, NULL);
@ -4385,7 +4386,7 @@ static int sp_raisepeasants(castorder * co)
"error_nopeasants", ""));
return 0;
}
bauern = _min(rpeasants(r), (int)(power * 250));
bauern = MIN(rpeasants(r), (int)(power * 250));
rsetpeasants(r, rpeasants(r) - bauern);
u2 =
@ -4468,7 +4469,7 @@ int sp_puttorest(castorder * co)
message *seen = msg_message("puttorest", "mage", mage);
message *unseen = msg_message("puttorest", "mage", NULL);
laid_to_rest = _max(laid_to_rest, dead);
laid_to_rest = MAX(laid_to_rest, dead);
deathcounts(r, -laid_to_rest);
@ -4713,7 +4714,7 @@ static int sp_gbdreams(castorder * co, const char *curse_name, int effect)
/* wirkt erst in der Folgerunde, soll mindestens eine Runde wirken,
* also duration+2 */
duration = (int)_max(1, power / 2); /* Stufe 1 macht sonst mist */
duration = (int)MAX(1, power / 2); /* Stufe 1 macht sonst mist */
duration = 2 + rng_int() % duration;
/* Nichts machen als ein entsprechendes Attribut in die Region legen. */
@ -4752,7 +4753,7 @@ int sp_clonecopy(castorder * co)
return 0;
}
_snprintf(name, sizeof(name), (const char *)LOC(mage->faction->locale,
slprintf(name, sizeof(name), (const char *)LOC(mage->faction->locale,
"clone_of"), unitname(mage));
clone =
create_unit(target_region, mage->faction, 1, get_race(RC_CLONE), 0, name,
@ -4855,7 +4856,7 @@ int sp_sweetdreams(castorder * co)
cmistake(mage, co->order, 40, MSG_EVENT);
continue;
}
men = _min(opfer, u->number);
men = MIN(opfer, u->number);
opfer -= men;
/* Nichts machen als ein entsprechendes Attribut an die Einheit legen. */
@ -4969,7 +4970,7 @@ int sp_itemcloak(castorder * co)
spellparameter *pa = co->par;
int cast_level = co->level;
double power = co->force;
int duration = (int)_max(2.0, power + 1); /* works in the report, and ageing this round would kill it if it's <=1 */
int duration = (int)MAX(2.0, power + 1); /* works in the report, and ageing this round would kill it if it's <=1 */
/* wenn kein Ziel gefunden, Zauber abbrechen */
if (pa->param[0]->flag == TARGET_NOTFOUND)
@ -5027,7 +5028,7 @@ int sp_resist_magic_bonus(castorder * co)
u = pa->param[n]->data.u;
m = _min(u->number, victims);
m = MIN(u->number, victims);
victims -= m;
create_curse(mage, &u->attribs, ct_find("magicresistance"),
@ -5043,8 +5044,8 @@ int sp_resist_magic_bonus(castorder * co)
msg_release(msg);
}
cast_level = _min(cast_level, (int)(cast_level * (victims + 4) / maxvictims));
return _max(cast_level, 1);
cast_level = MIN(cast_level, (int)(cast_level * (victims + 4) / maxvictims));
return MAX(cast_level, 1);
}
/** spell 'Astraler Weg'.
@ -5656,7 +5657,7 @@ int sp_showastral(castorder * co)
free_regionlist(rl);
return cast_level;
unused_arg(co);
UNUSED_ARG(co);
return 0;
}
#endif
@ -5907,7 +5908,7 @@ int sp_permtransfer(castorder * co)
return 0;
}
aura = _min(get_spellpoints(mage) - spellcost(mage, sp), aura);
aura = MIN(get_spellpoints(mage) - spellcost(mage, sp), aura);
change_maxspellpoints(mage, -aura);
change_spellpoints(mage, -aura);
@ -6216,7 +6217,7 @@ int sp_speed2(castorder * co)
spellparameter *pa = co->par;
maxmen = 2 * cast_level * cast_level;
dur = _max(1, cast_level / 2);
dur = MAX(1, cast_level / 2);
for (n = 0; n < pa->length; n++) {
double effect;
@ -6230,7 +6231,7 @@ int sp_speed2(castorder * co)
u = pa->param[n]->data.u;
men = _min(maxmen, u->number);
men = MIN(maxmen, u->number);
effect = 2;
create_curse(mage, &u->attribs, ct_find("speed"), force, dur, effect, men);
maxmen -= men;
@ -6241,7 +6242,7 @@ int sp_speed2(castorder * co)
"unit region amount", mage, mage->region, used));
/* Effektiv benoetigten cast_level (mindestens 1) zurueckgeben */
used = (int)sqrt(used / 2);
return _max(1, used);
return MAX(1, used);
}
/* ------------------------------------------------------------- */
@ -6324,7 +6325,7 @@ int sp_q_antimagie(castorder * co)
ADDMSG(&mage->faction->msgs, msg_message("destroy_magic_noeffect",
"unit region command", mage, mage->region, co->order));
}
return _max(succ, 1);
return MAX(succ, 1);
}
/* ------------------------------------------------------------- */

8
src/spells/borders.c
View file

@ -206,7 +206,7 @@ struct region *from, struct region *to, bool routing)
wall_data *fd = (wall_data *)b->data.v;
if (!routing && fd->active) {
int hp = dice(3, fd->force) * u->number;
hp = _min(u->hp, hp);
hp = MIN(u->hp, hp);
u->hp -= hp;
if (u->hp) {
ADDMSG(&u->faction->msgs, msg_message("firewall_damage",
@ -227,9 +227,9 @@ static const char *b_namefirewall(const connection * b, const region * r,
const faction * f, int gflags)
{
const char *bname;
unused_arg(f);
unused_arg(r);
unused_arg(b);
UNUSED_ARG(f);
UNUSED_ARG(r);
UNUSED_ARG(b);
if (gflags & GF_ARTICLE)
bname = "a_firewall";
else

3
src/spells/borders.h
View file

@ -1,5 +1,8 @@
#ifndef H_KRNL_CURSES
#define H_KRNL_CURSES
#include <stdbool.h>
#ifdef __cplusplus
extern "C" {
#endif

2
src/spells/buildingcurse.c
View file

@ -36,7 +36,7 @@ message *cinfo_building(const void *obj, objtype_t typ, const curse * c,
int self)
{
const building *b = (const building *)obj;
unused_arg(typ);
UNUSED_ARG(typ);
assert(typ == TYP_BUILDING);
assert(obj);
assert(c);

Some files were not shown because too many files have changed in this diff Show more