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.44 by root, Thu Nov 5 15:43:21 2009 UTC vs.
Revision 1.53 by root, Sat Apr 23 04:56:46 2011 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 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 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.
… …
35 return rgn; 35 return rgn;
36 36
37 return regions [0]; 37 return regions [0];
38} 38}
39 39
40/*
41 * Pass a char array, returns a pointer to the region of the same name.
42 * if it can't find a region of the same name it returns the first region
43 * with the 'fallback' property set.
44 * if it can't find a matching name /or/ a fallback region it logs an info message
45 * message and returns NULL
46 * used by the map parsing code.
47 */
48region * 40region *
49region::find (shstr_cmp name) 41region::find (shstr_cmp name)
50{ 42{
51 for_all_regions (rgn) 43 for_all_regions (rgn)
52 if (rgn->name == name) 44 if (rgn->name == name)
53 return rgn; 45 return rgn;
54 46
55 LOG (llevError, "region called %s requested, but not found, using fallback.\n", &name);
56
57 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 ();
58} 65}
59 66
60void 67void
61region::do_destroy () 68region::do_destroy ()
62{ 69{
… …
112 if (reg->jailmap) 119 if (reg->jailmap)
113 { 120 {
114 object *exit = object::create (); 121 object *exit = object::create ();
115 EXIT_PATH (exit) = reg->jailmap; 122 EXIT_PATH (exit) = reg->jailmap;
116 /* 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 */
117 SET_FLAG (exit, FLAG_DAMNED); 124 exit->set_flag (FLAG_DAMNED);
118 EXIT_X (exit) = reg->jailx; 125 EXIT_X (exit) = reg->jailx;
119 EXIT_Y (exit) = reg->jaily; 126 EXIT_Y (exit) = reg->jaily;
120 return exit; 127 return exit;
121 } 128 }
122 else 129 else
… …
144 for (;;) 151 for (;;)
145 { 152 {
146 switch (f.kw) 153 switch (f.kw)
147 { 154 {
148 case KW_parent: 155 case KW_parent:
149 rgn->parent = region::find (f.get_str ()); 156 f.get (rgn->parent);
150 break; 157 break;
151 158
152 case KW_msg: f.get_ml (KW_endmsg, rgn->msg); break; 159 case KW_msg: f.get_ml (KW_endmsg, rgn->msg); break;
153 case KW_longname: f.get (rgn->longname); break; 160 case KW_longname: f.get (rgn->longname); break;
154 case KW_jail_map: f.get (rgn->jailmap); break; 161 case KW_jail_map: f.get (rgn->jailmap); break;
155 case KW_jail_x: f.get (rgn->jailx); break; 162 case KW_jail_x: f.get (rgn->jailx); break;
156 case KW_jail_y: f.get (rgn->jaily); break; 163 case KW_jail_y: f.get (rgn->jaily); break;
157 case KW_portal_map: f.get (rgn->portalmap);break; 164 case KW_portal_map: f.get (rgn->portalmap);break;
158 case KW_portal_x: f.get (rgn->portalx); break;
159 case KW_portal_y: f.get (rgn->portaly); break;
160 case KW_fallback: f.get (rgn->fallback); break; 165 case KW_fallback: f.get (rgn->fallback); break;
161 case KW_chance: f.get (rgn->treasure_density); break; 166 case KW_chance: f.get (rgn->treasure_density); break;
162 167
163 case KW_randomitems: 168 case KW_randomitems:
164 rgn->treasure = treasurelist::get (f.get_str ()); 169 rgn->treasure = treasurelist::get (f.get_str ());
… …
195 200
196 f.next (); 201 f.next ();
197 } 202 }
198} 203}
199 204
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