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.37 by root, Thu Nov 8 19:43:23 2007 UTC vs.
Revision 1.43 by root, Mon Oct 12 14:00:57 2009 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra 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 <support@deliantra.net> 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>
… …
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 return default_region ();
57}
58
59/*
60 * Tries to find a region that 'name' corresponds to.
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{
74 if (!name)
75 return default_region ();
76
77 char *p = strchr (name, '\n');
78 if (p)
79 *p = '\0';
80
81 for_all_regions (rgn)
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 56
116 return default_region (); 57 return default_region ();
117} 58}
118 59
119void 60void
… …
132 * if passed a NULL region returns -1 73 * if passed a NULL region returns -1
133 */ 74 */
134static int 75static int
135region_is_child_of_region (const region * child, const region * r) 76region_is_child_of_region (const region * child, const region * r)
136{ 77{
137 78 if (!r)
138 if (r == NULL)
139 return -1; 79 return -1;
140 80
141 if (child == NULL) 81 if (!child)
142 return 0; 82 return 0;
143 83
144 if (!strcmp (child->name, r->name)) 84 if (child->name == r->name)
145 return 1; 85 return 1;
146 86
147 else if (child->parent != NULL) 87 if (child->parent)
148 return region_is_child_of_region (child->parent, r); 88 return region_is_child_of_region (child->parent, r);
149 else 89
150 return 0; 90 return 0;
151} 91}
152 92
153/** 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
154 * 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
155 * 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
156 * created by this function. 96 * created by this function.
157 */ 97 */
158object * 98object *
159get_jail_exit (object *op) 99get_jail_exit (object *op)
160{ 100{
161 region *reg;
162 object *exit;
163
164 if (op->type != PLAYER) 101 if (op->type != PLAYER)
165 { 102 {
166 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");
167 return NULL; 104 return NULL;
168 } 105 }
169 106
170 reg = op->region (); 107 region *reg = op->region ();
171 while (reg) 108 while (reg)
172 { 109 {
173 if (reg->jailmap) 110 if (reg->jailmap)
174 { 111 {
175 exit = object::create (); 112 object *exit = object::create ();
176 EXIT_PATH (exit) = reg->jailmap; 113 EXIT_PATH (exit) = reg->jailmap;
177 /* 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 */
178 SET_FLAG (exit, FLAG_DAMNED); 115 SET_FLAG (exit, FLAG_DAMNED);
179 EXIT_X (exit) = reg->jailx; 116 EXIT_X (exit) = reg->jailx;
180 EXIT_Y (exit) = reg->jaily; 117 EXIT_Y (exit) = reg->jaily;

Diff Legend

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