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.48 by root, Mon Apr 16 11:09:30 2007 UTC vs.
Revision 1.57 by root, Thu Apr 19 19:24:25 2007 UTC

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

Diff Legend

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