From 2ea484313f08eb2041274a7f5f37a3ed03fbd646 Mon Sep 17 00:00:00 2001
From: amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sun, 26 Dec 2004 21:52:45 +0000
Subject: fix build

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@796 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/common/mmo.h | 14 ++++++++++++++
 src/map/battle.c |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'src')

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;
 			}
-- 
cgit v1.2.3-70-g09d2