forked from github/server
- Fix Tavernengröße 10
- Fix Skillchange-Anzeige - Compiliert wieder
This commit is contained in:
parent
facc8aaab1
commit
1d625d1683
|
@ -475,7 +475,7 @@ tactics_bonus(troop at, troop dt, boolean attacking)
|
||||||
}
|
}
|
||||||
#endif /* NEW_TACTICS */
|
#endif /* NEW_TACTICS */
|
||||||
|
|
||||||
static int
|
int
|
||||||
statusrow(int status)
|
statusrow(int status)
|
||||||
{
|
{
|
||||||
switch (status) {
|
switch (status) {
|
||||||
|
|
|
@ -237,5 +237,6 @@ extern struct troop select_corpse(struct battle * b, struct fighter * af);
|
||||||
extern fighter * make_fighter(struct battle * b, struct unit * u, boolean attack);
|
extern fighter * make_fighter(struct battle * b, struct unit * u, boolean attack);
|
||||||
void flee(const troop dt);
|
void flee(const troop dt);
|
||||||
void drain_exp(struct unit *u, int d);
|
void drain_exp(struct unit *u, int d);
|
||||||
|
extern int statusrow(int status);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -648,7 +648,7 @@ static const construction inn_bld = {
|
||||||
building_type bt_inn = {
|
building_type bt_inn = {
|
||||||
"inn", /* _name */
|
"inn", /* _name */
|
||||||
BFL_NONE, /* flags */
|
BFL_NONE, /* flags */
|
||||||
1, 10, 10, /* capac/size, maxcapac, maxsize */
|
1, 10, -1, /* capac/size, maxcapac, maxsize */
|
||||||
inn_keep, /* maintenance */
|
inn_keep, /* maintenance */
|
||||||
&inn_bld, /* construction */
|
&inn_bld, /* construction */
|
||||||
NULL /* name() */
|
NULL /* name() */
|
||||||
|
|
|
@ -643,7 +643,7 @@ spskill(const struct locale * lang, const struct unit * u, skill_t sk, int *dh,
|
||||||
diff = effsk - oldeff;
|
diff = effsk - oldeff;
|
||||||
|
|
||||||
if(diff != 0) {
|
if(diff != 0) {
|
||||||
sbuf += sprintf(sbuf, " (%s%hd)", (diff>0)?"+":"", diff);
|
sbuf += sprintf(sbuf, " (%s%d)", (diff>0)?"+":"", diff);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -854,7 +854,8 @@ add_skill(unit * u, skill_t id)
|
||||||
sv = (u->skills + u->skill_size - 1);
|
sv = (u->skills + u->skill_size - 1);
|
||||||
sv->level = (unsigned char)0;
|
sv->level = (unsigned char)0;
|
||||||
sv->weeks = (unsigned char)1;
|
sv->weeks = (unsigned char)1;
|
||||||
sv->id = (unsigned char)id;
|
sv->old = (unsigned char)0;
|
||||||
|
sv->id = (unsigned char)id;
|
||||||
return sv;
|
return sv;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -268,7 +268,7 @@ SeedPartei(void)
|
||||||
do {
|
do {
|
||||||
win = openwin(SX - 10, 6, "< Neue Partei einfügen >");
|
win = openwin(SX - 10, 6, "< Neue Partei einfügen >");
|
||||||
wmove(win, y, 4);
|
wmove(win, y, 4);
|
||||||
for (i = 1; i < MAXRACES; i++) if(playerrace(new_race[i])) {
|
for (i = 1; i < MAXRACES; i++) if(playerrace(new_race[i]) && i != RC_ORC) {
|
||||||
sprintf(buf, "%d=%s; ", i, new_race[i]->_name[0]);
|
sprintf(buf, "%d=%s; ", i, new_race[i]->_name[0]);
|
||||||
q += strlen(buf);
|
q += strlen(buf);
|
||||||
if (q > SX - 20) {
|
if (q > SX - 20) {
|
||||||
|
@ -281,7 +281,7 @@ SeedPartei(void)
|
||||||
rc = (race_t) map_input(win, 2, 1, "Rasse", 0, MAXRACES-1, rc);
|
rc = (race_t) map_input(win, 2, 1, "Rasse", 0, MAXRACES-1, rc);
|
||||||
|
|
||||||
delwin(win);
|
delwin(win);
|
||||||
} while(!playerrace(new_race[i]));
|
} while(!playerrace(new_race[i]) || i == RC_ORC);
|
||||||
return goodregion(rc);
|
return goodregion(rc);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue