- Removed Magic Rod's cast bar.

- Corrected warning on login sql.
- Gravitation no longer causes damage flinch.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10038 54d463be-8e91-2dee-dedb-b68131a5f0ec

8 files changed, 11 insertions, 10 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 2a5ce5dad..0f6f9d444 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,9 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
+2007/03/21
+	* Removed Magic Rod's cast bar.
+	* Gravitation no longer causes damage flinch. [Skotlex]
 2007/03/20
 	* Increased MAX_STATUSCHANGE to 300 to make room for new statuses [DracoRPG]
 	* Reverted mapindex reading from map_list.txt for the map-server [DracoRPG]
diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt
index af23e1664..c4e8ab7c8 100644
--- a/db/skill_cast_db.txt
+++ b/db/skill_cast_db.txt
@@ -431,7 +431,7 @@
 
 //===== Sage ===============================
 //-- SA_MAGICROD
-276,0,1500,0,400:600:800:1000:1200,0
+276,0,0,0,400:600:800:1000:1200,0
 //-- SA_SPELLBREAKER
 277,700,0,0,0,0
 
diff --git a/src/login_sql/login.c b/src/login_sql/login.c
index b895bbab8..73a32950b 100644
--- a/src/login_sql/login.c
+++ b/src/login_sql/login.c
@@ -1545,7 +1545,7 @@ int parse_login(int fd)
 					default : error = "Unknown Error."; break;
 					}
 
-					sprintf(tmpsql, "INSERT DELAYED INTO `%s`(`time`,`ip`,`user`,`rcode`,`log`) VALUES (NOW(), '%lu', '%s', '%d','login failed : %s')", loginlog_db, ntohl(ipl), t_uid, result, error);
+					sprintf(tmpsql, "INSERT DELAYED INTO `%s`(`time`,`ip`,`user`,`rcode`,`log`) VALUES (NOW(), '%lu', '%s', '%d','login failed : %s')", loginlog_db, (unsigned int)ntohl(ipl), t_uid, result, error);
 
 					//query
 					if(mysql_query(&mysql_handle, tmpsql)) {
diff --git a/src/map/battle.c b/src/map/battle.c
index 92297e67d..133b7eed7 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2177,6 +2177,7 @@ struct Damage battle_calc_magic_attack(
 				ad.blewcount = 0; //No knockback
 			else
 				ad.blewcount |= 0x10000;
+		case HW_GRAVITATION:
 			ad.dmotion = 0; //No flinch animation.
 			break;
 		case WZ_STORMGUST: //Should knockback randomly.
diff --git a/src/map/map.c b/src/map/map.c
index f2dcd1a23..f16282bf4 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -479,6 +479,8 @@ int map_moveblock(struct block_list *bl, int x1, int y1, unsigned int tick) {
 				status_change_end(bl, SC_BASILICA, -1);
 			if (sc->data[SC_TATAMIGAESHI].timer != -1)
 				status_change_end(bl, SC_TATAMIGAESHI, -1);
+			if (sc->data[SC_MAGICROD].timer != -1)
+				status_change_end(bl, SC_MAGICROD, -1);
 		}
 	}
 	if (moveblock) map_delblock_sub(bl,0);
diff --git a/src/map/script.c b/src/map/script.c
index ffc0a10ad..5d7c3154d 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -9257,10 +9257,10 @@ BUILDIN_FUNC(setcastledata)
 			case 25:
 				gc->guardian[index-18].hp = value;
 				if (gc->guardian[index-18].id)
-		  		{	//Update this mob's HP.
+				{	//Update this mob's HP.
 					struct block_list *bl = map_id2bl(gc->guardian[index-18].id);
 					if (!bl)
-			  		{	//Wrong target?
+					{	//Wrong target?
 						gc->guardian[index-18].id = 0;
 						break;
 					}
diff --git a/src/map/skill.c b/src/map/skill.c
index 861c33e87..bc00db58c 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -812,7 +812,6 @@ int skill_calc_heal (struct block_list *bl, int skill_lv)
 	if(bl->type == BL_HOM && (skill = merc_hom_checkskill(((TBL_HOM*)bl), HLIF_BRAIN)) > 0)
 		heal += heal * skill * 2 / 100;
 
-
 	return heal;
 }
 
@@ -5711,10 +5710,7 @@ int skill_castend_id (int tid, unsigned int tick, int id, int data)
 		if (ud->walktimer != -1 && ud->skillid != TK_RUN)
 			unit_stop_walking(src,1);
 		
-		if (ud->skillid == SA_MAGICROD)
-			ud->canact_tick = tick;
-		else
-			ud->canact_tick = tick + skill_delayfix(src, ud->skillid, ud->skilllv);
+		ud->canact_tick = tick + skill_delayfix(src, ud->skillid, ud->skilllv);
 	
 		if (skill_get_state(ud->skillid) != ST_MOVE_ENABLE)
 			unit_set_walkdelay(src, tick, battle_config.default_skill_delay+skill_get_walkdelay(ud->skillid, ud->skilllv), 1);
diff --git a/src/map/unit.c b/src/map/unit.c
index e784c68ce..9a48dc488 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -966,7 +966,6 @@ int unit_skilluse_id2(struct block_list *src, int target_id, int skill_num, int
 		if (sc && sc->data[SC_RUN].timer != -1)
 			casttime = 0;
 		break;
-	case SA_MAGICROD:
 	case SA_SPELLBREAKER:
 		temp =1;
 		break;