--- deliantra/server/random_maps/exit.C 2007/01/18 19:42:10 1.24 +++ deliantra/server/random_maps/exit.C 2008/04/11 21:09:53 1.29 @@ -1,25 +1,24 @@ /* - * CrossFire, A Multiplayer game for X-windows + * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team - * Copyright (C) 2001 Mark Wedel & Crossfire Development Team - * Copyright (C) 1992 Frank Tore Johansen + * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team + * Copyright (©) 1992,2007 Frank Tore Johansen * - * This program is free software; you can redistribute it and/or modify + * Deliantra is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * The authors can be reached via e-mail at + * along with this program. If not, see . + * + * The authors can be reached via e-mail to */ #include @@ -173,7 +172,7 @@ { object *tmp; - tmp = pick_random_object (style_map_up); + tmp = style_map_up->pick_random_object (); the_exit_up = arch_to_object (tmp->arch); } @@ -186,7 +185,7 @@ { object *tmp; - tmp = pick_random_object (style_map_down); + tmp = style_map_down->pick_random_object (); the_exit_down = arch_to_object (tmp->arch); } else @@ -380,7 +379,7 @@ { if (walk->move_block == MOVE_ALL && walk->type != LOCKED_DOOR) { - walk->move_block = MOVE_BLOCK_DEFAULT; + walk->move_block = 0; update_object (walk, UP_OBJ_CHANGE); } }