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.63 by root, Mon Jun 4 13:04:00 2007 UTC vs.
Revision 1.73 by root, Sun Apr 20 00:44:12 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * 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, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25#include <cassert> 24#include <cassert>
26 25
27#include <global.h> 26#include <global.h>
… …
29#include <loader.h> 28#include <loader.h>
30 29
31#include <tr1/functional> 30#include <tr1/functional>
32#include <tr1/unordered_map> 31#include <tr1/unordered_map>
33 32
34/* The naming of these functions is really poor - they are all
35 * pretty much named '.._arch_...', but they may more may not
36 * return archetypes. Some make the arch_to_object call, and thus
37 * return an object. Perhaps those should be called 'archob' functions
38 * to denote they return an object derived from the archetype.
39 * MSW 2003-04-29
40 */
41
42bool loading_arch; // ugly flag to object laoder etc. to suppress/request special processing 33archetype *loading_arch; // ugly flag to object laoder etc. to suppress/request special processing
34archetype *archetype::empty;
43 35
44// the hashtable 36// the hashtable
45typedef std::tr1::unordered_map 37typedef std::tr1::unordered_map
46 < 38 <
47 const char *, 39 const char *,
… …
51 slice_allocator< std::pair<const char *const, arch_ptr> > 43 slice_allocator< std::pair<const char *const, arch_ptr> >
52 > HT; 44 > HT;
53 45
54static HT ht (5000); 46static HT ht (5000);
55archvec archetypes; 47archvec archetypes;
48
49// the vector of other_arch references to be resolved
50static std::vector< std::pair<arch_ptr *, shstr> > postponed_arch_ref;
51// the vector of loaded but not yet committed archetypes
52static std::vector<archetype *> postponed_arch;
56 53
57/** 54/**
58 * GROS - This function retrieves an archetype given the name that appears 55 * GROS - This function retrieves an archetype given the name that appears
59 * during the game (for example, "writing pen" instead of "stylus"). 56 * 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. 57 * It does not use the hashtable system, but browse the whole archlist each time.
… …
69find_archetype_by_object_name (const char *name) 66find_archetype_by_object_name (const char *name)
70{ 67{
71 shstr_cmp name_cmp (name); 68 shstr_cmp name_cmp (name);
72 69
73 for_all_archetypes (at) 70 for_all_archetypes (at)
74 if (at->archname == name_cmp) 71 if (at->name == name_cmp)
75 return at; 72 return at;
76 73
77 return 0; 74 return 0;
78} 75}
79 76
… …
86find_archetype_by_object_type_name (int type, const char *name) 83find_archetype_by_object_type_name (int type, const char *name)
87{ 84{
88 shstr_cmp name_cmp (name); 85 shstr_cmp name_cmp (name);
89 86
90 for_all_archetypes (at) 87 for_all_archetypes (at)
91 if (at->archname == name_cmp && at->type == type) 88 if (at->name == name_cmp && at->type == type)
92 return at; 89 return at;
93 90
94 return 0; 91 return 0;
95} 92}
96 93
… …
157 } 154 }
158 155
159 return create_singularity (name); 156 return create_singularity (name);
160} 157}
161 158
162 /* This is a subset of the parse_id command. Basically, name can be 159/* This is a subset of the parse_id command. Basically, name can be
163 * a string seperated lists of things to match, with certain keywords. 160 * a string seperated lists of things to match, with certain keywords.
164 * pl is the player (only needed to set count properly) 161 * pl is the player (only needed to set count properly)
165 * op is the item we are trying to match. Calling function takes care 162 * op is the item we are trying to match. Calling function takes care
166 * of what action might need to be done and if it is valid 163 * of what action might need to be done and if it is valid
167 * (pickup, drop, etc.) Return NONZERO if we have a match. A higher 164 * (pickup, drop, etc.) Return NONZERO if we have a match. A higher
168 * value means a better match. 0 means no match. 165 * value means a better match. 0 means no match.
169 * 166 *
170 * Brief outline of the procedure: 167 * Brief outline of the procedure:
171 * We take apart the name variable into the individual components. 168 * We take apart the name variable into the individual components.
172 * cases for 'all' and unpaid are pretty obvious. 169 * cases for 'all' and unpaid are pretty obvious.
173 * Next, we check for a count (either specified in name, or in the 170 * Next, we check for a count (either specified in name, or in the
174 * player object.) 171 * player object.)
175 * If count is 1, make a quick check on the name. 172 * If count is 1, make a quick check on the name.
176 * IF count is >1, we need to make plural name. Return if match. 173 * IF count is >1, we need to make plural name. Return if match.
177 * Last, make a check on the full name. 174 * Last, make a check on the full name.
178 */ 175 */
179int 176int
180item_matched_string (object *pl, object *op, const char *name) 177item_matched_string (object *pl, object *op, const char *name)
181{ 178{
182 char *cp, local_name[MAX_BUF]; 179 char *cp, local_name[MAX_BUF];
183 int count, retval = 0; 180 int count, retval = 0;
… …
277 return 0; 274 return 0;
278} 275}
279 276
280archetype::archetype (const char *name) 277archetype::archetype (const char *name)
281{ 278{
282 stub = true;
283 arch = this; 279 arch = this;
284 this->archname = this->name = this->name_pl = name; 280 this->archname = this->name = this->name_pl = name;
285} 281}
286 282
287archetype::~archetype () 283archetype::~archetype ()
… …
324 else 320 else
325 return i->second; 321 return i->second;
326} 322}
327 323
328archetype * 324archetype *
329archetype::get (const char *name)
330{
331 if (!name)
332 {
333 LOG (llevError, "null archetype requested\n");
334 name = "(null)";
335 }
336
337 archetype *at = find (name);
338
339 if (loading_arch && at && !at->stub)
340 {
341 at->unlink ();
342 at = 0;
343 }
344
345 if (!at || (!at->stub && loading_arch))
346 {
347 at = new archetype (name);
348 at->link ();
349 }
350
351 return at;
352}
353
354archetype *
355archetype::read (object_thawer &f) 325archetype::read (object_thawer &f)
356{ 326{
357 assert (f.kw == KW_object); 327 assert (f.kw == KW_object);
358 328
359 loading_arch = true; // hack to tell parse_kv et al. to behave
360
361 std::vector<archetype *> parts; 329 std::vector<archetype *> parts;
362 330
363 coroapi::cede_to_tick_every (10); 331 coroapi::cede_to_tick ();
364 332
365 for (;;) 333 for (;;)
366 { 334 {
367 // the archetype might have been referenced earlier
368 // so try to find an existing stub archetype first
369 archetype *at = find (f.get_str ()); 335 archetype *at = new archetype (f.get_str ());
370
371 if (!at || !at->stub)
372 at = new archetype (f.get_str ());
373 336
374 f.next (); 337 f.next ();
375 338
376#if 0 339#if 0
377 // implementing it here in the server does neither allow multiple inheritence 340 // implementing it here in the server does neither allow multiple inheritence
… …
388 351
389 f.next (); 352 f.next ();
390 } 353 }
391#endif 354#endif
392 355
356 loading_arch = at; // hack to tell parse_kv et al. to behave
357 bool parse_ok = at->parse_kv (f);
358 loading_arch = 0;
359
393 if (!at->parse_kv (f)) 360 if (!parse_ok)
394 goto fail; 361 goto fail;
395 362
363 loading_arch = at; // hack to tell parse_kv et al. to behave
396 at->post_load_check (); 364 at->post_load_check ();
365 loading_arch = 0;
397 366
398 parts.push_back (at); 367 parts.push_back (at);
399 368
400 if (f.kw != KW_more) 369 if (f.kw != KW_more)
401 break; 370 break;
… …
407 f.parse_error ("more object"); 376 f.parse_error ("more object");
408 goto fail; 377 goto fail;
409 } 378 }
410 } 379 }
411 380
412 loading_arch = false;
413
414 { 381 {
415 auto (at, parts.begin ()); 382 auto (at, parts.begin ());
416 383
417 archetype *new_head = parts.front (); 384 archetype *new_head = parts.front ();
418 archetype *old_head = find (new_head->archname); 385 archetype *old_head = find (new_head->archname);
419 386
420 for (auto (at, parts.begin ()); at != parts.end (); ++at) 387 if (old_head && !old_head->is_head ())
421 fprintf (stderr, "%d: %s\n", at - parts.begin(), &(*at)->archname);//D 388 {
389 LOG (llevError, "%s: unable to overwrite non-head archetype '%s' with head archetype, skipping.\n",
390 &new_head->archname, &old_head->archname);
391 goto fail;
392 }
422 393
423 // check that all archetypes belong to the same old object or are new 394 // check that all archetypes belong to the same old object or are new
424 for (auto (at, parts.begin ()); at != parts.end (); ++at) 395 for (auto (at, parts.begin ()); at != parts.end (); ++at)
425 { 396 {
426 archetype *new_part = *at; 397 archetype *new_part = *at;
427 archetype *old_part = find (new_part->archname); 398 archetype *old_part = find (new_part->archname);
428 399
429 if (old_part && old_part->head_ () != old_head) 400 if (old_part && old_part->head_ () != old_head)
430 { 401 {
431 fprintf (stderr, "nhn %s\n", &new_head->archname);//D
432 fprintf (stderr, "old_head %p,%p new_head %p,%p ph %p\n", old_head, old_part, new_head, new_part, old_part->head_());
433 LOG (llevError, "%s: unable to overwrite archetype '%s' with archetype of different object, skipping.\n", 402 LOG (llevError, "%s: unable to overwrite archetype '%s' with archetype of different object, skipping.\n",
434 &new_part->archname, &((archetype *)old_part->head_ ())->archname); 403 &new_part->archname, &((archetype *)old_part->head_ ())->archname);
435 goto fail; 404 goto fail;
436 } 405 }
437 } 406 }
438 407
439 fprintf (stderr, "oh %p %s\n", old_head, &new_head->archname);//D
440
441 // deactivate existing archetype
442 for (archetype *at = old_head; at; at = (archetype *)at->more)
443 at->unlink ();
444
445 // reassemble new chain 408 // assemble new chain
446 new_head->min_x = new_head->max_x = new_head->x; 409 new_head->min_x = new_head->max_x = new_head->x;
447 new_head->min_y = new_head->max_y = new_head->y; 410 new_head->min_y = new_head->max_y = new_head->y;
448 411
449 archetype *less = new_head; 412 archetype *less = new_head;
450 archetype *head = 0;
451 for (auto (p, parts.begin () + 1); p != parts.end (); ++p) 413 for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
452 { 414 {
453 archetype *at = *p; 415 archetype *at = *p;
416
417 // some flags get inherited formt he head (probably a lot more)
418 // doing it here doesn't feel too cozy, but it allows code
419 // to ignore head checks for these flags, which saves time
420 at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE];
421 at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK];
422 at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER];
423 at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR];
454 424
455 if (at->x < new_head->min_x) new_head->min_x = at->x; 425 if (at->x < new_head->min_x) new_head->min_x = at->x;
456 if (at->y < new_head->min_y) new_head->min_y = at->y; 426 if (at->y < new_head->min_y) new_head->min_y = at->y;
457 if (at->x > new_head->max_x) new_head->max_x = at->x; 427 if (at->x > new_head->max_x) new_head->max_x = at->x;
458 if (at->y > new_head->max_y) new_head->max_y = at->y; 428 if (at->y > new_head->max_y) new_head->max_y = at->y;
459 429
460 at->head = head; head = new_head; 430 at->head = new_head;
461 less->more = at; less = at; 431 less->more = at;
432 less = at;
462 } 433 }
463 434
464 // now activate it 435 postponed_arch.insert (postponed_arch.end (), parts.begin (), parts.end ());
465 for (auto (p, parts.begin ()); p != parts.end (); ++p)
466 {
467 archetype *at = *p;
468 at->stub = false;
469 at->link ();
470 }
471 436
472 return new_head; 437 return new_head;
473 } 438 }
474 439
475fail: 440fail:
476 for (auto (p, parts.begin ()); p != parts.end (); ++p) 441 for (auto (p, parts.begin ()); p != parts.end (); ++p)
477 (*p)->destroy (true); 442 (*p)->destroy (true);
478 443
479 loading_arch = false;
480 return 0; 444 return 0;
481} 445}
482 446
483/*
484 * Initialize global archtype pointers:
485 */
486void 447void
487init_archetype_pointers () 448archetype::postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch)
488{ 449{
489 ring_arch = archetype::find ("ring"); 450 ref = 0;
490 amulet_arch = archetype::find ("amulet"); 451 postponed_arch_ref.push_back (std::pair<arch_ptr *, shstr>(&ref, shstr (other_arch)));
491 staff_arch = archetype::find ("staff"); 452}
492 crown_arch = archetype::find ("crown"); 453
493 empty_archetype = archetype::find ("empty_archetype"); 454void
455archetype::commit_load ()
456{
457 // unlink old archetypes and link in new ones */
458 for (auto (p, postponed_arch.begin ()); p != postponed_arch.end (); ++p)
459 {
460 archetype *at = *p;
461
462 if (archetype *old = find (at->archname))
463 old->unlink ();
464
465 at->link ();
466 }
467
468 postponed_arch.clear ();
469
470 // now resolve arch references
471 for (auto (p, postponed_arch_ref.begin ()); p != postponed_arch_ref.end (); ++p)
472 {
473 arch_ptr *ap = p->first;
474 archetype *at = find (p->second);
475
476 if (!at)
477 LOG (llevError, "unable to resolve postponed arch reference to '%s'", &p->second);
478
479 *ap = at;
480 }
481
482 postponed_arch_ref.clear ();
483
484 empty = find (shstr_empty_archetype);
494} 485}
495 486
496/* 487/*
497 * Creates and returns a new object which is a copy of the given archetype. 488 * Creates and returns a new object which is a copy of the given archetype.
498 * This function returns NULL on failure. 489 * This function returns NULL on failure.
… …
509 object *op = at->clone (); 500 object *op = at->clone ();
510 op->arch = at; 501 op->arch = at;
511 op->instantiate (); 502 op->instantiate ();
512 503
513 return op; 504 return op;
505}
506
507object *
508archetype::instance ()
509{
510 return arch_to_object (this);
514} 511}
515 512
516/* 513/*
517 * Creates an object. This function is called by get_archetype() 514 * Creates an object. This function is called by get_archetype()
518 * if it fails to find the appropriate archetype. 515 * if it fails to find the appropriate archetype.
… …
520 * an object, and never NULL. 517 * an object, and never NULL.
521 */ 518 */
522object * 519object *
523create_singularity (const char *name) 520create_singularity (const char *name)
524{ 521{
525 object *op; 522 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
523
524 if (!strcmp (name, "bug"))
525 abort ();
526
526 char buf[MAX_BUF]; 527 char buf[MAX_BUF];
528 sprintf (buf, "bug, please report (%s)", name);
527 529
528 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 530 object *op = get_archetype ("bug");
529 op = object::create ();
530 op->name = op->name_pl = buf; 531 op->name = op->name_pl = buf;
531 SET_FLAG (op, FLAG_NO_PICK); 532
532 return op; 533 return op;
533} 534}
534 535
535/* 536/*
536 * Finds which archetype matches the given name, and returns a new 537 * Finds which archetype matches the given name, and returns a new

Diff Legend

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