summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-12-23 11:06:58 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-12-23 11:06:58 +0000
commita050a1a8a1bb9e5a61a3b9ac60e1e688e98c4ea3 (patch)
tree93e52b49aaee75c70e52aa0400fe20814d38ec7a
parent4161c99f71fbd824163356c642731f7599c291e2 (diff)
downloadhercules-a050a1a8a1bb9e5a61a3b9ac60e1e688e98c4ea3.tar.gz
hercules-a050a1a8a1bb9e5a61a3b9ac60e1e688e98c4ea3.tar.bz2
hercules-a050a1a8a1bb9e5a61a3b9ac60e1e688e98c4ea3.tar.xz
hercules-a050a1a8a1bb9e5a61a3b9ac60e1e688e98c4ea3.zip
- Fixed warning about unused variable
- Made the kaahi heal timer function uncrashable. - Fixed pc move item to cart function checking against the wrong max index. - Fixed initialization of sd issue in map_addblock - Removed redundant reinitialization when parsing item pickup. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11968 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/clif.c3
-rw-r--r--src/map/map.c3
-rw-r--r--src/map/npc.c2
-rw-r--r--src/map/pc.c2
-rw-r--r--src/map/status.c18
5 files changed, 12 insertions, 16 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index cc71e670f..3ee08824c 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -8547,9 +8547,6 @@ void clif_parse_DropItem(int fd, struct map_session_data *sd)
{
int item_index = RFIFOW(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0])-2;
int item_amount = RFIFOW(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[1]);
-
- item_index = RFIFOW(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0])-2;
- item_amount = RFIFOW(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[1]);
do {
if (pc_isdead(sd))
break;
diff --git a/src/map/map.c b/src/map/map.c
index 6050d6ed4..c4a0847b6 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -359,14 +359,13 @@ int map_addblock_sub (struct block_list *bl, int flag)
} else {
if (bl->type == BL_PC && flag)
{
- struct map_session_data* sd;
+ struct map_session_data* sd = (struct map_session_data*)bl;
if (!sd->state.auth) {
ShowError("map_addblock: Attempted to add a non-authed player (%d:%d)!\n", sd->status.account_id, sd->status.char_id);
return 1;
}
if (map[m].users++ == 0 && battle_config.dynamic_mobs) //Skotlex
map_spawnmobs(m);
- sd = (struct map_session_data*)bl;
if (battle_config.pet_no_gvg && map_flag_gvg(m) && sd->pd)
{ //Return the pet to egg. [Skotlex]
clif_displaymessage(sd->fd, "Pets are not allowed in Guild Wars.");
diff --git a/src/map/npc.c b/src/map/npc.c
index e95a32c71..ca4201428 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -2137,7 +2137,7 @@ int npc_parse_mob2(struct spawn_data* mob, int index)
static const char* npc_parse_mob(char* w1, char* w2, char* w3, char* w4, const char* start, const char* buffer, const char* filepath)
{
- int level, num, class_, mode, x,y,xs,ys, temp;
+ int level, num, class_, mode, x,y,xs,ys;
char mapname[32];
char mobname[128];
struct spawn_data mob, *data;
diff --git a/src/map/pc.c b/src/map/pc.c
index 13065ea24..520f10f0d 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -3212,7 +3212,7 @@ int pc_putitemtocart(struct map_session_data *sd,int idx,int amount) {
nullpo_retr(0, sd);
- if (idx < 0 || idx >= MAX_CART) //Invalid index check [Skotlex]
+ if (idx < 0 || idx >= MAX_INVENTORY) //Invalid index check [Skotlex]
return 1;
item_data = &sd->status.inventory[idx];
diff --git a/src/map/status.c b/src/map/status.c
index 42695e1b4..1c51ab444 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -3390,7 +3390,7 @@ static unsigned short status_calc_batk(struct block_list *bl, struct status_chan
if(sc->data[SC_CURSE])
batk -= batk * 25/100;
//Curse shouldn't effect on this? <- Curse OR Bleeding??
-// if(sc->data[SC_BLEEDING]->)
+// if(sc->data[SC_BLEEDING])
// batk -= batk * 25/100;
if(sc->data[SC_FLEET])
batk += batk * sc->data[SC_FLEET]->val3/100;
@@ -3819,7 +3819,7 @@ static short status_calc_aspd_rate(struct block_list *bl, struct status_change *
}
aspd_rate -= max;
- //These stack with the rest of bonuses->
+ //These stack with the rest of bonuses.
if(sc->data[SC_BERSERK])
aspd_rate -= 300;
else if(sc->data[SC_MADNESSCANCEL])
@@ -6622,19 +6622,19 @@ int kaahi_heal_timer(int tid, unsigned int tick, int id, int data)
struct status_data *status;
int hp;
- bl=map_id2bl(id);
- sc=status_get_sc(bl);
- status=status_get_status_data(bl);
-
- if (!(sc && status && data == SC_KAAHI && sc->data[data]))
+ ;
+ if(!((bl=map_id2bl(id))&&
+ (sc=status_get_sc(bl)) &&
+ (sce = sc->data[SC_KAAHI])))
return 0;
- sce = sc->data[data];
+
if(sce->val4 != tid) {
ShowError("kaahi_heal_timer: Timer mismatch: %d != %d\n", tid, sce->val4);
sce->val4=-1;
return 0;
}
-
+
+ status=status_get_status_data(bl);
if(!status_charge(bl, 0, sce->val3)) {
sce->val4=-1;
return 0;