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.10 by root, Sun Sep 3 00:18:39 2006 UTC vs.
Revision 1.14 by root, Fri Sep 8 17:14:07 2006 UTC

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

Diff Legend

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