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

Diff Legend

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