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

Fix MSVC static analysis warnings in laws.c

Browse source
This commit is contained in:
Enno Rehling 2018-11-23 22:16:44 +01:00
parent bb11026321
commit e155f1ef29
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/laws.c
View file

@ -326,7 +326,7 @@ static void calculate_emigration(region * r)
static double peasant_growth_factor(void) static double peasant_growth_factor(void)
{ {
return config_get_flt("rules.peasants.growth.factor", 0.0001F * PEASANTGROWTH); return config_get_flt("rules.peasants.growth.factor", 0.0001 * (double)PEASANTGROWTH);
} }
static double peasant_luck_factor(void) static double peasant_luck_factor(void)
@ -424,8 +424,10 @@ static migration *get_migrants(region * r)
/* Es gibt noch keine Migration. Also eine erzeugen /* Es gibt noch keine Migration. Also eine erzeugen
*/ */
m = free_migrants; m = free_migrants;
if (!m) if (!m) {
m = calloc(1, sizeof(migration)); m = calloc(1, sizeof(migration));
if (!m) abort();
}
else { else {
free_migrants = free_migrants->next; free_migrants = free_migrants->next;
m->horses = 0; m->horses = 0;
@ -476,8 +478,8 @@ static void horses(region * r)
} }
else if (maxhorses > 0) { else if (maxhorses > 0) {
double growth = double growth =
(RESOURCE_QUANTITY * HORSEGROWTH * 200 * (maxhorses - (RESOURCE_QUANTITY * (HORSEGROWTH * 200.0 * ((double)maxhorses -
horses)) / maxhorses; horses))) / (double)maxhorses;
if (growth > 0) { if (growth > 0) {
int i; int i;
@ -1233,6 +1235,7 @@ static void remove_idle_players(void)
i = turn + 1; i = turn + 1;
if (i < 4) i = 4; if (i < 4) i = 4;
age = calloc(i, sizeof(int)); age = calloc(i, sizeof(int));
if (!age) abort();
for (fp = &factions; *fp;) { for (fp = &factions; *fp;) {
faction *f = *fp; faction *f = *fp;
if (!is_monsters(f)) { if (!is_monsters(f)) {
@ -1393,8 +1396,10 @@ static void init_prefixnames(void)
} }
in = in->next; in = in->next;
} }
if (in == NULL) if (in == NULL) {
in = calloc(sizeof(local_names), 1); in = calloc(sizeof(local_names), 1);
if (!in) abort();
}
in->next = pnames; in->next = pnames;
in->lang = lang; in->lang = lang;
@ -1432,7 +1437,8 @@ int prefix_cmd(unit * u, struct order *ord)
} }
if (in == NULL) { if (in == NULL) {
init_prefixnames(); init_prefixnames();
for (in = pnames; in->lang != lang; in = in->next); for (in = pnames; in && in->lang != lang; in = in->next);
if (!in) return 0;
} }
init_order_depr(ord); init_order_depr(ord);
@ -3072,9 +3078,11 @@ void monthly_healing(void)
/* hp über Maximum bauen sich ab. Wird zb durch Elixier der Macht /* hp über Maximum bauen sich ab. Wird zb durch Elixier der Macht
* oder verändertes Ausdauertalent verursacht */ * oder verändertes Ausdauertalent verursacht */
if (u->hp > umhp) { if (u->hp > umhp) {
u->hp -= (int)ceil((u->hp - umhp) / 2.0); int diff = u->hp - umhp;
if (u->hp < umhp) u->hp -= (int)ceil(diff / 2.0);
if (u->hp < umhp) {
u->hp = umhp; u->hp = umhp;
}
continue; continue;
} }
@ -3511,6 +3519,7 @@ static processor *add_proc(int priority, const char *name, processor_t type)
} }
proc = (processor *)malloc(sizeof(processor)); proc = (processor *)malloc(sizeof(processor));
if (!proc) abort();
proc->priority = priority; proc->priority = priority;
proc->type = type; proc->type = type;
proc->name = name; proc->name = name;