X-Git-Url: https://plomlompom.com/repos/test.html?a=blobdiff_plain;f=src%2Fserver%2Fthing_actions.c;h=6a8803d162483a6a3ac06c2fe46dfc05420be31d;hb=ad665ff6f22943c1f1982d13e1dbea1cedc97a65;hp=839a6e36d85eaa84644e723f576c9fa069c2cf6c;hpb=3fb2cb493ae564f8b14ddb4143b6c1f5bf16f16a;p=plomrogue
diff --git a/src/server/thing_actions.c b/src/server/thing_actions.c
index 839a6e3..6a8803d 100644
--- a/src/server/thing_actions.c
+++ b/src/server/thing_actions.c
@@ -7,11 +7,11 @@
#include "thing_actions.h"
#include /* NULL */
-#include /* uint8_t, INT16_MIN */
+#include /* uint8_t, INT16_MIN, INT16_MAX */
#include /* sprintf() */
#include /* free() */
#include /* strlen() */
-#include "../common/rexit.h" /* exit_trouble() */
+#include "../common/rexit.h" /* exit_err(), exit_trouble() */
#include "../common/try_malloc.h" /* try_malloc() */
#include "../common/yx_uint8.h" /* yx_uint8 */
#include "field_of_view.h" /* build_fov_map() */
@@ -270,11 +270,16 @@ extern void actor_pick(struct Thing * t)
{
struct Thing * picked = NULL;
struct Thing * t_i;
+ uint8_t highest_id = 0;
for (t_i = world.things; t_i; t_i = t_i->next)
{
if (t_i != t && t_i->pos.y == t->pos.y && t_i->pos.x == t->pos.x)
{
- picked = t_i;
+ if (t_i->id >= highest_id) /* With several Things to pick, */
+ { /* pick the one with the highest ID. */
+ highest_id = t_i->id;
+ picked = t_i;
+ }
}
}
if (picked)
@@ -317,7 +322,8 @@ extern void actor_use(struct Thing * t)
{
t->owns = next;
}
- t->lifepoints = t->lifepoints + tt->consumable;
+ t->satiation = t->satiation + tt->consumable > INT16_MAX ?
+ INT16_MAX : t->satiation + tt->consumable;
}
}
if (t == get_player())
@@ -328,19 +334,44 @@ extern void actor_use(struct Thing * t)
-extern void hunger(struct Thing * t)
+extern void try_healing(struct Thing * t)
{
struct ThingType * tt = get_thing_type(t->type);
- if (!(tt->stomach))
+ if ( t->satiation > 0 && t->lifepoints < tt->lifepoints
+ && 0 == (rrand() % 31)
+ && get_thing_action_id_by_name(s[S_CMD_WAIT]) == t->command)
{
- return;
+ t->lifepoints++;
+ t->satiation = t->satiation - 32;
+ if (get_player() == t)
+ {
+ update_log("You heal.");
+ }
+ else
+ {
+ char * msg_part = " heals.";
+ uint8_t len = strlen(tt->name) + strlen(msg_part) + 1;
+ char * msg = try_malloc(len, __func__);
+ int test = sprintf(msg, "%s%s", tt->name, msg_part);
+ exit_trouble(test < 0, __func__, s[S_FCN_SPRINTF]);
+ update_log(msg);
+ free(msg);
+ }
}
+}
+
+
+
+extern void hunger(struct Thing * t)
+{
if (t->satiation > INT16_MIN)
{
t->satiation--;
}
+ struct ThingType * tt = get_thing_type(t->type);
uint16_t testbase = t->satiation < 0 ? -(t->satiation) : t->satiation;
- uint16_t endurance = tt->stomach;
+ exit_err(!(tt->lifepoints), "A thing that should not hunger is hungering.");
+ uint16_t endurance = INT16_MAX / tt->lifepoints;
if ((testbase / endurance) / ((rrand() % endurance) + 1))
{
if (get_player() == t)