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.54 by root, Tue Apr 17 18:59:05 2007 UTC vs.
Revision 1.62 by root, Mon Jun 4 12:19:08 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>
… …
50 str_equal, 50 str_equal,
51 slice_allocator< std::pair<const char *const, arch_ptr> > 51 slice_allocator< std::pair<const char *const, arch_ptr> >
52 > HT; 52 > HT;
53 53
54static HT ht (5000); 54static HT ht (5000);
55static std::vector<archetype *> archetypes; 55archvec archetypes;
56 56
57/** 57/**
58 * GROS - This function retrieves an archetype given the name that appears 58 * GROS - This function retrieves an archetype given the name that appears
59 * during the game (for example, "writing pen" instead of "stylus"). 59 * during the game (for example, "writing pen" instead of "stylus").
60 * It does not use the hashtable system, but browse the whole archlist each time. 60 * It does not use the hashtable system, but browse the whole archlist each time.
… …
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
… …
335 object *op = object::create (); 335 object *op = object::create ();
336 archetype *at = get (f.get_str ()); 336 archetype *at = get (f.get_str ());
337 f.get (op->name); 337 f.get (op->name);
338 f.next (); 338 f.next ();
339 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
352
340 if (!op->parse_kv (f)) 353 if (!op->parse_kv (f))
341 goto fail; 354 goto fail;
355
356 op->post_load_check ();
342 357
343 parts.push_back (std::make_pair (at, op)); 358 parts.push_back (std::make_pair (at, op));
344 359
345 if (f.kw != KW_more) 360 if (f.kw != KW_more)
346 break; 361 break;
… …
362 { 377 {
363 archetype *at = p->first; 378 archetype *at = p->first;
364 379
365 if (at->head != head && at->head) 380 if (at->head != head && at->head)
366 { 381 {
367 LOG (llevError, "%s: unable to overwrite foreign non-head archetype with non-head archetype\n", &at->name); 382 LOG (llevError, "%s: unable to overwrite foreign non-head archetype with non-head archetype\n", &at->archname);
368 goto fail; 383 goto fail;
369 } 384 }
370 385
371 if (at->next && at != head) 386 if (at->next && at != head)
372 { 387 {
373 LOG (llevError, "%s: unable to overwrite foreign head archetype with non-head archetype\n", &at->name); 388 LOG (llevError, "%s: unable to overwrite foreign head archetype with non-head archetype\n", &at->archname);
374 goto fail; 389 goto fail;
375 } 390 }
376 } 391 }
377 392
378 // sever chain of existing head object 393 // sever chain of existing head object
… …
513} 528}
514 529
515archetype * 530archetype *
516archetype::get (const char *name) 531archetype::get (const char *name)
517{ 532{
533 if (!name)
534 {
535 LOG (llevError, "null archetype requested\n");
536 name = "(null)";
537 }
538
518 archetype *at = find (name); 539 archetype *at = find (name);
519 540
520 if (!at) 541 if (!at)
521 { 542 {
522 archetypes.push_back (at = new archetype); 543 archetypes.insert (at = new archetype);
523 at->name = name; 544 at->archname = at->clone.name = at->clone.name_pl = name;
524 at->hash_add (); 545 at->hash_add ();
525 } 546 }
526 547
527 return at; 548 return at;
528} 549}
… …
531 * Adds an archetype to the hashtable. 552 * Adds an archetype to the hashtable.
532 */ 553 */
533void 554void
534archetype::hash_add () 555archetype::hash_add ()
535{ 556{
536 ht.insert (std::make_pair (name, this)); 557 ht.insert (std::make_pair (archname, this));
537} 558}
538 559
539void 560void
540archetype::hash_del () 561archetype::hash_del ()
541{ 562{
542 ht.erase (name); 563 ht.erase (archname);
543} 564}
544 565
545/* 566/*
546 * Returns the first archetype using the given type. 567 * Returns the first archetype using the given type.
547 * Used in treasure-generation. 568 * Used in treasure-generation.

Diff Legend

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