summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-07-29 14:33:16 +0000
committerrud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-07-29 14:33:16 +0000
commitfbf1a94396d200e8ae6e6d0d30e291e95f85cf90 (patch)
treedf95f11658e24a27a369b40d0744c3d657a3cfcc
parent131a6f555562e56dfb180b310d4c893a993e7b15 (diff)
downloadhercules-fbf1a94396d200e8ae6e6d0d30e291e95f85cf90.tar.gz
hercules-fbf1a94396d200e8ae6e6d0d30e291e95f85cf90.tar.bz2
hercules-fbf1a94396d200e8ae6e6d0d30e291e95f85cf90.tar.xz
hercules-fbf1a94396d200e8ae6e6d0d30e291e95f85cf90.zip
Fixed some compile warnings.(bugreport:6352, bugreport:6361)
Follow up r16520 added some missing entry in packet_db.txt where my patch doesn't include it...XD git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16530 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--db/packet_db.txt1
-rw-r--r--src/map/homunculus.c2
-rw-r--r--src/map/pc.h4
-rw-r--r--src/map/status.c4
4 files changed, 8 insertions, 3 deletions
diff --git a/db/packet_db.txt b/db/packet_db.txt
index 9c2c6e58e..a7360006a 100644
--- a/db/packet_db.txt
+++ b/db/packet_db.txt
@@ -1754,6 +1754,7 @@ packet_ver: 30
0x0907,5,moveitem,2:4
0x0908,5
0x08D7,28,battlegroundreg,2:4 //Added to prevent disconnections
+0x08CF,10 //Amulet spirits
//Add new packets here
//packet_ver: 31 \ No newline at end of file
diff --git a/src/map/homunculus.c b/src/map/homunculus.c
index 1d7b44168..aaf6dd410 100644
--- a/src/map/homunculus.c
+++ b/src/map/homunculus.c
@@ -371,7 +371,7 @@ int hom_mutate(struct homun_data *hd, int homun_id)
m_class = hom_class2mapid(hd->homunculus.class_);
m_id = hom_class2mapid(homun_id);
- if( !m_class&HOM_EVO || !m_id&HOM_S ) {
+ if( !(m_class&HOM_EVO) || !(m_id&HOM_S) ) {
clif_emotion(&hd->bl, E_SWT);
return 0;
}
diff --git a/src/map/pc.h b/src/map/pc.h
index 05ffb0c72..f7a821768 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -332,8 +332,8 @@ struct map_session_data {
short spiritball, spiritball_old;
int spirit_timer[MAX_SKILL_LEVEL];
- short talisman[5];
- int talisman_timer[5][10];
+ short talisman[ELE_POISON+1]; // There are actually 5 talisman Fire, Ice, Wind, Earth & Poison maybe because its color violet.
+ int talisman_timer[ELE_POISON+1][10];
unsigned char potion_success_counter; //Potion successes in row counter
unsigned char mission_count; //Stores the bounty kill count for TK_MISSION
diff --git a/src/map/status.c b/src/map/status.c
index fb9d8320c..987de30fe 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -3234,7 +3234,9 @@ static signed short status_calc_mdef2(struct block_list *,struct status_change *
static unsigned short status_calc_speed(struct block_list *,struct status_change *,int);
static short status_calc_aspd_rate(struct block_list *,struct status_change *,int);
static unsigned short status_calc_dmotion(struct block_list *bl, struct status_change *sc, int dmotion);
+#ifdef RENEWAL_ASPD
static short status_calc_aspd(struct block_list *bl, struct status_change *sc, short flag);
+#endif
static unsigned int status_calc_maxhp(struct block_list *,struct status_change *,unsigned int);
static unsigned int status_calc_maxsp(struct block_list *,struct status_change *,unsigned int);
static unsigned char status_calc_element(struct block_list *bl, struct status_change *sc, int element);
@@ -5058,6 +5060,7 @@ static unsigned short status_calc_speed(struct block_list *bl, struct status_cha
return (short)cap_value(speed,10,USHRT_MAX);
}
+#ifdef RENEWAL_ASPD
// flag&1 - fixed value [malufett]
// flag&2 - percentage value
static short status_calc_aspd(struct block_list *bl, struct status_change *sc, short flag)
@@ -5181,6 +5184,7 @@ static short status_calc_aspd(struct block_list *bl, struct status_change *sc, s
return ( flag&1? (skills1 + pots) : skills2 );
}
+#endif
/// Calculates an object's ASPD modifier (alters the base amotion value).
/// Note that the scale of aspd_rate is 1000 = 100%.