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.54 by root, Tue Apr 17 18:59:05 2007 UTC

… …
311overwrite (archetype *at, object *op) 311overwrite (archetype *at, object *op)
312{ 312{
313 at->clone = *op; 313 at->clone = *op;
314 314
315 at->clone.arch = at; 315 at->clone.arch = at;
316 //TODO: inv et al. 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
343 archetype *more = get (f.get_str ());
344 unlink (more);
345 object *op = object::create ();
346 339
347 if (!op->parse_kv (f)) 340 if (!op->parse_kv (f))
341 goto fail;
342
343 parts.push_back (std::make_pair (at, op));
344
345 if (f.kw != KW_more)
346 break;
347
348 f.next ();
349
350 if (f.kw != KW_object)
348 { 351 {
349 op->destroy (true); 352 f.parse_error ("more object");
350 // leak head more* 353 goto fail;
351 return 0;
352 } 354 }
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 } 355 }
367 356
368 if (!head->next) 357 {
358 archetype *head = parts.front ().first;
359
360 // check that all archetypes belong to the same object or are heads
361 for (auto (p, parts.begin ()); p != parts.end (); ++p)
369 { 362 {
363 archetype *at = p->first;
364
365 if (at->head != head && at->head)
366 {
367 LOG (llevError, "%s: unable to overwrite foreign non-head archetype with non-head archetype\n", &at->name);
368 goto fail;
369 }
370
371 if (at->next && at != head)
372 {
373 LOG (llevError, "%s: unable to overwrite foreign head archetype with non-head archetype\n", &at->name);
374 goto fail;
375 }
376 }
377
378 // sever chain of existing head object
379 for (archetype *more, *at = head; at; at = more)
380 {
381 more = at->more;
382
383 at->head = 0;
384 at->more = 0;
385 }
386
387 // replace/update head
388 overwrite (head, parts.front ().second);
389 head->tail_x = 0;
390 head->tail_y = 0;
391
392 // link into list of heads, if not already there
393 if (!head->linked)
394 {
395 head->linked = true;
370 head->next = first_archetype; 396 head->next = first_archetype;
371 first_archetype = head; 397 first_archetype = head;
372 } 398 }
373 399
400 // reassemble new chain
401 archetype *prev = head;
402 for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
403 {
404 archetype *at = p->first;
405 overwrite (at, p->second);
406
407 if (at->clone.x > head->tail_x) head->tail_x = at->clone.x;
408 if (at->clone.y > head->tail_y) head->tail_y = at->clone.y;
409
410 at->head = head;
411 at->clone.head = &head->clone;
412 prev->more = at;
413 prev->clone.more = &at->clone;
414
415 prev = at;
416 }
417
418 loading_arch = false;
374 return head; 419 return head;
375} 420 }
376 421
377/* 422fail:
378 * Reads/parses the archetype-file, and copies into a linked list 423 for (auto (p, parts.begin ()); p != parts.end (); ++p)
379 * of archetype-structures. 424 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 425
396 loading_arch = false; 426 loading_arch = false;
397 continue; 427 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} 428}
410 429
411/* 430/*
412 * First initialises the archtype hash-table (init_archetable()). 431 * Initialize global archtype pointers:
413 * Reads and parses the archetype file (with the first and second-pass
414 * functions).
415 */ 432 */
416bool 433void
417load_archetype_file (const char *filename) 434init_archetype_pointers ()
418{ 435{
419 object_thawer f (filename); 436 ring_arch = archetype::find ("ring");
420 437 amulet_arch = archetype::find ("amulet");
421 f.next (); 438 staff_arch = archetype::find ("staff");
422 439 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"); 440 empty_archetype = archetype::find ("empty_archetype");
432 if (!empty_archetype)
433 return false;
434
435 coroapi::cede ();
436
437 return true;
438} 441}
439 442
440/* 443/*
441 * Creates and returns a new object which is a copy of the given archetype. 444 * Creates and returns a new object which is a copy of the given archetype.
442 * This function returns NULL on failure. 445 * This function returns NULL on failure.
… …
444object * 447object *
445arch_to_object (archetype *at) 448arch_to_object (archetype *at)
446{ 449{
447 if (!at) 450 if (!at)
448 { 451 {
449 if (warn_archetypes)
450 LOG (llevError, "Couldn't find archetype.\n"); 452 LOG (llevError, "Couldn't find archetype.\n");
451
452 return NULL; 453 return 0;
453 } 454 }
454 455
455 object *op = at->clone.clone (); 456 object *op = at->clone.clone ();
456 op->arch = at; 457 op->arch = at;
457 op->instantiate (); 458 op->instantiate ();
459
458 return op; 460 return op;
459} 461}
460 462
461/* 463/*
462 * Creates an object. This function is called by get_archetype() 464 * Creates an object. This function is called by get_archetype()
… …
491 493
492 return arch_to_object (at); 494 return arch_to_object (at);
493} 495}
494 496
495/* 497/*
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. 498 * Finds, using the hashtable, which archetype matches the given name.
527 * returns a pointer to the found archetype, otherwise NULL. 499 * returns a pointer to the found archetype, otherwise NULL.
528 */ 500 */
529archetype * 501archetype *
530archetype::find (const char *name) 502archetype::find (const char *name)
531{ 503{
532 if (!name) 504 if (!name)
533 return 0; 505 return 0;
534 506
535 AUTODECL (i, ht.find (name)); 507 auto (i, ht.find (name));
536 508
537 if (i == ht.end ()) 509 if (i == ht.end ())
538 return 0; 510 return 0;
539 else 511 else
540 return i->second; 512 return i->second;

Diff Legend

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