summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/map/pc.c6
-rw-r--r--src/map/skill.c2
-rw-r--r--src/map/unit.c14
3 files changed, 9 insertions, 13 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index 7d464cbc9..965636da5 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -96,13 +96,11 @@ int pc_class2idx(int class_) {
return class_;
}
-int inline pc_get_group_id(struct map_session_data *sd)
-{
+inline int pc_get_group_id(struct map_session_data *sd) {
return sd->group_id;
}
-int inline pc_get_group_level(struct map_session_data *sd)
-{
+inline int pc_get_group_level(struct map_session_data *sd) {
return pc_group_id2level(pc_get_group_id(sd));
}
diff --git a/src/map/skill.c b/src/map/skill.c
index 31ec7acd1..fd4e706a5 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -4545,7 +4545,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
struct status_change *tsc;
struct status_change_entry *tsce;
- int i;
+ int i = 0;
enum sc_type type;
if(skillid > 0 && skilllv <= 0) return 0; // celest
diff --git a/src/map/unit.c b/src/map/unit.c
index ed4035ebe..dbd71878c 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -2410,14 +2410,12 @@ int unit_free(struct block_list *bl, clr_type clrtype)
case BL_ELEM: {
struct elemental_data *ed = (TBL_ELEM*)bl;
struct map_session_data *sd = ed->master;
- if( clrtype >= 0 ) {
- if( elemental_get_lifetime(ed) > 0 )
- elemental_save(ed);
- else {
- intif_elemental_delete(ed->elemental.elemental_id);
- if( sd )
- sd->status.ele_id = 0;
- }
+ if( elemental_get_lifetime(ed) > 0 )
+ elemental_save(ed);
+ else {
+ intif_elemental_delete(ed->elemental.elemental_id);
+ if( sd )
+ sd->status.ele_id = 0;
}
if( sd )
sd->ed = NULL;