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.36 by root, Thu Aug 30 07:28:25 2007 UTC vs.
Revision 1.41 by root, Thu Jan 1 11:41:17 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/* 59/*
… …
72region::find_fuzzy (const char *name) 72region::find_fuzzy (const char *name)
73{ 73{
74 if (!name) 74 if (!name)
75 return default_region (); 75 return default_region ();
76 76
77 // TODO: bug, changes possibly const string
77 char *p = strchr (name, '\n'); 78 char *p = strchr (name, '\n');
78 if (p) 79 if (p)
79 *p = '\0'; 80 *p = '\0';
80 81
81 for_all_regions (rgn) 82 for_all_regions (rgn)
82 if (!strcasecmp (rgn->name, name)) 83 if (rgn->name.eq_nc (name))
83 return rgn;
84
85 for_all_regions (rgn)
86 if (rgn->longname)
87 if (!strcasecmp (rgn->longname, name))
88 return rgn; 84 return rgn;
89 85
90 for_all_regions (rgn) 86 for_all_regions (rgn)
91 if (rgn->longname) 87 if (rgn->longname.eq_nc (name))
92 {
93 if (strstr (rgn->longname, name))
94 return rgn; 88 return rgn;
95 }
96 89
97 for_all_regions (rgn) 90 for_all_regions (rgn)
98 if (rgn->longname) 91 if (rgn->longname.contains (name))
99 { 92 return rgn;
93
94 for_all_regions (rgn)
100 /* 95 /*
101 * 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
102 * 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
103 * '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
104 * regions with a longname set. 99 * regions with a longname set.
105 */ 100 */
106 if (strstr (rgn->name, name)) 101 if (rgn->longname && rgn->name.contains (name))
107 return rgn;
108 }
109
110 for_all_regions (rgn)
111 {
112 if (strstr (rgn->name, name))
113 return rgn; 102 return rgn;
114 } 103
104 for_all_regions (rgn)
105 if (rgn->name.contains (name))
106 return rgn;
115 107
116 return default_region (); 108 return default_region ();
117} 109}
118 110
119void 111void
… …
132 * if passed a NULL region returns -1 124 * if passed a NULL region returns -1
133 */ 125 */
134static int 126static int
135region_is_child_of_region (const region * child, const region * r) 127region_is_child_of_region (const region * child, const region * r)
136{ 128{
137 129 if (!r)
138 if (r == NULL)
139 return -1; 130 return -1;
140 131
141 if (child == NULL) 132 if (!child)
142 return 0; 133 return 0;
143 134
144 if (!strcmp (child->name, r->name)) 135 if (child->name == r->name)
145 return 1; 136 return 1;
146 137
147 else if (child->parent != NULL) 138 if (child->parent)
148 return region_is_child_of_region (child->parent, r); 139 return region_is_child_of_region (child->parent, r);
149 else 140
150 return 0; 141 return 0;
151} 142}
152 143
153/** 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
154 * 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
155 * 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
156 * created by this function. 147 * created by this function.
157 */ 148 */
158object * 149object *
159get_jail_exit (object *op) 150get_jail_exit (object *op)
160{ 151{
161 region *reg;
162 object *exit;
163
164 if (op->type != PLAYER) 152 if (op->type != PLAYER)
165 { 153 {
166 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");
167 return NULL; 155 return NULL;
168 } 156 }
169 157
170 reg = op->region (); 158 region *reg = op->region ();
171 while (reg) 159 while (reg)
172 { 160 {
173 if (reg->jailmap) 161 if (reg->jailmap)
174 { 162 {
175 exit = object::create (); 163 object *exit = object::create ();
176 EXIT_PATH (exit) = reg->jailmap; 164 EXIT_PATH (exit) = reg->jailmap;
177 /* 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 */
178 SET_FLAG (exit, FLAG_DAMNED); 166 SET_FLAG (exit, FLAG_DAMNED);
179 EXIT_X (exit) = reg->jailx; 167 EXIT_X (exit) = reg->jailx;
180 EXIT_Y (exit) = reg->jaily; 168 EXIT_Y (exit) = reg->jaily;

Diff Legend

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