summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortoms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-28 09:45:30 +0000
committertoms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-28 09:45:30 +0000
commitf412aa286157b5e9484d66887431236a4dcddbe7 (patch)
tree7e88c183b3a8ce309e5cce0480f34e60588fd0ac
parentc42726e011ada594defa5cee38e5e2b28e8721e5 (diff)
downloadhercules-f412aa286157b5e9484d66887431236a4dcddbe7.tar.gz
hercules-f412aa286157b5e9484d66887431236a4dcddbe7.tar.bz2
hercules-f412aa286157b5e9484d66887431236a4dcddbe7.tar.xz
hercules-f412aa286157b5e9484d66887431236a4dcddbe7.zip
Fixed "conversion from 'double' to 'int', possible loss of data"
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7939 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/script.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index a54b28885..83ba1d299 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.
2006/07/28
+ * Fixed "conversion from 'double' to 'int', possible loss of data" [Toms]
* Fixed "warning: redefinition of [ushort/uint/ulong]" [Toms]
* Fixed duplicate case value on NJ_SUITON [Toms]
2006/07/27
diff --git a/src/map/script.c b/src/map/script.c
index b3f3e5355..afa8b113a 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -2379,7 +2379,7 @@ void op_2num(struct script_state *st,int op,int i1,int i2)
if(ret_double > INT_MAX || ret_double < INT_MIN) {
printf("script::op_2num overflow detected op:%d\n",op);
report_src(st);
- ret = cap_value(ret_double,INT_MAX,INT_MIN);
+ ret = (int)cap_value(ret_double,INT_MAX,INT_MIN);
}
}
push_val(st->stack,C_INT,ret);