ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/arch.C
(Generate patch)

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.4 by root, Sun Aug 27 16:15:11 2006 UTC vs.
Revision 1.13 by pippijn, Thu Sep 7 09:37:11 2006 UTC

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

Diff Legend

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