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

- Lehren gefixt

This commit is contained in:
Christian Schlittchen 2002-03-10 15:43:00 +00:00
parent 4553aa3f60
commit 2314fefc93
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/gamecode/study.c
View File

@ -304,7 +304,7 @@ teach(region * r, unit * u)
if (igetkeyword(student->thisorder, student->faction->locale) == K_STUDY) { if (igetkeyword(student->thisorder, student->faction->locale) == K_STUDY) {
/* Input ist nun von student->thisorder !! */ /* Input ist nun von student->thisorder !! */
sk = getskill(student->faction->locale); sk = getskill(student->faction->locale);
if (sk != NOSKILL && eff_skill(u, sk, r) >= eff_skill(student, sk, r)+TEACHDIFFERENCE) { if (sk != NOSKILL && eff_skill(u, sk, r)-TEACHDIFFERENCE >= eff_skill(student, sk, r)) {
teaching -= teach_unit(u, student, teaching, sk, true, &academy); teaching -= teach_unit(u, student, teaching, sk, true, &academy);
} }
} }
@ -402,7 +402,8 @@ teach(region * r, unit * u)
msg_error(u, u->thisorder, "teach_nolearn", "student", u2)); msg_error(u, u->thisorder, "teach_nolearn", "student", u2));
continue; continue;
} }
if (eff_skill(u2, sk, r) + TEACHDIFFERENCE >= eff_skill(u, sk, r)) { /* u is teacher, u2 is student */
if (eff_skill(u2, sk, r) >= eff_skill(u, sk, r)-TEACHDIFFERENCE) {
add_message(&u->faction->msgs, add_message(&u->faction->msgs,
msg_error(u, u->thisorder, "teach_asgood", "student", u2)); msg_error(u, u->thisorder, "teach_asgood", "student", u2));
continue; continue;

5
src/mapper/map_partei.c
View File

@ -351,7 +351,10 @@ NeuePartei(region * r)
lang = nf->lang; lang = nf->lang;
strcpy(email, nf->email); strcpy(email, nf->email);
if (late) { if (late) {
WINDOW *win = openwin(SX - 10, 2, "< Neue Partei einfügen >"); WINDOW *win = openwin(SX - 10, 3, "< Neue Partei einfügen >");
if(r->age >= 5)
late = (int) map_input(win, 2, 1, "Startbonus", -1, 99, r->age/2);
else
late = (int) map_input(win, 2, 1, "Startbonus", -1, 99, 0); late = (int) map_input(win, 2, 1, "Startbonus", -1, 99, 0);
delwin(win); delwin(win);
} }

2
src/mapper/mapper.h
View File

@ -134,7 +134,7 @@ void insert_selection(struct selection ** p_sel, struct selection * prev, char *
extern void read_newfactions(const char * filename); extern void read_newfactions(const char * filename);
extern void read_orders(const char * filename); extern void read_orders(const char * filename);
extern void read_dropouts(const char *filename); extern void read_dropouts(const char *filename);
extern void seed_dropouts(); extern void seed_dropouts(void);
#define sncat(b, s, size) strncat ((b), s, size - strlen (b)) #define sncat(b, s, size) strncat ((b), s, size - strlen (b))