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

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.53 by root, Tue Apr 17 18:40:31 2007 UTC vs.
Revision 1.61 by root, Mon May 28 21:21:39 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software; you can redistribute it and/or modify it
9 * it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
10 * the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
11 * (at your option) any later version. 11 * 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, but
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16 * GNU General Public License for more details. 16 * 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 along
19 * along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 23 */
24 24
25#include <cassert> 25#include <cassert>
26 26
27#include <global.h> 27#include <global.h>
… …
309// dire hack, need to rationalise 309// dire hack, need to rationalise
310void 310void
311overwrite (archetype *at, object *op) 311overwrite (archetype *at, object *op)
312{ 312{
313 at->clone = *op; 313 at->clone = *op;
314
315 at->clone.arch = at; 314 at->clone.arch = at;
315
316 at->clone.inv = op->inv; op->inv = 0; 316 at->clone.inv = op->inv; op->inv = 0;
317 317
318 op->destroy (); 318 op->destroy ();
319} 319}
320 320
… …
330 330
331 coroapi::cede_to_tick_every (100); 331 coroapi::cede_to_tick_every (100);
332 332
333 for (;;) 333 for (;;)
334 { 334 {
335 object *op = object::create ();
335 archetype *at = get (f.get_str ()); 336 archetype *at = get (f.get_str ());
336 object *op = object::create (); 337 f.get (op->name);
338 f.next ();
339
340#if 0
341 if (f.kw == KW_inherit)
342 {
343 if (archetype *at = find (f.get_str ()))
344 *op = at->clone;
345 else
346 LOG (llevError, "archetype '%s' tries to inherit from non-existent archetype '%s'.\n",
347 &at->name, f.get_str ());
348
349 f.next ();
350 }
351#endif
337 352
338 if (!op->parse_kv (f)) 353 if (!op->parse_kv (f))
339 goto fail; 354 goto fail;
340 355
356 op->post_load_check ();
357
341 parts.push_back (std::make_pair (at, op)); 358 parts.push_back (std::make_pair (at, op));
342 359
343 if (f.kw != KW_more) 360 if (f.kw != KW_more)
344 break; 361 break;
345 362
346 f.next (); 363 f.next ();
364
347 assert (f.kw == KW_object); 365 if (f.kw != KW_object)
366 {
367 f.parse_error ("more object");
368 goto fail;
369 }
348 } 370 }
349 371
350 { 372 {
351 archetype *head = parts.front ().first; 373 archetype *head = parts.front ().first;
352 374
… …
506} 528}
507 529
508archetype * 530archetype *
509archetype::get (const char *name) 531archetype::get (const char *name)
510{ 532{
533 if (!name)
534 {
535 LOG (llevError, "null archetype requested\n");
536 name = "(null)";
537 }
538
511 archetype *at = find (name); 539 archetype *at = find (name);
512 540
513 if (!at) 541 if (!at)
514 { 542 {
515 archetypes.push_back (at = new archetype); 543 archetypes.push_back (at = new archetype);
516 at->name = name; 544 at->name = at->clone.name = at->clone.name_pl = name;
517 at->hash_add (); 545 at->hash_add ();
518 } 546 }
519 547
520 return at; 548 return at;
521} 549}

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines