summaryrefslogtreecommitdiff
path: root/src/map/script.cpp
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2013-05-23 13:58:57 -0700
committerBen Longbons <b.r.longbons@gmail.com>2013-05-23 13:58:57 -0700
commit543e4b419239f37321bc5a224d56773d1fe6ebfe (patch)
treeb1af74736f9ecaf4e7b7770c9fbff59e971d3f4b /src/map/script.cpp
parentcce12d0d059b3328ad74446b389445bd43e0a90b (diff)
downloadtmwa-543e4b419239f37321bc5a224d56773d1fe6ebfe.tar.gz
tmwa-543e4b419239f37321bc5a224d56773d1fe6ebfe.tar.bz2
tmwa-543e4b419239f37321bc5a224d56773d1fe6ebfe.tar.xz
tmwa-543e4b419239f37321bc5a224d56773d1fe6ebfe.zip
Rename fields of block_list in preparation for subclassing
This is necessary because at least some of the subclasses overlap names.
Diffstat (limited to 'src/map/script.cpp')
-rw-r--r--src/map/script.cpp44
1 files changed, 22 insertions, 22 deletions
diff --git a/src/map/script.cpp b/src/map/script.cpp
index 43bcebf..0c56bc7 100644
--- a/src/map/script.cpp
+++ b/src/map/script.cpp
@@ -1619,8 +1619,8 @@ void builtin_isat(ScriptState *st)
return;
push_val(st->stack, ScriptCode::INT,
- (x == sd->bl.x)
- && (y == sd->bl.y) && (!strcmp(str, map[sd->bl.m].name)));
+ (x == sd->bl.bl_x)
+ && (y == sd->bl.bl_y) && (!strcmp(str, map[sd->bl.bl_m].name)));
}
@@ -1641,7 +1641,7 @@ void builtin_warp(ScriptState *st)
pc_randomwarp(sd, BeingRemoveWhy::WARPED);
else if (strcmp(str, "SavePoint") == 0)
{
- if (map[sd->bl.m].flag.noreturn) // 蝶禁止
+ if (map[sd->bl.bl_m].flag.noreturn) // 蝶禁止
return;
pc_setpos(sd, sd->status.save_point.map,
@@ -1649,7 +1649,7 @@ void builtin_warp(ScriptState *st)
}
else if (strcmp(str, "Save") == 0)
{
- if (map[sd->bl.m].flag.noreturn) // 蝶禁止
+ if (map[sd->bl.bl_m].flag.noreturn) // 蝶禁止
return;
pc_setpos(sd, sd->status.save_point.map,
@@ -2138,7 +2138,7 @@ void builtin_getitem(ScriptState *st)
{
clif_additem(sd, 0, 0, flag);
map_addflooritem(&item_tmp, amount,
- sd->bl.m, sd->bl.x, sd->bl.y,
+ sd->bl.bl_m, sd->bl.bl_x, sd->bl.bl_y,
NULL, NULL, NULL);
}
}
@@ -2179,7 +2179,7 @@ void builtin_makeitem(ScriptState *st)
y = conv_num(st, &(st->stack->stack_data[st->start + 6]));
if (sd && strcmp(mapname, "this") == 0)
- m = sd->bl.m;
+ m = sd->bl.bl_m;
else
m = map_mapname2mapid(mapname);
@@ -3039,7 +3039,7 @@ void builtin_getusers(ScriptState *st)
switch (flag & 0x07)
{
case 0:
- val = map[bl->m].users;
+ val = map[bl->bl_m].users;
break;
case 1:
val = map_getusers();
@@ -3129,7 +3129,7 @@ void builtin_getareadropitem_sub_anddelete(struct block_list *bl, int item, int
if (drop->item_data.nameid == item) {
(*amount) += drop->item_data.amount;
clif_clearflooritem(drop, 0);
- map_delobject(drop->bl.id, drop->bl.type);
+ map_delobject(drop->bl.bl_id, drop->bl.bl_type);
}
}
@@ -3567,11 +3567,11 @@ void builtin_pvpon(ScriptState *st)
map_session_data *pl_sd = static_cast<map_session_data *>(session[i]->session_data.get());
if (pl_sd && pl_sd->state.auth)
{
- if (m == pl_sd->bl.m && !pl_sd->pvp_timer)
+ if (m == pl_sd->bl.bl_m && !pl_sd->pvp_timer)
{
pl_sd->pvp_timer = Timer(gettick() + std::chrono::milliseconds(200),
std::bind(pc_calc_pvprank_timer, ph::_1, ph::_2,
- pl_sd->bl.id));
+ pl_sd->bl.bl_id));
pl_sd->pvp_rank = 0;
pl_sd->pvp_lastusers = 0;
pl_sd->pvp_point = 5;
@@ -3601,7 +3601,7 @@ void builtin_pvpoff(ScriptState *st)
map_session_data *pl_sd = static_cast<map_session_data *>(session[i]->session_data.get());
if (pl_sd && pl_sd->state.auth)
{
- if (m == pl_sd->bl.m)
+ if (m == pl_sd->bl.bl_m)
{
pl_sd->pvp_timer.cancel();
}
@@ -4065,18 +4065,18 @@ void builtin_npcwarp(ScriptState *st)
if (!nd)
return;
- short m = nd->bl.m;
+ short m = nd->bl.bl_m;
/* Crude sanity checks. */
- if (m < 0 || !nd->bl.prev
+ if (m < 0 || !nd->bl.bl_prev
|| x < 0 || x > map[m].xs -1
|| y < 0 || y > map[m].ys - 1)
return;
npc_enable(npc, 0);
map_delblock(&nd->bl); /* [Freeyorp] */
- nd->bl.x = x;
- nd->bl.y = y;
+ nd->bl.bl_x = x;
+ nd->bl.bl_y = y;
map_addblock(&nd->bl);
npc_enable(npc, 1);
@@ -4253,9 +4253,9 @@ void builtin_isin(ScriptState *st)
return;
push_val(st->stack, ScriptCode::INT,
- (sd->bl.x >= x1 && sd->bl.x <= x2)
- && (sd->bl.y >= y1 && sd->bl.y <= y2)
- && (!strcmp(str, map[sd->bl.m].name)));
+ (sd->bl.bl_x >= x1 && sd->bl.bl_x <= x2)
+ && (sd->bl.bl_y >= y1 && sd->bl.bl_y <= y2)
+ && (!strcmp(str, map[sd->bl.bl_m].name)));
}
@@ -4274,7 +4274,7 @@ void builtin_shop(ScriptState *st)
return;
builtin_close(st);
- clif_npcbuysell(sd, nd->bl.id);
+ clif_npcbuysell(sd, nd->bl.bl_id);
}
/*==========================================
@@ -4320,7 +4320,7 @@ void builtin_getx(ScriptState *st)
{
struct map_session_data *sd = script_rid2sd(st);
- push_val(st->stack, ScriptCode::INT, sd->bl.x);
+ push_val(st->stack, ScriptCode::INT, sd->bl.bl_x);
}
/*============================
@@ -4332,7 +4332,7 @@ void builtin_gety(ScriptState *st)
{
struct map_session_data *sd = script_rid2sd(st);
- push_val(st->stack, ScriptCode::INT, sd->bl.y);
+ push_val(st->stack, ScriptCode::INT, sd->bl.bl_y);
}
/*
@@ -4344,7 +4344,7 @@ void builtin_getmap(ScriptState *st)
struct map_session_data *sd = script_rid2sd(st);
// A map_data lives essentially forever.
- push_str(st->stack, ScriptCode::CONSTSTR, map[sd->bl.m].name);
+ push_str(st->stack, ScriptCode::CONSTSTR, map[sd->bl.bl_m].name);
}
//