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.69 by root, Tue Sep 4 18:20:35 2007 UTC vs.
Revision 1.72 by root, Wed Apr 2 11:13:51 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24#include <cassert> 24#include <cassert>
25 25
26#include <global.h> 26#include <global.h>
352{ 352{
353 assert (f.kw == KW_object); 353 assert (f.kw == KW_object);
354 354
355 std::vector<archetype *> parts; 355 std::vector<archetype *> parts;
356 356
357 coroapi::cede_to_tick_every (10); 357 coroapi::cede_to_tick ();
358 358
359 for (;;) 359 for (;;)
360 { 360 {
361 // the archetype might have been referenced earlier 361 // the archetype might have been referenced earlier
362 // so try to find an existing stub archetype first 362 // so try to find an existing stub archetype first
516 op->instantiate (); 516 op->instantiate ();
517 517
518 return op; 518 return op;
519} 519}
520 520
521object *
522archetype::instance ()
523{
524 return arch_to_object (this);
525}
526
521/* 527/*
522 * Creates an object. This function is called by get_archetype() 528 * Creates an object. This function is called by get_archetype()
523 * if it fails to find the appropriate archetype. 529 * if it fails to find the appropriate archetype.
524 * Thus get_archetype() will be guaranteed to always return 530 * Thus get_archetype() will be guaranteed to always return
525 * an object, and never NULL. 531 * an object, and never NULL.

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines