home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Server: Refactor yx_uint8 moving; handle actors hitting the map edge.
[plomrogue]
/
src
/
server
/
thing_actions.c
diff --git
a/src/server/thing_actions.c
b/src/server/thing_actions.c
index 9befd76234bc1efba1f2c9edf0c047d99eb7946c..d12087692514d70569c297a4fee893ae3b2d76ce 100644
(file)
--- a/
src/server/thing_actions.c
+++ b/
src/server/thing_actions.c
@@
-15,8
+15,8
@@
* set_thing_position(), get_thing_type(),
* free_things_in_memory()
*/
* set_thing_position(), get_thing_type(),
* free_things_in_memory()
*/
-#include "map.h" /* is_passable() */
-#include "yx_uint8.h" /* mv_yx_in_dir(), yx_uint8_cmp() */
+#include "map.h" /*
mv_yx_in_dir_legal(),
is_passable() */
+#include "yx_uint8.h" /* mv_yx_in_dir
_wrap
(), yx_uint8_cmp() */
#include "world.h" /* global world */
#include "world.h" /* global world */
@@
-259,21
+259,26
@@
extern void actor_wait(struct Thing * t)
extern void actor_move(struct Thing * t)
{
char d = t->arg;
extern void actor_move(struct Thing * t)
{
char d = t->arg;
- struct yx_uint8 target = mv_yx_in_dir(d, t->pos);
struct Thing * other_t;
struct Thing * other_t;
- for (other_t = world.things; other_t != 0; other_t = other_t->next)
+ struct yx_uint8 target = t->pos;
+ uint8_t legal_move = mv_yx_in_dir_legal(d, &target);
+ mv_yx_in_dir_wrap(0, NULL, 1);
+ if (legal_move)
{
{
-
if (0 == other_t->lifepoints || other_t ==
t)
+
for (other_t = world.things; other_t != 0; other_t = other_t->nex
t)
{
{
- continue;
- }
- if (yx_uint8_cmp(&target, &other_t->pos))
- {
- actor_hits_actor(t, other_t);
- return;
+ if (0 == other_t->lifepoints || other_t == t)
+ {
+ continue;
+ }
+ if (yx_uint8_cmp(&target, &other_t->pos))
+ {
+ actor_hits_actor(t, other_t);
+ return;
+ }
}
}
}
}
- uint8_t passable = is_passable(target);
+ uint8_t passable =
legal_move &&
is_passable(target);
if (passable)
{
set_thing_position(t, target);
if (passable)
{
set_thing_position(t, target);