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.9 by root, Wed Aug 30 11:02:15 2006 UTC vs.
Revision 1.17 by root, Tue Sep 12 19:20:06 2006 UTC

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

Diff Legend

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