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.5 by root, Mon Aug 28 14:05:23 2006 UTC vs.
Revision 1.15 by root, Sun Sep 10 13:20:12 2006 UTC

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

Diff Legend

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