From 1e2e37a9d4ac16c7c8285d73ffc920ef43d998f8 Mon Sep 17 00:00:00 2001 From: Lemongrass3110 Date: Mon, 15 Aug 2016 12:15:35 +0200 Subject: [PATCH] Some small cleanups --- src/map/atcommand.c | 4 ++-- src/map/guild.c | 2 +- src/map/homunculus.c | 2 +- src/map/pc.c | 2 +- src/map/script_constants.h | 9 +++++++++ 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/map/atcommand.c b/src/map/atcommand.c index eace9511c63..daa3b4e1a9d 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -2956,7 +2956,7 @@ ACMD_FUNC(char_ban) { char *modif_p, output[CHAT_SIZE_MAX]; int32 timediff = 0; //don't set this as uint as we may want to decrease banned time - int bantype = 0; + enum chrif_req_op bantype; nullpo_retr(-1, sd); @@ -3038,7 +3038,7 @@ ACMD_FUNC(char_unblock) * char unban command (usage: charunban ) *------------------------------------------*/ ACMD_FUNC(char_unban){ - int unbantype = 0; + enum chrif_req_op unbantype; nullpo_retr(-1, sd); memset(atcmd_output, '\0', sizeof(atcmd_output)); diff --git a/src/map/guild.c b/src/map/guild.c index 35a1e90cdfb..89bf5fbaac6 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -1349,7 +1349,7 @@ int guild_skillupack(int guild_id,uint16 skill_id,uint32 account_id) { void guild_guildaura_refresh(struct map_session_data *sd, uint16 skill_id, uint16 skill_lv) { struct skill_unit_group* group = NULL; - int type = status_skill2sc(skill_id); + sc_type type = status_skill2sc(skill_id); if( !(battle_config.guild_aura&((agit_flag || agit2_flag)?2:1)) && !(battle_config.guild_aura&(map_flag_gvg2(sd->bl.m)?8:4)) ) return; diff --git a/src/map/homunculus.c b/src/map/homunculus.c index 6fbbbf387e6..5808262e9f8 100644 --- a/src/map/homunculus.c +++ b/src/map/homunculus.c @@ -515,7 +515,7 @@ int hom_levelup(struct homun_data *hd) APPLY_HOMUN_LEVEL_STATWEIGHT(); // Needed to update skill list for mutated homunculus so unlocked skills will appear when the needed level is reached. - status_calc_homunculus(hd,0); + status_calc_homunculus(hd,SCO_NONE); clif_hominfo(hd->master,hd,0); clif_homskillinfoblock(hd->master); diff --git a/src/map/pc.c b/src/map/pc.c index 1e19ba376da..a9a67aa8702 100755 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -10323,7 +10323,7 @@ static int pc_autosave(int tid, unsigned int tick, int id, intptr_t data) last_save_id = sd->bl.id; save_flag = 2; if (pc_isvip(sd)) // Check if we're still VIP - chrif_req_login_operation(1, sd->status.name, 6, 0, 1, 0); + chrif_req_login_operation(1, sd->status.name, CHRIF_OP_LOGIN_VIP, 0, 1, 0); chrif_save(sd,0); break; } diff --git a/src/map/script_constants.h b/src/map/script_constants.h index 8e7b5264f7b..cfd6b71d70f 100644 --- a/src/map/script_constants.h +++ b/src/map/script_constants.h @@ -1392,6 +1392,15 @@ export_constant(SC_FRESHSHRIMP); export_constant(SC_ACTIVE_MONSTER_TRANSFORM); export_constant(SC_CLOUD_KILL); + export_constant(SC_LJOSALFAR); + export_constant(SC_MERMAID_LONGING); + export_constant(SC_HAT_EFFECT); + export_constant(SC_FLOWERSMOKE); + export_constant(SC_FSTONE); + export_constant(SC_HAPPINESS_STAR); + export_constant(SC_MAPLE_FALLS); + export_constant(SC_TIME_ACCESSORY); + export_constant(SC_MAGICAL_FEATHER); #ifdef RENEWAL export_constant(SC_EXTREMITYFIST2); #endif