home
·
contact
·
privacy
projects
/
plomrogue
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
10c1227
)
Repaired last commit and provided more consistent variable names.
author
Christian Heller
<c.heller@plomlompom.de>
Tue, 27 Aug 2013 01:46:45 +0000
(
03:46
+0200)
committer
Christian Heller
<c.heller@plomlompom.de>
Tue, 27 Aug 2013 01:46:45 +0000
(
03:46
+0200)
src/map_object_actions.c
patch
|
blob
|
history
diff --git
a/src/map_object_actions.c
b/src/map_object_actions.c
index 490874f249f018c9315e753e8e6633c8940343b6..a4e186d28b17f0acbd0cb4333fcdb0715efbacb6 100644
(file)
--- a/
src/map_object_actions.c
+++ b/
src/map_object_actions.c
@@
-12,47
+12,47
@@
-/* Log monster (described by "d
e
sc_monster1") bumping into "monster2". */
-static void monster_bumps_monster(struct World * world, char * d
e
sc_monster1,
+/* Log monster (described by "dsc_monster1") bumping into "monster2". */
+static void monster_bumps_monster(struct World * world, char * dsc_monster1,
struct Monster * monster2);
struct Monster * monster2);
-/* Decrement player HPs due to attack of monster described by "d
e
sc_monster",
+/* Decrement player HPs due to attack of monster described by "dsc_monster",
* kill player if his HP hit zero; log the whole action.
*/
* kill player if his HP hit zero; log the whole action.
*/
-static void monster_hits_player(struct World * world, char * d
e
sc_monster);
+static void monster_hits_player(struct World * world, char * dsc_monster);
/* Decrement HP of "monster" hit by player, kill it if its HP hit zero; log the
* whole action.
*/
/* Decrement HP of "monster" hit by player, kill it if its HP hit zero; log the
* whole action.
*/
-static void player_hits_monster(struct World * world, struct Monster * monster)
+static void player_hits_monster(struct World * world, struct Monster * monster)
;
/* Try moving the player in direction "d" towards coordinate "target"; log
* success or failure of the whole action.
*/
static void try_player_move(struct World * world,
/* Try moving the player in direction "d" towards coordinate "target"; log
* success or failure of the whole action.
*/
static void try_player_move(struct World * world,
- enum dir d, struct yx_uint16 target)
+ enum dir d, struct yx_uint16 target)
;
-static void monster_bumps_monster(struct World * world, char * d
e
sc_monster1,
+static void monster_bumps_monster(struct World * world, char * dsc_monster1,
struct Monster * monster2)
{
struct Monster * monster2)
{
- char * bump
de
sc = " bumps into ";
+ char * bump
_d
sc = " bumps into ";
struct MapObjDef * mod = get_map_obj_def(world, monster2->map_obj.type);
struct MapObjDef * mod = get_map_obj_def(world, monster2->map_obj.type);
- char * msg = malloc(strlen(d
esc_monster1) + strlen(bumpde
sc)
+ char * msg = malloc(strlen(d
sc_monster1) + strlen(bump_d
sc)
+ strlen(mod->desc) + 3);
+ strlen(mod->desc) + 3);
- sprintf(msg, "\n%s%s%s.", d
esc_monster1, bumpde
sc, mod->desc);
+ sprintf(msg, "\n%s%s%s.", d
sc_monster1, bump_d
sc, mod->desc);
update_log(world, msg);
free(msg);
}
update_log(world, msg);
free(msg);
}
-static void monster_hits_player(struct World * world, char * d
e
sc_monster)
+static void monster_hits_player(struct World * world, char * dsc_monster)
{
{
- char * hit
de
sc = " hits you";
- char * msg = malloc(strlen(d
esc_monster) + strlen(hitde
sc) + 3);
- sprintf(msg, "\n%s%s.", d
esc_monster, hitde
sc);
+ char * hit
_d
sc = " hits you";
+ char * msg = malloc(strlen(d
sc_monster) + strlen(hit_d
sc) + 3);
+ sprintf(msg, "\n%s%s.", d
sc_monster, hit_d
sc);
update_log(world, msg);
free(msg);
world->player->hitpoints--;
update_log(world, msg);
free(msg);
world->player->hitpoints--;
@@
-67,19
+67,19
@@
static void monster_hits_player(struct World * world, char * desc_monster)
static void player_hits_monster(struct World * world, struct Monster * monster)
{
struct MapObjDef * mod = get_map_obj_def(world, monster->map_obj.type);
static void player_hits_monster(struct World * world, struct Monster * monster)
{
struct MapObjDef * mod = get_map_obj_def(world, monster->map_obj.type);
- char * hit_d
e
sc = "You hit the ";
- char * monster_d
e
sc = mod->desc;
- char * msg = malloc(strlen(hit_d
esc) + strlen(monster_de
sc) + 3);
- sprintf(msg, "\n%s%s.", hit_d
esc, monster_de
sc);
+ char * hit_dsc = "You hit the ";
+ char * monster_dsc = mod->desc;
+ char * msg = malloc(strlen(hit_d
sc) + strlen(monster_d
sc) + 3);
+ sprintf(msg, "\n%s%s.", hit_d
sc, monster_d
sc);
update_log(world, msg);
free(msg);
monster->hitpoints--;
if (0 == monster->hitpoints)
{
update_log(world, msg);
free(msg);
monster->hitpoints--;
if (0 == monster->hitpoints)
{
- hit_d
e
sc = "You kill the ";
- msg = malloc(strlen(hit_d
esc) + strlen(monster_de
sc) + 3);
- sprintf(msg, "\n%s%s.", hit_d
esc, monster_de
sc);
+ hit_dsc = "You kill the ";
+ msg = malloc(strlen(hit_d
sc) + strlen(monster_d
sc) + 3);
+ sprintf(msg, "\n%s%s.", hit_d
sc, monster_d
sc);
update_log(world, msg);
free(msg);
if (world->monster == monster)
update_log(world, msg);
free(msg);
if (world->monster == monster)
@@
-141,10
+141,10
@@
extern void move_monster(struct World * world, struct Monster * monster)
char d = rrand() % 5;
struct yx_uint16 t = mv_yx_in_dir(d, monster->map_obj.pos);
struct MapObjDef * mod = get_map_obj_def(world, monster->map_obj.type);
char d = rrand() % 5;
struct yx_uint16 t = mv_yx_in_dir(d, monster->map_obj.pos);
struct MapObjDef * mod = get_map_obj_def(world, monster->map_obj.type);
- char * d
e
sc = mod->desc;
+ char * dsc = mod->desc;
if (yx_uint16_cmp(&t, &world->player->pos))
{
if (yx_uint16_cmp(&t, &world->player->pos))
{
- monster_hits_player(world, d
e
sc);
+ monster_hits_player(world, dsc);
return;
}
struct Monster * other_monster;
return;
}
struct Monster * other_monster;
@@
-158,7
+158,7
@@
extern void move_monster(struct World * world, struct Monster * monster)
}
if (yx_uint16_cmp(&t, &other_monster->map_obj.pos))
{
}
if (yx_uint16_cmp(&t, &other_monster->map_obj.pos))
{
- monster_bumps_monster(world, d
e
sc, other_monster);
+ monster_bumps_monster(world, dsc, other_monster);
return;
}
}
return;
}
}
@@
-170,7
+170,7
@@
extern void move_monster(struct World * world, struct Monster * monster)
-extern void move_player
(struct World * world, enum dir d)
+extern void move_player(struct World * world, enum dir d)
{
struct yx_uint16 t = mv_yx_in_dir(d, world->player->pos);
struct Monster * monster;
{
struct yx_uint16 t = mv_yx_in_dir(d, world->player->pos);
struct Monster * monster;