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

Diff Legend

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