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.27 by root, Sat Apr 14 07:22:59 2007 UTC vs.
Revision 1.43 by root, Mon Oct 12 14:00:57 2009 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program 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 2 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, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <unistd.h> 26#include <unistd.h>
27 27
… …
44 * 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
45 * message and returns NULL 45 * message and returns NULL
46 * used by the map parsing code. 46 * used by the map parsing code.
47 */ 47 */
48region * 48region *
49region::find (const char *name) 49region::find (shstr_cmp name)
50{ 50{
51 for_all_regions (rgn) 51 for_all_regions (rgn)
52 if (!strcmp (rgn->name, name)) 52 if (rgn->name == name)
53 return rgn; 53 return rgn;
54 54
55 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);
56 56
57 return default_region (); 57 return default_region ();
58} 58}
59 59
60/* 60void
61 * Tries to find a region that 'name' corresponds to. 61region::do_destroy ()
62 * It looks, in order, for:
63 * an exact match to region name (case insensitive)
64 * an exact match to longname (case insensitive)
65 * a substring that matches to the longname (eg Kingdom)
66 * a substring that matches to the region name (eg nav)
67 * if it can find none of these it returns the first parentless region
68 * (there should be only one of these - the top level one)
69 * If we got a NULL, then just return the top level region
70 *
71 */
72region *
73region::find_fuzzy (const char *name)
74{ 62{
75 if (!name) 63 regions.erase (this);
76 return default_region ();
77 64
78 char *p = strchr (name, '\n'); 65 attachable::do_destroy ();
79 if (p)
80 *p = '\0';
81 66
82 for_all_regions (rgn) 67 refcnt_dec ();
83 if (!strcasecmp (rgn->name, name))
84 return rgn;
85
86 for_all_regions (rgn)
87 if (rgn->longname)
88 if (!strcasecmp (rgn->longname, name))
89 return rgn;
90
91 for_all_regions (rgn)
92 if (rgn->longname)
93 {
94 if (strstr (rgn->longname, name))
95 return rgn;
96 }
97
98 for_all_regions (rgn)
99 if (rgn->longname)
100 {
101 /*
102 * This is not a bug, we want the region that is most identifiably a discrete
103 * area in the game, eg if we have 'scor', we want to return 'scorn' and not
104 * 'scornarena', regardless of their order on the list so we only look at those
105 * regions with a longname set.
106 */
107 if (strstr (rgn->name, name))
108 return rgn;
109 }
110
111 for_all_regions (rgn)
112 {
113 if (strstr (rgn->name, name))
114 return rgn;
115 }
116
117 return default_region ();
118} 68}
119 69
120/* 70/*
121 * returns 1 if the player is in the region reg, or a child region thereof 71 * returns 1 if the player is in the region reg, or a child region thereof
122 * otherwise returns 0 72 * otherwise returns 0
123 * if passed a NULL region returns -1 73 * if passed a NULL region returns -1
124 */ 74 */
125
126static int 75static int
127region_is_child_of_region (const region * child, const region * r) 76region_is_child_of_region (const region * child, const region * r)
128{ 77{
129 78 if (!r)
130 if (r == NULL)
131 return -1; 79 return -1;
132 80
133 if (child == NULL) 81 if (!child)
134 return 0; 82 return 0;
135 83
136 if (!strcmp (child->name, r->name)) 84 if (child->name == r->name)
137 return 1; 85 return 1;
138 86
139 else if (child->parent != NULL) 87 if (child->parent)
140 return region_is_child_of_region (child->parent, r); 88 return region_is_child_of_region (child->parent, r);
141 else 89
142 return 0; 90 return 0;
143} 91}
144 92
145/** Returns an object which is an exit through which the player represented by op should be 93/** Returns an object which is an exit through which the player represented by op should be
146 * sent in order to be imprisoned. If there is no suitable place to which an exit can be 94 * sent in order to be imprisoned. If there is no suitable place to which an exit can be
147 * constructed, then NULL will be returned. The caller is responsible for freeing the object 95 * constructed, then NULL will be returned. The caller is responsible for freeing the object
148 * created by this function. 96 * created by this function.
149 */ 97 */
150object * 98object *
151get_jail_exit (object *op) 99get_jail_exit (object *op)
152{ 100{
153 region *reg;
154 object *exit;
155
156 if (op->type != PLAYER) 101 if (op->type != PLAYER)
157 { 102 {
158 LOG (llevError, "region.c: get_jail_exit called against non-player object.\n"); 103 LOG (llevError, "region.c: get_jail_exit called against non-player object.\n");
159 return NULL; 104 return NULL;
160 } 105 }
161 106
162 reg = op->region (); 107 region *reg = op->region ();
163 while (reg) 108 while (reg)
164 { 109 {
165 if (reg->jailmap) 110 if (reg->jailmap)
166 { 111 {
167 exit = object::create (); 112 object *exit = object::create ();
168 EXIT_PATH (exit) = reg->jailmap; 113 EXIT_PATH (exit) = reg->jailmap;
169 /* damned exits reset savebed and remove teleports, so the prisoner can't escape */ 114 /* damned exits reset savebed and remove teleports, so the prisoner can't escape */
170 SET_FLAG (exit, FLAG_DAMNED); 115 SET_FLAG (exit, FLAG_DAMNED);
171 EXIT_X (exit) = reg->jailx; 116 EXIT_X (exit) = reg->jailx;
172 EXIT_Y (exit) = reg->jaily; 117 EXIT_Y (exit) = reg->jaily;
… …
185region::read (object_thawer &f) 130region::read (object_thawer &f)
186{ 131{
187 assert (f.kw == KW_region); 132 assert (f.kw == KW_region);
188 133
189 region *rgn = new region; 134 region *rgn = new region;
135 rgn->refcnt_inc ();
136
190 f.get (rgn->name); 137 f.get (rgn->name);
191 f.next (); 138 f.next ();
192 139
193 for (;;) 140 for (;;)
194 { 141 {
… …
196 { 143 {
197 case KW_parent: 144 case KW_parent:
198 rgn->parent = region::find (f.get_str ()); 145 rgn->parent = region::find (f.get_str ());
199 break; 146 break;
200 147
201 case KW_longname: f.get (rgn->longname); break;
202 case KW_match: f.get (rgn->match); break;
203 case KW_jail_map: f.get (rgn->jailmap); break;
204 case KW_jail_x: f.get (rgn->jailx); break;
205 case KW_jail_y: f.get (rgn->jaily); break;
206 case KW_fallback: f.get (rgn->fallback); break;
207 case KW_msg: f.get_ml (KW_endmsg, rgn->msg); break; 148 case KW_msg: f.get_ml (KW_endmsg, rgn->msg); break;
149 case KW_longname: f.get (rgn->longname); break;
150 case KW_jail_map: f.get (rgn->jailmap); break;
151 case KW_jail_x: f.get (rgn->jailx); break;
152 case KW_jail_y: f.get (rgn->jaily); break;
153 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;
157 case KW_chance: f.get (rgn->treasure_density); break;
158
159 case KW_randomitems:
160 rgn->treasure = treasurelist::get (f.get_str ());
161 break;
208 162
209 case KW_end: 163 case KW_end:
164 f.next ();
165
166 // cannot use find as that will request the default region
210 for_all_regions (old) 167 for_all_regions (old)
211 if (old->name == rgn->name) 168 if (old->name == rgn->name)
212 { 169 {
213 // replace, copy new values (ugly) 170 old->destroy ();
214 rgn->index = old->index;
215 *old = *rgn;
216 delete rgn;
217
218 return old; 171 break;
219 } 172 }
220 173
221 // just append 174 // just append
222 regions.push_back (rgn); 175 regions.push_back (rgn);
223 return rgn; 176 return rgn;
224 177
178 case KW_ERROR:
179 rgn->set_key_text (f.kw_str, f.value);
180 //fprintf (stderr, "region addkv(%s,%s)\n", f.kw_str, f.value);//D
181 break;
182
225 default: 183 default:
226 if (!f.parse_error ("region", rgn->name)) 184 if (!f.parse_error ("region", rgn->name))
227 { 185 {
228 delete rgn; 186 rgn->destroy ();
229 return 0; 187 return 0;
230 } 188 }
231 break; 189 break;
232 } 190 }
233 191
… …
237 195
238/* 196/*
239 * First initialises the archtype hash-table (init_archetable()). 197 * First initialises the archtype hash-table (init_archetable()).
240 * Reads and parses the archetype file (with the first and second-pass 198 * Reads and parses the archetype file (with the first and second-pass
241 * functions). 199 * functions).
242 * Then initialises treasures by calling load_treasures().
243 */ 200 */
244void 201void
245init_regions (void) 202init_regions (void)
246{ 203{
247 if (!regions.size ()) 204 if (!regions.size ())

Diff Legend

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