summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-22 16:05:53 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-22 16:05:53 +0000
commit8c1192d8dd59c8b37204efcac02f20427f5393d8 (patch)
tree99ed4b575ebea596a8d1a62aa94cd3592c49acc5
parent4fa2f3998dc6a4b57734e3e4bf171244e322aa75 (diff)
downloadhercules-8c1192d8dd59c8b37204efcac02f20427f5393d8.tar.gz
hercules-8c1192d8dd59c8b37204efcac02f20427f5393d8.tar.bz2
hercules-8c1192d8dd59c8b37204efcac02f20427f5393d8.tar.xz
hercules-8c1192d8dd59c8b37204efcac02f20427f5393d8.zip
- Modified the homun-txt file-save format to separate the name from the rest of fields with tabs (like character saving does), this may fix homun save/loading when using non-latin characters on the name, but be warned that it also means the previous homun-data files are lost! (unless you replace the comma before the start of a name with a tab)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8432 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt5
-rw-r--r--conf-tmpl/atcommand_athena.conf2
-rw-r--r--src/char/int_homun.c4
3 files changed, 7 insertions, 4 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 55d50122b..68c8cb504 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,11 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/08/22
+ * Modified the homun-txt file-save format to separate the name from the
+ rest of fields with tabs (like character saving does), this may fix homun
+ save/loading when using non-latin characters on the name, but be warned
+ that it also means the previous homun-data files are lost! (unless you
+ replace the comma before the start of a name with a tab) [Skotlex]
* getnameditem will now also work on stackable items [Skotlex]
* Corrected battle_calc_weapon_attack so that all skills ignore your
left-hand weapon, and that the Katar's double-attack damage bonus for the
diff --git a/conf-tmpl/atcommand_athena.conf b/conf-tmpl/atcommand_athena.conf
index 27f6327a5..b7246898f 100644
--- a/conf-tmpl/atcommand_athena.conf
+++ b/conf-tmpl/atcommand_athena.conf
@@ -723,8 +723,6 @@ battleignore: 99
//---------------------------------------------------------------
// 99: Weather effects
-rain: 99
-
snow: 99
clouds: 99
diff --git a/src/char/int_homun.c b/src/char/int_homun.c
index 48e96b9f0..fc06995c6 100644
--- a/src/char/int_homun.c
+++ b/src/char/int_homun.c
@@ -23,7 +23,7 @@ int inter_homun_tostr(char *str,struct s_homunculus *p)
{
int i;
- str+=sprintf(str,"%d,%d,%s\t%d,%d,%d,%d,%d,"
+ str+=sprintf(str,"%d,%d\t%s\t%d,%d,%d,%d,%d,"
"%u,%d,%d,%d,"
"%u,%d,%d,"
"%d,%d,%d,%d,%d,%d\t",
@@ -51,7 +51,7 @@ int inter_homun_fromstr(char *str,struct s_homunculus *p)
memset(p,0,sizeof(struct s_homunculus));
- i=sscanf(str,"%d,%d,%[^\t]\t%d,%d,%d,%d,%d,"
+ i=sscanf(str,"%d,%d\t%127[^\t]\t%d,%d,%d,%d,%d,"
"%u,%d,%d,%d,"
"%u,%d,%d,"
"%d,%d,%d,%d,%d,%d\t%n",