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.46 by root, Mon Apr 16 06:23:39 2007 UTC vs.
Revision 1.59 by root, Mon May 7 06:01:47 2007 UTC

… …
275 } 275 }
276 276
277 return 0; 277 return 0;
278} 278}
279 279
280void
281init_archetypes (void)
282{
283 load_archetypes ();
284
285 empty_archetype = archetype::find ("empty_archetype");
286}
287
288archetype::archetype () 280archetype::archetype ()
289{ 281{
290 clone.arch = this; 282 clone.arch = this;
291 283
292 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */ 284 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */
… …
317// dire hack, need to rationalise 309// dire hack, need to rationalise
318void 310void
319overwrite (archetype *at, object *op) 311overwrite (archetype *at, object *op)
320{ 312{
321 at->clone = *op; 313 at->clone = *op;
322
323 at->clone.arch = at; 314 at->clone.arch = at;
324 //TODO: inv et al. 315
316 at->clone.inv = op->inv; op->inv = 0;
317
318 op->destroy ();
325} 319}
326 320
327archetype * 321archetype *
328archetype::read (object_thawer &f) 322archetype::read (object_thawer &f)
329{ 323{
330 assert (f.kw == KW_object); 324 assert (f.kw == KW_object);
331 325
332 archetype *head = get (f.get_str ()); 326 loading_arch = true; // hack to tell parse_kv et al. to behave
333 unlink (head); 327
328 typedef std::pair<archetype *, object *> part;
329 std::vector<part> parts;
330
331 coroapi::cede_to_tick_every (100);
332
333 for (;;)
334 {
334 object *op = object::create (); 335 object *op = object::create ();
335 336 archetype *at = get (f.get_str ());
336 if (!op->parse_kv (f)) 337 f.get (op->name);
337 {
338 op->destroy (true);
339 // leak head
340 return 0;
341 }
342
343 overwrite (head, op);
344 op->destroy ();
345
346 for (archetype *prev = head; f.kw == KW_more; )
347 {
348 f.next (); 338 f.next ();
349 assert (f.kw == KW_object);
350 339
340#if 0
341 if (f.kw == KW_inherit)
342 {
351 archetype *more = get (f.get_str ()); 343 if (archetype *at = find (f.get_str ()))
352 unlink (more); 344 *op = at->clone;
353 object *op = object::create (); 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
354 352
355 if (!op->parse_kv (f)) 353 if (!op->parse_kv (f))
354 goto fail;
355
356 op->post_load_check ();
357
358 parts.push_back (std::make_pair (at, op));
359
360 if (f.kw != KW_more)
361 break;
362
363 f.next ();
364
365 if (f.kw != KW_object)
356 { 366 {
357 op->destroy (true); 367 f.parse_error ("more object");
358 // leak head more* 368 goto fail;
359 return 0;
360 } 369 }
361
362 overwrite (more, op);
363 op->destroy ();
364
365 if (more->clone.x > head->tail_x) head->tail_x = more->clone.x;
366 if (more->clone.y > head->tail_y) head->tail_y = more->clone.y;
367
368 more->head = head;
369 more->clone.head = &head->clone;
370 prev->more = more;
371 prev->clone.more = &more->clone;
372
373 prev = more;
374 } 370 }
375 371
376 if (!head->next) 372 {
373 archetype *head = parts.front ().first;
374
375 // check that all archetypes belong to the same object or are heads
376 for (auto (p, parts.begin ()); p != parts.end (); ++p)
377 { 377 {
378 archetype *at = p->first;
379
380 if (at->head != head && at->head)
381 {
382 LOG (llevError, "%s: unable to overwrite foreign non-head archetype with non-head archetype\n", &at->name);
383 goto fail;
384 }
385
386 if (at->next && at != head)
387 {
388 LOG (llevError, "%s: unable to overwrite foreign head archetype with non-head archetype\n", &at->name);
389 goto fail;
390 }
391 }
392
393 // sever chain of existing head object
394 for (archetype *more, *at = head; at; at = more)
395 {
396 more = at->more;
397
398 at->head = 0;
399 at->more = 0;
400 }
401
402 // replace/update head
403 overwrite (head, parts.front ().second);
404 head->tail_x = 0;
405 head->tail_y = 0;
406
407 // link into list of heads, if not already there
408 if (!head->linked)
409 {
410 head->linked = true;
378 head->next = first_archetype; 411 head->next = first_archetype;
379 first_archetype = head; 412 first_archetype = head;
380 } 413 }
381 414
415 // reassemble new chain
416 archetype *prev = head;
417 for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
418 {
419 archetype *at = p->first;
420 overwrite (at, p->second);
421
422 if (at->clone.x > head->tail_x) head->tail_x = at->clone.x;
423 if (at->clone.y > head->tail_y) head->tail_y = at->clone.y;
424
425 at->head = head;
426 at->clone.head = &head->clone;
427 prev->more = at;
428 prev->clone.more = &at->clone;
429
430 prev = at;
431 }
432
433 loading_arch = false;
382 return head; 434 return head;
383} 435 }
384 436
385/* 437fail:
386 * Reads/parses the archetype-file, and copies into a linked list 438 for (auto (p, parts.begin ()); p != parts.end (); ++p)
387 * of archetype-structures. 439 p->second->destroy (true);
388 */
389static bool
390load_archetypes (object_thawer &f)
391{
392 for (;;)
393 {
394 switch (f.kw)
395 {
396 case KW_object:
397 loading_arch = true;
398 if (!archetype::read (f))
399 {
400 loading_arch = false;
401 return false;
402 }
403 440
404 loading_arch = false; 441 loading_arch = false;
405 continue; 442 return 0;
406
407 case KW_EOF:
408 return true;
409
410 default:
411 if (!f.parse_error ("archetypes file"))
412 return false;
413 }
414
415 f.next ();
416 }
417} 443}
418 444
419/* 445/*
420 * First initialises the archtype hash-table (init_archetable()). 446 * Initialize global archtype pointers:
421 * Reads and parses the archetype file (with the first and second-pass
422 * functions).
423 * Then initialises treasures by calling load_treasures().
424 */ 447 */
425void 448void
426load_archetypes (void) 449init_archetype_pointers ()
427{ 450{
428 char filename[MAX_BUF]; 451 ring_arch = archetype::find ("ring");
429 452 amulet_arch = archetype::find ("amulet");
430 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes); 453 staff_arch = archetype::find ("staff");
431 LOG (llevDebug, "Reading archetypes from %s:\n", filename); 454 crown_arch = archetype::find ("crown");
432 455 empty_archetype = archetype::find ("empty_archetype");
433 object_thawer f (filename);
434
435 f.next ();
436
437 if (!load_archetypes (f))
438 cleanup ("unable to load archetypes");
439
440 warn_archetypes = 1;
441} 456}
442 457
443/* 458/*
444 * Creates and returns a new object which is a copy of the given archetype. 459 * Creates and returns a new object which is a copy of the given archetype.
445 * This function returns NULL on failure. 460 * This function returns NULL on failure.
… …
447object * 462object *
448arch_to_object (archetype *at) 463arch_to_object (archetype *at)
449{ 464{
450 if (!at) 465 if (!at)
451 { 466 {
452 if (warn_archetypes)
453 LOG (llevError, "Couldn't find archetype.\n"); 467 LOG (llevError, "Couldn't find archetype.\n");
454
455 return NULL; 468 return 0;
456 } 469 }
457 470
458 object *op = at->clone.clone (); 471 object *op = at->clone.clone ();
459 op->arch = at; 472 op->arch = at;
460 op->instantiate (); 473 op->instantiate ();
474
461 return op; 475 return op;
462} 476}
463 477
464/* 478/*
465 * Creates an object. This function is called by get_archetype() 479 * Creates an object. This function is called by get_archetype()
… …
494 508
495 return arch_to_object (at); 509 return arch_to_object (at);
496} 510}
497 511
498/* 512/*
499 * Hash-function used by the arch-hashtable.
500 */
501
502unsigned long
503hasharch (const char *str, int tablesize)
504{
505 unsigned long hash = 0;
506 unsigned int i = 0;
507 const char *p;
508
509 /* use the one-at-a-time hash function, which supposedly is
510 * better than the djb2-like one used by perl5.005, but
511 * certainly is better then the bug used here before.
512 * see http://burtleburtle.net/bob/hash/doobs.html
513 */
514 for (p = str; i < MAXSTRING && *p; p++, i++)
515 {
516 hash += *p;
517 hash += hash << 10;
518 hash ^= hash >> 6;
519 }
520
521 hash += hash << 3;
522 hash ^= hash >> 11;
523 hash += hash << 15;
524
525 return hash % tablesize;
526}
527
528/*
529 * Finds, using the hashtable, which archetype matches the given name. 513 * Finds, using the hashtable, which archetype matches the given name.
530 * returns a pointer to the found archetype, otherwise NULL. 514 * returns a pointer to the found archetype, otherwise NULL.
531 */ 515 */
532archetype * 516archetype *
533archetype::find (const char *name) 517archetype::find (const char *name)
534{ 518{
535 if (!name) 519 if (!name)
536 return 0; 520 return 0;
537 521
538 AUTODECL (i, ht.find (name)); 522 auto (i, ht.find (name));
539 523
540 if (i == ht.end ()) 524 if (i == ht.end ())
541 return 0; 525 return 0;
542 else 526 else
543 return i->second; 527 return i->second;
544} 528}
545 529
546archetype * 530archetype *
547archetype::get (const char *name) 531archetype::get (const char *name)
548{ 532{
533 if (!name)
534 {
535 LOG (llevError, "null archetype requested\n");
536 name = "(null)";
537 }
538
549 archetype *at = find (name); 539 archetype *at = find (name);
550 540
551 if (!at) 541 if (!at)
552 { 542 {
553 archetypes.push_back (at = new archetype); 543 archetypes.push_back (at = new archetype);
554 at->name = name; 544 at->name = at->clone.name = at->clone.name_pl = name;
555 at->hash_add (); 545 at->hash_add ();
556 } 546 }
557 547
558 return at; 548 return at;
559} 549}

Diff Legend

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