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

Diff Legend

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