home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bug that led to endless loop in nearest_enemy_dir().
[plomrogue]
/
src
/
yx_uint16.c
diff --git
a/src/yx_uint16.c
b/src/yx_uint16.c
index 54274f404223486af0dee1735e3b9014d51ba8a1..c980693b998bf3156ea70e1f3f5a8df8fc36402b 100644
(file)
--- a/
src/yx_uint16.c
+++ b/
src/yx_uint16.c
@@
-1,8
+1,7
@@
/* yx_uint16.c */
/* yx_uint16.c */
-
-
-#include "yx_uint16.h" /* for uint8_t, uint16_t */
+#include "yx_uint16.h"
+#include <stdint.h> /* for uint8_t, uint16_t */
@@
-12,29
+11,26
@@
extern uint8_t yx_uint16_cmp(struct yx_uint16 * a, struct yx_uint16 * b)
{
return 1;
}
{
return 1;
}
- else
- {
- return 0;
- }
+ return 0;
}
}
-extern struct yx_uint16 mv_yx_in_dir(
enum di
r d, struct yx_uint16 yx)
+extern struct yx_uint16 mv_yx_in_dir(
cha
r d, struct yx_uint16 yx)
{
{
- if (d ==
NORTH
)
+ if (d ==
'N' && yx.y > 0
)
{
yx.y--;
}
{
yx.y--;
}
- else if (d ==
EAST
)
+ else if (d ==
'E' && yx.x < UINT16_MAX
)
{
yx.x++;
}
{
yx.x++;
}
- else if (d ==
SOUTH
)
+ else if (d ==
'S' && yx.y < UINT16_MAX
)
{
yx.y++;
}
{
yx.y++;
}
- else if (d ==
WEST
)
+ else if (d ==
'W' && yx.x > 0
)
{
yx.x--;
}
{
yx.x--;
}