Skip to content

Commit

Permalink
Some small cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
Lemongrass3110 committed Aug 15, 2016
1 parent 8deabb1 commit 1e2e37a
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/map/atcommand.c
Expand Up @@ -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);

Expand Down Expand Up @@ -3038,7 +3038,7 @@ ACMD_FUNC(char_unblock)
* char unban command (usage: charunban <player_name>)
*------------------------------------------*/
ACMD_FUNC(char_unban){
int unbantype = 0;
enum chrif_req_op unbantype;
nullpo_retr(-1, sd);

memset(atcmd_output, '\0', sizeof(atcmd_output));
Expand Down
2 changes: 1 addition & 1 deletion src/map/guild.c
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/map/homunculus.c
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion src/map/pc.c
Expand Up @@ -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;
}
Expand Down
9 changes: 9 additions & 0 deletions src/map/script_constants.h
Expand Up @@ -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
Expand Down

0 comments on commit 1e2e37a

Please sign in to comment.