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

Comparing deliantra/server/server/build_map.C (file contents):
Revision 1.20 by root, Sat Dec 30 10:16:11 2006 UTC vs.
Revision 1.24 by root, Mon Feb 5 02:07:40 2007 UTC

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) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001 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 authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <living.h> 26#include <living.h>
26#include <spells.h> 27#include <spells.h>
27#include <skills.h> 28#include <skills.h>
145 } 146 }
146 147
147 /* Now, find force in player's inventory */ 148 /* Now, find force in player's inventory */
148 force = pl->inv; 149 force = pl->inv;
149 while (force 150 while (force
150 && ((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
151 || (strcmp (force->msg, rune->msg)))) 152 || force->msg != rune->msg))
152 force = force->below; 153 force = force->below;
153 154
154 if (!force) 155 if (!force)
155 /* No force, need to create & insert one */ 156 /* No force, need to create & insert one */
156 { 157 {
244 if (!wall) 245 if (!wall)
245 /* Nothing -> bail out */ 246 /* Nothing -> bail out */
246 return; 247 return;
247 248
248 /* Find base name */ 249 /* Find base name */
249 strcpy (archetype, wall->arch->name); 250 assign (archetype, wall->arch->name);
250 underscore = strchr (archetype, '_'); 251 underscore = strchr (archetype, '_');
251 252
252 /* search for the first _ before a number */ 253 /* search for the first _ before a number */
253 while (underscore && !isdigit (*(underscore + 1))) 254 while (underscore && !isdigit (*(underscore + 1)))
254 underscore = strchr (underscore + 1, '_'); 255 underscore = strchr (underscore + 1, '_');

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines