summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorMatheus Macabu <mkbu95@gmail.com>2013-02-04 00:13:50 -0200
committerMatheus Macabu <mkbu95@gmail.com>2013-02-04 00:13:50 -0200
commitf651ffc9f92dbf339e9691c24d66577bf4a43d47 (patch)
tree067b3df4edcfb1366661b81c06e94dac9882adc6 /src/map
parentfe8d3fc42729f2afc37426e26080b2d04f65d9f3 (diff)
downloadhercules-f651ffc9f92dbf339e9691c24d66577bf4a43d47.tar.gz
hercules-f651ffc9f92dbf339e9691c24d66577bf4a43d47.tar.bz2
hercules-f651ffc9f92dbf339e9691c24d66577bf4a43d47.tar.xz
hercules-f651ffc9f92dbf339e9691c24d66577bf4a43d47.zip
Some changes to .gitignore;
Merged r15231 and r15232 from eAthena. Signed-off-by: Matheus Macabu <mkbu95@gmail.com>
Diffstat (limited to 'src/map')
-rw-r--r--src/map/clif.c4
-rw-r--r--src/map/clif.h4
-rw-r--r--src/map/mob.c2
3 files changed, 6 insertions, 4 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index e04941336..8d5090c2c 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -5344,6 +5344,9 @@ void clif_cooking_list(struct map_session_data *sd, int trigger, uint16 skill_id
/// Notifies clients of a status change.
/// 0196 <index>.W <id>.L <state>.B (ZC_MSG_STATE_CHANGE) [used for ending status changes and starting them on non-pc units (when needed)]
/// 043f <index>.W <id>.L <state>.B <remain msec>.L { <val>.L }*3 (ZC_MSG_STATE_CHANGE2) [used exclusively for starting statuses on pcs]
+/// 08ff <id>.L <index>.W <remain msec>.L { <val>.L }*3 (PACKETVER >= 20111108)
+/// 0983 <index>.W <id>.L <state>.B <total msec>.L <remain msec>.L { <val>.L }*3 (PACKETVER >= 20120618)
+/// 0984 <id>.L <index>.W <total msec>.L <remain msec>.L { <val>.L }*3 (PACKETVER >= 20120618)
void clif_status_change(struct block_list *bl,int type,int flag,int tick,int val1, int val2, int val3)
{
unsigned char buf[32];
@@ -17111,7 +17114,6 @@ int do_init_clif(void) {
clif_config.packet_db_ver = -1; // the main packet version of the DB
memset(clif_config.connect_cmd, 0, sizeof(clif_config.connect_cmd)); //The default connect command will be determined after reading the packet_db [Skotlex]
- memset(packet_db,0,sizeof(packet_db));
//Using the packet_db file is the only way to set up packets now [Skotlex]
packetdb_readdb();
diff --git a/src/map/clif.h b/src/map/clif.h
index 45e2fd4f0..8e0fc6629 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -31,8 +31,8 @@ struct party_booking_ad_info;
enum
{// packet DB
- MAX_PACKET_DB = 0xA00,
- MAX_PACKET_VER = 31,
+ MAX_PACKET_DB = 0xF00,
+ MAX_PACKET_VER = 32,
MAX_PACKET_POS = 20,
};
diff --git a/src/map/mob.c b/src/map/mob.c
index 6550d9b0e..aceebc506 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -1537,7 +1537,7 @@ static bool mob_ai_sub_hard(struct mob_data *md, unsigned int tick)
// Scan area for targets
if (!tbl && mode&MD_LOOTER && md->lootitem && DIFF_TICK(tick, md->ud.canact_tick) > 0 &&
(md->lootitem_count < LOOTITEM_SIZE || battle_config.monster_loot_type != 1))
- { // Scan area for items to loot, avoid trying to loot of the mob is full and can't consume the items.
+ { // Scan area for items to loot, avoid trying to loot if the mob is full and can't consume the items.
map_foreachinrange (mob_ai_sub_hard_lootsearch, &md->bl, view_range, BL_ITEM, md, &tbl);
}