/* Bonus stuff to actor_*() to happen if actor==player. Mostly writing of log
* messages; _pick and _drop also decrement world.inventory_sel by 1 if >0.
+ * (match_dir() is just a little helper to playerbonus_move().)
*/
static void playerbonus_wait();
+static uint8_t match_dir(char d, char ** dsc_d, char match, char * dsc_match);
static void playerbonus_move(char d, uint8_t passable);
static void playerbonus_drop(uint8_t owns_none);
static void playerbonus_pick(uint8_t picked);
-static void playerbonus_move(char d, uint8_t passable)
+static uint8_t match_dir(char d, char ** dsc_d, char match, char * dsc_match)
{
- char * dsc_dir = "north";
- if ('E' == d)
- {
- dsc_dir = "east" ;
- }
- else if ('S' == d)
+ if (d == match)
{
- dsc_dir = "south";
- }
- else if ('W' == d)
- {
- dsc_dir = "west" ;
+ * dsc_d = dsc_match;
+ return 1;
}
+ return 0;
+}
+
+
+
+static void playerbonus_move(char d, uint8_t passable)
+{
+ char * dsc_dir = "north";
+ if ( match_dir(d, &dsc_dir, '6', "east")
+ || match_dir(d, &dsc_dir, '2', "south")
+ || match_dir(d, &dsc_dir, '4', "west")
+ || 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"));
char * dsc_move = "You move ";
if (0 == passable)
{
extern void actor_pick(struct MapObj * mo)
{
- struct MapObj * picked;
- for (picked = world.map_objs; NULL != picked; picked = picked->next)
+ struct MapObj * picked = NULL;
+ struct MapObj * mo_i;
+ for (mo_i = world.map_objs; NULL != mo_i; mo_i = mo_i->next)
{
- if (picked != mo && yx_uint16_cmp(&picked->pos, &mo->pos))
+ if (mo_i != mo && yx_uint16_cmp(&mo_i->pos, &mo->pos))
{
- break;
+ picked = mo_i;
}
}
if (NULL != picked)