X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=src%2Fmap_object_actions.c;h=490874f249f018c9315e753e8e6633c8940343b6;hb=10c1227861382eb2bc754dc5a91eaf662e1f9231;hp=86b71181f6f579c379e3c55b56598f4bc2ccfff8;hpb=6a490bdc756b2de5ce30f098ddbfd15fb55dfc8f;p=plomrogue
diff --git a/src/map_object_actions.c b/src/map_object_actions.c
index 86b7118..490874f 100644
--- a/src/map_object_actions.c
+++ b/src/map_object_actions.c
@@ -2,31 +2,149 @@
#include "map_object_actions.h"
#include /* for malloc(), calloc(), free() */
+#include /* for strlen() */
#include "yx_uint16.h" /* for yx_uint16 struct, mv_yx_in_dir(), yx_uint16_cmp */
-#include "misc.h" /* for rrand(), update_log(), turn_over()*/
+#include "misc.h" /* for update_log(), turn_over()*/
#include "map.h" /* for Map struct */
#include "main.h" /* for World struct */
#include "map_objects.h" /* for map object (definition) structs */
+#include "rrand.h" /* for rrand() */
-extern void move_monster(struct World * world, struct Monster * monster)
+/* Log monster (described by "desc_monster1") bumping into "monster2". */
+static void monster_bumps_monster(struct World * world, char * desc_monster1,
+ struct Monster * monster2);
+
+/* Decrement player HPs due to attack of monster described by "desc_monster",
+ * kill player if his HP hit zero; log the whole action.
+ */
+static void monster_hits_player(struct World * world, char * desc_monster);
+
+/* Decrement HP of "monster" hit by player, kill it if its HP hit zero; log the
+ * whole action.
+ */
+static void player_hits_monster(struct World * world, struct Monster * monster)
+
+/* Try moving the player in direction "d" towards coordinate "target"; log
+ * success or failure of the whole action.
+ */
+static void try_player_move(struct World * world,
+ enum dir d, struct yx_uint16 target)
+
+
+
+static void monster_bumps_monster(struct World * world, char * desc_monster1,
+ struct Monster * monster2)
+{
+ char * bumpdesc = " bumps into ";
+ struct MapObjDef * mod = get_map_obj_def(world, monster2->map_obj.type);
+ char * msg = malloc(strlen(desc_monster1) + strlen(bumpdesc)
+ + strlen(mod->desc) + 3);
+ sprintf(msg, "\n%s%s%s.", desc_monster1, bumpdesc, mod->desc);
+ update_log(world, msg);
+ free(msg);
+}
+
+
+
+static void monster_hits_player(struct World * world, char * desc_monster)
+{
+ char * hitdesc = " hits you";
+ char * msg = malloc(strlen(desc_monster) + strlen(hitdesc) + 3);
+ sprintf(msg, "\n%s%s.", desc_monster, hitdesc);
+ update_log(world, msg);
+ free(msg);
+ world->player->hitpoints--;
+ if (0 == world->player->hitpoints)
+ {
+ update_log(world, "\nYou are dead.");
+ }
+}
+
+
+
+static void player_hits_monster(struct World * world, struct Monster * monster)
{
- 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))
+ char * hit_desc = "You hit the ";
+ char * monster_desc = mod->desc;
+ char * msg = malloc(strlen(hit_desc) + strlen(monster_desc) + 3);
+ sprintf(msg, "\n%s%s.", hit_desc, monster_desc);
+ update_log(world, msg);
+ free(msg);
+ monster->hitpoints--;
+
+ if (0 == monster->hitpoints)
{
- sprintf(msg, "\nThe %s hits you.", desc);
+ hit_desc = "You kill the ";
+ msg = malloc(strlen(hit_desc) + strlen(monster_desc) + 3);
+ sprintf(msg, "\n%s%s.", hit_desc, monster_desc);
update_log(world, msg);
- world->player->hitpoints--;
- if (0 == world->player->hitpoints)
+ free(msg);
+ if (world->monster == monster)
{
- update_log(world, "\nYou are dead.");
+ world->monster = world->monster->map_obj.next;
}
+ else
+ {
+ struct Monster * m_prev;
+ for (m_prev = world->monster;
+ m_prev->map_obj.next != monster;
+ m_prev = m_prev->map_obj.next);
+ {
+ m_prev->map_obj.next = monster->map_obj.next;
+ }
+ }
+ free(monster);
+ }
+}
+
+
+
+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 = malloc(strlen(dsc_move) + strlen (dsc_dir) + 3);
+ sprintf(msg, "\n%s%s.", dsc_move, dsc_dir);
+ update_log(world, msg);
+ free(msg);
+}
+
+
+
+extern void move_monster(struct World * world, struct Monster * monster)
+{
+ char d = rrand() % 5;
+ struct yx_uint16 t = mv_yx_in_dir(d, monster->map_obj.pos);
+ struct MapObjDef * mod = get_map_obj_def(world, monster->map_obj.type);
+ char * desc = mod->desc;
+ if (yx_uint16_cmp(&t, &world->player->pos))
+ {
+ monster_hits_player(world, desc);
return;
}
struct Monster * other_monster;
@@ -38,16 +156,12 @@ extern void move_monster(struct World * world, struct Monster * monster)
{
continue;
}
- if (yx_uint16_cmp(t, other_monster->map_obj.pos))
+ if (yx_uint16_cmp(&t, &other_monster->map_obj.pos))
{
- mod = get_map_obj_def(world, other_monster->map_obj.type);
- desc_other = mod->desc;
- sprintf(msg, "\n%s bumps into %s.", desc, desc_other);
- update_log(world, msg);
+ monster_bumps_monster(world, desc, other_monster);
return;
}
}
- free(msg);
if (is_passable(world->map, t))
{
monster->map_obj.pos = t;
@@ -60,69 +174,19 @@ extern void move_player (struct World * world, enum dir d)
{
struct yx_uint16 t = mv_yx_in_dir(d, world->player->pos);
struct Monster * monster;
- struct MapObjDef * mod;
- char * msg = calloc(100, sizeof(char));
- char * desc;
for (monster = world->monster;
monster != 0;
monster = monster->map_obj.next)
{
- if (yx_uint16_cmp(t, monster->map_obj.pos))
+ if (yx_uint16_cmp(&t, &monster->map_obj.pos))
{
- mod = get_map_obj_def(world, monster->map_obj.type);
- desc = mod->desc;
- sprintf(msg, "\nYou hit the %s.", desc);
- update_log(world, msg);
- monster->hitpoints--;
- if (0 == monster->hitpoints)
- {
- sprintf(msg, "\nYou kill the %s.", desc);
- update_log(world, msg);
- if (world->monster == monster)
- {
- world->monster = world->monster->map_obj.next;
- }
- else
- {
- struct Monster * m_prev;
- for (m_prev = world->monster;
- m_prev->map_obj.next != monster;
- m_prev = m_prev->map_obj.next);
- m_prev->map_obj.next = monster->map_obj.next;
- }
- free(monster);
- }
+ player_hits_monster(world, monster);
turn_over(world, d);
return;
}
- }
- char * msg_content = "You fail to move";
- char * dir;
- if (NORTH == d)
- {
- dir = "north";
- }
- else if (EAST == d)
- {
- dir = "east" ;
- }
- else if (SOUTH == d)
- {
- dir = "south";
- }
- else if (WEST == d)
- {
- dir = "west" ;
- }
- if (is_passable(world->map, t))
- {
- msg_content = "You move";
- world->player->pos = t;
- }
- sprintf(msg, "\n%s %s.", msg_content, dir);
- update_log(world, msg);
- free(msg);
- turn_over(world, d);
+ }
+ try_player_move(world, d, t);
+ turn_over(world, d);
}