summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-09-25 02:36:14 +0300
committerAndrei Karas <akaras@inbox.ru>2018-09-25 02:36:14 +0300
commitd15e6bce81b6728f98f1bd4b33d8a10cc4a020e1 (patch)
tree5e1f8a8aac84cfc73d353fd56f5384d45a59787b
parent505d310c38ab4c2ce80edb082a609959ee0ec5e6 (diff)
downloadevol-hercules-d15e6bce81b6728f98f1bd4b33d8a10cc4a020e1.tar.gz
evol-hercules-d15e6bce81b6728f98f1bd4b33d8a10cc4a020e1.tar.bz2
evol-hercules-d15e6bce81b6728f98f1bd4b33d8a10cc4a020e1.tar.xz
evol-hercules-d15e6bce81b6728f98f1bd4b33d8a10cc4a020e1.zip
Fix compilation after hercules update.
-rw-r--r--src/emap/init.c1
-rw-r--r--src/emap/lang.c4
-rw-r--r--src/emap/pc.c1
-rw-r--r--src/emap/script.c1
-rw-r--r--src/emap/script_buildins.c3
5 files changed, 7 insertions, 3 deletions
diff --git a/src/emap/init.c b/src/emap/init.c
index 647f56a..c670dd4 100644
--- a/src/emap/init.c
+++ b/src/emap/init.c
@@ -16,6 +16,7 @@
#include "common/socket.h"
#include "common/strlib.h"
#include "common/timer.h"
+#include "map/achievement.h"
#include "map/channel.h"
#include "map/chat.h"
#include "map/chrif.h"
diff --git a/src/emap/lang.c b/src/emap/lang.c
index fcef241..a05c568 100644
--- a/src/emap/lang.c
+++ b/src/emap/lang.c
@@ -211,7 +211,7 @@ int lang_getId(const char *str)
char *str2 = NULL;
int f;
- if ((str2 = strchr(str, '.')))
+ if ((str2 = (char*)strchr(str, '.')))
*str2 = 0;
for (f = 0; f < MAX_LANGS && lang_langs[f]; f ++)
@@ -223,7 +223,7 @@ int lang_getId(const char *str)
}
}
- if ((str2 = strchr(str1, '_')))
+ if ((str2 = (char*)strchr(str1, '_')))
*str2 = 0;
for (f = 0; f < MAX_LANGS && lang_langs[f]; f ++)
diff --git a/src/emap/pc.c b/src/emap/pc.c
index e54b9e7..a11d2b7 100644
--- a/src/emap/pc.c
+++ b/src/emap/pc.c
@@ -14,6 +14,7 @@
#include "common/socket.h"
#include "common/strlib.h"
#include "common/timer.h"
+#include "map/achievement.h"
#include "map/chrif.h"
#include "map/homunculus.h"
#include "map/elemental.h"
diff --git a/src/emap/script.c b/src/emap/script.c
index 5e8d1ae..236461b 100644
--- a/src/emap/script.c
+++ b/src/emap/script.c
@@ -10,6 +10,7 @@
#include "common/HPMi.h"
#include "common/memmgr.h"
#include "common/nullpo.h"
+#include "map/achievement.h"
#include "map/npc.h"
#include "map/pc.h"
#include "map/script.h"
diff --git a/src/emap/script_buildins.c b/src/emap/script_buildins.c
index 02b26cd..78b9ac6 100644
--- a/src/emap/script_buildins.c
+++ b/src/emap/script_buildins.c
@@ -11,6 +11,7 @@
#include "common/memmgr.h"
#include "common/utils.h"
#include "common/timer.h"
+#include "map/achievement.h"
#include "map/chat.h"
#include "map/chrif.h"
#include "map/instance.h"
@@ -1158,7 +1159,7 @@ BUILDIN(successRefIndex)
logs->pick_pc(sd, LOG_TYPE_SCRIPT, 1, &sd->status.inventory[n],sd->inventory_data[n]);
clif->additem(sd, n, 1, 0);
clif->misceffect(&sd->bl, 3);
- achievement->validate_refine(sd, i, true); // Achievements [Smokexyz/Hercules]
+ achievement->validate_refine(sd, n, true); // Achievements [Smokexyz/Hercules]
if (sd->status.inventory[n].refine == 10 &&
sd->status.inventory[n].card[0] == CARD0_FORGE &&