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.58 by root, Sat Apr 21 11:55:36 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.
… …
351#endif 351#endif
352 352
353 if (!op->parse_kv (f)) 353 if (!op->parse_kv (f))
354 goto fail; 354 goto fail;
355 355
356 op->post_load_check ();
357
356 parts.push_back (std::make_pair (at, op)); 358 parts.push_back (std::make_pair (at, op));
357 359
358 if (f.kw != KW_more) 360 if (f.kw != KW_more)
359 break; 361 break;
360 362
… …
375 { 377 {
376 archetype *at = p->first; 378 archetype *at = p->first;
377 379
378 if (at->head != head && at->head) 380 if (at->head != head && at->head)
379 { 381 {
380 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);
381 goto fail; 383 goto fail;
382 } 384 }
383 385
384 if (at->next && at != head) 386 if (at->next && at != head)
385 { 387 {
386 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);
387 goto fail; 389 goto fail;
388 } 390 }
389 } 391 }
390 392
391 // sever chain of existing head object 393 // sever chain of existing head object
… …
536 538
537 archetype *at = find (name); 539 archetype *at = find (name);
538 540
539 if (!at) 541 if (!at)
540 { 542 {
541 archetypes.push_back (at = new archetype); 543 archetypes.insert (at = new archetype);
542 at->name = at->clone.name = at->clone.name_pl = name; 544 at->archname = at->clone.name = at->clone.name_pl = name;
543 at->hash_add (); 545 at->hash_add ();
544 } 546 }
545 547
546 return at; 548 return at;
547} 549}
… …
550 * Adds an archetype to the hashtable. 552 * Adds an archetype to the hashtable.
551 */ 553 */
552void 554void
553archetype::hash_add () 555archetype::hash_add ()
554{ 556{
555 ht.insert (std::make_pair (name, this)); 557 ht.insert (std::make_pair (archname, this));
556} 558}
557 559
558void 560void
559archetype::hash_del () 561archetype::hash_del ()
560{ 562{
561 ht.erase (name); 563 ht.erase (archname);
562} 564}
563 565
564/* 566/*
565 * Returns the first archetype using the given type. 567 * Returns the first archetype using the given type.
566 * Used in treasure-generation. 568 * Used in treasure-generation.

Diff Legend

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