ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/arch.C
(Generate patch)

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.86 by root, Sun Oct 5 14:54:05 2008 UTC vs.
Revision 1.91 by root, Tue Oct 27 01:38:39 2009 UTC

… …
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,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 <cassert> 25#include <cassert>
… …
140 */ 141 */
141object * 142object *
142get_archetype_by_object_name (const char *name) 143get_archetype_by_object_name (const char *name)
143{ 144{
144 char tmpname[MAX_BUF]; 145 char tmpname[MAX_BUF];
145 int i;
146 146
147 assign (tmpname, name); 147 assign (tmpname, name);
148 148
149 for (i = strlen (tmpname); i > 0; i--) 149 for (int i = strlen (tmpname); i > 0; i--)
150 { 150 {
151 tmpname[i] = 0; 151 tmpname[i] = 0;
152 152
153 if (archetype *at = find_archetype_by_object_name (tmpname)) 153 if (archetype *at = find_archetype_by_object_name (tmpname))
154 return at->instance (); 154 return at->instance ();
… …
193 return 1; 193 return 1;
194 194
195 /* unpaid is a little more specific */ 195 /* unpaid is a little more specific */
196 if (!strcmp (cp, "unpaid") && QUERY_FLAG (op, FLAG_UNPAID)) 196 if (!strcmp (cp, "unpaid") && QUERY_FLAG (op, FLAG_UNPAID))
197 return 2; 197 return 2;
198
198 if (!strcmp (cp, "cursed") && QUERY_FLAG (op, FLAG_KNOWN_CURSED) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) 199 if (!strcmp (cp, "cursed") && QUERY_FLAG (op, FLAG_KNOWN_CURSED) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
199 return 2; 200 return 2;
200 201
201 if (!strcmp (cp, "unlocked") && !QUERY_FLAG (op, FLAG_INV_LOCKED)) 202 if (!strcmp (cp, "unlocked") && !QUERY_FLAG (op, FLAG_INV_LOCKED))
202 return 2; 203 return 2;
… …
224 * is because of the 'else' handling - we don't want to match on 225 * is because of the 'else' handling - we don't want to match on
225 * something and set a low retval, even though it may match a higher retcal 226 * something and set a low retval, even though it may match a higher retcal
226 * later. So keep it in descending order here, so we try for the best 227 * later. So keep it in descending order here, so we try for the best
227 * match first, and work downward. 228 * match first, and work downward.
228 */ 229 */
230 const char *qbn0, *qbn1, *qsn; // query base name/short name caches
231
229 if (!strcasecmp (cp, query_name (op))) 232 if (!strcasecmp (cp, query_name (op)))
230 retval = 20; 233 retval = 20;
231 else if (!strcasecmp (cp, query_short_name (op))) 234 else if (!strcasecmp (cp, qsn = query_short_name (op)))
232 retval = 18; 235 retval = 18;
233 else if (!strcasecmp (cp, query_base_name (op, 0))) 236 else if (!strcasecmp (cp, qbn0 = query_base_name (op, 0)))
234 retval = 16; 237 retval = 16;
235 else if (!strcasecmp (cp, query_base_name (op, 1))) 238 else if (!strcasecmp (cp, qbn1 = query_base_name (op, 1)))
236 retval = 16; 239 retval = 16;
237 else if (op->custom_name && !strcasecmp (cp, op->custom_name)) 240 else if (op->custom_name && !strcasecmp (cp, op->custom_name))
238 retval = 15; 241 retval = 15;
239 else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp))) 242 else if (!strncasecmp (cp, qbn0, strlen (cp)))
240 retval = 14; 243 retval = 14;
241 else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp))) 244 else if (!strncasecmp (cp, qbn1, strlen (cp)))
242 retval = 14; 245 retval = 14;
243 /* Do substring checks, so things like 'Str+1' will match. 246 /* Do substring checks, so things like 'Str+1' will match.
244 * retval of these should perhaps be lower - they are lower 247 * retval of these should perhaps be lower - they are lower
245 * then the specific strcasecmp aboves, but still higher than 248 * then the specific strcasecmp aboves, but still higher than
246 * some other match criteria. 249 * some other match criteria.
247 */ 250 */
248 else if (strstr (query_base_name (op, 1), cp)) 251 else if (strstr (qbn1, cp))
249 retval = 12; 252 retval = 12;
250 else if (strstr (query_base_name (op, 0), cp)) 253 else if (strstr (qbn0, cp))
251 retval = 12; 254 retval = 12;
252 else if (strstr (query_short_name (op), cp)) 255 else if (strstr (qsn, cp))
253 retval = 12; 256 retval = 12;
254 /* Check against plural/non plural based on count. */ 257 /* Check against plural/non plural based on count. */
255 else if (count > 1 && !strcasecmp (cp, op->name_pl)) 258 else if (count > 1 && !strcasecmp (cp, op->name_pl))
256 retval = 6; 259 retval = 6;
257 else if (count == 1 && !strcasecmp (op->name, cp)) 260 else if (count == 1 && !strcasecmp (op->name, cp))
258 retval = 6; 261 retval = 6;
259 /* base name matched - not bad */ 262 /* base name matched - not bad */
260 else if (strcasecmp (cp, op->name) == 0 && !count) 263 else if (strcasecmp (cp, op->name) == 0 && !count)
261 retval = 4; 264 retval = 4;
262 /* Check for partial custom name, but give a real low priority */ 265 /* Check for partial custom name, but give a real low priority */
263 else if (op->custom_name && strstr (op->custom_name, cp)) 266 else if (op->custom_name.contains (cp))
264 retval = 3; 267 retval = 3;
265 268
266 if (retval) 269 if (retval)
267 { 270 {
268 if (pl->type == PLAYER) 271 if (pl->type == PLAYER)

Diff Legend

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