ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/move.C
(Generate patch)

Comparing deliantra/server/server/move.C (file contents):
Revision 1.19 by root, Mon May 28 21:28:36 2007 UTC vs.
Revision 1.21 by root, Sun Jul 1 05:00:20 2007 UTC

3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
180 179
181 if (op->head != NULL) 180 if (op->head != NULL)
182 op = op->head; 181 op = op->head;
183 op->remove (); 182 op->remove ();
184 for (tmp = op; tmp != NULL; tmp = tmp->more) 183 for (tmp = op; tmp != NULL; tmp = tmp->more)
185 tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x), 184 tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->x),
186 tmp->y = y + freearr_y[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.y); 185 tmp->y = y + freearr_y[i] + (tmp->arch == NULL ? 0 : tmp->arch->y);
187 186
188 tmp = insert_ob_in_map (op, op->map, originator, 0); 187 tmp = insert_ob_in_map (op, op->map, originator, 0);
189 if (tmp) 188 if (tmp)
190 return 0; 189 return 0;
191 else 190 else
286 user->remove (); 285 user->remove ();
287 286
288 /* Update location for the object */ 287 /* Update location for the object */
289 for (tmp = user; tmp != NULL; tmp = tmp->more) 288 for (tmp = user; tmp != NULL; tmp = tmp->more)
290 { 289 {
291 tmp->x = other_teleporter->x + freearr_x[k] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x); 290 tmp->x = other_teleporter->x + freearr_x[k] + (tmp->arch == NULL ? 0 : tmp->arch->x);
292 tmp->y = other_teleporter->y + freearr_y[k] + (tmp->arch == NULL ? 0 : tmp->arch->clone.y); 291 tmp->y = other_teleporter->y + freearr_y[k] + (tmp->arch == NULL ? 0 : tmp->arch->y);
293 } 292 }
294 tmp = insert_ob_in_map (user, other_teleporter->map, NULL, 0); 293 tmp = insert_ob_in_map (user, other_teleporter->map, NULL, 0);
295 return (tmp == NULL); 294 return (tmp == NULL);
296} 295}
297 296

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines