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

Diff Legend

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