- char d = rrand(0, 0) % 5;
- struct yx_uint16 t = mv_yx_in_dir(d, monster->map_obj.pos);
- char * msg = malloc(100);
- struct MapObjDef * mod = get_map_obj_def(world, monster->map_obj.type);
- char * desc = mod->desc;
- char * desc_other;
- if (yx_uint16_cmp(t, world->player->pos))
- {
- sprintf(msg, "\nThe %s hits you.", desc);
- update_log(world, msg);
- world->player->hitpoints--;
- if (0 == world->player->hitpoints)
- {
- update_log(world, "\nYou are dead.");
- }
+ char * bump_dsc = " bumps into ";
+ struct MapObjDef * mod = get_map_object_def(world, monster2->type);
+ char msg[strlen(dsc_monster1) + strlen(bump_dsc) + strlen(mod->name) + 3];
+ sprintf(msg, "\n%s%s%s.", dsc_monster1, bump_dsc, mod->name);
+ update_log(world, msg);
+}
+
+
+
+static void monster_hits_player(struct World * world, char * dsc_monster)
+{
+ char * hit_dsc = " hits you";
+ char msg[strlen(dsc_monster) + strlen(hit_dsc) + 3];
+ sprintf(msg, "\n%s%s.", dsc_monster, hit_dsc);
+ update_log(world, msg);
+ world->player->hitpoints--;
+
+ if (0 == world->player->hitpoints)
+ {
+ update_log(world, "\nYou are dead.");
+ }
+}
+
+
+
+static void player_hits_monster(struct World * world, struct MapObj * monster)
+{
+ struct MapObjDef * mod = get_map_object_def(world, monster->type);
+ char * hit_dsc = "You hit the ";
+ char * monster_dsc = mod->name;
+ char hitmsg[strlen(hit_dsc) + strlen(monster_dsc) + 3];
+ sprintf(hitmsg, "\n%s%s.", hit_dsc, monster_dsc);
+ update_log(world, hitmsg);
+ monster->lifepoints--;
+ if (0 == monster->lifepoints)
+ {
+ hit_dsc = "You kill the ";
+ char kill_msg[strlen(hit_dsc) + strlen(monster_dsc) + 3];
+ sprintf(kill_msg, "\n%s%s.", hit_dsc, monster_dsc);
+ update_log(world, kill_msg);
+ struct MapObjDef * md = mod;
+ monster->type = md->corpse_id;
+ uint8_t score = md->lifepoints;
+ world->score = world->score + score;
+ }
+}
+
+
+
+static void try_player_move(struct World * world,
+ enum dir d, struct yx_uint16 target)
+{
+ char * dsc_dir;
+ if (NORTH == d)
+ {
+ dsc_dir = "north";
+ }
+ else if (EAST == d)
+ {
+ dsc_dir = "east" ;
+ }
+ else if (SOUTH == d)
+ {
+ dsc_dir = "south";
+ }
+ else if (WEST == d)
+ {
+ dsc_dir = "west" ;
+ }
+ char * dsc_move = "You fail to move ";
+ if (is_passable(world->map, target))
+ {
+ dsc_move = "You move ";
+ world->player->pos = target;
+ }
+ char msg[strlen(dsc_move) + strlen (dsc_dir) + 3];
+ sprintf(msg, "\n%s%s.", dsc_move, dsc_dir);
+ update_log(world, msg);
+}
+
+
+
+extern void move_monster(struct World * world, struct MapObj * monster)
+{
+ char d = rrand() % 5;
+ struct yx_uint16 t = mv_yx_in_dir(d, monster->pos);
+ struct MapObjDef * mod = get_map_object_def(world, monster->type);
+ char * dsc = mod->name;
+ if (yx_uint16_cmp(&t, &world->player->pos))
+ {
+ monster_hits_player(world, dsc);