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.51 by root, Mon Apr 16 15:41:26 2007 UTC vs.
Revision 1.52 by root, Tue Apr 17 10:06:32 2007 UTC

324 assert (f.kw == KW_object); 324 assert (f.kw == KW_object);
325 325
326 typedef std::pair<archetype *, object *> part; 326 typedef std::pair<archetype *, object *> part;
327 std::vector<part> parts; 327 std::vector<part> parts;
328 328
329 coroapi::cede_to_tick_every (100);
330
329 for (;;) 331 for (;;)
330 { 332 {
331 archetype *at = get (f.get_str ()); 333 archetype *at = get (f.get_str ());
332 object *op = object::create (); 334 object *op = object::create ();
333 335
458{ 460{
459 object_thawer f (filename); 461 object_thawer f (filename);
460 462
461 f.next (); 463 f.next ();
462 464
463 // make sure the next - long - step is only done after a tick
464 coroapi::wait_for_tick_begin ();
465
466 if (!load_archetypes (f)) 465 if (!load_archetypes (f))
467 return false; 466 return false;
468 467
469 warn_archetypes = 1; 468 warn_archetypes = 1;
470 469
471 empty_archetype = archetype::find ("empty_archetype"); 470 empty_archetype = archetype::find ("empty_archetype");
472 if (!empty_archetype) 471 if (!empty_archetype)
473 return false; 472 return false;
474
475 coroapi::cede ();
476 473
477 return true; 474 return true;
478} 475}
479 476
480/* 477/*

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines