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.29 by root, Tue Apr 17 18:24:30 2007 UTC vs.
Revision 1.41 by root, Thu Jan 1 11:41:17 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
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 2 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,
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 GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
26#include <unistd.h> 25#include <unistd.h>
27 26
… …
44 * 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
45 * message and returns NULL 44 * message and returns NULL
46 * used by the map parsing code. 45 * used by the map parsing code.
47 */ 46 */
48region * 47region *
49region::find (const char *name) 48region::find (shstr_cmp name)
50{ 49{
51 for_all_regions (rgn) 50 for_all_regions (rgn)
52 if (!strcmp (rgn->name, name)) 51 if (rgn->name == name)
53 return rgn; 52 return rgn;
54 53
55 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);
56 55
57 return default_region (); 56 return default_region ();
58} 57}
59 58
60/* 59/*
… …
73region::find_fuzzy (const char *name) 72region::find_fuzzy (const char *name)
74{ 73{
75 if (!name) 74 if (!name)
76 return default_region (); 75 return default_region ();
77 76
77 // TODO: bug, changes possibly const string
78 char *p = strchr (name, '\n'); 78 char *p = strchr (name, '\n');
79 if (p) 79 if (p)
80 *p = '\0'; 80 *p = '\0';
81 81
82 for_all_regions (rgn) 82 for_all_regions (rgn)
83 if (!strcasecmp (rgn->name, name)) 83 if (rgn->name.eq_nc (name))
84 return rgn;
85
86 for_all_regions (rgn)
87 if (rgn->longname)
88 if (!strcasecmp (rgn->longname, name))
89 return rgn; 84 return rgn;
90 85
91 for_all_regions (rgn) 86 for_all_regions (rgn)
92 if (rgn->longname) 87 if (rgn->longname.eq_nc (name))
93 {
94 if (strstr (rgn->longname, name))
95 return rgn; 88 return rgn;
96 }
97 89
98 for_all_regions (rgn) 90 for_all_regions (rgn)
99 if (rgn->longname) 91 if (rgn->longname.contains (name))
100 { 92 return rgn;
93
94 for_all_regions (rgn)
101 /* 95 /*
102 * This is not a bug, we want the region that is most identifiably a discrete 96 * 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 97 * 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 98 * 'scornarena', regardless of their order on the list so we only look at those
105 * regions with a longname set. 99 * regions with a longname set.
106 */ 100 */
107 if (strstr (rgn->name, name)) 101 if (rgn->longname && rgn->name.contains (name))
108 return rgn;
109 }
110
111 for_all_regions (rgn)
112 {
113 if (strstr (rgn->name, name))
114 return rgn; 102 return rgn;
115 } 103
104 for_all_regions (rgn)
105 if (rgn->name.contains (name))
106 return rgn;
116 107
117 return default_region (); 108 return default_region ();
109}
110
111void
112region::do_destroy ()
113{
114 regions.erase (this);
115
116 attachable::do_destroy ();
117
118 refcnt_dec ();
118} 119}
119 120
120/* 121/*
121 * returns 1 if the player is in the region reg, or a child region thereof 122 * returns 1 if the player is in the region reg, or a child region thereof
122 * otherwise returns 0 123 * otherwise returns 0
123 * if passed a NULL region returns -1 124 * if passed a NULL region returns -1
124 */ 125 */
125
126static int 126static int
127region_is_child_of_region (const region * child, const region * r) 127region_is_child_of_region (const region * child, const region * r)
128{ 128{
129 129 if (!r)
130 if (r == NULL)
131 return -1; 130 return -1;
132 131
133 if (child == NULL) 132 if (!child)
134 return 0; 133 return 0;
135 134
136 if (!strcmp (child->name, r->name)) 135 if (child->name == r->name)
137 return 1; 136 return 1;
138 137
139 else if (child->parent != NULL) 138 if (child->parent)
140 return region_is_child_of_region (child->parent, r); 139 return region_is_child_of_region (child->parent, r);
141 else 140
142 return 0; 141 return 0;
143} 142}
144 143
145/** Returns an object which is an exit through which the player represented by op should be 144/** 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 145 * 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 146 * constructed, then NULL will be returned. The caller is responsible for freeing the object
148 * created by this function. 147 * created by this function.
149 */ 148 */
150object * 149object *
151get_jail_exit (object *op) 150get_jail_exit (object *op)
152{ 151{
153 region *reg;
154 object *exit;
155
156 if (op->type != PLAYER) 152 if (op->type != PLAYER)
157 { 153 {
158 LOG (llevError, "region.c: get_jail_exit called against non-player object.\n"); 154 LOG (llevError, "region.c: get_jail_exit called against non-player object.\n");
159 return NULL; 155 return NULL;
160 } 156 }
161 157
162 reg = op->region (); 158 region *reg = op->region ();
163 while (reg) 159 while (reg)
164 { 160 {
165 if (reg->jailmap) 161 if (reg->jailmap)
166 { 162 {
167 exit = object::create (); 163 object *exit = object::create ();
168 EXIT_PATH (exit) = reg->jailmap; 164 EXIT_PATH (exit) = reg->jailmap;
169 /* damned exits reset savebed and remove teleports, so the prisoner can't escape */ 165 /* damned exits reset savebed and remove teleports, so the prisoner can't escape */
170 SET_FLAG (exit, FLAG_DAMNED); 166 SET_FLAG (exit, FLAG_DAMNED);
171 EXIT_X (exit) = reg->jailx; 167 EXIT_X (exit) = reg->jailx;
172 EXIT_Y (exit) = reg->jaily; 168 EXIT_Y (exit) = reg->jaily;
… …
185region::read (object_thawer &f) 181region::read (object_thawer &f)
186{ 182{
187 assert (f.kw == KW_region); 183 assert (f.kw == KW_region);
188 184
189 region *rgn = new region; 185 region *rgn = new region;
186 rgn->refcnt_inc ();
187
190 f.get (rgn->name); 188 f.get (rgn->name);
191 f.next (); 189 f.next ();
192 190
193 for (;;) 191 for (;;)
194 { 192 {
… …
196 { 194 {
197 case KW_parent: 195 case KW_parent:
198 rgn->parent = region::find (f.get_str ()); 196 rgn->parent = region::find (f.get_str ());
199 break; 197 break;
200 198
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; 199 case KW_msg: f.get_ml (KW_endmsg, rgn->msg); break;
200 case KW_longname: f.get (rgn->longname); break;
201 case KW_jail_map: f.get (rgn->jailmap); break;
202 case KW_jail_x: f.get (rgn->jailx); break;
203 case KW_jail_y: f.get (rgn->jaily); break;
204 case KW_portal_map: f.get (rgn->portalmap);break;
205 case KW_portal_x: f.get (rgn->portalx); break;
206 case KW_portal_y: f.get (rgn->portaly); break;
207 case KW_fallback: f.get (rgn->fallback); break;
208 case KW_chance: f.get (rgn->treasure_density); break;
209
210 case KW_randomitems:
211 rgn->treasure = treasurelist::get (f.get_str ());
212 break;
208 213
209 case KW_end: 214 case KW_end:
210 f.next (); 215 f.next ();
211 216
217 // cannot use find as that will request the default region
212 for_all_regions (old) 218 for_all_regions (old)
213 if (old->name == rgn->name) 219 if (old->name == rgn->name)
214 { 220 {
215 // replace, copy new values (ugly) 221 old->destroy ();
216 rgn->index = old->index;
217 *old = *rgn;
218 delete rgn;
219
220 return old; 222 break;
221 } 223 }
222 224
223 // just append 225 // just append
224 regions.push_back (rgn); 226 regions.push_back (rgn);
225 return rgn; 227 return rgn;
226 228
229 case KW_ERROR:
230 rgn->set_key_text (f.kw_str, f.value);
231 //fprintf (stderr, "region addkv(%s,%s)\n", f.kw_str, f.value);//D
232 break;
233
227 default: 234 default:
228 if (!f.parse_error ("region", rgn->name)) 235 if (!f.parse_error ("region", rgn->name))
229 { 236 {
230 delete rgn; 237 rgn->destroy ();
231 return 0; 238 return 0;
232 } 239 }
233 break; 240 break;
234 } 241 }
235 242

Diff Legend

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