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.11 by root, Sun Sep 3 22:45:55 2006 UTC vs.
Revision 1.16 by root, Sun Sep 10 16:00:23 2006 UTC

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

Diff Legend

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