Skill lv up fix

Manually updated VS8 char_sql project

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

4 files changed, 13 insertions, 15 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 846fd465a..dbe3d51f3 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ 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/17

+	* Manually added int_homun.c to the VS8 char_sql project, *should* work [DracoRPG]

+	* Orn's fix to the very critical skill level up bug [DracoRPG]

 	* Updated mob_db.sql to current mob_db.txt data. [Skotlex]

 	* Added Orn's lil fix on homun [Vicious]

 	* Added Homunculus system, enjoy! [orn aka Nylou]

diff --git a/src/map/clif.c b/src/map/clif.c
index bfa2f7eb7..72798922c 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -1588,19 +1588,6 @@ void clif_parse_HomMoveToMaster(int fd, struct map_session_data *sd) {	//[orn]
 	unit_walktoxy(&sd->hd->bl, sd->bl.x,sd->bl.y-1, 0); //move to master

 }

 

-// player spend a skillpoint for homunculus

-void clif_parse_HomUseSKillPoint(int fd, struct map_session_data *sd) {	//[orn]

-	int skillid ;

-	nullpo_retv(sd);

-	nullpo_retv(sd->hd);

-

-	if ( !sd->hd ) 

-		return ;

-	skillid = RFIFOW(fd,2);

-

-	merc_hom_skillup(sd->hd, skillid);

-}

-

 // Request a Homunculus move-to-position

 void clif_parse_HomMoveTo(int fd,struct map_session_data *sd) {	//[orn]

 	int x,y,cmd;

@@ -11917,7 +11904,6 @@ static int packetdb_readdb(void)
 		{clif_parse_HomMoveToMaster,"hommovetomaster"},

 		{clif_parse_HomMoveTo,"hommoveto"},

 		{clif_parse_HomAttack,"homattack"},

-		{clif_parse_HomUseSKillPoint,"homuseskillpoint"},

 		{clif_parse_HomMenu,"hommenu"},

 		{NULL,NULL}

 	};

diff --git a/src/map/pc.c b/src/map/pc.c
index dc1ecbde7..f7c93c94f 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -4371,10 +4371,16 @@ int pc_skillup(struct map_session_data *sd,int skill_num)
 {
 	nullpo_retr(0, sd);
 
-	if( skill_num>=GD_SKILLBASE){
+	if(skill_num >= GD_SKILLBASE){
 		guild_skillup(sd,skill_num,0);
 		return 0;
 	}
+
+	if(skill_num >= HM_SKILLBASE){
+		merc_hom_skillup(sd->hd, skill_num);
+		return 0;
+	}
+
 	if (skill_num < 0 || skill_num >= MAX_SKILL)
 		return 0;
 	
diff --git a/vcproj-8/char-server_sql.vcproj b/vcproj-8/char-server_sql.vcproj
index b5e378f7e..0bfd5d2d2 100644
--- a/vcproj-8/char-server_sql.vcproj
+++ b/vcproj-8/char-server_sql.vcproj
@@ -224,6 +224,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\src\char_sql\int_homun.c"

+				>

+			</File>

+			<File

 				RelativePath="..\src\char_sql\int_party.c"

 				>

 			</File>