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.4 by root, Sun Aug 27 16:15:11 2006 UTC vs.
Revision 1.21 by root, Thu Sep 14 22:33:58 2006 UTC

1/*
2 * static char *rcsid_arch_c =
3 * "$Id: arch.C,v 1.4 2006/08/27 16:15:11 root Exp $";
4 */
5
6/* 1/*
7 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
8 3
9 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
10 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
… …
21 16
22 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
23 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
24 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
25 20
26 The authors can be reached via e-mail at crossfire-devel@real-time.com 21 The authors can be reached via e-mail at <crossfire@schmorp.de>
27*/ 22*/
23
24#include <cassert>
25
26#include <tr1/unordered_map>
28 27
29#include <global.h> 28#include <global.h>
30#include <arch.h> 29#include <arch.h>
31#include <funcpoint.h> 30#include <funcpoint.h>
32#include <loader.h> 31#include <loader.h>
33 32
34#include <cassert>
35
36/* IF set, does a little timing on the archetype load. */ 33/* IF set, does a little timing on the archetype load. */
37#define TIME_ARCH_LOAD 0 34#define TIME_ARCH_LOAD 0
38 35
39static void add_arch(archetype *at); 36static void add_arch (archetype *at);
40 37
41static archetype *arch_table[ARCHTABLE]; 38static archetype *arch_table[ARCHTABLE];
42int arch_cmp=0; /* How many strcmp's */ 39int arch_cmp = 0; /* How many strcmp's */
43int arch_search=0; /* How many searches */ 40int arch_search = 0; /* How many searches */
44int arch_init; /* True if doing arch initialization */ 41int arch_init; /* True if doing arch initialization */
45 42
46/* The naming of these functions is really poor - they are all 43/* The naming of these functions is really poor - they are all
47 * pretty much named '.._arch_...', but they may more may not 44 * pretty much named '.._arch_...', but they may more may not
48 * return archetypes. Some make the arch_to_object call, and thus 45 * return archetypes. Some make the arch_to_object call, and thus
49 * return an object. Perhaps those should be called 'archob' functions 46 * return an object. Perhaps those should be called 'archob' functions
50 * to denote they return an object derived from the archetype. 47 * to denote they return an object derived from the archetype.
51 * MSW 2003-04-29 48 * MSW 2003-04-29
52 */ 49 */
50
51#if USE_UNORDERED_MAP
52// the hashtable
53typedef std::tr1::unordered_map
54 <
55 std::size_t,
56 archetype *,
57 std::hash<size_t>,
58 std::equal_to<size_t>,
59 slice_allocator< std::pair<const std::size_t, archetype *> >
60 true,
61 > HT;
62
63static HT ht;
64#endif
53 65
54/** 66/**
55 * GROS - This function retrieves an archetype given the name that appears 67 * GROS - This function retrieves an archetype given the name that appears
56 * during the game (for example, "writing pen" instead of "stylus"). 68 * during the game (for example, "writing pen" instead of "stylus").
57 * It does not use the hashtable system, but browse the whole archlist each time. 69 * It does not use the hashtable system, but browse the whole archlist each time.
… …
60 * Params: 72 * Params:
61 * - name: the name we're searching for (ex: "writing pen"); 73 * - name: the name we're searching for (ex: "writing pen");
62 * Return value: 74 * Return value:
63 * - the archetype found or null if nothing was found. 75 * - the archetype found or null if nothing was found.
64 */ 76 */
77archetype *
65archetype *find_archetype_by_object_name(const char *name) { 78find_archetype_by_object_name (const char *name)
79{
66 archetype *at; 80 archetype *at;
67 81
68 if (name == NULL) 82 if (name == NULL)
69 return (archetype *) NULL; 83 return (archetype *) NULL;
70 84
71 for(at = first_archetype;at!=NULL;at=at->next) { 85 for (at = first_archetype; at != NULL; at = at->next)
86 {
72 if (!strcmp(at->clone.name, name)) 87 if (!strcmp (at->clone.name, name))
73 return at; 88 return at;
74 } 89 }
75 return NULL; 90 return NULL;
76} 91}
77 92
78/** 93/**
79 * This function retrieves an archetype by type and name that appears during 94 * This function retrieves an archetype by type and name that appears during
80 * the game. It is basically the same as find_archetype_by_object_name() 95 * the game. It is basically the same as find_archetype_by_object_name()
81 * except that it considers only items of the given type. 96 * except that it considers only items of the given type.
82 */ 97 */
98archetype *
83archetype *find_archetype_by_object_type_name(int type, const char *name) { 99find_archetype_by_object_type_name (int type, const char *name)
100{
84 archetype *at; 101 archetype *at;
85 102
86 if (name == NULL) 103 if (name == NULL)
87 return NULL;
88
89 for (at = first_archetype; at != NULL; at = at->next) {
90 if (at->clone.type == type && strcmp(at->clone.name, name) == 0)
91 return at;
92 }
93
94 return NULL; 104 return NULL;
105
106 for (at = first_archetype; at != NULL; at = at->next)
107 {
108 if (at->clone.type == type && strcmp (at->clone.name, name) == 0)
109 return at;
110 }
111
112 return NULL;
95} 113}
96 114
97/* This is a lot like the above function. Instead, we are trying to match 115/* This is a lot like the above function. Instead, we are trying to match
98 * the arch->skill values. type is the type of object to match 116 * the arch->skill values. type is the type of object to match
99 * against (eg, to only match against skills or only skill objects for example). 117 * against (eg, to only match against skills or only skill objects for example).
100 * If type is -1, ew don't match on type. 118 * If type is -1, ew don't match on type.
101 */ 119 */
120object *
102object *get_archetype_by_skill_name(const char *skill, int type) { 121get_archetype_by_skill_name (const char *skill, int type)
122{
103 archetype *at; 123 archetype *
124 at;
104 125
105 if (skill == NULL) 126 if (skill == NULL)
106 return NULL;
107
108 for(at = first_archetype;at!=NULL;at=at->next) {
109 if ( ((type == -1) || (type == at->clone.type)) &&
110 (!strcmp(at->clone.skill, skill)))
111 return arch_to_object(at);
112 }
113 return NULL; 127 return NULL;
128
129 for (at = first_archetype; at != NULL; at = at->next)
130 {
131 if (((type == -1) || (type == at->clone.type)) && (!strcmp (at->clone.skill, skill)))
132 return arch_to_object (at);
133 }
134 return NULL;
114} 135}
115 136
116/* similiar to above - this returns the first archetype 137/* similiar to above - this returns the first archetype
117 * that matches both the type and subtype. type and subtype 138 * that matches both the type and subtype. type and subtype
118 * can be -1 to say ignore, but in this case, the match it does 139 * can be -1 to say ignore, but in this case, the match it does
119 * may not be very useful. This function is most useful when 140 * may not be very useful. This function is most useful when
120 * subtypes are known to be unique for a particular type 141 * subtypes are known to be unique for a particular type
121 * (eg, skills) 142 * (eg, skills)
122 */ 143 */
144archetype *
123archetype *get_archetype_by_type_subtype(int type, int subtype) { 145get_archetype_by_type_subtype (int type, int subtype)
146{
124 archetype *at; 147 archetype *
148 at;
125 149
126 for(at = first_archetype;at!=NULL;at=at->next) { 150 for (at = first_archetype; at != NULL; at = at->next)
127 if ( ((type == -1) || (type == at->clone.type)) &&
128 (subtype == -1 || subtype == at->clone.subtype))
129 return at;
130 } 151 {
152 if (((type == -1) || (type == at->clone.type)) && (subtype == -1 || subtype == at->clone.subtype))
153 return at;
154 }
131 return NULL; 155 return NULL;
132} 156}
133 157
134/** 158/**
135 * GROS - this returns a new object given the name that appears during the game 159 * GROS - this returns a new object given the name that appears during the game
136 * (for example, "writing pen" instead of "stylus"). 160 * (for example, "writing pen" instead of "stylus").
… …
141 * Note by MSW - it appears that it takes the full name and keeps 165 * Note by MSW - it appears that it takes the full name and keeps
142 * shortening it until it finds a match. I re-wrote this so that it 166 * shortening it until it finds a match. I re-wrote this so that it
143 * doesn't malloc it each time - not that this function is used much, 167 * doesn't malloc it each time - not that this function is used much,
144 * but it otherwise had a big memory leak. 168 * but it otherwise had a big memory leak.
145 */ 169 */
170object *
146object *get_archetype_by_object_name(const char *name) { 171get_archetype_by_object_name (const char *name)
172{
147 archetype *at; 173 archetype *at;
148 char tmpname[MAX_BUF]; 174 char tmpname[MAX_BUF];
149 int i; 175 int i;
150 176
151 strncpy(tmpname,name,MAX_BUF-1); 177 assign (tmpname, name);
152 tmpname[MAX_BUF-1] = 0; 178
153 for(i=strlen(tmpname); i>0; i--) { 179 for (i = strlen (tmpname); i > 0; i--)
180 {
154 tmpname[i] = 0; 181 tmpname[i] = 0;
155 at = find_archetype_by_object_name(tmpname); 182 at = find_archetype_by_object_name (tmpname);
183
156 if (at !=NULL) 184 if (at != NULL)
157 {
158 return arch_to_object(at); 185 return arch_to_object (at);
159 }
160 } 186 }
187
161 return create_singularity(name); 188 return create_singularity (name);
162} 189}
163
164 /* GROS - find_best_weapon_used_match and item_matched_string moved there */
165object *find_best_weapon_used_match(object *pl, const char *params)
166 {
167 object *tmp, *best=NULL;
168 int match_val=0,tmpmatch;
169
170 for (tmp=pl->inv; tmp; tmp=tmp->below) {
171 if (tmp->invisible) continue;
172 if ((tmpmatch=item_matched_string(pl, tmp, params))>match_val)
173 {
174 if ((QUERY_FLAG(tmp, FLAG_APPLIED))&&(tmp->type==WEAPON))
175 {
176 match_val=tmpmatch;
177 best=tmp;
178 };
179 }
180 }
181 return best;
182 }
183 190
184 /* This is a subset of the parse_id command. Basically, name can be 191 /* This is a subset of the parse_id command. Basically, name can be
185 * a string seperated lists of things to match, with certain keywords. 192 * a string seperated lists of things to match, with certain keywords.
186 * pl is the player (only needed to set count properly) 193 * pl is the player (only needed to set count properly)
187 * op is the item we are trying to match. Calling function takes care 194 * op is the item we are trying to match. Calling function takes care
… …
196 * player object.) 203 * player object.)
197 * If count is 1, make a quick check on the name. 204 * If count is 1, make a quick check on the name.
198 * IF count is >1, we need to make plural name. Return if match. 205 * IF count is >1, we need to make plural name. Return if match.
199 * Last, make a check on the full name. 206 * Last, make a check on the full name.
200 */ 207 */
208int
201int item_matched_string(object *pl, object *op, const char *name) 209item_matched_string (object *pl, object *op, const char *name)
202{ 210{
211 char *
212 cp,
203 char *cp, local_name[MAX_BUF]; 213 local_name[MAX_BUF];
204 int count,retval=0; 214 int
215 count,
216 retval = 0;
217
205 strcpy(local_name, name); /* strtok is destructive to name */ 218 strcpy (local_name, name); /* strtok is destructive to name */
206 219
207 for (cp=strtok(local_name,","); cp; cp=strtok(NULL,",")) { 220 for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))
208 while (cp[0]==' ') ++cp; /* get rid of spaces */ 221 {
222 while (cp[0] == ' ')
223 ++cp; /* get rid of spaces */
209 224
210 /* LOG(llevDebug,"Trying to match %s\n", cp);*/ 225 /* LOG(llevDebug,"Trying to match %s\n", cp); */
211 /* All is a very generic match - low match value */ 226 /* All is a very generic match - low match value */
212 if (!strcmp(cp,"all")) return 1; 227 if (!strcmp (cp, "all"))
228 return 1;
213 229
214 /* unpaid is a little more specific */ 230 /* unpaid is a little more specific */
215 if (!strcmp(cp,"unpaid") && QUERY_FLAG(op,FLAG_UNPAID)) return 2; 231 if (!strcmp (cp, "unpaid") && QUERY_FLAG (op, FLAG_UNPAID))
216 if (!strcmp(cp,"cursed") && QUERY_FLAG(op,FLAG_KNOWN_CURSED) &&
217 (QUERY_FLAG(op,FLAG_CURSED) ||QUERY_FLAG(op,FLAG_DAMNED)))
218 return 2; 232 return 2;
233 if (!strcmp (cp, "cursed") && QUERY_FLAG (op, FLAG_KNOWN_CURSED) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
234 return 2;
219 235
220 if (!strcmp(cp,"unlocked") && !QUERY_FLAG(op, FLAG_INV_LOCKED)) 236 if (!strcmp (cp, "unlocked") && !QUERY_FLAG (op, FLAG_INV_LOCKED))
221 return 2; 237 return 2;
222 238
223 /* Allow for things like '100 arrows' */ 239 /* Allow for things like '100 arrows' */
224 if ((count=atoi(cp))!=0) { 240 if ((count = atoi (cp)) != 0)
241 {
225 cp=strchr(cp, ' '); 242 cp = strchr (cp, ' ');
226 while (cp && cp[0]==' ') ++cp; /* get rid of spaces */ 243 while (cp && cp[0] == ' ')
227 } 244 ++cp; /* get rid of spaces */
228 else { 245 }
246 else
247 {
229 if (pl->type==PLAYER) 248 if (pl->type == PLAYER)
230 count=pl->contr->count; 249 count = pl->contr->count;
231 else 250 else
232 count = 0; 251 count = 0;
233 } 252 }
234 253
235 if (!cp || cp[0]=='\0' || count<0) return 0; 254 if (!cp || cp[0] == '\0' || count < 0)
255 return 0;
236 256
237 257
238 /* The code here should go from highest retval to lowest. That 258 /* The code here should go from highest retval to lowest. That
239 * is because of the 'else' handling - we don't want to match on 259 * is because of the 'else' handling - we don't want to match on
240 * something and set a low retval, even though it may match a higher retcal 260 * something and set a low retval, even though it may match a higher retcal
241 * later. So keep it in descending order here, so we try for the best 261 * later. So keep it in descending order here, so we try for the best
242 * match first, and work downward. 262 * match first, and work downward.
243 */ 263 */
244 if (!strcasecmp(cp,query_name(op))) retval=20; 264 if (!strcasecmp (cp, query_name (op)))
265 retval = 20;
245 else if (!strcasecmp(cp,query_short_name(op))) retval=18; 266 else if (!strcasecmp (cp, query_short_name (op)))
246 else if (!strcasecmp(cp,query_base_name(op,0))) retval=16; 267 retval = 18;
247 else if (!strcasecmp(cp,query_base_name(op,1))) retval=16;
248 else if (op->custom_name && !strcasecmp(cp,op->custom_name)) retval=15;
249 else if (!strncasecmp(cp,query_base_name(op,0), 268 else if (!strcasecmp (cp, query_base_name (op, 0)))
250 strlen(cp))) retval=14; 269 retval = 16;
251 else if (!strncasecmp(cp,query_base_name(op,1), 270 else if (!strcasecmp (cp, query_base_name (op, 1)))
252 strlen(cp))) retval=14; 271 retval = 16;
272 else if (op->custom_name && !strcasecmp (cp, op->custom_name))
273 retval = 15;
274 else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp)))
275 retval = 14;
276 else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp)))
277 retval = 14;
253 278
254 /* Do substring checks, so things like 'Str+1' will match. 279 /* Do substring checks, so things like 'Str+1' will match.
255 * retval of these should perhaps be lower - they are lower 280 * retval of these should perhaps be lower - they are lower
256 * then the specific strcasecmp aboves, but still higher than 281 * then the specific strcasecmp aboves, but still higher than
257 * some other match criteria. 282 * some other match criteria.
258 */ 283 */
259 else if (strstr(query_base_name(op,1), cp)) retval = 12; 284 else if (strstr (query_base_name (op, 1), cp))
285 retval = 12;
260 else if (strstr(query_base_name(op,0), cp)) retval = 12; 286 else if (strstr (query_base_name (op, 0), cp))
287 retval = 12;
261 else if (strstr(query_short_name(op), cp)) retval = 12; 288 else if (strstr (query_short_name (op), cp))
289 retval = 12;
262 290
263 /* Check against plural/non plural based on count. */ 291 /* Check against plural/non plural based on count. */
264 else if (count>1 && !strcasecmp(cp,op->name_pl)) { 292 else if (count > 1 && !strcasecmp (cp, op->name_pl))
265 retval=6; 293 {
266 } 294 retval = 6;
295 }
267 else if (count==1 && !strcasecmp(op->name,cp)) { 296 else if (count == 1 && !strcasecmp (op->name, cp))
268 retval=6; 297 {
269 } 298 retval = 6;
299 }
270 /* base name matched - not bad */ 300 /* base name matched - not bad */
271 else if (strcasecmp(cp,op->name)==0 && !count) retval=4; 301 else if (strcasecmp (cp, op->name) == 0 && !count)
302 retval = 4;
272 /* Check for partial custom name, but give a real low priority */ 303 /* Check for partial custom name, but give a real low priority */
273 else if (op->custom_name && strstr(op->custom_name, cp)) retval = 3; 304 else if (op->custom_name && strstr (op->custom_name, cp))
305 retval = 3;
274 306
275 if (retval) { 307 if (retval)
308 {
276 if (pl->type == PLAYER) 309 if (pl->type == PLAYER)
277 pl->contr->count=count; 310 pl->contr->count = count;
278 return retval; 311 return retval;
279 } 312 }
280 } 313 }
281 return 0; 314 return 0;
282} 315}
283 316
284/* 317/*
285 * Initialises the internal linked list of archetypes (read from file). 318 * Initialises the internal linked list of archetypes (read from file).
286 * Then the global "empty_archetype" pointer is initialised. 319 * Then the global "empty_archetype" pointer is initialised.
287 * Then the blocksview[] array is initialised. 320 * Then the blocksview[] array is initialised.
288 */ 321 */
289 322
290void init_archetypes(void) { /* called from add_player() and edit() */ 323void
324init_archetypes (void)
325{ /* called from add_player() and edit() */
291 if(first_archetype!=NULL) /* Only do this once */ 326 if (first_archetype != NULL) /* Only do this once */
292 return; 327 return;
328
293 arch_init = 1; 329 arch_init = 1;
294 load_archetypes(); 330 load_archetypes ();
295 arch_init = 0; 331 arch_init = 0;
296 empty_archetype=find_archetype("empty_archetype"); 332 empty_archetype = archetype::find ("empty_archetype");
333
297/* init_blocksview();*/ 334/* init_blocksview();*/
298} 335}
299 336
300/* 337/*
301 * Stores debug-information about how efficient the hashtable 338 * Stores debug-information about how efficient the hashtable
302 * used for archetypes has been in the static errmsg array. 339 * used for archetypes has been in the static errmsg array.
303 */ 340 */
304 341
342void
305void arch_info(object *op) { 343arch_info (object *op)
344{
306 sprintf(errmsg,"%d searches and %d strcmp()'s",arch_search,arch_cmp); 345 sprintf (errmsg, "%d searches and %d strcmp()'s", arch_search, arch_cmp);
307 new_draw_info(NDI_BLACK, 0, op,errmsg); 346 new_draw_info (NDI_BLACK, 0, op, errmsg);
308} 347}
309 348
310/* 349/*
311 * Initialise the hashtable used by the archetypes. 350 * Initialise the hashtable used by the archetypes.
312 */ 351 */
313 352
353void
314void clear_archetable(void) { 354clear_archetable (void)
355{
315 memset((void *) arch_table,0,ARCHTABLE*sizeof(archetype *)); 356 memset ((void *) arch_table, 0, ARCHTABLE * sizeof (archetype *));
316} 357}
317 358
318/* 359/*
319 * An alternative way to init the hashtable which is slower, but _works_... 360 * An alternative way to init the hashtable which is slower, but _works_...
320 */ 361 */
321 362
363void
322void init_archetable(void) { 364init_archetable (void)
365{
323 archetype *at; 366 archetype *
367 at;
368
324 LOG(llevDebug," Setting up archetable...\n"); 369 LOG (llevDebug, " Setting up archetable...\n");
370
325 for(at=first_archetype;at!=NULL;at=(at->more==NULL)?at->next:at->more) 371 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
326 add_arch(at); 372 add_arch (at);
373
327 LOG(llevDebug,"done\n"); 374 LOG (llevDebug, "done\n");
328} 375}
329 376
330/* 377/*
331 * Dumps an archetype to debug-level output. 378 * Dumps an archetype to debug-level output.
332 */ 379 */
333 380
381void
334void dump_arch(archetype *at) { 382dump_arch (archetype *at)
383{
335 dump_object(&at->clone); 384 dump_object (&at->clone);
336} 385}
337 386
338/* 387/*
339 * Dumps _all_ archetypes to debug-level output. 388 * Dumps _all_ archetypes to debug-level output.
340 * If you run crossfire with debug, and enter DM-mode, you can trigger 389 * If you run crossfire with debug, and enter DM-mode, you can trigger
341 * this with the O key. 390 * this with the O key.
342 */ 391 */
343 392
393void
344void dump_all_archetypes(void) { 394dump_all_archetypes (void)
395{
345 archetype *at; 396 archetype *
397 at;
398
346 for(at=first_archetype;at!=NULL;at=(at->more==NULL)?at->next:at->more) { 399 for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
400 {
347 dump_arch(at); 401 dump_arch (at);
348 fprintf(logfile, "%s\n", errmsg); 402 fprintf (logfile, "%s\n", errmsg);
349 } 403 }
350} 404}
351 405
406void
352void free_all_archs(void) 407free_all_archs (void)
353{ 408{
354 archetype *at, *next; 409 archetype *
355 int i=0,f=0; 410 at, *
411 next;
412 int
413 i = 0, f = 0;
356 414
357 for (at=first_archetype; at!=NULL; at=next) { 415 for (at = first_archetype; at != NULL; at = next)
358 if (at->more) next=at->more;
359 else next=at->next;
360 if (at->name) free_string(at->name);
361 if (at->clone.name) free_string(at->clone.name);
362 if (at->clone.name_pl) free_string(at->clone.name_pl);
363 if (at->clone.title) free_string(at->clone.title);
364 if (at->clone.race) free_string(at->clone.race);
365 if (at->clone.slaying) free_string(at->clone.slaying);
366 if (at->clone.msg) free_string(at->clone.msg);
367 free(at);
368 i++;
369 } 416 {
417 if (at->more)
418 next = at->more;
419 else
420 next = at->next;
421
422 delete
423 at;
424
425 i++;
426 }
370 LOG(llevDebug,"Freed %d archetypes, %d faces\n", i, f); 427 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
371} 428}
372 429
373/* 430archetype::archetype ()
374 * Allocates, initialises and returns the pointer to an archetype structure. 431{
375 */
376
377archetype *get_archetype_struct(void) {
378 archetype *arch;
379
380 arch=(archetype *)CALLOC(1,sizeof(archetype));
381 if(arch==NULL)
382 fatal(OUT_OF_MEMORY);
383 arch->next=NULL;
384 arch->name=NULL;
385 arch->clone.other_arch=NULL;
386 arch->clone.name=NULL;
387 arch->clone.name_pl=NULL;
388 arch->clone.title=NULL;
389 arch->clone.race=NULL;
390 arch->clone.slaying=NULL;
391 arch->clone.msg=NULL;
392 clear_object(&arch->clone); /* to initial state other also */ 432 clear_object (&clone); /* to initial state other also */
393 CLEAR_FLAG((&arch->clone),FLAG_FREED); /* This shouldn't matter, since copy_object() */ 433 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_object() */
394 SET_FLAG((&arch->clone), FLAG_REMOVED); /* doesn't copy these flags... */ 434 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
395 arch->head=NULL; 435}
396 arch->more=NULL; 436
397 return arch; 437archetype::~archetype ()
438{
398} 439}
399 440
400/* 441/*
401 * Reads/parses the archetype-file, and copies into a linked list 442 * Reads/parses the archetype-file, and copies into a linked list
402 * of archetype-structures. 443 * of archetype-structures.
403 */ 444 */
404void first_arch_pass(FILE *fp) { 445void
405 object *op; 446first_arch_pass (object_thawer & fp)
447{
448 archetype *
449 at, *
406 archetype *at,*head=NULL,*last_more=NULL; 450 head = NULL, *last_more = NULL;
407 int i,first=2;
408 451
409 object_thawer thawer; 452 at->clone.arch = first_archetype = at = new archetype;
410 453
411 op=get_object(); 454 while (int i = load_object (fp, &at->clone, 0))
412 op->arch=first_archetype=at=get_archetype_struct(); 455 {
413
414 while((i=load_object(fp,thawer,op,first,0))) {
415 first=0;
416 copy_object(op,&at->clone);
417 at->clone.speed_left= (float) (-0.1); 456 at->clone.speed_left = (float) (-0.1);
418 /* copy the body_info to the body_used - this is only really 457 /* copy the body_info to the body_used - this is only really
419 * need for monsters, but doesn't hurt to do it for everything. 458 * need for monsters, but doesn't hurt to do it for everything.
420 * by doing so, when a monster is created, it has good starting 459 * by doing so, when a monster is created, it has good starting
421 * values for the body_used info, so when items are created 460 * values for the body_used info, so when items are created
422 * for it, they can be properly equipped. 461 * for it, they can be properly equipped.
423 */ 462 */
424 memcpy(&at->clone.body_used, &op->body_info, sizeof(op->body_info)); 463 memcpy (&at->clone.body_used, &at->clone.body_info, sizeof (at->clone.body_info));
425 464
426 switch(i) { 465 switch (i)
466 {
427 case LL_NORMAL: /* A new archetype, just link it with the previous */ 467 case LL_NORMAL: /* A new archetype, just link it with the previous */
428 if(last_more!=NULL) 468 if (last_more != NULL)
429 last_more->next=at; 469 last_more->next = at;
430 if(head!=NULL) 470 if (head != NULL)
431 head->next=at; 471 head->next = at;
432 head=last_more=at; 472 head = last_more = at;
433#if 0 473#if 0
434 if(!op->type) 474 if (!op->type)
435 LOG(llevDebug," WARNING: Archetype %s has no type info!\n", op->arch->name); 475 LOG (llevDebug, " WARNING: Archetype %s has no type info!\n", op->arch->name);
436#endif 476#endif
437 at->tail_x = 0; 477 at->tail_x = 0;
438 at->tail_y = 0; 478 at->tail_y = 0;
439 break; 479 break;
440 480
441 case LL_MORE: /* Another part of the previous archetype, link it correctly */ 481 case LL_MORE: /* Another part of the previous archetype, link it correctly */
442 482
443 at->head=head; 483 at->head = head;
444 at->clone.head = &head->clone; 484 at->clone.head = &head->clone;
445 if(last_more!=NULL) { 485 if (last_more != NULL)
446 last_more->more=at; 486 {
487 last_more->more = at;
447 last_more->clone.more = &at->clone; 488 last_more->clone.more = &at->clone;
448 } 489 }
449 last_more=at; 490 last_more = at;
450 491
451 /* If this multipart image is still composed of individual small 492 /* If this multipart image is still composed of individual small
452 * images, don't set the tail_.. values. We can't use them anyways, 493 * images, don't set the tail_.. values. We can't use them anyways,
453 * and setting these to zero makes the map sending to the client much 494 * and setting these to zero makes the map sending to the client much
454 * easier as just looking at the head, we know what to do. 495 * easier as just looking at the head, we know what to do.
455 */ 496 */
456 if (at->clone.face != head->clone.face) { 497 if (at->clone.face != head->clone.face)
457 head->tail_x = 0; 498 {
458 head->tail_y = 0; 499 head->tail_x = 0;
459 } else { 500 head->tail_y = 0;
460 if (at->clone.x > head->tail_x) head->tail_x = at->clone.x; 501 }
461 if (at->clone.y > head->tail_y) head->tail_y = at->clone.y; 502 else
462 } 503 {
463 break; 504 if (at->clone.x > head->tail_x)
505 head->tail_x = at->clone.x;
506 if (at->clone.y > head->tail_y)
507 head->tail_y = at->clone.y;
508 }
509 break;
464 510
465 } 511 }
466 512
467 at=get_archetype_struct(); 513 at = new archetype;
468 clear_object(op); 514
469 op->arch=at; 515 at->clone.arch = at;
470 } 516 }
471 free(at); 517
472 free_object(op); 518 delete at;
473} 519}
474 520
475/* 521/*
476 * Reads the archetype file once more, and links all pointers between 522 * Reads the archetype file once more, and links all pointers between
477 * archetypes. 523 * archetypes.
478 */ 524 */
479 525
480void second_arch_pass(FILE *fp) { 526void
481 char buf[MAX_BUF],*variable=buf,*argument,*cp; 527second_arch_pass (object_thawer & thawer)
482 archetype *at=NULL,*other; 528{
529 char
530 buf[MAX_BUF], *
531 variable = buf, *argument, *cp;
532 archetype *
533 at = NULL, *other;
483 534
484 while(fgets(buf,MAX_BUF,fp)!=NULL) { 535 while (fgets (buf, MAX_BUF, thawer) != NULL)
536 {
485 if(*buf=='#') 537 if (*buf == '#')
486 continue; 538 continue;
487 if((argument=strchr(buf,' '))!=NULL) { 539 if ((argument = strchr (buf, ' ')) != NULL)
540 {
488 *argument='\0',argument++; 541 *argument = '\0', argument++;
489 cp = argument + strlen(argument)-1; 542 cp = argument + strlen (argument) - 1;
490 while (isspace(*cp)) { 543 while (isspace (*cp))
491 *cp='\0'; 544 {
492 cp--; 545 *cp = '\0';
493 } 546 cp--;
494 } 547 }
548 }
495 if(!strcmp("Object",variable)) { 549 if (!strcmp ("Object", variable))
550 {
496 if((at=find_archetype(argument))==NULL) 551 if ((at = archetype::find (argument)) == NULL)
497 LOG(llevError,"Warning: failed to find arch %s\n",argument); 552 LOG (llevError, "Warning: failed to find arch %s\n", argument);
553 }
498 } else if(!strcmp("other_arch",variable)) { 554 else if (!strcmp ("other_arch", variable))
555 {
499 if(at!=NULL&&at->clone.other_arch==NULL) { 556 if (at != NULL && at->clone.other_arch == NULL)
557 {
500 if((other=find_archetype(argument))==NULL) 558 if ((other = archetype::find (argument)) == NULL)
501 LOG(llevError,"Warning: failed to find other_arch %s\n",argument); 559 LOG (llevError, "Warning: failed to find other_arch %s\n", argument);
502 else if(at!=NULL) 560 else if (at != NULL)
503 at->clone.other_arch=other; 561 at->clone.other_arch = other;
562 }
504 } 563 }
505 } else if(!strcmp("randomitems",variable)) { 564 else if (!strcmp ("randomitems", variable))
565 {
506 if(at!=NULL) { 566 if (at != NULL)
567 {
568 treasurelist *
507 treasurelist *tl=find_treasurelist(argument); 569 tl = find_treasurelist (argument);
570
508 if(tl==NULL) 571 if (tl == NULL)
509 LOG(llevError,"Failed to link treasure to arch (%s): %s\n",at->name, argument); 572 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
510 else 573 else
511 at->clone.randomitems=tl; 574 at->clone.randomitems = tl;
575 }
512 } 576 }
513 }
514 } 577 }
515} 578}
516 579
517#ifdef DEBUG 580#ifdef DEBUG
581void
518void check_generators(void) { 582check_generators (void)
583{
519 archetype *at; 584 archetype *
585 at;
586
520 for(at=first_archetype;at!=NULL;at=at->next) 587 for (at = first_archetype; at != NULL; at = at->next)
521 if(QUERY_FLAG(&at->clone,FLAG_GENERATOR)&&at->clone.other_arch==NULL) 588 if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL)
522 LOG(llevError,"Warning: %s is generator but lacks other_arch.\n", 589 LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);
523 at->name);
524} 590}
525#endif 591#endif
526 592
527/* 593/*
528 * First initialises the archtype hash-table (init_archetable()). 594 * First initialises the archtype hash-table (init_archetable()).
529 * Reads and parses the archetype file (with the first and second-pass 595 * Reads and parses the archetype file (with the first and second-pass
530 * functions). 596 * functions).
531 * Then initialises treasures by calling load_treasures(). 597 * Then initialises treasures by calling load_treasures().
532 */ 598 */
533 599
600void
534void load_archetypes(void) { 601load_archetypes (void)
535 FILE *fp; 602{
603 char
536 char filename[MAX_BUF]; 604 filename[MAX_BUF];
537 int comp; 605
538#if TIME_ARCH_LOAD 606#if TIME_ARCH_LOAD
539 struct timeval tv1,tv2; 607 struct timeval
608 tv1,
609 tv2;
540#endif 610#endif
541 611
542 sprintf(filename,"%s/%s",settings.datadir,settings.archetypes); 612 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
543 LOG(llevDebug,"Reading archetypes from %s...\n",filename); 613 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
544 if((fp=open_and_uncompress(filename,0,&comp))==NULL) { 614
545 LOG(llevError," Can't open archetype file.\n"); 615 {
546 return; 616 object_thawer
547 } 617 thawer (filename);
618
548 clear_archetable(); 619 clear_archetable ();
549 LOG(llevDebug," arch-pass 1...\n"); 620 LOG (llevDebug, " arch-pass 1...\n");
550#if TIME_ARCH_LOAD 621 first_arch_pass (thawer);
551 GETTIMEOFDAY(&tv1); 622 LOG (llevDebug, " done\n");
623 }
624
625 init_archetable ();
626 warn_archetypes = 1;
627
628 {
629 object_thawer
630 thawer (filename);
631
632 LOG (llevDebug, " loading treasure...\n");
633 load_treasures ();
634 LOG (llevDebug, " done\n arch-pass 2...\n");
635 second_arch_pass (thawer);
636 LOG (llevDebug, " done\n");
637#ifdef DEBUG
638 check_generators ();
552#endif 639#endif
553 first_arch_pass(fp); 640 }
554#if TIME_ARCH_LOAD
555 { int sec, usec;
556 GETTIMEOFDAY(&tv2);
557 sec = tv2.tv_sec - tv1.tv_sec;
558 usec = tv2.tv_usec - tv1.tv_usec;
559 if (usec<0) { usec +=1000000; sec--;}
560 LOG(llevDebug,"Load took %d.%06d seconds\n", sec, usec);
561 }
562#endif
563
564 LOG(llevDebug," done\n"); 641 LOG (llevDebug, " done\n");
565 init_archetable();
566 warn_archetypes=1;
567
568 /* do a close and reopen instead of a rewind - necessary in case the
569 * file has been compressed.
570 */
571 close_and_delete(fp, comp);
572 fp=open_and_uncompress(filename,0,&comp);
573
574 LOG(llevDebug," loading treasure...\n");
575 load_treasures();
576 LOG(llevDebug," done\n arch-pass 2...\n");
577 second_arch_pass(fp);
578 LOG(llevDebug," done\n");
579#ifdef DEBUG
580 check_generators();
581#endif
582 close_and_delete(fp, comp);
583 LOG(llevDebug," done\n");
584} 642}
585 643
586/* 644/*
587 * Creates and returns a new object which is a copy of the given archetype. 645 * Creates and returns a new object which is a copy of the given archetype.
588 * This function returns NULL on failure. 646 * This function returns NULL on failure.
589 */ 647 */
590 648
649object *
591object *arch_to_object(archetype *at) { 650arch_to_object (archetype *at)
651{
592 object *op; 652 object *
653 op;
654
593 if(at==NULL) { 655 if (at == NULL)
656 {
594 if(warn_archetypes) 657 if (warn_archetypes)
595 LOG(llevError,"Couldn't find archetype.\n"); 658 LOG (llevError, "Couldn't find archetype.\n");
659
596 return NULL; 660 return NULL;
597 } 661 }
662
598 op=get_object(); 663 op = get_object ();
599 copy_object(&at->clone,op); 664 copy_object (&at->clone, op);
665 op->arch = at;
600 op->instantiate (); 666 op->instantiate ();
601 op->arch=at;
602 return op; 667 return op;
603} 668}
604 669
605/* 670/*
606 * Creates an object. This function is called by get_archetype() 671 * Creates an object. This function is called by get_archetype()
607 * if it fails to find the appropriate archetype. 672 * if it fails to find the appropriate archetype.
608 * Thus get_archetype() will be guaranteed to always return 673 * Thus get_archetype() will be guaranteed to always return
609 * an object, and never NULL. 674 * an object, and never NULL.
610 */ 675 */
611 676
677object *
612object *create_singularity(const char *name) { 678create_singularity (const char *name)
679{
613 object *op; 680 object * op;
614 char buf[MAX_BUF]; 681 char buf[MAX_BUF];
682
615 sprintf(buf,"%s (%s)",ARCH_SINGULARITY,name); 683 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
616 op = get_object(); 684 op = get_object ();
617 op->name = add_string(buf); 685 op->name = op->name_pl = buf;
618 op->name_pl = add_string(buf);
619 SET_FLAG(op,FLAG_NO_PICK); 686 SET_FLAG (op, FLAG_NO_PICK);
620 return op; 687 return op;
621} 688}
622 689
623/* 690/*
624 * Finds which archetype matches the given name, and returns a new 691 * Finds which archetype matches the given name, and returns a new
625 * object containing a copy of the archetype. 692 * object containing a copy of the archetype.
626 */ 693 */
627 694
695object *
628object *get_archetype(const char *name) { 696get_archetype (const char *name)
629 archetype *at; 697{
630 at = find_archetype(name); 698 archetype *at = archetype::find (name);
631 if (at == NULL) 699
700 if (!at)
632 return create_singularity(name); 701 return create_singularity (name);
702
633 return arch_to_object(at); 703 return arch_to_object (at);
634} 704}
635 705
636/* 706/*
637 * Hash-function used by the arch-hashtable. 707 * Hash-function used by the arch-hashtable.
638 */ 708 */
639 709
640unsigned long 710unsigned long
641hasharch(const char *str, int tablesize) { 711hasharch (const char *str, int tablesize)
712{
642 unsigned long hash = 0; 713 unsigned long hash = 0;
643 int i = 0; 714 unsigned int i = 0;
644 const char *p; 715 const char *p;
645 716
646 /* use the one-at-a-time hash function, which supposedly is 717 /* use the one-at-a-time hash function, which supposedly is
647 * better than the djb2-like one used by perl5.005, but 718 * better than the djb2-like one used by perl5.005, but
648 * certainly is better then the bug used here before. 719 * certainly is better then the bug used here before.
649 * see http://burtleburtle.net/bob/hash/doobs.html 720 * see http://burtleburtle.net/bob/hash/doobs.html
650 */ 721 */
651 for (p = str; i < MAXSTRING && *p; p++, i++) { 722 for (p = str; i < MAXSTRING && *p; p++, i++)
723 {
652 hash += *p; 724 hash += *p;
653 hash += hash << 10; 725 hash += hash << 10;
654 hash ^= hash >> 6; 726 hash ^= hash >> 6;
655 } 727 }
728
656 hash += hash << 3; 729 hash += hash << 3;
657 hash ^= hash >> 11; 730 hash ^= hash >> 11;
658 hash += hash << 15; 731 hash += hash << 15;
732
659 return hash % tablesize; 733 return hash % tablesize;
660} 734}
661 735
662/* 736/*
663 * Finds, using the hashtable, which archetype matches the given name. 737 * Finds, using the hashtable, which archetype matches the given name.
664 * returns a pointer to the found archetype, otherwise NULL. 738 * returns a pointer to the found archetype, otherwise NULL.
665 */ 739 */
666 740
741archetype *
667archetype *find_archetype(const char *name) { 742archetype::find (const char *name)
743{
744 if (!name)
745 return 0;
746
747#if USE_UNORDERED_MAP
748 AUTODECL (i, ht.find ((size_t) name));
749
750 if (i == ht.end ())
751 return 0;
752 else
753 return i->second;
754#endif
755
668 archetype *at; 756 archetype *at;
669 unsigned long index; 757 unsigned long index;
670 758
671 if (name == NULL)
672 return (archetype *) NULL;
673
674 index=hasharch(name, ARCHTABLE); 759 index = hasharch (name, ARCHTABLE);
675 arch_search++; 760 arch_search++;
676 for(;;) { 761 for (;;)
762 {
677 at = arch_table[index]; 763 at = arch_table[index];
764
678 if (at==NULL) { 765 if (at == NULL)
766 {
679 if(warn_archetypes) 767 if (warn_archetypes)
680 LOG(llevError,"Couldn't find archetype %s\n",name); 768 LOG (llevError, "Couldn't find archetype %s\n", name);
769
681 return NULL; 770 return NULL;
682 } 771 }
772
683 arch_cmp++; 773 arch_cmp++;
774
684 if (!strcmp(at->name,name)) 775 if (!strcmp ((const char *) at->name, name))
685 return at; 776 return at;
777
686 if(++index>=ARCHTABLE) 778 if (++index >= ARCHTABLE)
687 index=0; 779 index = 0;
688 } 780 }
689} 781}
690 782
691/* 783/*
692 * Adds an archetype to the hashtable. 784 * Adds an archetype to the hashtable.
693 */ 785 */
694 786
787static void
695static void add_arch(archetype *at) { 788add_arch (archetype *at)
789{
790#if USE_UNORDERED_MAP
791 ht.insert (std::make_pair ((size_t) (const char *) at->name, at));
792#endif
793
696 int index=hasharch(at->name, ARCHTABLE),org_index=index; 794 int index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index;
795
697 for(;;) { 796 for (;;)
797 {
698 if(arch_table[index]==NULL) { 798 if (arch_table[index] == NULL)
799 {
699 arch_table[index]=at; 800 arch_table[index] = at;
700 return; 801 return;
701 } 802 }
803
702 if(++index==ARCHTABLE) 804 if (++index == ARCHTABLE)
703 index=0; 805 index = 0;
806
704 if(index==org_index) 807 if (index == org_index)
705 fatal(ARCHTABLE_TOO_SMALL); 808 fatal (ARCHTABLE_TOO_SMALL);
706 } 809 }
707} 810}
708 811
709/* 812/*
710 * Returns the first archetype using the given type. 813 * Returns the first archetype using the given type.
711 * Used in treasure-generation. 814 * Used in treasure-generation.
712 */ 815 */
713 816
817archetype *
714archetype *type_to_archetype(int type) { 818type_to_archetype (int type)
819{
715 archetype *at; 820 archetype *at;
716 821
717 for(at=first_archetype;at!=NULL;at=(at->more==NULL)?at->next:at->more) 822 for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more)
718 if(at->clone.type==type) 823 if (at->clone.type == type)
719 return at; 824 return at;
825
720 return NULL; 826 return 0;
721} 827}
722 828
723/* 829/*
724 * Returns a new object copied from the first archetype matching 830 * Returns a new object copied from the first archetype matching
725 * the given type. 831 * the given type.
726 * Used in treasure-generation. 832 * Used in treasure-generation.
727 */ 833 */
728 834
835object *
729object *clone_arch(int type) { 836clone_arch (int type)
837{
730 archetype *at; 838 archetype *at;
731 object *op=get_object(); 839 object *op = get_object ();
732 840
733 if((at=type_to_archetype(type))==NULL) { 841 if ((at = type_to_archetype (type)) == NULL)
842 {
734 LOG(llevError,"Can't clone archetype %d\n",type); 843 LOG (llevError, "Can't clone archetype %d\n", type);
735 free_object(op); 844 free_object (op);
736 return NULL; 845 return NULL;
737 } 846 }
847
738 copy_object(&at->clone,op); 848 copy_object (&at->clone, op);
739 op->instantiate (); 849 op->instantiate ();
740 return op; 850 return op;
741} 851}
742 852
743/* 853/*
744 * member: make instance from class 854 * member: make instance from class
745 */ 855 */
746 856
857object *
747object *object_create_arch (archetype * at) 858object_create_arch (archetype *at)
748{ 859{
749 object *op, *prev = NULL, *head = NULL; 860 object *op, *prev = 0, *head = 0;
750 861
751 while (at) { 862 while (at)
863 {
752 op = arch_to_object (at); 864 op = arch_to_object (at);
753 op->x = at->clone.x; 865 op->x = at->clone.x;
754 op->y = at->clone.y; 866 op->y = at->clone.y;
867
755 if (head) 868 if (head)
756 op->head = head, prev->more = op; 869 op->head = head, prev->more = op;
870
757 if (!head) 871 if (!head)
758 head = op; 872 head = op;
873
759 prev = op; 874 prev = op;
760 at = at->more; 875 at = at->more;
761 } 876 }
877
762 return (head); 878 return (head);
763} 879}
764 880
765/*** end of arch.c ***/

Diff Legend

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