| 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) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
| 5 | Copyright (C) 2001 Mark Wedel & Crossfire Development Team |
5 | * Copyright (C) 2001 Mark Wedel & Crossfire Development Team |
| 6 | Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (C) 1992 Frank Tore Johansen |
| 7 | |
7 | * |
| 8 | 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 |
| 9 | 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 |
| 10 | the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation; either version 2 of the License, or |
| 11 | (at your option) 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, |
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 GNU General Public License |
| 19 | along with this program; if not, write to the Free Software |
19 | * along with this program; if not, write to the Free Software |
| 20 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 21 | |
21 | * |
| 22 | The authors can be reached via e-mail to <crossfire@schmorp.de> |
22 | * The authors can be reached via e-mail to <crossfire@schmorp.de> |
| 23 | */ |
23 | */ |
| 24 | |
24 | |
| 25 | #include <global.h> |
25 | #include <global.h> |
| 26 | #include <living.h> |
26 | #include <living.h> |
| 27 | #include <spells.h> |
27 | #include <spells.h> |
| 28 | #include <skills.h> |
28 | #include <skills.h> |
| … | |
… | |
| 146 | } |
146 | } |
| 147 | |
147 | |
| 148 | /* Now, find force in player's inventory */ |
148 | /* Now, find force in player's inventory */ |
| 149 | force = pl->inv; |
149 | force = pl->inv; |
| 150 | while (force |
150 | while (force |
| 151 | && ((force->type != FORCE) || (!force->slaying) || (strcmp (force->slaying, pl->map->path)) || (!force->msg) |
151 | && ((force->type != FORCE) || !force->slaying || force->slaying != pl->map->path || !force->msg |
| 152 | || (strcmp (force->msg, rune->msg)))) |
152 | || force->msg != rune->msg)) |
| 153 | force = force->below; |
153 | force = force->below; |
| 154 | |
154 | |
| 155 | if (!force) |
155 | if (!force) |
| 156 | /* No force, need to create & insert one */ |
156 | /* No force, need to create & insert one */ |
| 157 | { |
157 | { |
| … | |
… | |
| 245 | if (!wall) |
245 | if (!wall) |
| 246 | /* Nothing -> bail out */ |
246 | /* Nothing -> bail out */ |
| 247 | return; |
247 | return; |
| 248 | |
248 | |
| 249 | /* Find base name */ |
249 | /* Find base name */ |
| 250 | strcpy (archetype, wall->arch->name); |
250 | assign (archetype, wall->arch->name); |
| 251 | underscore = strchr (archetype, '_'); |
251 | underscore = strchr (archetype, '_'); |
| 252 | |
252 | |
| 253 | /* search for the first _ before a number */ |
253 | /* search for the first _ before a number */ |
| 254 | while (underscore && !isdigit (*(underscore + 1))) |
254 | while (underscore && !isdigit (*(underscore + 1))) |
| 255 | underscore = strchr (underscore + 1, '_'); |
255 | underscore = strchr (underscore + 1, '_'); |
