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.43 by root, Mon Oct 12 14:00:57 2009 UTC vs.
Revision 1.51 by root, Sun Apr 25 11:23:31 2010 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 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
47 return default_region ();
48}
49
50region *
51region::find (object_thawer &f)
52{
53 shstr_cmp name = f.get_str ();
54
55 for_all_regions (rgn)
56 if (rgn->name == name)
57 return rgn;
58
55 LOG (llevError, "region called %s requested, but not found, using fallback.\n", &name); 59 f.parse_error (format ("region called %s requested, but not found, using fallback.\n", f.get_str ()));
56 60
57 return default_region (); 61 return default_region ();
58} 62}
59 63
60void 64void
… …
64 68
65 attachable::do_destroy (); 69 attachable::do_destroy ();
66 70
67 refcnt_dec (); 71 refcnt_dec ();
68} 72}
73
74//+GPL
69 75
70/* 76/*
71 * returns 1 if the player is in the region reg, or a child region thereof 77 * returns 1 if the player is in the region reg, or a child region thereof
72 * otherwise returns 0 78 * otherwise returns 0
73 * if passed a NULL region returns -1 79 * if passed a NULL region returns -1
… …
110 if (reg->jailmap) 116 if (reg->jailmap)
111 { 117 {
112 object *exit = object::create (); 118 object *exit = object::create ();
113 EXIT_PATH (exit) = reg->jailmap; 119 EXIT_PATH (exit) = reg->jailmap;
114 /* damned exits reset savebed and remove teleports, so the prisoner can't escape */ 120 /* damned exits reset savebed and remove teleports, so the prisoner can't escape */
115 SET_FLAG (exit, FLAG_DAMNED); 121 exit->set_flag (FLAG_DAMNED);
116 EXIT_X (exit) = reg->jailx; 122 EXIT_X (exit) = reg->jailx;
117 EXIT_Y (exit) = reg->jaily; 123 EXIT_Y (exit) = reg->jaily;
118 return exit; 124 return exit;
119 } 125 }
120 else 126 else
… …
124 LOG (llevError, "No suitable jailmap for region %s was found.\n", &reg->name); 130 LOG (llevError, "No suitable jailmap for region %s was found.\n", &reg->name);
125 131
126 return 0; 132 return 0;
127} 133}
128 134
135//-GPL
136
129region * 137region *
130region::read (object_thawer &f) 138region::read (object_thawer &f)
131{ 139{
132 assert (f.kw == KW_region); 140 assert (f.kw == KW_region);
133 141
… …
140 for (;;) 148 for (;;)
141 { 149 {
142 switch (f.kw) 150 switch (f.kw)
143 { 151 {
144 case KW_parent: 152 case KW_parent:
145 rgn->parent = region::find (f.get_str ()); 153 rgn->parent = region::find (f);
146 break; 154 break;
147 155
148 case KW_msg: f.get_ml (KW_endmsg, rgn->msg); break; 156 case KW_msg: f.get_ml (KW_endmsg, rgn->msg); break;
149 case KW_longname: f.get (rgn->longname); break; 157 case KW_longname: f.get (rgn->longname); break;
150 case KW_jail_map: f.get (rgn->jailmap); break; 158 case KW_jail_map: f.get (rgn->jailmap); break;
151 case KW_jail_x: f.get (rgn->jailx); break; 159 case KW_jail_x: f.get (rgn->jailx); break;
152 case KW_jail_y: f.get (rgn->jaily); break; 160 case KW_jail_y: f.get (rgn->jaily); break;
153 case KW_portal_map: f.get (rgn->portalmap);break; 161 case KW_portal_map: f.get (rgn->portalmap);break;
154 case KW_portal_x: f.get (rgn->portalx); break;
155 case KW_portal_y: f.get (rgn->portaly); break;
156 case KW_fallback: f.get (rgn->fallback); break; 162 case KW_fallback: f.get (rgn->fallback); break;
157 case KW_chance: f.get (rgn->treasure_density); break; 163 case KW_chance: f.get (rgn->treasure_density); break;
158 164
159 case KW_randomitems: 165 case KW_randomitems:
160 rgn->treasure = treasurelist::get (f.get_str ()); 166 rgn->treasure = treasurelist::get (f.get_str ());
… …
191 197
192 f.next (); 198 f.next ();
193 } 199 }
194} 200}
195 201
196/*
197 * First initialises the archtype hash-table (init_archetable()).
198 * Reads and parses the archetype file (with the first and second-pass
199 * functions).
200 */
201void
202init_regions (void)
203{
204 if (!regions.size ())
205 {
206 // make sure one region is always available
207 region *rgn = new region;
208 rgn->name = "<builtin>";
209 rgn->longname = "Built-in Region";
210 regions.push_back (rgn);
211 }
212}
213

Diff Legend

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