summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-07-03 01:54:46 +0000
committerFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-07-03 01:54:46 +0000
commitf0b6539b1f935f0c05ed3d6543abb604659418d7 (patch)
tree02ea249fb0759e7b3aa326e995a149b677007ba6
parent75c2294f4600430e5959a99798f7befcb6378e8f (diff)
downloadhercules-f0b6539b1f935f0c05ed3d6543abb604659418d7.tar.gz
hercules-f0b6539b1f935f0c05ed3d6543abb604659418d7.tar.bz2
hercules-f0b6539b1f935f0c05ed3d6543abb604659418d7.tar.xz
hercules-f0b6539b1f935f0c05ed3d6543abb604659418d7.zip
* Defined out a problematic piece code in conv_num.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10843 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/script.c4
2 files changed, 5 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index fa810923c..c95a094a8 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ 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.
2007/07/03
+ * Defined out a problematic piece code in conv_num.
* Added reporting of constant and param script data.
* Fixed an incorrect check in menu script command. [FlavioJS]
2007/07/02
diff --git a/src/map/script.c b/src/map/script.c
index 68cbb2bdc..c3985a4a3 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -2376,6 +2376,9 @@ int conv_num(struct script_state* st, struct script_data* data)
data->type = C_INT;
data->u.num = (int)num;
}
+#if 0
+ // FIXME this function is being used to retrieve the position of labels and
+ // probably other stuff [FlavioJS]
else
{// unsupported data type
ShowError("script:conv_num: cannot convert to number, defaulting to 0\n");
@@ -2384,6 +2387,7 @@ int conv_num(struct script_state* st, struct script_data* data)
data->type = C_INT;
data->u.num = 0;
}
+#endif
return data->u.num;
}