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.34 by root, Wed Jul 11 16:55:18 2007 UTC vs.
Revision 1.45 by root, Fri Nov 6 13:03:34 2009 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,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,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 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 <crossfire@schmorp.de> 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>
26 27
… …
43 * if it can't find a matching name /or/ a fallback region it logs an info message 44 * if it can't find a matching name /or/ a fallback region it logs an info message
44 * message and returns NULL 45 * message and returns NULL
45 * used by the map parsing code. 46 * used by the map parsing code.
46 */ 47 */
47region * 48region *
48region::find (const char *name) 49region::find (shstr_cmp name)
49{ 50{
50 for_all_regions (rgn) 51 for_all_regions (rgn)
51 if (!strcmp (rgn->name, name)) 52 if (rgn->name == name)
52 return rgn; 53 return rgn;
53 54
54 LOG (llevError, "region called %s requested, but not found, using fallback.\n", name); 55 LOG (llevError, "region called %s requested, but not found, using fallback.\n", &name);
55 56
56 return default_region (); 57 return default_region ();
57} 58}
58 59
59/* 60void
60 * Tries to find a region that 'name' corresponds to. 61region::do_destroy ()
61 * It looks, in order, for:
62 * an exact match to region name (case insensitive)
63 * an exact match to longname (case insensitive)
64 * a substring that matches to the longname (eg Kingdom)
65 * a substring that matches to the region name (eg nav)
66 * if it can find none of these it returns the first parentless region
67 * (there should be only one of these - the top level one)
68 * If we got a NULL, then just return the top level region
69 *
70 */
71region *
72region::find_fuzzy (const char *name)
73{ 62{
74 if (!name) 63 regions.erase (this);
75 return default_region ();
76 64
77 char *p = strchr (name, '\n'); 65 attachable::do_destroy ();
78 if (p)
79 *p = '\0';
80 66
81 for_all_regions (rgn) 67 refcnt_dec ();
82 if (!strcasecmp (rgn->name, name))
83 return rgn;
84
85 for_all_regions (rgn)
86 if (rgn->longname)
87 if (!strcasecmp (rgn->longname, name))
88 return rgn;
89
90 for_all_regions (rgn)
91 if (rgn->longname)
92 {
93 if (strstr (rgn->longname, name))
94 return rgn;
95 }
96
97 for_all_regions (rgn)
98 if (rgn->longname)
99 {
100 /*
101 * This is not a bug, we want the region that is most identifiably a discrete
102 * area in the game, eg if we have 'scor', we want to return 'scorn' and not
103 * 'scornarena', regardless of their order on the list so we only look at those
104 * regions with a longname set.
105 */
106 if (strstr (rgn->name, name))
107 return rgn;
108 }
109
110 for_all_regions (rgn)
111 {
112 if (strstr (rgn->name, name))
113 return rgn;
114 }
115
116 return default_region ();
117} 68}
69
70//+GPL
118 71
119/* 72/*
120 * returns 1 if the player is in the region reg, or a child region thereof 73 * returns 1 if the player is in the region reg, or a child region thereof
121 * otherwise returns 0 74 * otherwise returns 0
122 * if passed a NULL region returns -1 75 * if passed a NULL region returns -1
123 */ 76 */
124
125static int 77static int
126region_is_child_of_region (const region * child, const region * r) 78region_is_child_of_region (const region * child, const region * r)
127{ 79{
128 80 if (!r)
129 if (r == NULL)
130 return -1; 81 return -1;
131 82
132 if (child == NULL) 83 if (!child)
133 return 0; 84 return 0;
134 85
135 if (!strcmp (child->name, r->name)) 86 if (child->name == r->name)
136 return 1; 87 return 1;
137 88
138 else if (child->parent != NULL) 89 if (child->parent)
139 return region_is_child_of_region (child->parent, r); 90 return region_is_child_of_region (child->parent, r);
140 else 91
141 return 0; 92 return 0;
142} 93}
143 94
144/** Returns an object which is an exit through which the player represented by op should be 95/** Returns an object which is an exit through which the player represented by op should be
145 * sent in order to be imprisoned. If there is no suitable place to which an exit can be 96 * sent in order to be imprisoned. If there is no suitable place to which an exit can be
146 * constructed, then NULL will be returned. The caller is responsible for freeing the object 97 * constructed, then NULL will be returned. The caller is responsible for freeing the object
147 * created by this function. 98 * created by this function.
148 */ 99 */
149object * 100object *
150get_jail_exit (object *op) 101get_jail_exit (object *op)
151{ 102{
152 region *reg;
153 object *exit;
154
155 if (op->type != PLAYER) 103 if (op->type != PLAYER)
156 { 104 {
157 LOG (llevError, "region.c: get_jail_exit called against non-player object.\n"); 105 LOG (llevError, "region.c: get_jail_exit called against non-player object.\n");
158 return NULL; 106 return NULL;
159 } 107 }
160 108
161 reg = op->region (); 109 region *reg = op->region ();
162 while (reg) 110 while (reg)
163 { 111 {
164 if (reg->jailmap) 112 if (reg->jailmap)
165 { 113 {
166 exit = object::create (); 114 object *exit = object::create ();
167 EXIT_PATH (exit) = reg->jailmap; 115 EXIT_PATH (exit) = reg->jailmap;
168 /* damned exits reset savebed and remove teleports, so the prisoner can't escape */ 116 /* damned exits reset savebed and remove teleports, so the prisoner can't escape */
169 SET_FLAG (exit, FLAG_DAMNED); 117 SET_FLAG (exit, FLAG_DAMNED);
170 EXIT_X (exit) = reg->jailx; 118 EXIT_X (exit) = reg->jailx;
171 EXIT_Y (exit) = reg->jaily; 119 EXIT_Y (exit) = reg->jaily;
… …
178 LOG (llevError, "No suitable jailmap for region %s was found.\n", &reg->name); 126 LOG (llevError, "No suitable jailmap for region %s was found.\n", &reg->name);
179 127
180 return 0; 128 return 0;
181} 129}
182 130
131//-GPL
132
183region * 133region *
184region::read (object_thawer &f) 134region::read (object_thawer &f)
185{ 135{
186 assert (f.kw == KW_region); 136 assert (f.kw == KW_region);
187 137
188 region *rgn = new region; 138 region *rgn = new region;
139 rgn->refcnt_inc ();
140
189 f.get (rgn->name); 141 f.get (rgn->name);
190 f.next (); 142 f.next ();
191 143
192 for (;;) 144 for (;;)
193 { 145 {
… …
213 break; 165 break;
214 166
215 case KW_end: 167 case KW_end:
216 f.next (); 168 f.next ();
217 169
170 // cannot use find as that will request the default region
218 for_all_regions (old) 171 for_all_regions (old)
219 if (old->name == rgn->name) 172 if (old->name == rgn->name)
220 { 173 {
221 // replace, copy new values (ugly) 174 old->destroy ();
222 rgn->index = old->index;
223 *old = *rgn;
224 delete rgn;
225
226 return old; 175 break;
227 } 176 }
228 177
229 // just append 178 // just append
230 regions.push_back (rgn); 179 regions.push_back (rgn);
231 return rgn; 180 return rgn;
232 181
233 case KW_ERROR: 182 case KW_ERROR:
234 rgn->set_key (f.kw_str, f.value); 183 rgn->set_key_text (f.kw_str, f.value);
235 //fprintf (stderr, "region addkv(%s,%s)\n", f.kw_str, f.value);//D 184 //fprintf (stderr, "region addkv(%s,%s)\n", f.kw_str, f.value);//D
236 break; 185 break;
237 186
238 default: 187 default:
239 if (!f.parse_error ("region", rgn->name)) 188 if (!f.parse_error ("region", rgn->name))
240 { 189 {
241 delete rgn; 190 rgn->destroy ();
242 return 0; 191 return 0;
243 } 192 }
244 break; 193 break;
245 } 194 }
246 195
247 f.next (); 196 f.next ();
248 } 197 }
249} 198}
250 199
251/* 200static void
252 * First initialises the archtype hash-table (init_archetable()).
253 * Reads and parses the archetype file (with the first and second-pass
254 * functions).
255 */
256void
257init_regions (void) 201init_regions (void)
258{ 202{
259 if (!regions.size ()) 203 if (!regions.size ())
260 { 204 {
261 // make sure one region is always available 205 // make sure one region is always available

Diff Legend

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