| … | |
… | |
| 3 | * |
3 | * |
| 4 | * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
4 | * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
| 5 | * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team |
| 6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
| 7 | * |
7 | * |
| 8 | * Deliantra is free software: you can redistribute it and/or modify |
8 | * Deliantra is free software: you can redistribute it and/or modify it under |
| 9 | * it under the terms of the GNU General Public License as published by |
9 | * the terms of the Affero GNU General Public License as published by the |
| 10 | * the Free Software Foundation, either version 3 of the License, or |
10 | * Free Software Foundation, either version 3 of the License, or (at your |
| 11 | * (at your option) any later version. |
11 | * option) any later version. |
| 12 | * |
12 | * |
| 13 | * This program is distributed in the hope that it will be useful, |
13 | * This program is distributed in the hope that it will be useful, |
| 14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 16 | * GNU General Public License 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 |
18 | * You should have received a copy of the Affero GNU General Public License |
| 19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
19 | * and the GNU General Public License along with this program. If not, see |
|
|
20 | * <http://www.gnu.org/licenses/>. |
| 20 | * |
21 | * |
| 21 | * The authors can be reached via e-mail to <support@deliantra.net> |
22 | * The authors can be reached via e-mail to <support@deliantra.net> |
| 22 | */ |
23 | */ |
| 23 | |
24 | |
| 24 | #include <unistd.h> |
25 | #include <unistd.h> |
| … | |
… | |
| 334 | if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height)) |
335 | if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height)) |
| 335 | { |
336 | { |
| 336 | // we insert manually because |
337 | // we insert manually because |
| 337 | // a) its way faster |
338 | // a) its way faster |
| 338 | // b) we remove manually, too, and there are good reasons for that |
339 | // b) we remove manually, too, and there are good reasons for that |
| 339 | // c) its correct |
340 | // c) it's correct |
| 340 | mapspace &ms = at (op->x, op->y); |
341 | mapspace &ms = at (op->x, op->y); |
| 341 | |
342 | |
| 342 | op->flag [FLAG_REMOVED] = false; |
343 | op->flag [FLAG_REMOVED] = false; |
| 343 | |
344 | |
| 344 | op->above = 0; |
345 | op->above = 0; |
| 345 | op->below = ms.top; |
346 | op->below = ms.top; |
| 346 | |
347 | |
| 347 | if (ms.top) |
|
|
| 348 | ms.top->above = op; |
348 | *(ms.top ? &ms.top->above : &ms.bot) = op; |
| 349 | else |
|
|
| 350 | ms.bot = op; |
|
|
| 351 | |
349 | |
| 352 | ms.top = op; |
350 | ms.top = op; |
| 353 | ms.flags_ = 0; |
351 | ms.flags_ = 0; |
| 354 | } |
352 | } |
| 355 | else |
353 | else |
| … | |
… | |
| 1518 | else |
1516 | else |
| 1519 | { |
1517 | { |
| 1520 | retval->distance_x += op2->x - x; |
1518 | retval->distance_x += op2->x - x; |
| 1521 | retval->distance_y += op2->y - y; |
1519 | retval->distance_y += op2->y - y; |
| 1522 | |
1520 | |
| 1523 | retval->part = NULL; |
1521 | retval->part = 0; |
| 1524 | retval->distance = idistance (retval->distance_x, retval->distance_y); |
1522 | retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y)); |
| 1525 | retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); |
1523 | retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); |
| 1526 | } |
1524 | } |
| 1527 | } |
1525 | } |
| 1528 | |
1526 | |
| 1529 | /* Returns true of op1 and op2 are effectively on the same map |
1527 | /* Returns true of op1 and op2 are effectively on the same map |
