From db232cbf9f4797433d1d9ba8f5dd58fc44a04180 Mon Sep 17 00:00:00 2001
From: mekolat <mekolat@users.noreply.github.com>
Date: Sat, 22 Aug 2015 13:36:30 -0400
Subject: fix compilation errors
---
src/map/map.cpp | 2 --
src/map/npc.cpp | 4 ++--
src/map/pc.cpp | 5 -----
src/map/pc.hpp | 1 -
src/map/script-call.cpp | 1 +
src/map/script-fun.cpp | 4 ++--
src/map/skill.cpp | 4 ++--
src/map/skill.hpp | 2 +-
8 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/src/map/map.cpp b/src/map/map.cpp
index 362d5d2..e7b0da8 100644
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -573,8 +573,6 @@ void map_delobject(BlockId id, BL type)
return;
map_delobjectnofree(id, type);
- if (obj->bl_type == BL::PC) // [Fate] Not sure where else to put this... I'm not sure where delobject for PCs is called from
- pc_cleanup(obj->is_player());
MapBlockLock::freeblock(obj);
}
diff --git a/src/map/npc.cpp b/src/map/npc.cpp
index a40a4ec..c55dbbf 100644
--- a/src/map/npc.cpp
+++ b/src/map/npc.cpp
@@ -61,8 +61,8 @@ namespace tmwa
{
namespace map
{
-const std::vector<ByteCode> fake_buffer;
-const ScriptBuffer& fake_script = reinterpret_cast<const ScriptBuffer&>(fake_buffer);
+static const std::vector<ByteCode> fake_buffer;
+static const ScriptBuffer& fake_script = reinterpret_cast<const ScriptBuffer&>(fake_buffer);
static
Borrowed<const ScriptBuffer> script_or_parent(dumb_ptr<npc_data_script> nd)
diff --git a/src/map/pc.cpp b/src/map/pc.cpp
index 96e0cac..64e0a6e 100644
--- a/src/map/pc.cpp
+++ b/src/map/pc.cpp
@@ -5063,11 +5063,6 @@ void do_init_pc(void)
).detach();
}
-void pc_cleanup(dumb_ptr<map_session_data> sd)
-{
- //magic_stop_completely(sd);
-}
-
void pc_invisibility(dumb_ptr<map_session_data> sd, int enabled)
{
if (enabled && !bool(sd->status.option & Opt0::INVISIBILITY))
diff --git a/src/map/pc.hpp b/src/map/pc.hpp
index 35ca975..0f04698 100644
--- a/src/map/pc.hpp
+++ b/src/map/pc.hpp
@@ -170,7 +170,6 @@ int pc_divorce(dumb_ptr<map_session_data> sd);
dumb_ptr<map_session_data> pc_get_partner(dumb_ptr<map_session_data> sd);
void pc_set_gm_level(AccountId account_id, GmLevel level);
void pc_setstand(dumb_ptr<map_session_data> sd);
-void pc_cleanup(dumb_ptr<map_session_data> sd); // [Fate] Clean up after a logged-out PC
int pc_read_gm_account(Session *, const std::vector<Packet_Repeat<0x2b15>>&);
int pc_setpvptimer(dumb_ptr<map_session_data> sd, interval_t);
diff --git a/src/map/script-call.cpp b/src/map/script-call.cpp
index b9a098a..b397fb4 100644
--- a/src/map/script-call.cpp
+++ b/src/map/script-call.cpp
@@ -169,6 +169,7 @@ void get_val(ScriptState *st, struct script_data *data)
{
MATCH_CASE (const ScriptDataParam&, u)
{
+ (void)u; // XXX travis complains if we don't use u
bl = map_id2bl(st->rid);
}
MATCH_CASE (const ScriptDataVariable&, u)
diff --git a/src/map/script-fun.cpp b/src/map/script-fun.cpp
index 3a5226e..61e63c8 100644
--- a/src/map/script-fun.cpp
+++ b/src/map/script-fun.cpp
@@ -4064,8 +4064,8 @@ void builtin_strnpcinfo(ScriptState *st)
if (sdata->is<ScriptDataStr>())
{
- NpcName name = stringish<NpcName>(ZString(conv_str(st, sdata)));
- nd = npc_name2id(name);
+ NpcName name_ = stringish<NpcName>(ZString(conv_str(st, sdata)));
+ nd = npc_name2id(name_);
}
else
{
diff --git a/src/map/skill.cpp b/src/map/skill.cpp
index 6066a0d..5ea1901 100644
--- a/src/map/skill.cpp
+++ b/src/map/skill.cpp
@@ -892,12 +892,12 @@ int skill_status_change_start(dumb_ptr<block_list> bl, StatusChange type,
int val1,
interval_t tick)
{
- return skill_status_effect(bl, type, val1, tick, BlockId());
+ return skill_status_effect(bl, type, val1, tick);
}
int skill_status_effect(dumb_ptr<block_list> bl, StatusChange type,
int val1,
- interval_t tick, BlockId spell_invocation)
+ interval_t tick)
{
dumb_ptr<map_session_data> sd = nullptr;
eptr<struct status_change, StatusChange, StatusChange::MAX_STATUSCHANGE> sc_data;
diff --git a/src/map/skill.hpp b/src/map/skill.hpp
index 23881d4..8b3fbc7 100644
--- a/src/map/skill.hpp
+++ b/src/map/skill.hpp
@@ -108,7 +108,7 @@ int skill_castcancel(dumb_ptr<block_list> bl, int type);
// ステータス異常
int skill_status_effect(dumb_ptr<block_list> bl, StatusChange type,
int val1,
- interval_t tick, BlockId spell_invocation);
+ interval_t tick);
int skill_status_change_start(dumb_ptr<block_list> bl, StatusChange type,
int val1,
interval_t tick);
--
cgit v1.2.3-70-g09d2