summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
Diffstat (limited to 'src/map')
-rw-r--r--src/map/atcommand.c4
-rw-r--r--src/map/battle.c12
-rw-r--r--src/map/battle.h2
-rw-r--r--src/map/clif.c14
-rw-r--r--src/map/duel.c2
-rw-r--r--src/map/map.c4
-rw-r--r--src/map/mob.c6
-rw-r--r--src/map/npc.c6
-rw-r--r--src/map/party.c2
-rw-r--r--src/map/pc.c4
-rw-r--r--src/map/pet.c6
-rw-r--r--src/map/script.c8
-rw-r--r--src/map/skill.c2
-rw-r--r--src/map/status.c10
-rw-r--r--src/map/unit.c8
15 files changed, 45 insertions, 45 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 7c7aafbb7..3d60e06d0 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -9177,7 +9177,7 @@ bool is_atcommand(const int fd, struct map_session_data* sd, const char* message
//Displays as a normal message for Non-GMs
if( battle_config.atc_gmonly != 0 && pc_isGM(sd) == 0 )
- return false;
+ return false;
}
while (*message == charcommand_symbol)
@@ -9251,7 +9251,7 @@ bool is_atcommand(const int fd, struct map_session_data* sd, const char* message
//Log atcommands
if( *atcmd_msg == atcommand_symbol )
- log_atcommand(sd, info->level, atcmd_msg);
+ log_atcommand(sd, info->level, atcmd_msg);
//Log Charcommands
else if( *atcmd_msg == charcommand_symbol && ssd != NULL )
log_atcommand(sd, info->level2, message);
diff --git a/src/map/battle.c b/src/map/battle.c
index 5865ce02b..419e40ebf 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -76,7 +76,7 @@ static int battle_gettargeted_sub(struct block_list *bl, va_list ap)
bl_list[(*c)++] = bl;
return 1;
}
- return 0;
+ return 0;
}
struct block_list* battle_gettargeted(struct block_list *target)
@@ -127,7 +127,7 @@ static int battle_getenemy_sub(struct block_list *bl, va_list ap)
bl_list[(*c)++] = bl;
return 1;
}
- return 0;
+ return 0;
}
// Picks a random enemy of the given type (BL_PC, BL_CHAR, etc) within the range given. [Skotlex]
@@ -164,7 +164,7 @@ static int battle_getenemyarea_sub(struct block_list *bl, va_list ap)
bl_list[(*c)++] = bl;
return 1;
}
- return 0;
+ return 0;
}
// Pick a random enemy
@@ -1075,7 +1075,7 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo
unsigned rh : 1; //Attack considers right hand (wd.damage)
unsigned lh : 1; //Attack considers left hand (wd.damage2)
unsigned weapon : 1; //It's a weapon attack (consider VVS, and all that)
- } flag;
+ } flag;
memset(&wd,0,sizeof(wd));
memset(&flag,0,sizeof(flag));
@@ -3865,7 +3865,7 @@ enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* t
if(tsc && tsc->data[SC_KAAHI] && tsc->data[SC_KAAHI]->val4 == INVALID_TIMER && tstatus->hp < tstatus->max_hp)
tsc->data[SC_KAAHI]->val4 = add_timer(tick + skill_get_time2(SL_KAAHI,tsc->data[SC_KAAHI]->val1), kaahi_heal_timer, target->id, SC_KAAHI); //Activate heal.
- wd = battle_calc_attack(BF_WEAPON, src, target, 0, 0, flag);
+ wd = battle_calc_attack(BF_WEAPON, src, target, 0, 0, flag);
if(sc && sc->data[SC_EXEEDBREAK])
{
@@ -4801,7 +4801,7 @@ void battle_adjust_conf()
{
battle_config.monster_max_aspd = 2000 - battle_config.monster_max_aspd*10;
battle_config.max_aspd = 2000 - battle_config.max_aspd*10;
- battle_config.max_walk_speed = 100*DEFAULT_WALK_SPEED/battle_config.max_walk_speed;
+ battle_config.max_walk_speed = 100*DEFAULT_WALK_SPEED/battle_config.max_walk_speed;
battle_config.max_cart_weight *= 10;
if(battle_config.max_def > 100 && !battle_config.weapon_defense_type) // added by [Skotlex]
diff --git a/src/map/battle.h b/src/map/battle.h
index e1e196d4d..2669af83d 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -121,7 +121,7 @@ extern struct Battle_Config
int use_weapon_skill_range; //[Skotlex]
int pc_damage_delay_rate;
int defnotenemy;
- int vs_traps_bctall;
+ int vs_traps_bctall;
int traps_setting;
int summon_flora; //[Skotlex]
int clear_unit_ondeath; //[Skotlex]
diff --git a/src/map/clif.c b/src/map/clif.c
index b2cc2881a..17cc24fd7 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -2931,7 +2931,7 @@ void clif_changelook(struct block_list *bl,int type,int val)
break;
case LOOK_HEAD_TOP:
vd->head_top = val;
- break;
+ break;
case LOOK_HEAD_MID:
vd->head_mid = val;
break;
@@ -7862,7 +7862,7 @@ void clif_manner_message(struct map_session_data* sd, uint32 type)
/// 1 = negative (mute)
void clif_GM_silence(struct map_session_data* sd, struct map_session_data* tsd, uint8 type)
{
- int fd;
+ int fd;
nullpo_retv(sd);
nullpo_retv(tsd);
@@ -8584,7 +8584,7 @@ void clif_viewequip_ack(struct map_session_data* sd, struct map_session_data* ts
#endif
safestrncpy((char*)WBUFP(buf, 4), tsd->status.name, NAME_LENGTH);
WBUFW(buf,28) = tsd->status.class_;
- WBUFW(buf,30) = tsd->vd.hair_style;
+ WBUFW(buf,30) = tsd->vd.hair_style;
WBUFW(buf,32) = tsd->vd.head_bottom;
WBUFW(buf,34) = tsd->vd.head_mid;
WBUFW(buf,36) = tsd->vd.head_top;
@@ -8609,7 +8609,7 @@ void clif_viewequip_ack(struct map_session_data* sd, struct map_session_data* ts
// Add refine, identify flag, element, etc.
clif_item_sub(WBUFP(buf,0), n*s+45, &tsd->status.inventory[i], tsd->inventory_data[i], pc_equippoint(tsd, i));
// Add cards
- clif_addcards(WBUFP(buf, n*s+55), &tsd->status.inventory[i]);
+ clif_addcards(WBUFP(buf, n*s+55), &tsd->status.inventory[i]);
// Expiration date stuff, if all of those are set to 0 then the client doesn't show anything related (6 bytes)
WBUFL(buf, n*s+63) = tsd->status.inventory[i].expire_time;
WBUFW(buf, n*s+67) = 0;
@@ -11072,7 +11072,7 @@ void clif_parse_ResetChar(int fd, struct map_session_data *sd)
if( sd->mission_mobid ) { //bugreport:2200
sd->mission_mobid = 0;
sd->mission_count = 0;
- pc_setglobalreg(sd,"TK_MISSION_ID", 0);
+ pc_setglobalreg(sd,"TK_MISSION_ID", 0);
}
}
log_atcommand(sd, get_atcommand_level("reset"), RFIFOW(fd,2) ? "/resetskill" : "/resetstate");
@@ -12713,7 +12713,7 @@ void clif_parse_NoviceDoriDori(int fd, struct map_session_data *sd)
break;
case MAPID_SUPER_NOVICE:
sd->state.doridori=1;
- break;
+ break;
}
}
@@ -13017,7 +13017,7 @@ void clif_parse_FriendsListRemove(int fd, struct map_session_data *sd)
memcpy(&sd->status.friends[j-1], &sd->status.friends[j], sizeof(sd->status.friends[0]));
memset(&sd->status.friends[MAX_FRIENDS-1], 0, sizeof(sd->status.friends[MAX_FRIENDS-1]));
- clif_displaymessage(fd, "Friend removed");
+ clif_displaymessage(fd, "Friend removed");
WFIFOHEAD(fd,packet_len(0x20a));
WFIFOW(fd,0) = 0x20a;
diff --git a/src/map/duel.c b/src/map/duel.c
index 7621b92be..ac1297bd5 100644
--- a/src/map/duel.c
+++ b/src/map/duel.c
@@ -27,7 +27,7 @@ void duel_savetime(struct map_session_data* sd)
time(&timer);
t = localtime(&timer);
- pc_setglobalreg(sd, "PC_LAST_DUEL_TIME", t->tm_mday*24*60 + t->tm_hour*60 + t->tm_min);
+ pc_setglobalreg(sd, "PC_LAST_DUEL_TIME", t->tm_mday*24*60 + t->tm_hour*60 + t->tm_min);
return;
}
diff --git a/src/map/map.c b/src/map/map.c
index 841e95df1..ea6c58d2b 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -386,7 +386,7 @@ int map_moveblock(struct block_list *bl, int x1, int y1, unsigned int tick)
//Block not in map, just update coordinates, but do naught else.
bl->x = x1;
bl->y = y1;
- return 0;
+ return 0;
}
//TODO: Perhaps some outs of bounds checking should be placed here?
@@ -2960,7 +2960,7 @@ int map_readallmaps (void)
ShowWarning("Map %s already loaded!"CL_CLL"\n", map[i].name);
if (map[i].cell) {
aFree(map[i].cell);
- map[i].cell = NULL;
+ map[i].cell = NULL;
}
map_delmapid(i);
maps_removed++;
diff --git a/src/map/mob.c b/src/map/mob.c
index 199c09dd6..7da208827 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -137,7 +137,7 @@ int mobdb_searchname_array(struct mob_db** data, int size, const char *str)
if (!mobdb_searchname_array_sub(mob, str)) {
if (count < size)
data[count] = mob;
- count++;
+ count++;
}
}
return count;
@@ -1995,7 +1995,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
if( src )
{ // Use Dead skill only if not killed by Script or Command
- md->state.skillstate = MSS_DEAD;
+ md->state.skillstate = MSS_DEAD;
mobskill_use(md,tick,-1);
}
@@ -2561,7 +2561,7 @@ int mob_guardian_guildchange(struct block_list *bl,va_list ap)
md->guardian_data->guardup_lv = guild_checkskill(g,GD_GUARDUP);
memcpy(md->guardian_data->guild_name, g->name, NAME_LENGTH);
- return 1;
+ return 1;
}
/*==========================================
diff --git a/src/map/npc.c b/src/map/npc.c
index 3859d8c68..7802ac1f9 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -511,7 +511,7 @@ int npc_timerevent(int tid, unsigned int tick, int id, intptr_t data)
}
// These stuffs might need to be restored.
- old_rid = nd->u.scr.rid;
+ old_rid = nd->u.scr.rid;
old_tick = nd->u.scr.timertick;
old_timer = nd->u.scr.timer;
@@ -524,7 +524,7 @@ int npc_timerevent(int tid, unsigned int tick, int id, intptr_t data)
te = nd->u.scr.timer_event + ted->next;
// Arrange for the next event
- ted->next++;
+ ted->next++;
if( nd->u.scr.timeramount > ted->next )
{
next = nd->u.scr.timer_event[ ted->next ].timer - nd->u.scr.timer_event[ ted->next - 1 ].timer;
@@ -547,7 +547,7 @@ int npc_timerevent(int tid, unsigned int tick, int id, intptr_t data)
}
// Run the script
- run_script(nd->u.scr.script,te->pos,nd->u.scr.rid,nd->bl.id);
+ run_script(nd->u.scr.script,te->pos,nd->u.scr.rid,nd->bl.id);
nd->u.scr.rid = old_rid; // Attached-rid should be restored anyway.
if( sd )
diff --git a/src/map/party.c b/src/map/party.c
index 15ada66fd..2c9b45a11 100644
--- a/src/map/party.c
+++ b/src/map/party.c
@@ -988,7 +988,7 @@ int party_exp_share(struct party_data* p, struct block_list* src, unsigned int b
if (c < 1)
return 0;
- base_exp/=c;
+ base_exp/=c;
job_exp/=c;
zeny/=c;
diff --git a/src/map/pc.c b/src/map/pc.c
index 44de2f8d4..9af3c9213 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -343,7 +343,7 @@ void pc_addfame(struct map_session_data *sd,int count)
break;
case MAPID_TAEKWON: // Taekwon
clif_fame_taekwon(sd,count);
- break;
+ break;
}
chrif_updatefamelist(sd);
}
@@ -5199,7 +5199,7 @@ static void pc_calcexp(struct map_session_data *sd, unsigned int *base_exp, unsi
struct status_data *status = status_get_status_data(src);
if (sd->expaddrace[status->race])
- bonus += sd->expaddrace[status->race];
+ bonus += sd->expaddrace[status->race];
bonus += sd->expaddrace[status->mode&MD_BOSS?RC_BOSS:RC_NONBOSS];
if (battle_config.pk_mode &&
diff --git a/src/map/pet.c b/src/map/pet.c
index 09c924c3c..248373edc 100644
--- a/src/map/pet.c
+++ b/src/map/pet.c
@@ -655,7 +655,7 @@ int pet_equipitem(struct map_session_data *sd,int index)
nullpo_retr(1, sd);
pd = sd->pd;
- if (!pd) return 1;
+ if (!pd) return 1;
nameid = sd->status.inventory[index].nameid;
@@ -1156,7 +1156,7 @@ int pet_skill_support_timer(int tid, unsigned int tick, int id, intptr_t data)
struct map_session_data *sd=map_id2sd(id);
struct pet_data *pd;
struct status_data *status;
- short rate = 100;
+ short rate = 100;
if(sd==NULL || sd->pd == NULL || sd->pd->s_skill == NULL)
return 1;
@@ -1355,7 +1355,7 @@ int do_init_pet(void)
add_timer_func_list(pet_hungry,"pet_hungry");
add_timer_func_list(pet_ai_hard,"pet_ai_hard");
add_timer_func_list(pet_skill_bonus_timer,"pet_skill_bonus_timer"); // [Valaris]
- add_timer_func_list(pet_delay_item_drop,"pet_delay_item_drop");
+ add_timer_func_list(pet_delay_item_drop,"pet_delay_item_drop");
add_timer_func_list(pet_skill_support_timer, "pet_skill_support_timer"); // [Skotlex]
add_timer_func_list(pet_recovery_timer,"pet_recovery_timer"); // [Valaris]
add_timer_func_list(pet_heal_timer,"pet_heal_timer"); // [Valaris]
diff --git a/src/map/script.c b/src/map/script.c
index dbbabf74f..220583ff5 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -9356,7 +9356,7 @@ BUILDIN_FUNC(globalmes)
/// waitingroom "<title>",<limit>{,"<event>"{,<trigger>{,<zeny>{,<minlvl>{,<maxlvl>}}}}};
BUILDIN_FUNC(waitingroom)
{
- struct npc_data* nd;
+ struct npc_data* nd;
int pub = 1;
const char* title = script_getstr(st, 2);
int limit = script_getnum(st, 3);
@@ -9630,7 +9630,7 @@ BUILDIN_FUNC(setmapflagnosave)
x=script_getnum(st,4);
y=script_getnum(st,5);
m = map_mapname2mapid(str);
- mapindex = mapindex_name2id(str2);
+ mapindex = mapindex_name2id(str2);
if(m >= 0 && mapindex) {
map[m].flag.nosave=1;
@@ -14147,7 +14147,7 @@ int axtoi(const char *hexStg)
BUILDIN_FUNC(axtoi)
{
const char *hex = script_getstr(st,2);
- script_pushint(st,axtoi(hex));
+ script_pushint(st,axtoi(hex));
return 0;
}
@@ -14786,7 +14786,7 @@ BUILDIN_FUNC(mercenary_heal)
hp = script_getnum(st,2);
sp = script_getnum(st,3);
- status_heal(&sd->md->bl, hp, sp, 0);
+ status_heal(&sd->md->bl, hp, sp, 0);
return 0;
}
diff --git a/src/map/skill.c b/src/map/skill.c
index 267f19324..1af0c34b7 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1161,7 +1161,7 @@ int skill_additional_effect (struct block_list* src, struct block_list *bl, int
**/
case LG_SHIELDPRESS:
sc_start(bl, SC_STUN, 30 + 8 * skilllv, skilllv, skill_get_time(skillid,skilllv));
- break;
+ break;
case LG_PINPOINTATTACK:
rate = 12 + (10 * skilllv + (sstatus->agi / 100) ) * 140 / 100;
switch( skilllv ) {
diff --git a/src/map/status.c b/src/map/status.c
index c2264717f..275c6c8f2 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -3438,7 +3438,7 @@ void status_calc_bl_main(struct block_list *bl, /*enum scb_flag*/int flag)
if(status->aspd_rate != 1000)
amotion = amotion*status->aspd_rate/1000;
- status->amotion = cap_value(amotion, battle_config.monster_max_aspd, 2000);
+ status->amotion = cap_value(amotion, battle_config.monster_max_aspd, 2000);
temp = b_status->adelay*status->aspd_rate/1000;
status->adelay = cap_value(temp, battle_config.monster_max_aspd*2, 4000);
@@ -4586,7 +4586,7 @@ static short status_calc_aspd_rate(struct block_list *bl, struct status_change *
if( sc->data[SC_SWINGDANCE] )
aspd_rate -= aspd_rate * sc->data[SC_SWINGDANCE]->val2 / 100;
if( sc->data[SC_DANCEWITHWUG] )
- aspd_rate -= aspd_rate * sc->data[SC_DANCEWITHWUG]->val3 / 100;
+ aspd_rate -= aspd_rate * sc->data[SC_DANCEWITHWUG]->val3 / 100;
if( sc->data[SC_GLOOMYDAY] )
aspd_rate += aspd_rate * sc->data[SC_GLOOMYDAY]->val3 / 100;
if( sc->data[SC_EARTHDRIVE] )
@@ -7332,7 +7332,7 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
clif_changelook(bl,LOOK_SHIELD,0);
clif_changelook(bl,LOOK_BASE,type==SC_WEDDING?JOB_WEDDING:type==SC_XMAS?JOB_XMAS:JOB_SUMMER);
clif_changelook(bl,LOOK_CLOTHES_COLOR,val4);
- break;
+ break;
case SC_KAAHI:
val4 = INVALID_TIMER;
break;
@@ -8838,7 +8838,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
case SC_OBLIVIONCURSE:
if( --(sce->val4) >= 0 )
{
- clif_emotion(bl,1);
+ clif_emotion(bl,1);
sc_timer_next(3000 + tick, status_change_timer, bl->id, data );
return 0;
}
@@ -9171,7 +9171,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
}
// default for all non-handled control paths is to end the status
- return status_change_end( bl,type,tid );
+ return status_change_end( bl,type,tid );
#undef sc_timer_next
}
diff --git a/src/map/unit.c b/src/map/unit.c
index 950ffc983..c27bde544 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -368,7 +368,7 @@ static int unit_walktobl_sub(int tid, unsigned int tick, int id, intptr_t data)
set_mobstate(bl, ud->state.attack_continue);
}
}
- return 0;
+ return 0;
}
// Chases a tbl. If the flag&1, use hard-path seek,
@@ -1019,7 +1019,7 @@ int unit_skilluse_id2(struct block_list *src, int target_id, short skill_num, sh
ud = unit_bl2ud(src);
if(ud == NULL) return 0;
- sc = status_get_sc(src);
+ sc = status_get_sc(src);
if (sc && !sc->count)
sc = NULL; //Unneeded
@@ -1214,7 +1214,7 @@ int unit_skilluse_id2(struct block_list *src, int target_id, short skill_num, sh
if( k > 2 ) k = 2; // ...but hard-limited to 300%.
casttime += casttime * k;
}
- break;
+ break;
case GD_EMERGENCYCALL: //Emergency Call double cast when the user has learned Leap [Daegaladh]
if( sd && pc_checkskill(sd,TK_HIGHJUMP) )
casttime *= 2;
@@ -1885,7 +1885,7 @@ static int unit_counttargeted_sub(struct block_list* bl, va_list ap)
if (ud && ud->target == id && ud->attacktimer != INVALID_TIMER && ud->attacktarget_lv >= target_lv)
return 1;
- return 0;
+ return 0;
}
/*==========================================
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-02 16:55:52 +0000