diff options
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/atcommand.c | 3 | ||||
| -rw-r--r-- | src/map/battle.c | 2 | ||||
| -rw-r--r-- | src/map/clif.c | 2 | ||||
| -rw-r--r-- | src/map/guild.c | 2 | ||||
| -rw-r--r-- | src/map/mob.c | 4 | ||||
| -rw-r--r-- | src/map/npc.c | 2 | ||||
| -rw-r--r-- | src/map/pet.c | 4 | ||||
| -rw-r--r-- | src/map/skill.c | 4 |
8 files changed, 11 insertions, 12 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 823dde505..2ee492e53 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -8,10 +8,9 @@ #include <math.h> #include <limits.h> -#include "../common/cbasetypes.h" +#include "../common/mmo.h" #include "../common/timer.h" #include "../common/nullpo.h" -#include "../common/mmo.h" #include "../common/core.h" #include "../common/showmsg.h" #include "../common/malloc.h" diff --git a/src/map/battle.c b/src/map/battle.c index b1e194247..e315142f9 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -4480,7 +4480,7 @@ int battle_config_read(const char *cfgName) } void do_init_battle(void) { - delay_damage_ers = ers_new((uint32)sizeof(struct delay_damage)); + delay_damage_ers = ers_new(sizeof(struct delay_damage)); } void do_final_battle(void) { diff --git a/src/map/clif.c b/src/map/clif.c index a1fc5447d..78fcb647b 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -3242,7 +3242,7 @@ int clif_changeoption(struct block_list* bl) WBUFW(buf,6) = sc->opt1; WBUFW(buf,8) = sc->opt2; WBUFL(buf,10) = sc->option; - WBUFB(buf,14) = 0; // ?? + WBUFB(buf,14) = 0; // PK??? if(disguised(bl)) { clif_send(buf,packet_len_table[0x229],bl,AREA_WOS); WBUFL(buf,2) = -bl->id; diff --git a/src/map/guild.c b/src/map/guild.c index 6ad15968e..0ddb966d5 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -206,7 +206,7 @@ void do_init_guild(void) castle_db=db_alloc(__FILE__,__LINE__,DB_INT,DB_OPT_RELEASE_DATA,sizeof(int)); guild_expcache_db=db_alloc(__FILE__,__LINE__,DB_INT,DB_OPT_BASE,sizeof(int)); guild_infoevent_db=db_alloc(__FILE__,__LINE__,DB_INT,DB_OPT_BASE,sizeof(int)); - expcache_ers = ers_new((uint32)sizeof(struct guild_expcache)); + expcache_ers = ers_new(sizeof(struct guild_expcache)); guild_castleinfoevent_db=db_alloc(__FILE__,__LINE__,DB_INT,DB_OPT_BASE,sizeof(int)); guild_read_castledb(); diff --git a/src/map/mob.c b/src/map/mob.c index d357c1199..286146e5c 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -4195,8 +4195,8 @@ int do_init_mob(void) malloc_set(mob_db_data,0,sizeof(mob_db_data)); //Clear the array mob_db_data[0] = aCalloc(1, sizeof (struct mob_data)); //This mob is used for random spawns mob_makedummymobdb(0); //The first time this is invoked, it creates the dummy mob - item_drop_ers = ers_new((uint32)sizeof(struct item_drop)); - item_drop_list_ers = ers_new((uint32)sizeof(struct item_drop_list)); + item_drop_ers = ers_new(sizeof(struct item_drop)); + item_drop_list_ers = ers_new(sizeof(struct item_drop_list)); #ifndef TXT_ONLY if(db_use_sqldbs) diff --git a/src/map/npc.c b/src/map/npc.c index 6e39f3a20..629d9e94f 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -3013,7 +3013,7 @@ int do_init_npc(void) npcname_db = db_alloc(__FILE__,__LINE__,DB_STRING,DB_OPT_BASE,NAME_LENGTH); malloc_set(&ev_tm_b, -1, sizeof(ev_tm_b)); - timer_event_ers = ers_new((uint32)sizeof(struct timer_event_data)); + timer_event_ers = ers_new(sizeof(struct timer_event_data)); for (nsl = npc_src_first; nsl; nsl = nsl->next) { npc_parsesrcfile(nsl->name); diff --git a/src/map/pet.c b/src/map/pet.c index 4d153be8d..035514bd1 100644 --- a/src/map/pet.c +++ b/src/map/pet.c @@ -1371,8 +1371,8 @@ int do_init_pet(void) malloc_set(pet_db,0,sizeof(pet_db)); read_petdb(); - item_drop_ers = ers_new((uint32)sizeof(struct item_drop)); - item_drop_list_ers = ers_new((uint32)sizeof(struct item_drop_list)); + item_drop_ers = ers_new(sizeof(struct item_drop)); + item_drop_list_ers = ers_new(sizeof(struct item_drop_list)); add_timer_func_list(pet_hungry,"pet_hungry"); add_timer_func_list(pet_ai_hard,"pet_ai_hard"); diff --git a/src/map/skill.c b/src/map/skill.c index fc440ecf0..c7f135df1 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -11647,8 +11647,8 @@ int do_init_skill (void) skill_readdb(); skill_dance_switch_sub(NULL, NULL, 2); //Initialize Song/Dance overlap switch code. - skill_unit_ers = ers_new((uint32)sizeof(struct skill_unit_group)); - skill_timer_ers = ers_new((uint32)sizeof(struct skill_timerskill)); + skill_unit_ers = ers_new(sizeof(struct skill_unit_group)); + skill_timer_ers = ers_new(sizeof(struct skill_timerskill)); if (battle_config.skill_sp_override_grffile) skill_read_skillspamount(); |