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.42 by root, Thu Jan 1 20:49:48 2009 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 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,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your 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 GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * 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>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <unistd.h> 26#include <unistd.h>
… …
34 return rgn; 35 return rgn;
35 36
36 return regions [0]; 37 return regions [0];
37} 38}
38 39
39/*
40 * Pass a char array, returns a pointer to the region of the same name.
41 * if it can't find a region of the same name it returns the first region
42 * with the 'fallback' property set.
43 * if it can't find a matching name /or/ a fallback region it logs an info message
44 * message and returns NULL
45 * used by the map parsing code.
46 */
47region * 40region *
48region::find (shstr_cmp name) 41region::find (shstr_cmp name)
49{ 42{
50 for_all_regions (rgn) 43 for_all_regions (rgn)
51 if (rgn->name == name) 44 if (rgn->name == name)
52 return rgn; 45 return rgn;
53 46
54 LOG (llevError, "region called %s requested, but not found, using fallback.\n", &name);
55
56 return default_region (); 47 return default_region ();
48}
49
50void
51object_thawer::get (region_ptr &r) const
52{
53 shstr_cmp name = get_str ();
54
55 for_all_regions (rgn)
56 if (rgn->name == name)
57 {
58 r = rgn;
59 return;
60 }
61
62 parse_error (format ("region called %s requested, but not found, using fallback.\n", get_str ()));
63
64 r = region::default_region ();
57} 65}
58 66
59void 67void
60region::do_destroy () 68region::do_destroy ()
61{ 69{
… …
63 71
64 attachable::do_destroy (); 72 attachable::do_destroy ();
65 73
66 refcnt_dec (); 74 refcnt_dec ();
67} 75}
76
77//+GPL
68 78
69/* 79/*
70 * returns 1 if the player is in the region reg, or a child region thereof 80 * returns 1 if the player is in the region reg, or a child region thereof
71 * otherwise returns 0 81 * otherwise returns 0
72 * if passed a NULL region returns -1 82 * if passed a NULL region returns -1
… …
109 if (reg->jailmap) 119 if (reg->jailmap)
110 { 120 {
111 object *exit = object::create (); 121 object *exit = object::create ();
112 EXIT_PATH (exit) = reg->jailmap; 122 EXIT_PATH (exit) = reg->jailmap;
113 /* damned exits reset savebed and remove teleports, so the prisoner can't escape */ 123 /* damned exits reset savebed and remove teleports, so the prisoner can't escape */
114 SET_FLAG (exit, FLAG_DAMNED); 124 exit->set_flag (FLAG_DAMNED);
115 EXIT_X (exit) = reg->jailx; 125 EXIT_X (exit) = reg->jailx;
116 EXIT_Y (exit) = reg->jaily; 126 EXIT_Y (exit) = reg->jaily;
117 return exit; 127 return exit;
118 } 128 }
119 else 129 else
… …
123 LOG (llevError, "No suitable jailmap for region %s was found.\n", &reg->name); 133 LOG (llevError, "No suitable jailmap for region %s was found.\n", &reg->name);
124 134
125 return 0; 135 return 0;
126} 136}
127 137
138//-GPL
139
128region * 140region *
129region::read (object_thawer &f) 141region::read (object_thawer &f)
130{ 142{
131 assert (f.kw == KW_region); 143 assert (f.kw == KW_region);
132 144
… …
139 for (;;) 151 for (;;)
140 { 152 {
141 switch (f.kw) 153 switch (f.kw)
142 { 154 {
143 case KW_parent: 155 case KW_parent:
144 rgn->parent = region::find (f.get_str ()); 156 f.get (rgn->parent);
145 break; 157 break;
146 158
147 case KW_msg: f.get_ml (KW_endmsg, rgn->msg); break; 159 case KW_msg: f.get_ml (KW_endmsg, rgn->msg); break;
148 case KW_longname: f.get (rgn->longname); break; 160 case KW_longname: f.get (rgn->longname); break;
149 case KW_jail_map: f.get (rgn->jailmap); break; 161 case KW_jail_map: f.get (rgn->jailmap); break;
150 case KW_jail_x: f.get (rgn->jailx); break; 162 case KW_jail_x: f.get (rgn->jailx); break;
151 case KW_jail_y: f.get (rgn->jaily); break; 163 case KW_jail_y: f.get (rgn->jaily); break;
152 case KW_portal_map: f.get (rgn->portalmap);break; 164 case KW_portal_map: f.get (rgn->portalmap);break;
153 case KW_portal_x: f.get (rgn->portalx); break;
154 case KW_portal_y: f.get (rgn->portaly); break;
155 case KW_fallback: f.get (rgn->fallback); break; 165 case KW_fallback: f.get (rgn->fallback); break;
156 case KW_chance: f.get (rgn->treasure_density); break; 166 case KW_chance: f.get (rgn->treasure_density); break;
157 167
158 case KW_randomitems: 168 case KW_randomitems:
159 rgn->treasure = treasurelist::get (f.get_str ()); 169 rgn->treasure = treasurelist::get (f.get_str ());
… …
190 200
191 f.next (); 201 f.next ();
192 } 202 }
193} 203}
194 204
195/*
196 * First initialises the archtype hash-table (init_archetable()).
197 * Reads and parses the archetype file (with the first and second-pass
198 * functions).
199 */
200void
201init_regions (void)
202{
203 if (!regions.size ())
204 {
205 // make sure one region is always available
206 region *rgn = new region;
207 rgn->name = "<builtin>";
208 rgn->longname = "Built-in Region";
209 regions.push_back (rgn);
210 }
211}
212

Diff Legend

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