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

Hungernde Einheiten kann man nicht lehren.

This commit is contained in:
Enno Rehling 2002-01-12 12:33:46 +00:00
parent 60419a6bb6
commit d067092922
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -289,7 +289,7 @@ teach(region * r, unit * u)
teachskill[i++]=sk; teachskill[i++]=sk;
} while (sk!=NOSKILL); } while (sk!=NOSKILL);
while (teaching && student) { while (teaching && student) {
if (student->faction == u->faction) { if (student->faction == u->faction && !fval(student, FL_HUNGER)) {
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);
@ -306,7 +306,7 @@ teach(region * r, unit * u)
} }
#if TEACH_FRIENDS #if TEACH_FRIENDS
while (teaching && student) { while (teaching && student) {
if (student->faction != u->faction && allied(u, student->faction, HELP_GUARD)) { if (student->faction != u->faction && !fval(student, FL_HUNGER) && allied(u, student->faction, HELP_GUARD)) {
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);