- Fixed a bunch of probably incorrect logical comparisons.

- Some small updates on the skill_db file (some max levels of npc skills, some elements for skills that didn't really need them)


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

4 files changed, 6 insertions, 6 deletions

diff --git a/src/map/clif.c b/src/map/clif.c
index 733bb7699..a50aa21bb 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -8212,7 +8212,7 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
 		//Homunc mimic their master's speed on each map change. [Skotlex]
 		if (battle_config.hom_setting&0x8)
 			status_calc_bl(&sd->hd->bl, SCB_SPEED);
-		if (!battle_config.hom_setting&0x2)
+		if (!(battle_config.hom_setting&0x2))
 			skill_unit_move(&sd->hd->bl,gettick(),1);
 	}
 
diff --git a/src/map/pc.c b/src/map/pc.c
index 307fb791c..3fba85898 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -613,7 +613,7 @@ int pc_authok(struct map_session_data *sd, int login_id2, time_t connect_until_t
 	if (battle_config.disp_zeny)
 		sd->state.showzeny = 1;
 	
-	if (!battle_config.display_skill_fail&2)
+	if (!(battle_config.display_skill_fail&2))
 		sd->state.showdelay = 1;
 		
 	// Request all registries.
diff --git a/src/map/status.c b/src/map/status.c
index bfae98dea..14ee57e0d 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -979,7 +979,7 @@ int status_check_skilluse(struct block_list *src, struct block_list *target, int
 		{	//Stuned/Frozen/etc
 			if (flag != 1) //Can't cast, casted stuff can't damage. 
 				return 0;
-			if (!skill_get_inf(skill_num)&INF_GROUND_SKILL)
+			if (!(skill_get_inf(skill_num)&INF_GROUND_SKILL))
 				return 0; //Targetted spells can't come off.
 		}
 
@@ -1530,7 +1530,7 @@ int status_calc_pc(struct map_session_data* sd,int first)
 	int i,index;
 	int skill,refinedef=0;
 
-	if(sd->state.connect_new && !first&1) //Shouldn't invoke yet until player is done loading.
+	if(sd->state.connect_new && !(first&1)) //Shouldn't invoke yet until player is done loading.
 		return -1;
 
 	if (++calculating > 10) //Too many recursive calls!
@@ -2921,7 +2921,7 @@ void status_calc_bl(struct block_list *bl, unsigned long flag)
 		return;
 	}
 
-	if((!bl->type&(BL_REGEN)) && (!sc || !sc->count)) { //No difference.
+	if((!(bl->type&BL_REGEN)) && (!sc || !sc->count)) { //No difference.
 		status_cpy(status, b_status);
 		return;
 	}
diff --git a/src/map/unit.c b/src/map/unit.c
index 53296f61a..2a360e6ab 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -292,7 +292,7 @@ int unit_walktoxy( struct block_list *bl, int x, int y, int flag) {
 		return 1;
 	}
 
-	if(!(flag&2) && (!status_get_mode(bl)&MD_CANMOVE || !unit_can_move(bl)))
+	if(!(flag&2) && (!(status_get_mode(bl)&MD_CANMOVE) || !unit_can_move(bl)))
 		return 0;
 	
 	ud->state.walk_easy = flag&1;