X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=inline;f=src%2Fserver%2Fthing_actions.c;h=8d6a802417ea6df95068892fe3b89b77cad7057f;hb=fa0c416ccad4c4278813909ca1b799cd0600840c;hp=c1e337b6842ab067ee2ef4e2d54d83023708131d;hpb=778534bf6946fe0fef17e353c55678d248d8d09d;p=plomrogue
diff --git a/src/server/thing_actions.c b/src/server/thing_actions.c
index c1e337b..8d6a802 100644
--- a/src/server/thing_actions.c
+++ b/src/server/thing_actions.c
@@ -5,12 +5,13 @@
#include /* uint8_t, uint16_t */
#include /* sprintf() */
#include /* free() */
-#include /* strlen(), strcmp(), memcpy(), strncmp() */
-#include "../common/rexit.h" /* exit_err(), exit_trouble() */
+#include /* strlen(), memcpy(), strncmp() */
+#include "../common/rexit.h" /* exit_trouble() */
#include "../common/try_malloc.h" /* try_malloc() */
#include "../common/yx_uint8.h" /* struct yx_uint8 */
#include "field_of_view.h" /* build_fov_map() */
-#include "things.h" /* structs Thing, ThingType, get_player(), own_thing(),
+#include "hardcoded_strings.h" /* s */
+#include "things.h" /* Thing, ThingType, get_player(), own_thing(),
* set_thing_position(), get_thing_type()
*/
#include "map.h" /* is_passable() */
@@ -84,7 +85,6 @@ static uint8_t text_equals_log_end(char * log, char * text)
static void update_log(char * text)
{
- char * f_name = "update_log()";
uint16_t len_new = strlen(text);
uint16_t len_old = 0;
uint16_t offset = 0;
@@ -102,10 +102,10 @@ static void update_log(char * text)
}
}
uint16_t len_whole = len_old + len_new + 1;
- char * new_text = try_malloc(len_whole, f_name);
+ char * new_text = try_malloc(len_whole, __func__);
memcpy(new_text, world.log + offset, len_old);
int test = sprintf(new_text + len_old, "%s", text);
- exit_trouble(test < 0, f_name, "sprintf()");
+ exit_trouble(test < 0, __func__, s[S_FCN_SPRINTF]);
free(world.log);
world.log = new_text;
}
@@ -114,7 +114,6 @@ static void update_log(char * text)
static void actor_hits_actor(struct Thing * hitter, struct Thing * hitted)
{
- char * f_name = "actor_hits_actor()";
struct ThingType * tt_hitter = get_thing_type(hitter->type);
struct ThingType * tt_hitted = get_thing_type(hitted->type);
struct Thing * player = get_player();
@@ -131,9 +130,9 @@ static void actor_hits_actor(struct Thing * hitter, struct Thing * hitted)
msg3 = tt_hitted->name;
}
uint8_t len = 1 + strlen(msg1) + 1 + strlen(msg2) + 1 + strlen(msg3) + 2;
- char * msg = try_malloc(len, f_name);
+ char * msg = try_malloc(len, __func__);
int test = sprintf(msg, "\n%s %s %s.", msg1, msg2, msg3);
- exit_trouble(test < 0, f_name, "sprintf()");
+ exit_trouble(test < 0, __func__, s[S_FCN_SPRINTF]);
update_log(msg);
free(msg);
hitted->lifepoints--;
@@ -172,7 +171,6 @@ static uint8_t match_dir(char d, char ** dsc_d, char match, char * dsc_match)
static void playerbonus_move(char d, uint8_t passable)
{
- char * f_name = "playerbonus_move()";
char * dsc_dir = "north-east";
if ( match_dir(d, &dsc_dir, 'd', "east")
|| match_dir(d, &dsc_dir, 'c', "south-east")
@@ -187,9 +185,9 @@ static void playerbonus_move(char d, uint8_t passable)
{
dsc_move = "You fail to move ";
}
- char * msg = try_malloc(strlen(dsc_move) + strlen (dsc_dir) + 3, f_name);
+ char * msg = try_malloc(strlen(dsc_move) + strlen (dsc_dir) + 3, __func__);
int test = sprintf(msg, "\n%s%s.", dsc_move, dsc_dir);
- exit_trouble(test < 0, f_name, "sprintf()");
+ exit_trouble(test < 0, __func__, s[S_FCN_SPRINTF]);
update_log(msg);
free(msg);
}
@@ -237,36 +235,6 @@ static void playerbonus_use(uint8_t no_thing, uint8_t wrong_thing)
-extern void free_thing_actions(struct ThingAction * ta)
-{
- if (NULL == ta)
- {
- return;
- }
- free(ta->name);
- free_thing_actions(ta->next);
- free(ta);
-}
-
-
-
-extern uint8_t get_thing_action_id_by_name(char * name)
-{
- struct ThingAction * ta = world.thing_actions;
- while (NULL != ta)
- {
- if (0 == strcmp(ta->name, name))
- {
- break;
- }
- ta = ta->next;
- }
- exit_err(NULL == ta, "get_thing_action_id_by_name() did not find action.");
- return ta->id;
-}
-
-
-
extern void actor_wait(struct Thing * t)
{
if (t == get_player())
@@ -298,8 +266,7 @@ extern void actor_move(struct Thing * t)
if (passable)
{
set_thing_position(t, target);
- free(t->fov_map);
- t->fov_map = build_fov_map(t);
+ build_fov_map(t);
}
if (t == get_player())
{