home
·
contact
·
privacy
projects
/
plomrogue
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cf0d81e
)
Server: In actor_move() avoid illegal world.map.cells access.
author
Christian Heller
<c.heller@plomlompom.de>
Fri, 22 Aug 2014 01:19:17 +0000
(
03:19
+0200)
committer
Christian Heller
<c.heller@plomlompom.de>
Fri, 22 Aug 2014 01:19:17 +0000
(
03:19
+0200)
src/server/thing_actions.c
patch
|
blob
|
history
diff --git
a/src/server/thing_actions.c
b/src/server/thing_actions.c
index 6f7254490c9819f37a009e5458649956140d8294..638bbd3ad35763ed278db26b8f08b6d056bf3b96 100644
(file)
--- a/
src/server/thing_actions.c
+++ b/
src/server/thing_actions.c
@@
-262,8
+262,10
@@
extern void actor_move(struct Thing * t)
struct yx_uint8 target = t->pos;
uint8_t legal_move = mv_yx_in_dir_legal(d, &target);
mv_yx_in_dir_legal(0, NULL);
struct yx_uint8 target = t->pos;
uint8_t legal_move = mv_yx_in_dir_legal(d, &target);
mv_yx_in_dir_legal(0, NULL);
+ uint8_t passable = 0;
if (legal_move)
{
if (legal_move)
{
+ passable = '.' == world.map.cells[target.y*world.map.length + target.x];
for (other_t = world.things; other_t != 0; other_t = other_t->next)
{
if (0 == other_t->lifepoints || other_t == t)
for (other_t = world.things; other_t != 0; other_t = other_t->next)
{
if (0 == other_t->lifepoints || other_t == t)
@@
-277,8
+279,6
@@
extern void actor_move(struct Thing * t)
}
}
}
}
}
}
- char target_cell = world.map.cells[target.y * world.map.length + target.x];
- uint8_t passable = legal_move && '.' == target_cell;
if (passable)
{
set_thing_position(t, target);
if (passable)
{
set_thing_position(t, target);