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.3 by root, Sat Aug 26 23:36:28 2006 UTC vs.
Revision 1.22 by root, Thu Sep 14 22:35:53 2006 UTC

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

Diff Legend

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