summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-26 21:52:45 +0000
committeramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-26 21:52:45 +0000
commit2ea484313f08eb2041274a7f5f37a3ed03fbd646 (patch)
tree554547e4298f429a070b9b25fb67db7efe71fb32
parent9ec5fbe2735ffb4ad524f7f5c2c798872106b0aa (diff)
downloadhercules-2ea484313f08eb2041274a7f5f37a3ed03fbd646.tar.gz
hercules-2ea484313f08eb2041274a7f5f37a3ed03fbd646.tar.bz2
hercules-2ea484313f08eb2041274a7f5f37a3ed03fbd646.tar.xz
hercules-2ea484313f08eb2041274a7f5f37a3ed03fbd646.zip
fix build
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@796 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog.txt2
-rw-r--r--src/common/mmo.h14
-rw-r--r--src/map/battle.c2
3 files changed, 16 insertions, 2 deletions
diff --git a/Changelog.txt b/Changelog.txt
index cf874cf69..3138a5934 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,6 +1,6 @@
Date Added
12/26
- * Fixed some array bounds errors (SVN 795) [MouseJstr]
+ * Fixed some array bounds errors (SVN 796) [MouseJstr]
* @mapexit (and do_final) now persist all data to the
char server before exiting to eliminate storage/inventory
inconsistancies.. [MouseJstr] (SVN 793)
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 44069b85f..617a870e9 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -7,6 +7,20 @@
#include <time.h>
#include "utils.h" // _WIN32
+#if ! defined(Assert)
+#if defined(RELEASE)
+#define Assert(EX)
+#else
+// extern "C" {
+#include <assert.h>
+// }
+#if defined(_WIN32)
+#include <crtdbg.h>
+#endif
+#define Assert(EX) assert(EX)
+#endif
+#endif /* ! defined(Assert) */
+
#ifdef CYGWIN
// txtやlogなどの書き出すファイルの改行コード
#define RETCODE "\r\n" // (CR/LF:Windows系)
diff --git a/src/map/battle.c b/src/map/battle.c
index a5f33a655..92711bcd4 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3076,7 +3076,7 @@ static struct Damage battle_calc_pc_weapon_attack(
else
damage2 += atkmin_ ;
if(sd->atk_rate != 100 || sd->weapon_atk_rate != 0) {
- if (((struct map_session_data *)bl)->status.weapon < 16) {
+ if (sd->status.weapon < 16) {
damage = (damage * (sd->atk_rate + sd->weapon_atk_rate[sd->status.weapon]))/100;
damage2 = (damage2 * (sd->atk_rate + sd->weapon_atk_rate[sd->status.weapon]))/100;
}