summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-04 15:18:30 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-04 15:18:30 +0000
commita8ed5bce482007aa96ff5f6674d6dfe6bbfaa487 (patch)
tree0fc125a761a7db8a4d8c7de02fb2fcb2f3c14c6d /src/common
parent07e900f02b198bbfec480fceefb4a492f5ca8911 (diff)
downloadhercules-a8ed5bce482007aa96ff5f6674d6dfe6bbfaa487.tar.gz
hercules-a8ed5bce482007aa96ff5f6674d6dfe6bbfaa487.tar.bz2
hercules-a8ed5bce482007aa96ff5f6674d6dfe6bbfaa487.tar.xz
hercules-a8ed5bce482007aa96ff5f6674d6dfe6bbfaa487.zip
- Stun time for using ES magic on non-mobs reduced to 0.5 secs.
- Eska is now usable on bosses. - Swoo will stun you if attempted on an already 'swooned' enemy. - clif_skill_failed will print out a debug line with the skill_id (since the current null_po does not helps at all to fix it) - Applied TheUltraMage's suggested fixes to the grfio module. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6467 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common')
-rw-r--r--src/common/grfio.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/common/grfio.c b/src/common/grfio.c
index d0178d3e4..41e6864ae 100644
--- a/src/common/grfio.c
+++ b/src/common/grfio.c
@@ -858,7 +858,7 @@ static void grfio_resourcecheck(void)
FILE *fp;
// read resnametable from data directory and return if successful
- sprintf(restable, "%sresnametable.txt", data_dir);
+ sprintf(restable, "%sdata\\resnametable.txt", data_dir);
for (ptr = &restable[0]; *ptr != 0; ptr++)
if (*ptr == '\\') *ptr = '/';
@@ -869,15 +869,15 @@ static void grfio_resourcecheck(void)
// we only need the map names and text files
(strstr(w2, ".gat") || strstr(w2, ".txt")))
{
- sprintf(src, "%s", w1);
- sprintf(dst, "%s", w2);
+ sprintf(src, "data\\%s", w1);
+ sprintf(dst, "data\\%s", w2);
entry = filelist_find(dst);
// create new entries reusing the original's info
if (entry != NULL) {
FILELIST fentry;
memcpy(&fentry, entry, sizeof(FILELIST));
strncpy(fentry.fn, src, sizeof(fentry.fn) - 1);
- fentry.fnd = grfio_alloc_ptr(w2);
+ fentry.fnd = grfio_alloc_ptr(dst);
filelist_modify(&fentry);
i++;
}
@@ -906,7 +906,7 @@ static void grfio_resourcecheck(void)
FILELIST fentry;
memcpy(&fentry, entry, sizeof(FILELIST));
strncpy(fentry.fn, src, sizeof(fentry.fn) - 1);
- fentry.fnd = grfio_alloc_ptr(w2);
+ fentry.fnd = grfio_alloc_ptr(dst);
filelist_modify(&fentry);
i++;
}