--- deliantra/server/server/move.C 2006/08/29 17:32:19 1.5 +++ deliantra/server/server/move.C 2006/09/03 00:18:42 1.6 @@ -1,6 +1,6 @@ /* * static char *rcsid_move_c = - * "$Id: move.C,v 1.5 2006/08/29 17:32:19 root Exp $"; + * "$Id: move.C,v 1.6 2006/09/03 00:18:42 root Exp $"; */ /* @@ -254,7 +254,7 @@ } if (k==9) { LOG(llevError,"Shop mat %s (%d, %d) is in solid rock?\n", - other_teleporter->name, other_teleporter->x, other_teleporter->y); + &other_teleporter->name, other_teleporter->x, other_teleporter->y); return 0; } } @@ -437,7 +437,7 @@ !QUERY_FLAG(who,FLAG_FRIENDLY)&& !QUERY_FLAG(who,FLAG_NEUTRAL)) { if(pusher->contr->run_on) /* only when we run */ { new_draw_info_format(NDI_UNIQUE, 0, pusher, - "You start to attack %s !!",who->name); + "You start to attack %s !!", &who->name); CLEAR_FLAG(who,FLAG_UNAGGRESSIVE); /* the sucker don't like you anymore */ who->enemy = pusher; return 1; @@ -445,7 +445,7 @@ else { new_draw_info_format(NDI_UNIQUE, 0, pusher, - "You avoid attacking %s .",who->name); + "You avoid attacking %s.", &who->name); } } @@ -453,7 +453,7 @@ if(QUERY_FLAG(who,FLAG_STAND_STILL)) { new_draw_info_format(NDI_UNIQUE, 0, pusher, - "You can't push %s.",who->name); + "You can't push %s.", &who->name); return 0; } @@ -473,7 +473,7 @@ { if (who ->type == PLAYER) { new_draw_info_format(NDI_UNIQUE, 0, who, - "%s tried to push you.",pusher->name); + "%s tried to push you.", &pusher->name); } return 0; } @@ -483,11 +483,11 @@ */ if (who->type == PLAYER) { new_draw_info_format(NDI_UNIQUE, 0, who, - "%s pushed you.",pusher->name); + "%s pushed you.", &pusher->name); } if (pusher->type == PLAYER) { new_draw_info_format(NDI_UNIQUE, 0, pusher, - "You pushed %s back.", who->name); + "You pushed %s back.", &who->name); } return 1;