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.25 by root, Tue Nov 7 16:30:54 2006 UTC

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

Diff Legend

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