home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ensure that multiple inanimate objects on a map cell are always treated as a
[plomrogue]
/
src
/
server
/
map_object_actions.c
diff --git
a/src/server/map_object_actions.c
b/src/server/map_object_actions.c
index 561a2e2bf39a5899c6d1e2e54ac4dd6486ac1160..0cbc1bf5f3e4b24c5827b2b916829f75dfb7d1a8 100644
(file)
--- a/
src/server/map_object_actions.c
+++ b/
src/server/map_object_actions.c
@@
-364,12
+364,13
@@
extern void actor_drop(struct MapObj * mo)
extern void actor_pick(struct MapObj * mo)
{
extern void actor_pick(struct MapObj * mo)
{
- struct MapObj * picked;
- for (picked = world.map_objs; NULL != picked; picked = picked->next)
+ struct MapObj * picked = NULL;
+ struct MapObj * mo_i;
+ for (mo_i = world.map_objs; NULL != mo_i; mo_i = mo_i->next)
{
{
- if (
picked != mo && yx_uint16_cmp(&picked
->pos, &mo->pos))
+ if (
mo_i != mo && yx_uint16_cmp(&mo_i
->pos, &mo->pos))
{
{
-
break
;
+
picked = mo_i
;
}
}
if (NULL != picked)
}
}
if (NULL != picked)