- struct MapObjDef * mod = get_map_obj_def(world, monster->map_obj.type);
- char * hit_dsc = "You hit the ";
- char * monster_dsc = mod->desc;
- char * msg = malloc(strlen(hit_dsc) + strlen(monster_dsc) + 3);
- sprintf(msg, "\n%s%s.", hit_dsc, monster_dsc);
- update_log(world, msg);
- free(msg);
- monster->hitpoints--;
- if (0 == monster->hitpoints)
- {
- hit_dsc = "You kill the ";
- msg = malloc(strlen(hit_dsc) + strlen(monster_dsc) + 3);
- sprintf(msg, "\n%s%s.", hit_dsc, monster_dsc);
- update_log(world, msg);
- free(msg);
- struct MonsterDef * md = (struct MonsterDef * ) mod;
- struct Item * corpse = malloc(sizeof(struct Item));
- corpse->map_obj.type = md->corpse_id;
- corpse->map_obj.pos = monster->map_obj.pos;
- corpse->map_obj.next = world->item;
- world->item = corpse;
- if (world->monster == monster)
+ struct MapObjDef * mod_hitter = get_map_object_def(hitter->type);
+ struct MapObjDef * mod_hitted = get_map_object_def(hitted->type);
+ struct MapObj * player = get_player();
+ char * msg1 = "You";
+ char * msg2 = "wound";
+ char * msg3 = "you";
+ if (player != hitter)
+ {
+ msg1 = mod_hitter->name;
+ msg2 = "wounds";
+ }
+ if (player != hitted)
+ {
+ msg3 = mod_hitted->name;
+ }
+ uint8_t len = 1 + strlen(msg1) + 1 + strlen(msg2) + 1 + strlen(msg3) + 2;
+ char msg[len];
+ sprintf(msg, "\n%s %s %s.", msg1, msg2, msg3);
+ update_log(msg);
+ hitted->lifepoints--;
+ if (0 == hitted->lifepoints)
+ {
+ hitted->type = mod_hitted->corpse_id;
+ if (player == hitted)