#include "map_object_actions.h"
#include <stddef.h> /* NULL */
-#include <stdint.h> /* uint8_t, uint16_t, UINT8_MAx */
+#include <stdint.h> /* uint8_t, uint16_t */
#include <stdio.h> /* sprintf(), ungetc() */
#include <stdlib.h> /* free(), atoi() */
#include <string.h> /* strlen(), strcmp(), memcpy(), strncmp() */
}
last_stop--;
}
- if ( (last_stop + 1) - last_nl == strlen(text)
+ if ( (last_stop + 1) - last_nl == (uint16_t) strlen(text)
&& 0 == strncmp(world.log + last_nl, text, strlen(text)))
{
text = ".";
return;
}
update_log(" It dies.");
- if (player == hitter)
- {
- world.score = world.score + mod_hitted->lifepoints;
- }
}
}
|| match_dir(d, &dsc_dir, '7', "north-west")
|| match_dir(d, &dsc_dir, '9', "north-east")
|| match_dir(d, &dsc_dir, '1', "south-west")
- || match_dir(d, &dsc_dir, '3', "south-east"));
+ || match_dir(d, &dsc_dir, '3', "south-east"))
+ {
+ ;
+ }
char * dsc_move = "You move ";
if (0 == passable)
{
char line[linemax + 1];
struct MapObjAct ** moa_ptr_ptr = &world.map_obj_acts;
char * context = "Failed reading map object actions config file. ";
- char * err_toolarge = "Value is too large.";
- char * err_uniq = "Declaration of ID already used.";
+ char * err_uniq = "Declaration of ID already used.";
reset_err_try_fgets_counter();
while (1)
{
}
exit_trouble(EOF == ungetc(test_for_end, file), f_name, "ungetc()");
struct MapObjAct * moa = try_malloc(sizeof(struct MapObjAct), f_name);
- err_try_fgets(line, linemax, file, context, "nfi");
- err_line(atoi(line) > UINT8_MAX, line, context, err_toolarge);
+ err_try_fgets(line, linemax, file, context, "nfi8");
moa->id = atoi(line);
struct MapObjAct * moa_test = world.map_obj_acts;
for (; NULL != moa_test; moa_test = moa_test->next)
{
err_line(moa->id == moa_test->id, line, context, err_uniq);
}
- err_try_fgets(line, linemax, file, context, "0nfi");
- err_line(atoi(line) > UINT8_MAX, line, context, err_toolarge);
+ err_try_fgets(line, linemax, file, context, "0nfi8");
moa->effort = atoi(line);
err_try_fgets(line, linemax, file, context, "0nf");
line[strlen(line) - 1] = '\0';
struct MapObj * selected = mo->owns;
for (; i != select; i++, selected = selected->next);
struct MapObjDef * mod = get_map_object_def(selected->type);
- if (!strcmp("MAGIC MEAT", mod->name))
+ if (mod->consumable)
{
wrong_object = 0;
struct MapObj * next = selected->next;
{
mo->owns = next;
}
- mo->lifepoints++;
+ mo->lifepoints = mo->lifepoints + mod->consumable;
}
}
if (mo == get_player())