| 1 | /* |
1 | /* |
| 2 | CrossFire, A Multiplayer game for X-windows |
2 | * CrossFire, A Multiplayer game for X-windows |
| 3 | |
3 | * |
|
|
4 | * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
| 4 | Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
5 | * Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
| 5 | Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (C) 1992 Frank Tore Johansen |
| 6 | |
7 | * |
| 7 | This program is free software; you can redistribute it and/or modify |
8 | * This program is free software; you can redistribute it and/or modify |
| 8 | it under the terms of the GNU General Public License as published by |
9 | * it under the terms of the GNU General Public License as published by |
| 9 | the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation; either version 2 of the License, or |
| 10 | (at your option) any later version. |
11 | * (at your option) any later version. |
| 11 | |
12 | * |
| 12 | 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, |
| 13 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 15 | GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
| 16 | |
17 | * |
| 17 | You should have received a copy of the GNU General Public License |
18 | * You should have received a copy of the GNU General Public License |
| 18 | along with this program; if not, write to the Free Software |
19 | * along with this program; if not, write to the Free Software |
| 19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 20 | |
21 | * |
| 21 | The author can be reached via e-mail to <crossfire@schmorp.de> |
22 | * The author can be reached via e-mail to <crossfire@schmorp.de> |
| 22 | */ |
23 | */ |
| 23 | |
24 | |
| 24 | #include <global.h> |
25 | #include <global.h> |
| 25 | #ifndef __CEXTRACT__ |
26 | #ifndef __CEXTRACT__ |
| 26 | # include <sproto.h> |
27 | # include <sproto.h> |
| 27 | #endif |
28 | #endif |
| … | |
… | |
| 121 | * ok - the caller will deal with actual object removal/insertion |
122 | * ok - the caller will deal with actual object removal/insertion |
| 122 | */ |
123 | */ |
| 123 | if (op->head) |
124 | if (op->head) |
| 124 | return 1; |
125 | return 1; |
| 125 | |
126 | |
|
|
127 | if (m != op->map && op->contr) |
|
|
128 | { |
|
|
129 | if (INVOKE_MAP (LEAVE, op->map, ARG_PLAYER (op->contr))) |
|
|
130 | return 0; |
|
|
131 | |
|
|
132 | op->remove (); |
|
|
133 | |
|
|
134 | if (INVOKE_PLAYER (MAP_CHANGE, op->contr, ARG_MAP (m), ARG_INT (newx), ARG_INT (newy))) |
|
|
135 | return 0; |
|
|
136 | |
|
|
137 | if (INVOKE_MAP (ENTER, m, ARG_PLAYER (op->contr), ARG_INT (newx), ARG_INT (newy))) |
|
|
138 | return 0; |
|
|
139 | } |
|
|
140 | else |
| 126 | op->remove (); |
141 | op->remove (); |
| 127 | |
142 | |
| 128 | /* we already have newx, newy, and m, so lets use them. |
143 | /* we already have newx, newy, and m, so lets use them. |
| 129 | * In addition, this fixes potential crashes, because multipart object was |
144 | * In addition, this fixes potential crashes, because multipart object was |
| 130 | * on edge of map, +=x, +=y doesn't make correct coordinates. |
145 | * on edge of map, +=x, +=y doesn't make correct coordinates. |
| 131 | */ |
146 | */ |
