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

Not yet ready to give up on the MIN/MAX macros

Browse source
This commit is contained in:
Enno Rehling 2017-12-29 19:26:20 +01:00
parent 095148ab50
commit f1a6203f3e
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/study.c
View file

@ -16,9 +16,7 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
**/ **/
#ifdef _MSC_VER
#include <platform.h> #include <platform.h>
#endif
#include <kernel/config.h> #include <kernel/config.h>
#include "study.h" #include "study.h"
#include "laws.h" #include "laws.h"
@ -228,7 +226,7 @@ teach_unit(unit * teacher, unit * student, int nteaching, skill_t sk,
students -= teach->students; students -= teach->students;
} }
students = MIN(students, nteaching); if (students > nteaching) students = nteaching;
if (students > 0) { if (students > 0) {
if (teach == NULL) { if (teach == NULL) {
@ -284,7 +282,7 @@ int teach_cmd(unit * teacher, struct order *ord)
teaching = teacher->number * TEACHNUMBER; teaching = teacher->number * TEACHNUMBER;
if ((i = get_effect(teacher, oldpotiontype[P_FOOL])) > 0) { /* Trank "Dumpfbackenbrot" */ if ((i = get_effect(teacher, oldpotiontype[P_FOOL])) > 0) { /* Trank "Dumpfbackenbrot" */
i = MIN(i, teacher->number * TEACHNUMBER); if (i > teaching) i = teaching;
/* Trank wirkt pro Schueler, nicht pro Lehrer */ /* Trank wirkt pro Schueler, nicht pro Lehrer */
teaching -= i; teaching -= i;
change_effect(teacher, oldpotiontype[P_FOOL], -i); change_effect(teacher, oldpotiontype[P_FOOL], -i);
@ -699,11 +697,11 @@ int study_cmd(unit * u, order * ord)
if (studycost) { if (studycost) {
int cost = studycost * u->number; int cost = studycost * u->number;
money = get_pooled(u, get_resourcetype(R_SILVER), GET_DEFAULT, cost); money = get_pooled(u, get_resourcetype(R_SILVER), GET_DEFAULT, cost);
money = MIN(money, cost); if (money > cost) money = cost;
} }
if (money < studycost * u->number) { if (money < studycost * u->number) {
studycost = p; /* Ohne Univertreurung */ studycost = p; /* Ohne Univertreurung */
money = MIN(money, studycost); if (money > studycost) money = studycost;
if (p > 0 && money < studycost * u->number) { if (p > 0 && money < studycost * u->number) {
cmistake(u, ord, 65, MSG_EVENT); cmistake(u, ord, 65, MSG_EVENT);
multi = money / (double)(studycost * u->number); multi = money / (double)(studycost * u->number);