--- deliantra/server/server/move.C 2009/10/12 14:00:59 1.32 +++ deliantra/server/server/move.C 2009/11/06 12:27:06 1.33 @@ -248,20 +248,6 @@ ); } -void -recursive_roll (object *op, int dir, object *pusher) -{ - if (!roll_ob (op, dir, pusher)) - { - new_draw_info_format (NDI_UNIQUE, 0, pusher, "You fail to push the %s.", query_name (op)); - return; - } - - move_ob (pusher, dir, pusher); - new_draw_info_format (NDI_BLACK, 0, pusher, "You move the %s.", query_name (op)); - return; -} - /* * This is a new version of blocked, this one handles objects * that can be passed through by monsters with the CAN_PASS_THRU defined. @@ -270,8 +256,7 @@ * This is currently only used for the boulder roll code. * Returns 1 if object does not fit, 0 if it does. */ - -int +static int try_fit (object *op, maptile *m, int x, int y) { object *tmp, *more; @@ -313,7 +298,7 @@ * it does not roll objects behind multipart objects properly. * Support for rolling multipart objects is questionable. */ -int +static int roll_ob (object *op, int dir, object *pusher) { sint16 x, y; @@ -361,6 +346,20 @@ return 1; } +void +recursive_roll (object *op, int dir, object *pusher) +{ + if (!roll_ob (op, dir, pusher)) + { + new_draw_info_format (NDI_UNIQUE, 0, pusher, "You fail to push the %s.", query_name (op)); + return; + } + + move_ob (pusher, dir, pusher); + new_draw_info_format (NDI_BLACK, 0, pusher, "You move the %s.", query_name (op)); + return; +} + /* returns 1 if pushing invokes a attack, 0 when not */ int push_ob (object *who, int dir, object *pusher)