ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/region.C
(Generate patch)

Comparing deliantra/server/common/region.C (file contents):
Revision 1.50 by root, Sun Apr 25 10:45:38 2010 UTC vs.
Revision 1.55 by root, Mon Oct 29 23:55:52 2012 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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 Affero GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <unistd.h> 26#include <unistd.h>
… …
45 return rgn; 45 return rgn;
46 46
47 return default_region (); 47 return default_region ();
48} 48}
49 49
50region * 50void
51region::find (object_thawer &f) 51object_thawer::get (region_ptr &r) const
52{ 52{
53 shstr_cmp name = f.get_str (); 53 shstr_cmp name = get_str ();
54 54
55 for_all_regions (rgn) 55 for_all_regions (rgn)
56 if (rgn->name == name) 56 if (rgn->name == name)
57 {
58 r = rgn;
57 return rgn; 59 return;
60 }
58 61
59 f.parse_error (format ("region called %s requested, but not found, using fallback.\n", f.get_str ())); 62 parse_error (format ("region called %s requested, but not found, using fallback.\n", get_str ()));
60 63
61 return default_region (); 64 r = region::default_region ();
62} 65}
63 66
64void 67void
65region::do_destroy () 68region::do_destroy ()
66{ 69{
… …
148 for (;;) 151 for (;;)
149 { 152 {
150 switch (f.kw) 153 switch (f.kw)
151 { 154 {
152 case KW_parent: 155 case KW_parent:
153 rgn->parent = region::find (f); 156 f.get (rgn->parent);
154 break; 157 break;
155 158
156 case KW_msg: f.get_ml (KW_endmsg, rgn->msg); break; 159 case KW_msg: f.get_ml (KW_endmsg, rgn->msg); break;
157 case KW_longname: f.get (rgn->longname); break; 160 case KW_longname: f.get (rgn->longname); break;
158 case KW_jail_map: f.get (rgn->jailmap); break; 161 case KW_jail_map: f.get (rgn->jailmap); break;
159 case KW_jail_x: f.get (rgn->jailx); break; 162 case KW_jail_x: f.get (rgn->jailx); break;
160 case KW_jail_y: f.get (rgn->jaily); break; 163 case KW_jail_y: f.get (rgn->jaily); break;
161 case KW_portal_map: f.get (rgn->portalmap);break; 164 case KW_portal_map: f.get (rgn->portalmap);break;
162 case KW_portal_x: f.get (rgn->portalx); break;
163 case KW_portal_y: f.get (rgn->portaly); break;
164 case KW_fallback: f.get (rgn->fallback); break; 165 case KW_fallback: f.get (rgn->fallback); break;
165 case KW_chance: f.get (rgn->treasure_density); break; 166 case KW_chance: f.get (rgn->treasure_density); break;
166 167
167 case KW_randomitems: 168 case KW_randomitems:
168 rgn->treasure = treasurelist::get (f.get_str ()); 169 rgn->treasure = treasurelist::get (f.get_str ());

Diff Legend

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