- Some cleaning around the return to egg code. Pets should stop duplicating now.

- Some cleaning of the egg hatching routine to prevent spawning the pet if the egg can't be found in the inventory.
- Removed some autoadded data/ strings in grfio.c module to see if it helps with the data_dir configuration.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5736 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 3 insertions, 3 deletions

diff --git a/src/common/grfio.c b/src/common/grfio.c
index fcc1ee461..9830ca85c 100644
--- a/src/common/grfio.c
+++ b/src/common/grfio.c
@@ -846,7 +846,7 @@ static void grfio_resourcecheck(void)
 	FILE *fp;

 

 	// read resnametable from data directory and return if successful

-	sprintf(restable, "%sdata\\resnametable.txt", data_dir);

+	sprintf(restable, "%sresnametable.txt", data_dir);

 	for (ptr = &restable[0]; *ptr != 0; ptr++)

 		if (*ptr == '\\') *ptr = '/';

 

@@ -857,8 +857,8 @@ static void grfio_resourcecheck(void)
 				// we only need the map names and text files

 				(strstr(w2, ".gat") || strstr(w2, ".txt")))

 			{

-				sprintf(src, "data\\%s", w1);

-				sprintf(dst, "data\\%s", w2);

+				sprintf(src, "%s", w1);

+				sprintf(dst, "%s", w2);

 				entry = filelist_find(dst);

 				// create new entries reusing the original's info

 				if (entry != NULL) {