Fixed 1734,Orc_Archer_Bow working with Iron Arrow instead of Steel Arrow. Thanks Muad Dib for reporting.

Fixed Active Guild skills not working when WoE is OFF, follow up on r12770, bugreport:1653 and bugreport:1637

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

4 files changed, 4 insertions, 2 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 4f6cd5b97..313deac10 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.
 
 2008/06/09
+	* Fixed Active Guild skills not working when WoE is OFF, follow up on r12770, bugreport:1653 and bugreport:1637
 	* Fixed Fire Pillar (and any future splash damage magical trap) not working on Land Protector.
 	* Fixed reject sword having a infinite duration, bugreport:695 [Brainstorm]
 
diff --git a/db/Changelog.txt b/db/Changelog.txt
index aa49f52a7..6fb33da52 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -44,6 +44,7 @@
 
 =======================
 2008/06/09
+	* Fixed 1734,Orc_Archer_Bow working with Iron Arrow instead of Steel Arrow. Thanks Muad Dib for reporting.
 	* Fixed 2000,Destruction_Rod being 0.2% per refine instead of 2%.
 
 2008/06/08
diff --git a/db/item_db.txt b/db/item_db.txt
index 4d6fe0b3a..128969f11 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -871,7 +871,7 @@
 1731,Frozen_Bow,Freezing Bow,4,,10,1400,100,,5,1,0x00020800,7,2,34,3,55,1,11,{ bonus2 bAddEff,Eff_Freeze,1000; if(isequipped(1754)) bonus bLongAtkRate,25; },{},{}
 1732,Earth_Bow,Earthen Bow,4,,10,1400,105,,5,1,0x00020800,7,2,34,3,55,1,11,{ bonus2 bAddEff,Eff_Stone,1000; if(isequipped(1756)) bonus bLongAtkRate,25; },{},{}
 1733,Gust_Bow,Gale Bow,4,,10,1400,95,,5,1,0x00020800,7,2,34,3,55,1,11,{ if(readparam(bInt)>40) { bonus3 bAutoSpell,540,5,100; } else bonus3 bAutoSpell,540,5,20; if(isequipped(1755)) bonus bLongAtkRate,25; },{},{}
-1734,Orc_Archer_Bow,Orc Archer's Bow,4,,10,1600,120,,5,0,0x00020800,7,2,34,4,65,1,11,{ bonus2 bAddMonsterDropItem,1770,200; if(isequipped(1770)) bonus bLongAtkRate,50; },{},{}
+1734,Orc_Archer_Bow,Orc Archer's Bow,4,,10,1600,120,,5,0,0x00020800,7,2,34,4,65,1,11,{ bonus2 bAddMonsterDropItem,1753,200; if(isequipped(1753)) bonus bLongAtkRate,50; },{},{}
 1735,Kkakkung,Kkakkung,4,,10,0,120,,5,0,0x000A0848,7,2,34,1,1,0,11,{ bonus2 bAddRace,RC_Boss,50; bonus2 bAddRace,RC_NonBoss,50; },{},{}
 1736,Double_Bound,Double Bound,4,,,900,70,,5,3,0x00000800,2,2,34,3,70,1,11,{ bonus3 bAutoSpell,46,GetSkillLv(46),100; },{},{}
 1737,Ixion_Wing,Ixion's Wings,4,,,300,135,,5,1,0x00000800,2,2,34,4,70,1,11,{ bonusautoscript "{ sc_start SC_INCASPDRATE,7000,7; }",10+(getrefine()*2); bonus2 bAddSkillBlow,148,3; },{},{}
diff --git a/src/map/skill.c b/src/map/skill.c
index 4d640f6cb..6de9e9067 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -7964,7 +7964,7 @@ int skill_check_condition(struct map_session_data* sd, short skill, short lv, in
 	case GD_BATTLEORDER:
 	case GD_REGENERATION:
 	case GD_RESTORE:
-		if (!map_flag_gvg(sd->bl.m)) {
+		if (!map_flag_gvg2(sd->bl.m)) {
 			clif_skill_fail(sd,skill,0,0);
 			return 0;
 		}