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.42 by root, Thu Jan 1 20:49:48 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
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
… …
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
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 55
116 return default_region (); 56 return default_region ();
117} 57}
118 58
119void 59void
… …
132 * if passed a NULL region returns -1 72 * if passed a NULL region returns -1
133 */ 73 */
134static int 74static int
135region_is_child_of_region (const region * child, const region * r) 75region_is_child_of_region (const region * child, const region * r)
136{ 76{
137 77 if (!r)
138 if (r == NULL)
139 return -1; 78 return -1;
140 79
141 if (child == NULL) 80 if (!child)
142 return 0; 81 return 0;
143 82
144 if (!strcmp (child->name, r->name)) 83 if (child->name == r->name)
145 return 1; 84 return 1;
146 85
147 else if (child->parent != NULL) 86 if (child->parent)
148 return region_is_child_of_region (child->parent, r); 87 return region_is_child_of_region (child->parent, r);
149 else 88
150 return 0; 89 return 0;
151} 90}
152 91
153/** Returns an object which is an exit through which the player represented by op should be 92/** 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 93 * 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 94 * constructed, then NULL will be returned. The caller is responsible for freeing the object
156 * created by this function. 95 * created by this function.
157 */ 96 */
158object * 97object *
159get_jail_exit (object *op) 98get_jail_exit (object *op)
160{ 99{
161 region *reg;
162 object *exit;
163
164 if (op->type != PLAYER) 100 if (op->type != PLAYER)
165 { 101 {
166 LOG (llevError, "region.c: get_jail_exit called against non-player object.\n"); 102 LOG (llevError, "region.c: get_jail_exit called against non-player object.\n");
167 return NULL; 103 return NULL;
168 } 104 }
169 105
170 reg = op->region (); 106 region *reg = op->region ();
171 while (reg) 107 while (reg)
172 { 108 {
173 if (reg->jailmap) 109 if (reg->jailmap)
174 { 110 {
175 exit = object::create (); 111 object *exit = object::create ();
176 EXIT_PATH (exit) = reg->jailmap; 112 EXIT_PATH (exit) = reg->jailmap;
177 /* damned exits reset savebed and remove teleports, so the prisoner can't escape */ 113 /* damned exits reset savebed and remove teleports, so the prisoner can't escape */
178 SET_FLAG (exit, FLAG_DAMNED); 114 SET_FLAG (exit, FLAG_DAMNED);
179 EXIT_X (exit) = reg->jailx; 115 EXIT_X (exit) = reg->jailx;
180 EXIT_Y (exit) = reg->jaily; 116 EXIT_Y (exit) = reg->jaily;

Diff Legend

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