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 (from parent 1:
3088d6e
)
Simplified internal structure of move_monster().
author
Christian Heller
<c.heller@plomlompom.de>
Wed, 26 Jun 2013 23:07:03 +0000
(
01:07
+0200)
committer
Christian Heller
<c.heller@plomlompom.de>
Wed, 26 Jun 2013 23:07:03 +0000
(
01:07
+0200)
src/roguelike.c
patch
|
blob
|
history
diff --git
a/src/roguelike.c
b/src/roguelike.c
index 84290f1e5f032530608cea5904f973207a17fbd1..833b64b09f1b8ca860d9f85084ab10913651804d 100644
(file)
--- a/
src/roguelike.c
+++ b/
src/roguelike.c
@@
-120,17
+120,14
@@
void move_monster (struct World * world, struct Monster * monster) {
if (yx_uint16_cmp (t, world->player->pos)) {
update_log (world, "\nThe monster hits you.");
return; }
if (yx_uint16_cmp (t, world->player->pos)) {
update_log (world, "\nThe monster hits you.");
return; }
- char met_monster = 0;
struct Monster * other_monster;
for (other_monster = world->monster; other_monster != 0; other_monster = other_monster->next) {
if (other_monster == monster)
continue;
if (yx_uint16_cmp (t, other_monster->pos)) {
struct Monster * other_monster;
for (other_monster = world->monster; other_monster != 0; other_monster = other_monster->next) {
if (other_monster == monster)
continue;
if (yx_uint16_cmp (t, other_monster->pos)) {
- met_monster = 1;
- break; } }
- if (met_monster)
- update_log (world, "\nMonster hits monster.");
- else if (is_passable(world->map, t.y, t.x))
+ update_log (world, "\nMonster hits monster.");
+ return; } }
+ if (is_passable(world->map, t.y, t.x))
monster->pos = t; }
void move_player (struct World * world, char d) {
monster->pos = t; }
void move_player (struct World * world, char d) {