From bea92bc0f1aa7d2d09195b616b64229343f658e3 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 17 Feb 2002 12:15:39 +0000 Subject: [PATCH] * Bugfix Eternath-Koordinaten * Bugfix GM SKILL --- src/common/modules/gmcmd.c | 6 +++++- src/common/settings-eressea.h | 1 - src/eressea/eressea.dsp | 16 ++++++++++++++++ src/eressea/korrektur.c | 2 +- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/common/modules/gmcmd.c b/src/common/modules/gmcmd.c index 1346acd60..5321a8438 100644 --- a/src/common/modules/gmcmd.c +++ b/src/common/modules/gmcmd.c @@ -378,7 +378,7 @@ gm_skill(const char * str, void * data, const char * cmd) } else if (skill==NOSKILL || skill==SK_MAGIC || skill==SK_ALCHEMY) { /* unknown or not enough */ mistake(u, cmd, "Dieses Talent ist unbekannt, oder kann nicht erhöht werden.\n", 0); - } else if (num<0 || num>30) { + } else if (num<0 || num>30+SKILLPOINTS*4970) { /* sanity check failed */ mistake(u, cmd, "Der gewählte Wert ist nicht zugelassen.\n", 0); } else { @@ -388,7 +388,11 @@ gm_skill(const char * str, void * data, const char * cmd) mistake(u, cmd, "Unzureichende Rechte für diesen Befehl.\n", 0); } else { +#if SKILLPOINTS + set_skill(to, skill, num*to->number); +#else set_level(to, skill, num); +#endif } } } diff --git a/src/common/settings-eressea.h b/src/common/settings-eressea.h index 6453ce075..ef7dc2ce9 100644 --- a/src/common/settings-eressea.h +++ b/src/common/settings-eressea.h @@ -26,4 +26,3 @@ #define TEACHDIFFERENCE 1 #define PEASANT_ADJUSTMENT 1 #define SKILLPOINTS 1 - diff --git a/src/eressea/eressea.dsp b/src/eressea/eressea.dsp index 74c4dc3c4..914638b76 100644 --- a/src/eressea/eressea.dsp +++ b/src/eressea/eressea.dsp @@ -120,5 +120,21 @@ SOURCE=.\korrektur.h SOURCE=.\main.c # End Source File +# Begin Source File + +SOURCE="..\common\settings-eressea.h" +# End Source File +# Begin Source File + +SOURCE="..\common\settings-vinyambar-classic.h" +# End Source File +# Begin Source File + +SOURCE="..\common\settings-vinyambar.h" +# End Source File +# Begin Source File + +SOURCE=..\common\settings.h +# End Source File # End Target # End Project diff --git a/src/eressea/korrektur.c b/src/eressea/korrektur.c index 973747c33..1f28eee0a 100644 --- a/src/eressea/korrektur.c +++ b/src/eressea/korrektur.c @@ -2659,7 +2659,7 @@ korrektur(void) do_once("idlo", fix_idleout()); do_once("szip", set_zip()); do_once("heal", heal_all()); - do_once("fqco", fix_questcoors()); + do_once("fquc", fix_questcoors()); /* seems something fishy is going on, do this just * to be on the safe side: