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.42 by root, Thu Jan 1 20:49:48 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
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your 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,
… …
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 GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24#include <global.h> 24#include <global.h>
25#include <unistd.h> 25#include <unistd.h>
26 26
… …
43 * if it can't find a matching name /or/ a fallback region it logs an info message 43 * if it can't find a matching name /or/ a fallback region it logs an info message
44 * message and returns NULL 44 * message and returns NULL
45 * used by the map parsing code. 45 * used by the map parsing code.
46 */ 46 */
47region * 47region *
48region::find (const char *name) 48region::find (shstr_cmp name)
49{ 49{
50 for_all_regions (rgn) 50 for_all_regions (rgn)
51 if (!strcmp (rgn->name, name)) 51 if (rgn->name == name)
52 return rgn; 52 return rgn;
53 53
54 LOG (llevError, "region called %s requested, but not found, using fallback.\n", name); 54 LOG (llevError, "region called %s requested, but not found, using fallback.\n", &name);
55 55
56 return default_region (); 56 return default_region ();
57} 57}
58 58
59/* 59void
60 * Tries to find a region that 'name' corresponds to. 60region::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{ 61{
74 if (!name) 62 regions.erase (this);
75 return default_region ();
76 63
77 char *p = strchr (name, '\n'); 64 attachable::do_destroy ();
78 if (p)
79 *p = '\0';
80 65
81 for_all_regions (rgn) 66 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} 67}
118 68
119/* 69/*
120 * returns 1 if the player is in the region reg, or a child region thereof 70 * returns 1 if the player is in the region reg, or a child region thereof
121 * otherwise returns 0 71 * otherwise returns 0
122 * if passed a NULL region returns -1 72 * if passed a NULL region returns -1
123 */ 73 */
124
125static int 74static int
126region_is_child_of_region (const region * child, const region * r) 75region_is_child_of_region (const region * child, const region * r)
127{ 76{
128 77 if (!r)
129 if (r == NULL)
130 return -1; 78 return -1;
131 79
132 if (child == NULL) 80 if (!child)
133 return 0; 81 return 0;
134 82
135 if (!strcmp (child->name, r->name)) 83 if (child->name == r->name)
136 return 1; 84 return 1;
137 85
138 else if (child->parent != NULL) 86 if (child->parent)
139 return region_is_child_of_region (child->parent, r); 87 return region_is_child_of_region (child->parent, r);
140 else 88
141 return 0; 89 return 0;
142} 90}
143 91
144/** Returns an object which is an exit through which the player represented by op should be 92/** 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 93 * 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 94 * constructed, then NULL will be returned. The caller is responsible for freeing the object
147 * created by this function. 95 * created by this function.
148 */ 96 */
149object * 97object *
150get_jail_exit (object *op) 98get_jail_exit (object *op)
151{ 99{
152 region *reg;
153 object *exit;
154
155 if (op->type != PLAYER) 100 if (op->type != PLAYER)
156 { 101 {
157 LOG (llevError, "region.c: get_jail_exit called against non-player object.\n"); 102 LOG (llevError, "region.c: get_jail_exit called against non-player object.\n");
158 return NULL; 103 return NULL;
159 } 104 }
160 105
161 reg = op->region (); 106 region *reg = op->region ();
162 while (reg) 107 while (reg)
163 { 108 {
164 if (reg->jailmap) 109 if (reg->jailmap)
165 { 110 {
166 exit = object::create (); 111 object *exit = object::create ();
167 EXIT_PATH (exit) = reg->jailmap; 112 EXIT_PATH (exit) = reg->jailmap;
168 /* damned exits reset savebed and remove teleports, so the prisoner can't escape */ 113 /* damned exits reset savebed and remove teleports, so the prisoner can't escape */
169 SET_FLAG (exit, FLAG_DAMNED); 114 SET_FLAG (exit, FLAG_DAMNED);
170 EXIT_X (exit) = reg->jailx; 115 EXIT_X (exit) = reg->jailx;
171 EXIT_Y (exit) = reg->jaily; 116 EXIT_Y (exit) = reg->jaily;
… …
184region::read (object_thawer &f) 129region::read (object_thawer &f)
185{ 130{
186 assert (f.kw == KW_region); 131 assert (f.kw == KW_region);
187 132
188 region *rgn = new region; 133 region *rgn = new region;
134 rgn->refcnt_inc ();
135
189 f.get (rgn->name); 136 f.get (rgn->name);
190 f.next (); 137 f.next ();
191 138
192 for (;;) 139 for (;;)
193 { 140 {
… …
213 break; 160 break;
214 161
215 case KW_end: 162 case KW_end:
216 f.next (); 163 f.next ();
217 164
165 // cannot use find as that will request the default region
218 for_all_regions (old) 166 for_all_regions (old)
219 if (old->name == rgn->name) 167 if (old->name == rgn->name)
220 { 168 {
221 // replace, copy new values (ugly) 169 old->destroy ();
222 rgn->index = old->index;
223 *old = *rgn;
224 delete rgn;
225
226 return old; 170 break;
227 } 171 }
228 172
229 // just append 173 // just append
230 regions.push_back (rgn); 174 regions.push_back (rgn);
231 return rgn; 175 return rgn;
232 176
233 case KW_ERROR: 177 case KW_ERROR:
234 rgn->set_key (f.kw_str, f.value); 178 rgn->set_key_text (f.kw_str, f.value);
235 //fprintf (stderr, "region addkv(%s,%s)\n", f.kw_str, f.value);//D 179 //fprintf (stderr, "region addkv(%s,%s)\n", f.kw_str, f.value);//D
236 break; 180 break;
237 181
238 default: 182 default:
239 if (!f.parse_error ("region", rgn->name)) 183 if (!f.parse_error ("region", rgn->name))
240 { 184 {
241 delete rgn; 185 rgn->destroy ();
242 return 0; 186 return 0;
243 } 187 }
244 break; 188 break;
245 } 189 }
246 190

Diff Legend

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