summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/admin/ladmin.cpp14
-rw-r--r--src/char/char.cpp100
-rw-r--r--src/map/atcommand.cpp48
-rw-r--r--src/map/battle.cpp30
-rw-r--r--src/map/chrif.cpp2
-rw-r--r--src/map/clif.cpp4
-rw-r--r--src/map/intif.cpp10
-rw-r--r--src/map/magic-expr.cpp24
-rw-r--r--src/map/magic-interpreter-base.cpp6
-rw-r--r--src/map/magic-stmt.cpp32
-rw-r--r--src/map/magic-v2.cpp8
-rw-r--r--src/map/magic.cpp4
-rw-r--r--src/map/mob.cpp12
-rw-r--r--src/map/pc.cpp8
-rw-r--r--src/map/script.cpp2
-rw-r--r--src/map/skill-pools.cpp2
-rw-r--r--src/map/trade.cpp4
17 files changed, 155 insertions, 155 deletions
diff --git a/src/admin/ladmin.cpp b/src/admin/ladmin.cpp
index 8d001a0..7b702ed 100644
--- a/src/admin/ladmin.cpp
+++ b/src/admin/ladmin.cpp
@@ -623,7 +623,7 @@ void display_help(ZString param)
{
if (command)
PRINTF("Unknown command [%s] for help. Displaying of all commands.\n"_fmt,
- AString(command));
+ AString(command));
PRINTF(" help/? -- Display this help\n"_fmt);
PRINTF(" help/? [command] -- Display the help of the command\n"_fmt);
PRINTF(" add <account_name> <sex> <password> -- Create an account with default email\n"_fmt);
@@ -848,7 +848,7 @@ void bansetaccountsub(AccountName name, XString date, XString time_)
&& day > 30) || (month == 1 && day > 29))
{
PRINTF("Please give a correct value for a day of this month (%d).\n"_fmt,
- month);
+ month);
LADMIN_LOG("Invalid day for this month ('banset' or 'ban' command).\n"_fmt);
return;
}
@@ -1243,7 +1243,7 @@ void listaccount(ZString param, int type)
}
LADMIN_LOG("Request to login-server to obtain the list of accounts from %d to %d.\n"_fmt,
- list_first, list_last);
+ list_first, list_last);
Packet_Fixed<0x7920> fixed_20;
fixed_20.start_account_id = list_first;
@@ -1306,7 +1306,7 @@ void changememo(ZString param)
PRINTF("Memo is too long (%zu characters).\n"_fmt, len);
PRINTF("Please input a memo of 254 bytes at the maximum.\n"_fmt);
LADMIN_LOG("Email is too long (%zu characters). Please input a memo of 254 bytes at the maximum.\n"_fmt,
- len);
+ len);
return;
}
@@ -1674,7 +1674,7 @@ void timesetaccount(ZString param)
&& day > 30) ||(month == 1 && day > 29))
{
PRINTF("Please give a correct value for a day of this month (%d).\n"_fmt,
- month);
+ month);
LADMIN_LOG("Invalid day for this month ('timeset' command).\n"_fmt);
return;
}
@@ -2092,7 +2092,7 @@ void parse_fromlogin(Session *s)
}
// asking of the following acounts
LADMIN_LOG("Request to login-server to obtain the list of accounts from %d to %d (complement).\n"_fmt,
- list_first, list_last);
+ list_first, list_last);
Packet_Fixed<0x7920> fixed_20;
fixed_20.start_account_id = list_first;
fixed_20.end_account_id = list_last;
@@ -2756,7 +2756,7 @@ void parse_fromlogin(Session *s)
break;
case 7:
PRINTF(" Statut: 7 [You are Prohibited to log in until %s]\n"_fmt,
- error_message);
+ error_message);
break;
case 8:
PRINTF(" Statut: 8 [Server is jammed due to over populated]\n"_fmt);
diff --git a/src/char/char.cpp b/src/char/char.cpp
index 5446347..790eeda 100644
--- a/src/char/char.cpp
+++ b/src/char/char.cpp
@@ -511,7 +511,7 @@ int mmo_char_init(void)
PRINTF("Characters file not found: %s.\n"_fmt, char_txt);
CHAR_LOG("Characters file not found: %s.\n"_fmt, char_txt);
CHAR_LOG("Id for the next created character: %d.\n"_fmt,
- char_id_count);
+ char_id_count);
return 0;
}
@@ -630,7 +630,7 @@ CharPair *make_new_char(Session *s, CharName name, const uint8_t (&stats)[6], ui
if (!name.to__actual().is_print())
{
CHAR_LOG("Make new char error (control char received in the name): (connection #%d, account: %d).\n"_fmt,
- s, sd->account_id);
+ s, sd->account_id);
return nullptr;
}
@@ -638,7 +638,7 @@ CharPair *make_new_char(Session *s, CharName name, const uint8_t (&stats)[6], ui
if (name.to__actual() != name.to__actual().strip())
{
CHAR_LOG("Make new char error (leading/trailing whitespace): (connection #%d, account: %d, name: '%s'.\n"_fmt,
- s, sd->account_id, name);
+ s, sd->account_id, name);
return nullptr;
}
@@ -646,7 +646,7 @@ CharPair *make_new_char(Session *s, CharName name, const uint8_t (&stats)[6], ui
if (name.to__actual().size() < 4)
{
CHAR_LOG("Make new char error (character name too small): (connection #%d, account: %d, name: '%s').\n"_fmt,
- s, sd->account_id, name);
+ s, sd->account_id, name);
return nullptr;
}
@@ -681,10 +681,10 @@ CharPair *make_new_char(Session *s, CharName name, const uint8_t (&stats)[6], ui
hair_color >= 12)
{
CHAR_LOG("Make new char error (invalid values): (connection #%d, account: %d) slot %d, name: %s, stats: %d+%d+%d+%d+%d+%d=%d, hair: %d, hair color: %d\n"_fmt,
- s, sd->account_id, slot, name,
- stats[0], stats[1], stats[2], stats[3], stats[4], stats[5],
- stats[0] + stats[1] + stats[2] + stats[3] + stats[4] + stats[5],
- hair_style, hair_color);
+ s, sd->account_id, slot, name,
+ stats[0], stats[1], stats[2], stats[3], stats[4], stats[5],
+ stats[0] + stats[1] + stats[2] + stats[3] + stats[4] + stats[5],
+ hair_style, hair_color);
return nullptr;
}
@@ -694,10 +694,10 @@ CharPair *make_new_char(Session *s, CharName name, const uint8_t (&stats)[6], ui
if (stats[i] < 1 || stats[i] > 9)
{
CHAR_LOG("Make new char error (invalid stat value: not between 1 to 9): (connection #%d, account: %d) slot %d, name: %s, stats: %d+%d+%d+%d+%d+%d=%d, hair: %d, hair color: %d\n"_fmt,
- s, sd->account_id, slot, name,
- stats[0], stats[1], stats[2], stats[3], stats[4], stats[5],
- stats[0] + stats[1] + stats[2] + stats[3] + stats[4] + stats[5],
- hair_style, hair_color);
+ s, sd->account_id, slot, name,
+ stats[0], stats[1], stats[2], stats[3], stats[4], stats[5],
+ stats[0] + stats[1] + stats[2] + stats[3] + stats[4] + stats[5],
+ hair_style, hair_color);
return nullptr;
}
}
@@ -707,20 +707,20 @@ CharPair *make_new_char(Session *s, CharName name, const uint8_t (&stats)[6], ui
if (cd.key.name == name)
{
CHAR_LOG("Make new char error (name already exists): (connection #%d, account: %d) slot %d, name: %s (actual name of other char: %s), stats: %d+%d+%d+%d+%d+%d=%d, hair: %d, hair color: %d.\n"_fmt,
- s, sd->account_id, slot, name, cd.key.name,
- stats[0], stats[1], stats[2], stats[3], stats[4], stats[5],
- stats[0] + stats[1] + stats[2] + stats[3] + stats[4] + stats[5],
- hair_style, hair_color);
+ s, sd->account_id, slot, name, cd.key.name,
+ stats[0], stats[1], stats[2], stats[3], stats[4], stats[5],
+ stats[0] + stats[1] + stats[2] + stats[3] + stats[4] + stats[5],
+ hair_style, hair_color);
return nullptr;
}
if (cd.key.account_id == sd->account_id
&& cd.key.char_num == slot)
{
CHAR_LOG("Make new char error (slot already used): (connection #%d, account: %d) slot %d, name: %s (actual name of other char: %s), stats: %d+%d+%d+%d+%d+%d=%d, hair: %d, hair color: %d.\n"_fmt,
- s, sd->account_id, slot, name, cd.key.name,
- stats[0], stats[1], stats[2], stats[3], stats[4], stats[5],
- stats[0] + stats[1] + stats[2] + stats[3] + stats[4] + stats[5],
- hair_style, hair_color);
+ s, sd->account_id, slot, name, cd.key.name,
+ stats[0], stats[1], stats[2], stats[3], stats[4], stats[5],
+ stats[0] + stats[1] + stats[2] + stats[3] + stats[4] + stats[5],
+ hair_style, hair_color);
return nullptr;
}
}
@@ -728,20 +728,20 @@ CharPair *make_new_char(Session *s, CharName name, const uint8_t (&stats)[6], ui
if (wisp_server_name == name)
{
CHAR_LOG("Make new char error (name used is wisp name for server): (connection #%d, account: %d) slot %d, name: %s (actual name whisper server: %s), stats: %d+%d+%d+%d+%d+%d=%d, hair: %d, hair color: %d.\n"_fmt,
- s, sd->account_id, slot, name, wisp_server_name,
- stats[0], stats[1], stats[2], stats[3], stats[4], stats[5],
- stats[0] + stats[1] + stats[2] + stats[3] + stats[4] + stats[5],
- hair_style, hair_color);
+ s, sd->account_id, slot, name, wisp_server_name,
+ stats[0], stats[1], stats[2], stats[3], stats[4], stats[5],
+ stats[0] + stats[1] + stats[2] + stats[3] + stats[4] + stats[5],
+ hair_style, hair_color);
return nullptr;
}
IP4Address ip = s->client_ip;
CHAR_LOG("Creation of New Character: (connection #%d, account: %d) slot %d, character Name: %s, stats: %d+%d+%d+%d+%d+%d=%d, hair: %d, hair color: %d. [%s]\n"_fmt,
- s, sd->account_id, slot, name,
- stats[0], stats[1], stats[2], stats[3], stats[4], stats[5],
- stats[0] + stats[1] + stats[2] + stats[3] + stats[4] + stats[5],
- hair_style, hair_color, ip);
+ s, sd->account_id, slot, name,
+ stats[0], stats[1], stats[2], stats[3], stats[4], stats[5],
+ stats[0] + stats[1] + stats[2] + stats[3] + stats[4] + stats[5],
+ hair_style, hair_color, ip);
CharPair cp;
CharKey& ck = cp.key;
@@ -812,11 +812,11 @@ void create_online_files(void)
FPRINTF(fp2, " <META http-equiv=\"Refresh\" content=\"%d\">\n"_fmt, online_refresh_html); // update on client explorer every x seconds
FPRINTF(fp2, " <HEAD>\n"_fmt);
FPRINTF(fp2, " <TITLE>Online Players on %s</TITLE>\n"_fmt,
- server_name);
+ server_name);
FPRINTF(fp2, " </HEAD>\n"_fmt);
FPRINTF(fp2, " <BODY>\n"_fmt);
FPRINTF(fp2, " <H3>Online Players on %s (%s):</H3>\n"_fmt,
- server_name, timetemp);
+ server_name, timetemp);
FPRINTF(fp, "Online Players on %s (%s):\n"_fmt, server_name, timetemp);
FPRINTF(fp, "\n"_fmt);
@@ -1421,8 +1421,8 @@ void parse_tologin(Session *ls)
#undef FIX
if (changes)
CHAR_LOG("itemfrob(%d -> %d): `%s'(%d, account %d): changed %d times\n"_fmt,
- source_id, dest_id, k->name, k->char_id,
- k->account_id, changes);
+ source_id, dest_id, k->name, k->char_id,
+ k->account_id, changes);
}
@@ -1514,9 +1514,9 @@ void parse_tologin(Session *ls)
gm_accounts.push_back({wrap<AccountId>(RFIFOL(ls, i)), GmLevel::from(static_cast<uint32_t>(RFIFOB(ls, i + 4)))});
}
PRINTF("From login-server: receiving of %zu GM accounts information.\n"_fmt,
- gm_accounts.size());
+ gm_accounts.size());
CHAR_LOG("From login-server: receiving of %zu GM accounts information.\n"_fmt,
- gm_accounts.size());
+ gm_accounts.size());
create_online_files(); // update online players files (perhaps some online players change of GM level)
// send new gm acccounts level to map-servers
RFIFO_BUF_CLONE(ls, buf, len);
@@ -1576,9 +1576,9 @@ void map_anti_freeze_system(TimerData *, tick_t)
if (server_freezeflag[i]-- < 1)
{ // Map-server anti-freeze system. Counter. 5 ok, 4...0 freezed
PRINTF("Map-server anti-freeze system: char-server #%d is freezed -> disconnection.\n"_fmt,
- i);
+ i);
CHAR_LOG("Map-server anti-freeze system: char-server #%d is freezed -> disconnection.\n"_fmt,
- i);
+ i);
server_session[i]->set_eof();
}
}
@@ -1627,11 +1627,11 @@ void parse_frommap(Session *ms)
}
{
PRINTF("Map-Server %d connected: %d maps, from IP %s port %d.\n"_fmt,
- id, j, server[id].ip, server[id].port);
+ id, j, server[id].ip, server[id].port);
PRINTF("Map-server %d loading complete.\n"_fmt, id);
CHAR_LOG("Map-Server %d connected: %d maps, from IP %s port %d. Map-server %d loading complete.\n"_fmt,
- id, j, server[id].ip,
- server[id].port, id);
+ id, j, server[id].ip,
+ server[id].port, id);
}
WFIFOW(ms, 0) = 0x2afb;
WFIFOB(ms, 2) = 0;
@@ -1643,7 +1643,7 @@ void parse_frommap(Session *ms)
{
PRINTF("WARNING: Map-Server %d have NO map.\n"_fmt, id);
CHAR_LOG("WARNING: Map-Server %d have NO map.\n"_fmt,
- id);
+ id);
// Transmitting maps information to the other map-servers
}
else
@@ -1724,8 +1724,8 @@ void parse_frommap(Session *ms)
cd->sex = afi.sex;
WFIFOW(ms, 16) = afi.packet_tmw_version;
FPRINTF(stderr,
- "From queue index %zd: recalling packet version %d\n"_fmt,
- (&afi - &auth_fifo.front()), afi.packet_tmw_version);
+ "From queue index %zd: recalling packet version %d\n"_fmt,
+ (&afi - &auth_fifo.front()), afi.packet_tmw_version);
WFIFO_STRUCT(ms, 18, *ck);
WFIFO_STRUCT(ms, 18 + sizeof(*ck), *cd);
WFIFOSET(ms, WFIFOW(ms, 2));
@@ -2083,7 +2083,7 @@ void parse_frommap(Session *ms)
}
// inter server処理でもない場合は切断
PRINTF("char: unknown packet 0x%04x (%zu bytes to read in buffer)! (from map).\n"_fmt,
- RFIFOW(ms, 0), RFIFOREST(ms));
+ RFIFOW(ms, 0), RFIFOREST(ms));
ms->set_eof();
return;
}
@@ -2140,8 +2140,8 @@ void handle_x0066(Session *s, struct char_session_data *sd, uint8_t rfifob_2, IP
CharData *cd = cp->data.get();
CHAR_LOG("Character Selected, Account ID: %d, Character Slot: %d, Character Name: %s [%s]\n"_fmt,
- sd->account_id, rfifob_2,
- ck->name, ip);
+ sd->account_id, rfifob_2,
+ ck->name, ip);
// searching map server
int i = search_mapserver(cd->last_point.map_);
// if map is not found, we check major cities
@@ -2157,7 +2157,7 @@ void handle_x0066(Session *s, struct char_session_data *sd, uint8_t rfifob_2, IP
i = j;
cd->last_point.map_ = server[j].maps[0];
PRINTF("Map-server #%d found with a map: '%s'.\n"_fmt,
- j, server[j].maps[0]);
+ j, server[j].maps[0]);
// coordonates are unknown
break;
}
@@ -2174,8 +2174,8 @@ void handle_x0066(Session *s, struct char_session_data *sd, uint8_t rfifob_2, IP
WFIFOL(s, 2) = unwrap<CharId>(ck->char_id);
WFIFO_STRING(s, 6, cd->last_point.map_, 16);
PRINTF("Character selection '%s' (account: %d, slot: %d) [%s]\n"_fmt,
- ck->name,
- sd->account_id, ck->char_num, ip);
+ ck->name,
+ sd->account_id, ck->char_num, ip);
PRINTF("--Send IP of map-server. "_fmt);
if (lan_ip_check(ip))
WFIFOIP(s, 22) = lan_map_ip;
@@ -2955,10 +2955,10 @@ int do_init(Slice<ZString> argv)
}
CHAR_LOG("The char-server is ready (Server is listening on the port %d).\n"_fmt,
- char_port);
+ char_port);
PRINTF("The char-server is " SGR_BOLD SGR_GREEN "ready" SGR_RESET " (Server is listening on the port %d).\n\n"_fmt,
- char_port);
+ char_port);
return 0;
}
diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp
index 733050c..bc026be 100644
--- a/src/map/atcommand.cpp
+++ b/src/map/atcommand.cpp
@@ -2154,7 +2154,7 @@ ATCE atcommand_character_stats(Session *s, dumb_ptr<map_session_data>,
AString output;
output = STRPRINTF("'%s' stats:"_fmt, pl_sd->status_key.name);
clif_displaymessage(s, output);
- output = STRPRINTF("Base Level - %d"_fmt, pl_sd->status.base_level),
+ output = STRPRINTF("Base Level - %d"_fmt, pl_sd->status.base_level);
clif_displaymessage(s, output);
output = STRPRINTF("Job - Novice/Human (level %d)"_fmt, pl_sd->status.job_level);
clif_displaymessage(s, output);
@@ -2220,14 +2220,14 @@ ATCE atcommand_character_stats_all(Session *s, dumb_ptr<map_session_data>,
pl_sd->status.sp, pl_sd->status.max_sp);
clif_displaymessage(s, output);
output = STRPRINTF("STR: %d | AGI: %d | VIT: %d | INT: %d | DEX: %d | LUK: %d | Zeny: %d %s"_fmt,
- pl_sd->status.attrs[ATTR::STR],
- pl_sd->status.attrs[ATTR::AGI],
- pl_sd->status.attrs[ATTR::VIT],
- pl_sd->status.attrs[ATTR::INT],
- pl_sd->status.attrs[ATTR::DEX],
- pl_sd->status.attrs[ATTR::LUK],
- pl_sd->status.zeny,
- gmlevel);
+ pl_sd->status.attrs[ATTR::STR],
+ pl_sd->status.attrs[ATTR::AGI],
+ pl_sd->status.attrs[ATTR::VIT],
+ pl_sd->status.attrs[ATTR::INT],
+ pl_sd->status.attrs[ATTR::DEX],
+ pl_sd->status.attrs[ATTR::LUK],
+ pl_sd->status.zeny,
+ gmlevel);
clif_displaymessage(s, output);
clif_displaymessage(s, "--------"_s);
count++;
@@ -3478,26 +3478,26 @@ ATCE atcommand_mapinfo(Session *s, dumb_ptr<map_session_data> sd,
clif_displaymessage(s, output);
clif_displaymessage(s, "------ Map Flags ------"_s);
output = STRPRINTF("Player vs Player: %s | No Party: %s"_fmt,
- (m_id->flag.get(MapFlag::PVP)) ? "True"_s : "False"_s,
- (m_id->flag.get(MapFlag::PVP_NOPARTY)) ? "True"_s : "False"_s);
+ (m_id->flag.get(MapFlag::PVP)) ? "True"_s : "False"_s,
+ (m_id->flag.get(MapFlag::PVP_NOPARTY)) ? "True"_s : "False"_s);
clif_displaymessage(s, output);
output = STRPRINTF("No Penalty: %s"_fmt,
- (m_id->flag.get(MapFlag::NOPENALTY)) ? "True"_s : "False"_s);
+ (m_id->flag.get(MapFlag::NOPENALTY)) ? "True"_s : "False"_s);
clif_displaymessage(s, output);
output = STRPRINTF("No Return: %s"_fmt,
- (m_id->flag.get(MapFlag::NORETURN)) ? "True"_s : "False"_s);
+ (m_id->flag.get(MapFlag::NORETURN)) ? "True"_s : "False"_s);
clif_displaymessage(s, output);
output = STRPRINTF("No Save: %s"_fmt,
- (m_id->flag.get(MapFlag::NOSAVE)) ? "True"_s : "False"_s);
+ (m_id->flag.get(MapFlag::NOSAVE)) ? "True"_s : "False"_s);
clif_displaymessage(s, output);
output = STRPRINTF("Re Save: %s"_fmt,
- (m_id->flag.get(MapFlag::RESAVE)) ? "True"_s : "False"_s);
+ (m_id->flag.get(MapFlag::RESAVE)) ? "True"_s : "False"_s);
clif_displaymessage(s, output);
output = STRPRINTF("No Teleport: %s"_fmt,
- (m_id->flag.get(MapFlag::NOTELEPORT)) ? "True"_s : "False"_s);
+ (m_id->flag.get(MapFlag::NOTELEPORT)) ? "True"_s : "False"_s);
clif_displaymessage(s, output);
output = STRPRINTF("No Monster Teleport: %s"_fmt,
- (m_id->flag.get(MapFlag::MONSTER_NOTELEPORT)) ? "True"_s : "False"_s);
+ (m_id->flag.get(MapFlag::MONSTER_NOTELEPORT)) ? "True"_s : "False"_s);
clif_displaymessage(s, output);
switch (list)
@@ -3925,10 +3925,10 @@ ATCE atcommand_character_item_list(Session *s, dumb_ptr<map_session_data> sd,
AString output;
if (true)
output = STRPRINTF("%d %s (%s, id: %d) %s"_fmt,
- pl_sd->status.inventory[i].amount,
- item_data->name, item_data->jname,
- pl_sd->status.inventory[i].nameid,
- AString(equipstr));
+ pl_sd->status.inventory[i].amount,
+ item_data->name, item_data->jname,
+ pl_sd->status.inventory[i].nameid,
+ AString(equipstr));
clif_displaymessage(s, output);
// snip cards
@@ -3999,9 +3999,9 @@ ATCE atcommand_character_storage_list(Session *s, dumb_ptr<map_session_data> sd,
AString output;
if (true)
output = STRPRINTF("%d %s (%s, id: %d)"_fmt,
- stor->storage_[i].amount,
- item_data->name, item_data->jname,
- stor->storage_[i].nameid);
+ stor->storage_[i].amount,
+ item_data->name, item_data->jname,
+ stor->storage_[i].nameid);
clif_displaymessage(s, output);
}
}
diff --git a/src/map/battle.cpp b/src/map/battle.cpp
index 02f5bdc..99252e3 100644
--- a/src/map/battle.cpp
+++ b/src/map/battle.cpp
@@ -2040,7 +2040,7 @@ ATK battle_weapon_attack(dumb_ptr<block_list> src, dumb_ptr<block_list> target,
wd.damage -= reduction;
MAP_LOG_PC(target->is_player(),
- "MAGIC-ABSORB-DMG %d"_fmt, reduction);
+ "MAGIC-ABSORB-DMG %d"_fmt, reduction);
}
{
@@ -2065,26 +2065,26 @@ ATK battle_weapon_attack(dumb_ptr<block_list> src, dumb_ptr<block_list> target,
weapon = sd->inventory_data[weapon_index]->nameid;
MAP_LOG("PC%d %s:%d,%d WPNDMG %s%d %d FOR %d WPN %d"_fmt,
- sd->status_key.char_id, src->bl_m->name_, src->bl_x, src->bl_y,
- (target->bl_type == BL::PC) ? "PC"_s : "MOB"_s,
- (target->bl_type == BL::PC)
- ? unwrap<CharId>(target->is_player()->status_key.char_id)
- : unwrap<BlockId>(target->bl_id),
- battle_get_class(target),
- wd.damage + wd.damage2, weapon);
+ sd->status_key.char_id, src->bl_m->name_, src->bl_x, src->bl_y,
+ (target->bl_type == BL::PC) ? "PC"_s : "MOB"_s,
+ (target->bl_type == BL::PC)
+ ? unwrap<CharId>(target->is_player()->status_key.char_id)
+ : unwrap<BlockId>(target->bl_id),
+ battle_get_class(target),
+ wd.damage + wd.damage2, weapon);
}
if (target->bl_type == BL::PC)
{
dumb_ptr<map_session_data> sd2 = target->is_player();
MAP_LOG("PC%d %s:%d,%d WPNINJURY %s%d %d FOR %d"_fmt,
- sd2->status_key.char_id, target->bl_m->name_, target->bl_x, target->bl_y,
- (src->bl_type == BL::PC) ? "PC"_s : "MOB"_s,
- (src->bl_type == BL::PC)
- ? unwrap<CharId>(src->is_player()->status_key.char_id)
- : unwrap<BlockId>(src->bl_id),
- battle_get_class(src),
- wd.damage + wd.damage2);
+ sd2->status_key.char_id, target->bl_m->name_, target->bl_x, target->bl_y,
+ (src->bl_type == BL::PC) ? "PC"_s : "MOB"_s,
+ (src->bl_type == BL::PC)
+ ? unwrap<CharId>(src->is_player()->status_key.char_id)
+ : unwrap<BlockId>(src->bl_id),
+ battle_get_class(src),
+ wd.damage + wd.damage2);
}
battle_damage(src, target, (wd.damage + wd.damage2), 0);
diff --git a/src/map/chrif.cpp b/src/map/chrif.cpp
index c225608..9e69521 100644
--- a/src/map/chrif.cpp
+++ b/src/map/chrif.cpp
@@ -425,7 +425,7 @@ void chrif_changeemail(AccountId id, AccountEmail actual_email,
{
if (battle_config.etc_log)
PRINTF("chrif_changeemail: account: %d, actual_email: '%s', new_email: '%s'.\n"_fmt,
- id, actual_email, new_email);
+ id, actual_email, new_email);
WFIFOW(char_session, 0) = 0x2b0c;
WFIFOL(char_session, 2) = unwrap<AccountId>(id);
diff --git a/src/map/clif.cpp b/src/map/clif.cpp
index 7f0256a..10aeb0c 100644
--- a/src/map/clif.cpp
+++ b/src/map/clif.cpp
@@ -3392,7 +3392,7 @@ void clif_parse_WantToConnection(Session *s, dumb_ptr<map_session_data> sd)
clif_authfail_fd(s, 2); // same id
clif_authfail_fd(old_sd->sess, 2); // same id
PRINTF("clif_parse_WantToConnection: Double connection for account %d (sessions: #%d (new) and #%d (old)).\n"_fmt,
- account_id, s, old_sd->sess);
+ account_id, s, old_sd->sess);
}
else
{
@@ -5465,7 +5465,7 @@ void clif_parse(Session *s)
now, sd->bl_id);
FPRINTF(fp,
- "\t---- 00-01-02-03-04-05-06-07-08-09-0A-0B-0C-0D-0E-0F"_fmt);
+ "\t---- 00-01-02-03-04-05-06-07-08-09-0A-0B-0C-0D-0E-0F"_fmt);
for (i = 0; i < packet_len; i++)
{
if ((i & 15) == 0)
diff --git a/src/map/intif.cpp b/src/map/intif.cpp
index 1ad9cd4..5d8bfd6 100644
--- a/src/map/intif.cpp
+++ b/src/map/intif.cpp
@@ -282,9 +282,9 @@ int intif_parse_WisMessage(Session *s)
if (battle_config.etc_log)
{
PRINTF("intif_parse_wismessage: id: %d, from: %s, to: %s\n"_fmt,
- RFIFOL(s, 4),
- from,
- to);
+ RFIFOL(s, 4),
+ from,
+ to);
}
sd = map_nick2sd(to); // Searching destination player
if (sd != NULL && sd->status_key.name == to)
@@ -389,14 +389,14 @@ int intif_parse_LoadStorage(Session *s)
{ // Already open.. lets ignore this update
if (battle_config.error_log)
PRINTF("intif_parse_LoadStorage: storage received for a client already open (User %d:%d)\n"_fmt,
- sd->status_key.account_id, sd->status_key.char_id);
+ sd->status_key.account_id, sd->status_key.char_id);
return 1;
}
if (stor->dirty)
{ // Already have storage, and it has been modified and not saved yet! Exploit! [Skotlex]
if (battle_config.error_log)
PRINTF("intif_parse_LoadStorage: received storage for an already modified non-saved storage! (User %d:%d)\n"_fmt,
- sd->status_key.account_id, sd->status_key.char_id);
+ sd->status_key.account_id, sd->status_key.char_id);
return 1;
}
diff --git a/src/map/magic-expr.cpp b/src/map/magic-expr.cpp
index 2ae9b20..3631ca7 100644
--- a/src/map/magic-expr.cpp
+++ b/src/map/magic-expr.cpp
@@ -598,7 +598,7 @@ void magic_area_rect(map_local **m, int *x, int *y, int *width, int *height,
default:
FPRINTF(stderr,
- "Error: Trying to compute area of NE/SE/NW/SW-facing bar"_fmt);
+ "Error: Trying to compute area of NE/SE/NW/SW-facing bar"_fmt);
*x = tx;
*y = ty;
*width = *height = 1;
@@ -1581,8 +1581,8 @@ int magic_signature_check(ZString opname, ZString funname, ZString signature,
if (!ty_key)
{
FPRINTF(stderr,
- "[magic-eval]: L%d:%d: Too many arguments (%zu) to %s `%s'\n"_fmt,
- line, column, args.size(), opname, funname);
+ "[magic-eval]: L%d:%d: Too many arguments (%zu) to %s `%s'\n"_fmt,
+ line, column, args.size(), opname, funname);
return 1;
}
@@ -1595,8 +1595,8 @@ int magic_signature_check(ZString opname, ZString funname, ZString signature,
if (ty == TYPE::UNDEF)
{
FPRINTF(stderr,
- "[magic-eval]: L%d:%d: Argument #%d to %s `%s' undefined\n"_fmt,
- line, column, i + 1, opname, funname);
+ "[magic-eval]: L%d:%d: Argument #%d to %s `%s' undefined\n"_fmt,
+ line, column, i + 1, opname, funname);
return 1;
}
@@ -1627,9 +1627,9 @@ int magic_signature_check(ZString opname, ZString funname, ZString signature,
{ /* Coercion failed? */
if (ty != TYPE::FAIL)
FPRINTF(stderr,
- "[magic-eval]: L%d:%d: Argument #%d to %s `%s' of incorrect type (%d)\n"_fmt,
- line, column, i + 1, opname, funname,
- ty);
+ "[magic-eval]: L%d:%d: Argument #%d to %s `%s' of incorrect type (%d)\n"_fmt,
+ line, column, i + 1, opname, funname,
+ ty);
return 1;
}
}
@@ -1721,8 +1721,8 @@ void magic_eval(dumb_ptr<env_t> env, val_t *dest, dumb_ptr<expr_t> expr)
else
{
FPRINTF(stderr,
- "[magic] Attempt to access field %s on non-spell\n"_fmt,
- env->base_env->varv[id].name);
+ "[magic] Attempt to access field %s on non-spell\n"_fmt,
+ env->base_env->varv[id].name);
dest->ty = TYPE::FAIL;
}
break;
@@ -1730,8 +1730,8 @@ void magic_eval(dumb_ptr<env_t> env, val_t *dest, dumb_ptr<expr_t> expr)
default:
FPRINTF(stderr,
- "[magic] INTERNAL ERROR: Unknown expression type %d\n"_fmt,
- expr->ty);
+ "[magic] INTERNAL ERROR: Unknown expression type %d\n"_fmt,
+ expr->ty);
break;
}
}
diff --git a/src/map/magic-interpreter-base.cpp b/src/map/magic-interpreter-base.cpp
index b2ed0a5..2cc83b4 100644
--- a/src/map/magic-interpreter-base.cpp
+++ b/src/map/magic-interpreter-base.cpp
@@ -188,7 +188,7 @@ dumb_ptr<env_t> spell_create_env(magic_conf_t *conf, dumb_ptr<spell_t> spell,
default:
FPRINTF(stderr, "Unexpected spellarg type %d\n"_fmt,
- spell->spellarg_ty);
+ spell->spellarg_ty);
}
set_env_entity(VAR_CASTER, caster);
@@ -519,8 +519,8 @@ void spell_bind(dumb_ptr<map_session_data> subject, dumb_ptr<invocation> invocat
{
int *i = NULL;
FPRINTF(stderr,
- "[magic] INTERNAL ERROR: Attempt to re-bind spell invocation `%s'\n"_fmt,
- invocation->spell->name);
+ "[magic] INTERNAL ERROR: Attempt to re-bind spell invocation `%s'\n"_fmt,
+ invocation->spell->name);
*i = 1;
return;
}
diff --git a/src/map/magic-stmt.cpp b/src/map/magic-stmt.cpp
index f87eabf..ab7f60e 100644
--- a/src/map/magic-stmt.cpp
+++ b/src/map/magic-stmt.cpp
@@ -351,7 +351,7 @@ int op_instaheal(dumb_ptr<env_t> env, Slice<val_t> args)
dumb_ptr<map_session_data> caster_pc = caster->is_player();
dumb_ptr<map_session_data> subject_pc = subject->is_player();
MAP_LOG_PC(caster_pc, "SPELLHEAL-INSTA PC%d FOR %d"_fmt,
- subject_pc->status_key.char_id, ARGINT(1));
+ subject_pc->status_key.char_id, ARGINT(1));
}
battle_heal(caster, subject, ARGINT(1), ARGINT(2), 0);
@@ -825,8 +825,8 @@ int op_injure(dumb_ptr<env_t> env, Slice<val_t> args)
dumb_ptr<mob_data> mob = target->is_mob();
MAP_LOG_PC(caster_pc, "SPELLDMG MOB%d %d FOR %d BY %s"_fmt,
- mob->bl_id, mob->mob_class, damage_caused,
- get_invocation_name(env));
+ mob->bl_id, mob->mob_class, damage_caused,
+ get_invocation_name(env));
}
}
battle_damage(caster, target, damage_caused, mp_damage);
@@ -1004,8 +1004,8 @@ void spell_effect_report_termination(BlockId invocation_id, BlockId bl_id,
dumb_ptr<block_list> entity = map_id2bl(bl_id);
if (entity->bl_type == BL::PC)
FPRINTF(stderr,
- "[magic] INTERNAL ERROR: spell-effect-report-termination: tried to terminate on unexpected bl %d, sc %d\n"_fmt,
- bl_id, sc_id);
+ "[magic] INTERNAL ERROR: spell-effect-report-termination: tried to terminate on unexpected bl %d, sc %d\n"_fmt,
+ bl_id, sc_id);
return;
}
@@ -1089,8 +1089,8 @@ dumb_ptr<effect_t> return_to_stack(dumb_ptr<invocation> invocation_)
default:
FPRINTF(stderr,
- "[magic] INTERNAL ERROR: While executing spell `%s': stack corruption\n"_fmt,
- invocation_->spell->name);
+ "[magic] INTERNAL ERROR: While executing spell `%s': stack corruption\n"_fmt,
+ invocation_->spell->name);
return NULL;
}
}
@@ -1105,8 +1105,8 @@ cont_activation_record_t *add_stack_entry(dumb_ptr<invocation> invocation_,
if (invocation_->stack_size >= MAX_STACK_SIZE)
{
FPRINTF(stderr,
- "[magic] Execution stack size exceeded in spell `%s'; truncating effect\n"_fmt,
- invocation_->spell->name);
+ "[magic] Execution stack size exceeded in spell `%s'; truncating effect\n"_fmt,
+ invocation_->spell->name);
invocation_->stack_size--;
return NULL;
}
@@ -1221,8 +1221,8 @@ dumb_ptr<effect_t> run_foreach(dumb_ptr<invocation> invocation,
{
magic_clear_var(&area);
FPRINTF(stderr,
- "[magic] Error in spell `%s': FOREACH loop over non-area\n"_fmt,
- invocation->spell->name);
+ "[magic] Error in spell `%s': FOREACH loop over non-area\n"_fmt,
+ invocation->spell->name);
return return_location;
}
else
@@ -1271,8 +1271,8 @@ dumb_ptr<effect_t> run_for (dumb_ptr<invocation> invocation,
magic_clear_var(&start);
magic_clear_var(&stop);
FPRINTF(stderr,
- "[magic] Error in spell `%s': FOR loop start or stop point is not an integer\n"_fmt,
- invocation->spell->name);
+ "[magic] Error in spell `%s': FOR loop start or stop point is not an integer\n"_fmt,
+ invocation->spell->name);
return return_location;
}
@@ -1396,7 +1396,7 @@ interval_t spell_run(dumb_ptr<invocation> invocation_, int allow_delete)
#ifdef DEBUG
FPRINTF(stderr, "Resuming execution: invocation of `%s'\n"_fmt,
- invocation_->spell->name);
+ invocation_->spell->name);
print_cfg(1, invocation_->current_effect);
#endif
while (invocation_->current_effect)
@@ -1535,8 +1535,8 @@ interval_t spell_run(dumb_ptr<invocation> invocation_, int allow_delete)
default:
FPRINTF(stderr,
- "[magic] INTERNAL ERROR: Unknown effect %d\n"_fmt,
- e->ty);
+ "[magic] INTERNAL ERROR: Unknown effect %d\n"_fmt,
+ e->ty);
}
if (!next)
diff --git a/src/map/magic-v2.cpp b/src/map/magic-v2.cpp
index 1e2a330..ba43cb9 100644
--- a/src/map/magic-v2.cpp
+++ b/src/map/magic-v2.cpp
@@ -74,8 +74,8 @@ namespace magic_v2
if (zid != id)
{
FPRINTF(stderr,
- "[magic-conf] INTERNAL ERROR: Builtin special var %s interned to %d, not %d as it should be!\n"_fmt,
- name, zid, id);
+ "[magic-conf] INTERNAL ERROR: Builtin special var %s interned to %d, not %d as it should be!\n"_fmt,
+ name, zid, id);
}
return zid == id;
}
@@ -278,7 +278,7 @@ namespace magic_v2
if (op->signature.size() != argv.size())
{
span.error(STRPRINTF("Incorrect number of arguments to operation '%s': Expected %zu, found %zu"_fmt,
- name, op->signature.size(), argv.size()));
+ name, op->signature.size(), argv.size()));
return false;
}
@@ -314,7 +314,7 @@ namespace magic_v2
if (fun->signature.size() != argv.size())
{
span.error(STRPRINTF("Incorrect number of arguments to function '%s': Expected %zu, found %zu"_fmt,
- name, fun->signature.size(), argv.size()));
+ name, fun->signature.size(), argv.size()));
return false;
}
expr = magic_new_expr(EXPR::FUNAPP);
diff --git a/src/map/magic.cpp b/src/map/magic.cpp
index b502d3e..2cfa1e4 100644
--- a/src/map/magic.cpp
+++ b/src/map/magic.cpp
@@ -101,11 +101,11 @@ int magic_message(dumb_ptr<map_session_data> caster, XString source_invocation)
#ifdef DEBUG
FPRINTF(stderr, "Found spell `%s', triggered = %d\n"_fmt, spell_,
- effects != NULL);
+ effects != NULL);
#endif
MAP_LOG_PC(caster, "CAST %s %s"_fmt,
- spell->name, effects ? "SUCCESS"_s : "FAILURE"_s);
+ spell->name, effects ? "SUCCESS"_s : "FAILURE"_s);
if (effects)
{
diff --git a/src/map/mob.cpp b/src/map/mob.cpp
index 731448b..2dd7ea4 100644
--- a/src/map/mob.cpp
+++ b/src/map/mob.cpp
@@ -1720,7 +1720,7 @@ int mob_randomwalk(dumb_ptr<mob_data> md, tick_t tick)
{
if (battle_config.error_log == 1)
PRINTF("MOB cant move. random spawn %d, mob_class = %d\n"_fmt,
- md->bl_id, md->mob_class);
+ md->bl_id, md->mob_class);
md->move_fail_count = 0;
mob_spawn(md->bl_id);
}
@@ -2425,9 +2425,9 @@ int mob_damage(dumb_ptr<block_list> src, dumb_ptr<mob_data> md, int damage,
if (master_bl && master_bl->bl_type == BL::PC)
{
MAP_LOG_PC(master_bl->is_player(),
- "MOB-TO-MOB-DMG FROM MOB%d %d TO MOB%d %d FOR %d"_fmt,
- md2->bl_id, md2->mob_class, md->bl_id, md->mob_class,
- damage);
+ "MOB-TO-MOB-DMG FROM MOB%d %d TO MOB%d %d FOR %d"_fmt,
+ md2->bl_id, md2->mob_class, md->bl_id, md->mob_class,
+ damage);
}
nullpo_ret(md2);
@@ -3220,8 +3220,8 @@ int mobskill_use_pos(dumb_ptr<mob_data> md,
if (battle_config.monster_skill_log == 1)
PRINTF("MOB skill use target_pos= (%d,%d) skill=%d lv=%d cast=%d, mob_class = %d\n"_fmt,
- skill_x, skill_y, skill_id, skill_lv,
- static_cast<uint32_t>(casttime.count()), md->mob_class);
+ skill_x, skill_y, skill_id, skill_lv,
+ static_cast<uint32_t>(casttime.count()), md->mob_class);
if (casttime <= interval_t::zero())
// A skill without a cast time wont be cancelled.
diff --git a/src/map/pc.cpp b/src/map/pc.cpp
index 44c401b..8aeebdf 100644
--- a/src/map/pc.cpp
+++ b/src/map/pc.cpp
@@ -778,7 +778,7 @@ int pc_authok(AccountId id, int login_id2, TimeT connect_until_time,
if (pc_isGM(sd))
{
PRINTF("Connection accepted: character '%s' (account: %d; GM level %d).\n"_fmt,
- sd->status_key.name, sd->status_key.account_id, pc_isGM(sd));
+ sd->status_key.name, sd->status_key.account_id, pc_isGM(sd));
clif_updatestatus(sd, SP::GM);
}
else
@@ -3405,8 +3405,8 @@ int pc_damage(dumb_ptr<block_list> src, dumb_ptr<map_session_data> sd,
if (src->bl_type == BL::PC)
{
MAP_LOG_PC(sd, "INJURED-BY PC%d FOR %d"_fmt,
- src->is_player()->status_key.char_id,
- damage);
+ src->is_player()->status_key.char_id,
+ damage);
}
else
{
@@ -4313,7 +4313,7 @@ int pc_setaccountreg2(dumb_ptr<map_session_data> sd, VarName reg, int val)
}
if (battle_config.error_log)
PRINTF("pc_setaccountreg2 : couldn't set %s (ACCOUNT_REG2_NUM = %zu)\n"_fmt,
- reg, ACCOUNT_REG2_NUM);
+ reg, ACCOUNT_REG2_NUM);
return 1;
}
diff --git a/src/map/script.cpp b/src/map/script.cpp
index 9cc17aa..499e155 100644
--- a/src/map/script.cpp
+++ b/src/map/script.cpp
@@ -1888,7 +1888,7 @@ void builtin_getelementofarray(ScriptState *st)
if (i > 255 || i < 0)
{
PRINTF("script: getelementofarray (operator[]): param2 illegal number %d\n"_fmt,
- i);
+ i);
push_int(st->stack, ByteCode::INT, 0);
}
else
diff --git a/src/map/skill-pools.cpp b/src/map/skill-pools.cpp
index 9101d6a..bab89a1 100644
--- a/src/map/skill-pools.cpp
+++ b/src/map/skill-pools.cpp
@@ -35,7 +35,7 @@ void skill_pool_register(SkillID id)
if (skill_pool_skills_size + 1 >= MAX_POOL_SKILLS)
{
FPRINTF(stderr,
- "Too many pool skills! Increase MAX_POOL_SKILLS and recompile."_fmt);
+ "Too many pool skills! Increase MAX_POOL_SKILLS and recompile."_fmt);
return;
}
diff --git a/src/map/trade.cpp b/src/map/trade.cpp
index 08c1c6f..af5d1aa 100644
--- a/src/map/trade.cpp
+++ b/src/map/trade.cpp
@@ -349,8 +349,8 @@ void trade_tradecommit(dumb_ptr<map_session_data> sd)
if ((target_sd = map_id2sd(account_to_block(sd->trade_partner))) != NULL)
{
MAP_LOG_PC(sd, " TRADECOMMIT WITH %d GIVE %d GET %d"_fmt,
- target_sd->status_key.char_id, sd->deal_zeny,
- target_sd->deal_zeny);
+ target_sd->status_key.char_id, sd->deal_zeny,
+ target_sd->deal_zeny);
if ((sd->deal_locked >= 1) && (target_sd->deal_locked >= 1))
{ // both have pressed 'ok'
if (sd->deal_locked < 2)
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-04 16:10:26 +0000