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.7 by root, Tue Aug 29 08:01:35 2006 UTC vs.
Revision 1.12 by root, Mon Sep 4 17:16:19 2006 UTC

1/* 1/*
2 * static char *rcsid_arch_c = 2 * static char *rcsid_arch_c =
3 * "$Id: arch.C,v 1.7 2006/08/29 08:01:35 root Exp $"; 3 * "$Id: arch.C,v 1.12 2006/09/04 17:16:19 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 if (at->name) free_string(at->name); 416
341 if (at->clone.name) free_string(at->clone.name); 417 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); 418 at;
348 i++; 419 i++;
349 } 420 }
350 LOG(llevDebug,"Freed %d archetypes, %d faces\n", i, f); 421 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
351} 422}
352 423
353/* 424/*
354 * Allocates, initialises and returns the pointer to an archetype structure. 425 * Allocates, initialises and returns the pointer to an archetype structure.
355 */ 426 */
356 427// TODO: should become constructor
428archetype *
357archetype *get_archetype_struct(void) { 429get_archetype_struct (void)
430{
358 archetype *arch; 431 archetype *
432 arch;
359 433
360 arch=(archetype *)CALLOC(1,sizeof(archetype)); 434 arch = new archetype;
361 if(arch==NULL) 435
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 */ 436 clear_object (&arch->clone); /* to initial state other also */
373 CLEAR_FLAG((&arch->clone),FLAG_FREED); /* This shouldn't matter, since copy_object() */ 437 CLEAR_FLAG (&arch->clone, FLAG_FREED); /* This shouldn't matter, since copy_object() */
374 SET_FLAG((&arch->clone), FLAG_REMOVED); /* doesn't copy these flags... */ 438 SET_FLAG (&arch->clone, FLAG_REMOVED); /* doesn't copy these flags... */
375 arch->head=NULL; 439
376 arch->more=NULL;
377 return arch; 440 return arch;
378} 441}
379 442
380/* 443/*
381 * Reads/parses the archetype-file, and copies into a linked list 444 * Reads/parses the archetype-file, and copies into a linked list
382 * of archetype-structures. 445 * of archetype-structures.
383 */ 446 */
447void
384void first_arch_pass(object_thawer &fp) { 448first_arch_pass (object_thawer & fp)
449{
385 object *op; 450 object *
451 op;
452 archetype *
453 at, *
386 archetype *at,*head=NULL,*last_more=NULL; 454 head = NULL, *last_more = NULL;
387 int i,first=2; 455 int
456 i;
388 457
389 op=get_object(); 458 op = get_object ();
390 op->arch=first_archetype=at=get_archetype_struct(); 459 op->arch = first_archetype = at = get_archetype_struct ();
391 460
392 while((i=load_object(fp,op,first,0))) { 461 while ((i = load_object (fp, op, 0)))
393 first=0; 462 {
394 copy_object(op,&at->clone); 463 copy_object (op, &at->clone);
395 at->clone.speed_left= (float) (-0.1); 464 at->clone.speed_left = (float) (-0.1);
396 /* copy the body_info to the body_used - this is only really 465 /* 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. 466 * 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 467 * by doing so, when a monster is created, it has good starting
399 * values for the body_used info, so when items are created 468 * values for the body_used info, so when items are created
400 * for it, they can be properly equipped. 469 * for it, they can be properly equipped.
401 */ 470 */
402 memcpy(&at->clone.body_used, &op->body_info, sizeof(op->body_info)); 471 memcpy (&at->clone.body_used, &op->body_info, sizeof (op->body_info));
403 472
404 switch(i) { 473 switch (i)
474 {
405 case LL_NORMAL: /* A new archetype, just link it with the previous */ 475 case LL_NORMAL: /* A new archetype, just link it with the previous */
406 if(last_more!=NULL) 476 if (last_more != NULL)
407 last_more->next=at; 477 last_more->next = at;
408 if(head!=NULL) 478 if (head != NULL)
409 head->next=at; 479 head->next = at;
410 head=last_more=at; 480 head = last_more = at;
411#if 0 481#if 0
412 if(!op->type) 482 if (!op->type)
413 LOG(llevDebug," WARNING: Archetype %s has no type info!\n", op->arch->name); 483 LOG (llevDebug, " WARNING: Archetype %s has no type info!\n", op->arch->name);
414#endif 484#endif
415 at->tail_x = 0; 485 at->tail_x = 0;
416 at->tail_y = 0; 486 at->tail_y = 0;
417 break; 487 break;
418 488
419 case LL_MORE: /* Another part of the previous archetype, link it correctly */ 489 case LL_MORE: /* Another part of the previous archetype, link it correctly */
420 490
421 at->head=head; 491 at->head = head;
422 at->clone.head = &head->clone; 492 at->clone.head = &head->clone;
423 if(last_more!=NULL) { 493 if (last_more != NULL)
494 {
424 last_more->more=at; 495 last_more->more = at;
425 last_more->clone.more = &at->clone; 496 last_more->clone.more = &at->clone;
426 } 497 }
427 last_more=at; 498 last_more = at;
428 499
429 /* If this multipart image is still composed of individual small 500 /* If this multipart image is still composed of individual small
430 * images, don't set the tail_.. values. We can't use them anyways, 501 * 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 502 * 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. 503 * easier as just looking at the head, we know what to do.
433 */ 504 */
434 if (at->clone.face != head->clone.face) { 505 if (at->clone.face != head->clone.face)
506 {
435 head->tail_x = 0; 507 head->tail_x = 0;
436 head->tail_y = 0; 508 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 } 509 }
510 else
511 {
512 if (at->clone.x > head->tail_x)
513 head->tail_x = at->clone.x;
514 if (at->clone.y > head->tail_y)
515 head->tail_y = at->clone.y;
516 }
441 break; 517 break;
442 518
443 } 519 }
444 520
445 at=get_archetype_struct(); 521 at = get_archetype_struct ();
446 clear_object(op); 522 clear_object (op);
447 op->arch=at; 523 op->arch = at;
448 } 524 }
449 free(at); 525
526 delete
527 at;
450 free_object(op); 528 free_object (op);
451} 529}
452 530
453/* 531/*
454 * Reads the archetype file once more, and links all pointers between 532 * Reads the archetype file once more, and links all pointers between
455 * archetypes. 533 * archetypes.
456 */ 534 */
457 535
458void second_arch_pass(FILE *fp) { 536void
459 char buf[MAX_BUF],*variable=buf,*argument,*cp; 537second_arch_pass (object_thawer & thawer)
460 archetype *at=NULL,*other; 538{
539 char
540 buf[MAX_BUF], *
541 variable = buf, *argument, *cp;
542 archetype *
543 at = NULL, *other;
461 544
462 while(fgets(buf,MAX_BUF,fp)!=NULL) { 545 while (fgets (buf, MAX_BUF, thawer) != NULL)
546 {
463 if(*buf=='#') 547 if (*buf == '#')
464 continue; 548 continue;
465 if((argument=strchr(buf,' '))!=NULL) { 549 if ((argument = strchr (buf, ' ')) != NULL)
550 {
466 *argument='\0',argument++; 551 *argument = '\0', argument++;
467 cp = argument + strlen(argument)-1; 552 cp = argument + strlen (argument) - 1;
468 while (isspace(*cp)) { 553 while (isspace (*cp))
554 {
469 *cp='\0'; 555 *cp = '\0';
470 cp--; 556 cp--;
471 } 557 }
472 } 558 }
473 if(!strcmp("Object",variable)) { 559 if (!strcmp ("Object", variable))
560 {
474 if((at=find_archetype(argument))==NULL) 561 if ((at = find_archetype (argument)) == NULL)
475 LOG(llevError,"Warning: failed to find arch %s\n",argument); 562 LOG (llevError, "Warning: failed to find arch %s\n", argument);
563 }
476 } else if(!strcmp("other_arch",variable)) { 564 else if (!strcmp ("other_arch", variable))
565 {
477 if(at!=NULL&&at->clone.other_arch==NULL) { 566 if (at != NULL && at->clone.other_arch == NULL)
567 {
478 if((other=find_archetype(argument))==NULL) 568 if ((other = find_archetype (argument)) == NULL)
479 LOG(llevError,"Warning: failed to find other_arch %s\n",argument); 569 LOG (llevError, "Warning: failed to find other_arch %s\n", argument);
480 else if(at!=NULL) 570 else if (at != NULL)
481 at->clone.other_arch=other; 571 at->clone.other_arch = other;
572 }
482 } 573 }
483 } else if(!strcmp("randomitems",variable)) { 574 else if (!strcmp ("randomitems", variable))
575 {
484 if(at!=NULL) { 576 if (at != NULL)
577 {
578 treasurelist *
485 treasurelist *tl=find_treasurelist(argument); 579 tl = find_treasurelist (argument);
486 if(tl==NULL) 580 if (tl == NULL)
487 LOG(llevError,"Failed to link treasure to arch (%s): %s\n",at->name, argument); 581 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
488 else 582 else
489 at->clone.randomitems=tl; 583 at->clone.randomitems = tl;
584 }
490 } 585 }
491 }
492 } 586 }
493} 587}
494 588
495#ifdef DEBUG 589#ifdef DEBUG
590void
496void check_generators(void) { 591check_generators (void)
592{
497 archetype *at; 593 archetype *
594 at;
498 for(at=first_archetype;at!=NULL;at=at->next) 595 for (at = first_archetype; at != NULL; at = at->next)
499 if(QUERY_FLAG(&at->clone,FLAG_GENERATOR)&&at->clone.other_arch==NULL) 596 if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL)
500 LOG(llevError,"Warning: %s is generator but lacks other_arch.\n", 597 LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);
501 at->name);
502} 598}
503#endif 599#endif
504 600
505/* 601/*
506 * First initialises the archtype hash-table (init_archetable()). 602 * First initialises the archtype hash-table (init_archetable()).
507 * Reads and parses the archetype file (with the first and second-pass 603 * Reads and parses the archetype file (with the first and second-pass
508 * functions). 604 * functions).
509 * Then initialises treasures by calling load_treasures(). 605 * Then initialises treasures by calling load_treasures().
510 */ 606 */
511 607
608void
512void load_archetypes(void) { 609load_archetypes (void)
513 FILE *fp; 610{
611 char
514 char filename[MAX_BUF]; 612 filename[MAX_BUF];
613 int
515 int comp; 614 comp;
516#if TIME_ARCH_LOAD 615#if TIME_ARCH_LOAD
517 struct timeval tv1,tv2; 616 struct timeval
617 tv1,
618 tv2;
518#endif 619#endif
519 620
520 sprintf(filename,"%s/%s",settings.datadir,settings.archetypes); 621 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
521 LOG(llevDebug,"Reading archetypes from %s...\n",filename); 622 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
522 if((fp=open_and_uncompress(filename,0,&comp))==NULL) { 623
523 LOG(llevError," Can't open archetype file.\n"); 624 {
524 return; 625 object_thawer
525 } 626 thawer (filename);
627
526 clear_archetable(); 628 clear_archetable ();
527 LOG(llevDebug," arch-pass 1...\n"); 629 LOG (llevDebug, " arch-pass 1...\n");
528#if TIME_ARCH_LOAD 630 first_arch_pass (thawer);
529 GETTIMEOFDAY(&tv1); 631 LOG (llevDebug, " done\n");
632 }
633
634 init_archetable ();
635 warn_archetypes = 1;
636
637 {
638 object_thawer
639 thawer (filename);
640
641 LOG (llevDebug, " loading treasure...\n");
642 load_treasures ();
643 LOG (llevDebug, " done\n arch-pass 2...\n");
644 second_arch_pass (thawer);
645 LOG (llevDebug, " done\n");
646#ifdef DEBUG
647 check_generators ();
530#endif 648#endif
531 {
532 object_thawer thawer (fp);
533 first_arch_pass (thawer);
534 } 649 }
535#if TIME_ARCH_LOAD
536 { int sec, usec;
537 GETTIMEOFDAY(&tv2);
538 sec = tv2.tv_sec - tv1.tv_sec;
539 usec = tv2.tv_usec - tv1.tv_usec;
540 if (usec<0) { usec +=1000000; sec--;}
541 LOG(llevDebug,"Load took %d.%06d seconds\n", sec, usec);
542 }
543#endif
544
545 LOG(llevDebug," done\n"); 650 LOG (llevDebug, " done\n");
546 init_archetable();
547 warn_archetypes=1;
548
549 /* do a close and reopen instead of a rewind - necessary in case the
550 * file has been compressed.
551 */
552 close_and_delete(fp, comp);
553 fp=open_and_uncompress(filename,0,&comp);
554
555 LOG(llevDebug," loading treasure...\n");
556 load_treasures();
557 LOG(llevDebug," done\n arch-pass 2...\n");
558 second_arch_pass(fp);
559 LOG(llevDebug," done\n");
560#ifdef DEBUG
561 check_generators();
562#endif
563 close_and_delete(fp, comp);
564 LOG(llevDebug," done\n");
565} 651}
566 652
567/* 653/*
568 * Creates and returns a new object which is a copy of the given archetype. 654 * Creates and returns a new object which is a copy of the given archetype.
569 * This function returns NULL on failure. 655 * This function returns NULL on failure.
570 */ 656 */
571 657
658object *
572object *arch_to_object(archetype *at) { 659arch_to_object (archetype * at)
660{
573 object *op; 661 object *
662 op;
574 if(at==NULL) { 663 if (at == NULL)
664 {
575 if(warn_archetypes) 665 if (warn_archetypes)
576 LOG(llevError,"Couldn't find archetype.\n"); 666 LOG (llevError, "Couldn't find archetype.\n");
577 return NULL; 667 return NULL;
578 } 668 }
579 op=get_object(); 669 op = get_object ();
580 copy_object(&at->clone,op); 670 copy_object (&at->clone, op);
581 op->instantiate (); 671 op->instantiate ();
582 op->arch=at; 672 op->arch = at;
583 return op; 673 return op;
584} 674}
585 675
586/* 676/*
587 * Creates an object. This function is called by get_archetype() 677 * Creates an object. This function is called by get_archetype()
588 * if it fails to find the appropriate archetype. 678 * if it fails to find the appropriate archetype.
589 * Thus get_archetype() will be guaranteed to always return 679 * Thus get_archetype() will be guaranteed to always return
590 * an object, and never NULL. 680 * an object, and never NULL.
591 */ 681 */
592 682
683object *
593object *create_singularity(const char *name) { 684create_singularity (const char *name)
685{
594 object *op; 686 object *
687 op;
688 char
595 char buf[MAX_BUF]; 689 buf[MAX_BUF];
596 sprintf(buf,"%s (%s)",ARCH_SINGULARITY,name); 690 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
597 op = get_object(); 691 op = get_object ();
598 op->name = add_string(buf); 692 op->name = op->name_pl = buf;
599 op->name_pl = add_string(buf);
600 SET_FLAG(op,FLAG_NO_PICK); 693 SET_FLAG (op, FLAG_NO_PICK);
601 return op; 694 return op;
602} 695}
603 696
604/* 697/*
605 * Finds which archetype matches the given name, and returns a new 698 * Finds which archetype matches the given name, and returns a new
606 * object containing a copy of the archetype. 699 * object containing a copy of the archetype.
607 */ 700 */
608 701
702object *
609object *get_archetype(const char *name) { 703get_archetype (const char *name)
704{
610 archetype *at; 705 archetype *
706 at;
611 at = find_archetype(name); 707 at = find_archetype (name);
612 if (at == NULL) 708 if (at == NULL)
613 return create_singularity(name); 709 return create_singularity (name);
614 return arch_to_object(at); 710 return arch_to_object (at);
615} 711}
616 712
617/* 713/*
618 * Hash-function used by the arch-hashtable. 714 * Hash-function used by the arch-hashtable.
619 */ 715 */
620 716
621unsigned long 717unsigned long
622hasharch(const char *str, int tablesize) { 718hasharch (const char *str, int tablesize)
623 unsigned long hash = 0; 719{
720 unsigned long
721 hash = 0;
722 unsigned int
624 int i = 0; 723 i = 0;
625 const char *p; 724 const char *
725 p;
626 726
627 /* use the one-at-a-time hash function, which supposedly is 727 /* use the one-at-a-time hash function, which supposedly is
628 * better than the djb2-like one used by perl5.005, but 728 * better than the djb2-like one used by perl5.005, but
629 * certainly is better then the bug used here before. 729 * certainly is better then the bug used here before.
630 * see http://burtleburtle.net/bob/hash/doobs.html 730 * see http://burtleburtle.net/bob/hash/doobs.html
631 */ 731 */
632 for (p = str; i < MAXSTRING && *p; p++, i++) { 732 for (p = str; i < MAXSTRING && *p; p++, i++)
733 {
633 hash += *p; 734 hash += *p;
634 hash += hash << 10; 735 hash += hash << 10;
635 hash ^= hash >> 6; 736 hash ^= hash >> 6;
636 } 737 }
738
637 hash += hash << 3; 739 hash += hash << 3;
638 hash ^= hash >> 11; 740 hash ^= hash >> 11;
639 hash += hash << 15; 741 hash += hash << 15;
742
640 return hash % tablesize; 743 return hash % tablesize;
641} 744}
642 745
643/* 746/*
644 * Finds, using the hashtable, which archetype matches the given name. 747 * Finds, using the hashtable, which archetype matches the given name.
645 * returns a pointer to the found archetype, otherwise NULL. 748 * returns a pointer to the found archetype, otherwise NULL.
646 */ 749 */
647 750
751archetype *
648archetype *find_archetype(const char *name) { 752find_archetype (const char *name)
753{
754#if USE_UNORDERED_MAP
755 name = shstr::find (name);
756
757 if (!name)
758 return 0;
759
760 HT::const_iterator i = ht.find ((size_t)name);
761
762 if (i == ht.end ())
763 return 0;
764 else
765 return i->second;
766#endif
767
649 archetype *at; 768 archetype *at;
650 unsigned long index; 769 unsigned long index;
651 770
652 if (name == NULL) 771 if (name == NULL)
653 return (archetype *) NULL; 772 return (archetype *) NULL;
654 773
655 index=hasharch(name, ARCHTABLE); 774 index = hasharch (name, ARCHTABLE);
656 arch_search++; 775 arch_search++;
657 for(;;) { 776 for (;;)
777 {
658 at = arch_table[index]; 778 at = arch_table[index];
659 if (at==NULL) { 779 if (at == NULL)
780 {
660 if(warn_archetypes) 781 if (warn_archetypes)
661 LOG(llevError,"Couldn't find archetype %s\n",name); 782 LOG (llevError, "Couldn't find archetype %s\n", name);
662 return NULL; 783 return NULL;
663 } 784 }
664 arch_cmp++; 785 arch_cmp++;
665 if (!strcmp(at->name,name)) 786 if (!strcmp ((const char *) at->name, name))
666 return at; 787 return at;
667 if(++index>=ARCHTABLE) 788 if (++index >= ARCHTABLE)
668 index=0; 789 index = 0;
669 } 790 }
670} 791}
671 792
672/* 793/*
673 * Adds an archetype to the hashtable. 794 * Adds an archetype to the hashtable.
674 */ 795 */
675 796
797static void
676static void add_arch(archetype *at) { 798add_arch (archetype *at)
799{
800#if USE_UNORDERED_MAP
801 ht.insert (std::make_pair ((size_t)(const char *)at->name, at));
802#endif
803
677 int index=hasharch(at->name, ARCHTABLE),org_index=index; 804 int index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index;
805
678 for(;;) { 806 for (;;)
807 {
679 if(arch_table[index]==NULL) { 808 if (arch_table[index] == NULL)
809 {
680 arch_table[index]=at; 810 arch_table[index] = at;
681 return; 811 return;
682 } 812 }
813
683 if(++index==ARCHTABLE) 814 if (++index == ARCHTABLE)
684 index=0; 815 index = 0;
816
685 if(index==org_index) 817 if (index == org_index)
686 fatal(ARCHTABLE_TOO_SMALL); 818 fatal (ARCHTABLE_TOO_SMALL);
687 } 819 }
688} 820}
689 821
690/* 822/*
691 * Returns the first archetype using the given type. 823 * Returns the first archetype using the given type.
692 * Used in treasure-generation. 824 * Used in treasure-generation.
693 */ 825 */
694 826
827archetype *
695archetype *type_to_archetype(int type) { 828type_to_archetype (int type)
829{
696 archetype *at; 830 archetype *
831 at;
697 832
698 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)
699 if(at->clone.type==type) 834 if (at->clone.type == type)
700 return at; 835 return at;
701 return NULL; 836 return NULL;
702} 837}
703 838
704/* 839/*
705 * Returns a new object copied from the first archetype matching 840 * Returns a new object copied from the first archetype matching
706 * the given type. 841 * the given type.
707 * Used in treasure-generation. 842 * Used in treasure-generation.
708 */ 843 */
709 844
845object *
710object *clone_arch(int type) { 846clone_arch (int type)
847{
711 archetype *at; 848 archetype *
712 object *op=get_object(); 849 at;
850 object *
851 op = get_object ();
713 852
714 if((at=type_to_archetype(type))==NULL) { 853 if ((at = type_to_archetype (type)) == NULL)
854 {
715 LOG(llevError,"Can't clone archetype %d\n",type); 855 LOG (llevError, "Can't clone archetype %d\n", type);
716 free_object(op); 856 free_object (op);
717 return NULL; 857 return NULL;
718 } 858 }
719 copy_object(&at->clone,op); 859 copy_object (&at->clone, op);
720 op->instantiate (); 860 op->instantiate ();
721 return op; 861 return op;
722} 862}
723 863
724/* 864/*
725 * member: make instance from class 865 * member: make instance from class
726 */ 866 */
727 867
868object *
728object *object_create_arch (archetype * at) 869object_create_arch (archetype * at)
729{ 870{
871 object *
872 op, *
730 object *op, *prev = NULL, *head = NULL; 873 prev = NULL, *head = NULL;
731 874
732 while (at) { 875 while (at)
876 {
733 op = arch_to_object (at); 877 op = arch_to_object (at);
734 op->x = at->clone.x; 878 op->x = at->clone.x;
735 op->y = at->clone.y; 879 op->y = at->clone.y;
736 if (head) 880 if (head)
737 op->head = head, prev->more = op; 881 op->head = head, prev->more = op;
738 if (!head) 882 if (!head)
739 head = op; 883 head = op;
740 prev = op; 884 prev = op;
741 at = at->more; 885 at = at->more;
742 } 886 }
743 return (head); 887 return (head);
744} 888}
745 889
746/*** end of arch.c ***/ 890/*** end of arch.c ***/

Diff Legend

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