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.34 by pippijn, Wed Jan 3 00:10:04 2007 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*/
28 23
24#include <cassert>
25
29#include <global.h> 26#include <global.h>
30#include <arch.h>
31#include <funcpoint.h> 27#include <funcpoint.h>
32#include <loader.h> 28#include <loader.h>
33 29
34/* IF set, does a little timing on the archetype load. */ 30#define USE_UNORDERED_MAP 0
35#define TIME_ARCH_LOAD 0
36 31
37static void add_arch(archetype *at); 32#if USE_UNORDERED_MAP
33# include <tr1/functional>
34# include <tr1/unordered_map>
35#endif
38 36
39static archetype *arch_table[ARCHTABLE];
40int arch_cmp=0; /* How many strcmp's */ 37int arch_cmp = 0; /* How many strcmp's */
41int arch_search=0; /* How many searches */ 38int arch_search = 0; /* How many searches */
42int arch_init; /* True if doing arch initialization */ 39int arch_init; /* True if doing arch initialization */
43 40
44/* The naming of these functions is really poor - they are all 41/* The naming of these functions is really poor - they are all
45 * pretty much named '.._arch_...', but they may more may not 42 * pretty much named '.._arch_...', but they may more may not
46 * return archetypes. Some make the arch_to_object call, and thus 43 * return archetypes. Some make the arch_to_object call, and thus
47 * return an object. Perhaps those should be called 'archob' functions 44 * return an object. Perhaps those should be called 'archob' functions
48 * to denote they return an object derived from the archetype. 45 * to denote they return an object derived from the archetype.
49 * MSW 2003-04-29 46 * MSW 2003-04-29
50 */ 47 */
48
49#if USE_UNORDERED_MAP
50// the hashtable
51typedef std::tr1::unordered_map
52 <
53 std::size_t,
54 arch_ptr,
55 std::tr1::hash<size_t>,
56 std::equal_to<size_t>,
57 slice_allocator< std::pair<const std::size_t, archetype *> >
58 true,
59 > HT;
60
61static HT ht;
62#else
63static arch_ptr arch_table[ARCHTABLE];
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;
251 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;
252 /* Do substring checks, so things like 'Str+1' will match. 274 /* Do substring checks, so things like 'Str+1' will match.
253 * retval of these should perhaps be lower - they are lower 275 * retval of these should perhaps be lower - they are lower
254 * then the specific strcasecmp aboves, but still higher than 276 * then the specific strcasecmp aboves, but still higher than
255 * some other match criteria. 277 * some other match criteria.
256 */ 278 */
257 else if (strstr(query_base_name(op,1), cp)) retval = 12; 279 else if (strstr (query_base_name (op, 1), cp))
280 retval = 12;
258 else if (strstr(query_base_name(op,0), cp)) retval = 12; 281 else if (strstr (query_base_name (op, 0), cp))
282 retval = 12;
259 else if (strstr(query_short_name(op), cp)) retval = 12; 283 else if (strstr (query_short_name (op), cp))
260 284 retval = 12;
261 /* Check against plural/non plural based on count. */ 285 /* Check against plural/non plural based on count. */
262 else if (count>1 && !strcasecmp(cp,op->name_pl)) { 286 else if (count > 1 && !strcasecmp (cp, op->name_pl))
263 retval=6; 287 retval = 6;
264 }
265 else if (count==1 && !strcasecmp(op->name,cp)) { 288 else if (count == 1 && !strcasecmp (op->name, cp))
266 retval=6; 289 retval = 6;
267 }
268 /* base name matched - not bad */ 290 /* base name matched - not bad */
269 else if (strcasecmp(cp,op->name)==0 && !count) retval=4; 291 else if (strcasecmp (cp, op->name) == 0 && !count)
292 retval = 4;
270 /* Check for partial custom name, but give a real low priority */ 293 /* Check for partial custom name, but give a real low priority */
271 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;
272 296
273 if (retval) { 297 if (retval)
298 {
274 if (pl->type == PLAYER) 299 if (pl->type == PLAYER)
275 pl->contr->count=count; 300 pl->contr->count = count;
301
276 return retval; 302 return retval;
277 } 303 }
278 } 304 }
305
279 return 0; 306 return 0;
280} 307}
281 308
282/* 309/*
283 * Initialises the internal linked list of archetypes (read from file). 310 * Initialises the internal linked list of archetypes (read from file).
284 * Then the global "empty_archetype" pointer is initialised. 311 * Then the global "empty_archetype" pointer is initialised.
285 * Then the blocksview[] array is initialised. 312 * Then the blocksview[] array is initialised.
286 */ 313 */
287 314
288void init_archetypes(void) { /* called from add_player() and edit() */ 315void
316init_archetypes (void)
317{ /* called from add_player() and edit() */
289 if(first_archetype!=NULL) /* Only do this once */ 318 if (first_archetype != NULL) /* Only do this once */
290 return; 319 return;
320
291 arch_init = 1; 321 arch_init = 1;
292 load_archetypes(); 322 load_archetypes ();
293 arch_init = 0; 323 arch_init = 0;
294 empty_archetype=find_archetype("empty_archetype"); 324 empty_archetype = archetype::find ("empty_archetype");
325
295/* init_blocksview();*/ 326/* init_blocksview();*/
296} 327}
297 328
298/* 329/*
299 * Stores debug-information about how efficient the hashtable 330 * Stores debug-information about how efficient the hashtable
300 * used for archetypes has been in the static errmsg array. 331 * used for archetypes has been in the static errmsg array.
301 */ 332 */
302 333
334void
303void arch_info(object *op) { 335arch_info (object *op)
336{
304 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);
305 new_draw_info(NDI_BLACK, 0, op,errmsg); 338 new_draw_info (NDI_BLACK, 0, op, errmsg);
306} 339}
307 340
308/* 341/*
309 * Initialise the hashtable used by the archetypes. 342 * Initialise the hashtable used by the archetypes.
310 */ 343 */
311 344
345void
312void clear_archetable(void) { 346clear_archetable (void)
347{
313 memset((void *) arch_table,0,ARCHTABLE*sizeof(archetype *)); 348 memset ((void *) arch_table, 0, ARCHTABLE * sizeof (archetype *));
314} 349}
315 350
316/* 351/*
317 * 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_...
318 */ 353 */
319 354
355void
320void init_archetable(void) { 356init_archetable (void)
357{
321 archetype *at; 358 archetype *at;
359
322 LOG(llevDebug," Setting up archetable...\n"); 360 LOG (llevDebug, " Setting up archetable...\n");
361
323 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)
324 add_arch(at); 363 at->hash_add ();
364
325 LOG(llevDebug,"done\n"); 365 LOG (llevDebug, "done\n");
326} 366}
327 367
328/* 368void
329 * Dumps an archetype to debug-level output.
330 */
331
332void dump_arch(archetype *at) {
333 dump_object(&at->clone);
334}
335
336/*
337 * Dumps _all_ archetypes to debug-level output.
338 * If you run crossfire with debug, and enter DM-mode, you can trigger
339 * this with the O key.
340 */
341
342void dump_all_archetypes(void) {
343 archetype *at;
344 for(at=first_archetype;at!=NULL;at=(at->more==NULL)?at->next:at->more) {
345 dump_arch(at);
346 fprintf(logfile, "%s\n", errmsg);
347 }
348}
349
350void free_all_archs(void) 369free_all_archs (void)
351{ 370{
352 archetype *at, *next; 371 archetype *at, *next;
353 int i=0,f=0; 372 int i = 0, f = 0;
354 373
355 for (at=first_archetype; at!=NULL; at=next) { 374 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 } 375 {
376 if (at->more)
377 next = at->more;
378 else
379 next = at->next;
380
381 delete
382 at;
383
384 i++;
385 }
386
368 LOG(llevDebug,"Freed %d archetypes, %d faces\n", i, f); 387 LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
369} 388}
370 389
371/* 390archetype::archetype ()
372 * Allocates, initialises and returns the pointer to an archetype structure. 391{
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 */
391 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_to */
392 SET_FLAG((&arch->clone), FLAG_REMOVED); /* doesn't copy these flags... */ 393 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
393 arch->head=NULL; 394}
394 arch->more=NULL; 395
395 return arch; 396archetype::~archetype ()
397{
396} 398}
397 399
398/* 400/*
399 * Reads/parses the archetype-file, and copies into a linked list 401 * Reads/parses the archetype-file, and copies into a linked list
400 * of archetype-structures. 402 * of archetype-structures.
401 */ 403 */
402void first_arch_pass(FILE *fp) { 404void
403 object *op; 405first_arch_pass (object_thawer & fp)
404 archetype *at,*head=NULL,*last_more=NULL; 406{
405 int i,first=2; 407 archetype *head = 0, *last_more = 0;
406 408
407 op=get_object(); 409 archetype *at = new archetype;
408 op->arch=first_archetype=at=get_archetype_struct(); 410 at->clone.arch = first_archetype = at;
409 411
410 while((i=load_object(fp,op,first,0))) { 412 while (int i = load_object (fp, &at->clone, 0))
411 first=0; 413 {
412 copy_object(op,&at->clone);
413 at->clone.speed_left= (float) (-0.1); 414 at->clone.speed_left = (float) (-0.1);
414 /* copy the body_info to the body_used - this is only really 415 /* 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. 416 * 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 417 * by doing so, when a monster is created, it has good starting
417 * values for the body_used info, so when items are created 418 * values for the body_used info, so when items are created
418 * for it, they can be properly equipped. 419 * for it, they can be properly equipped.
419 */ 420 */
420 memcpy(&at->clone.body_used, &op->body_info, sizeof(op->body_info)); 421 memcpy (&at->clone.body_used, &at->clone.body_info, sizeof (at->clone.body_info));
421 422
422 switch(i) { 423 switch (i)
424 {
423 case LL_NORMAL: /* A new archetype, just link it with the previous */ 425 case LL_NORMAL: /* A new archetype, just link it with the previous */
424 if(last_more!=NULL) 426 if (last_more != NULL)
425 last_more->next=at; 427 last_more->next = at;
426 if(head!=NULL) 428 if (head != NULL)
427 head->next=at; 429 head->next = at;
428 head=last_more=at; 430 head = last_more = at;
429#if 0 431#if 0
430 if(!op->type) 432 if (!op->type)
431 LOG(llevDebug," WARNING: Archetype %s has no type info!\n", op->arch->name); 433 LOG (llevDebug, " WARNING: Archetype %s has no type info!\n", op->arch->name);
432#endif 434#endif
433 at->tail_x = 0; 435 at->tail_x = 0;
434 at->tail_y = 0; 436 at->tail_y = 0;
435 break; 437 break;
436 438
437 case LL_MORE: /* Another part of the previous archetype, link it correctly */ 439 case LL_MORE: /* Another part of the previous archetype, link it correctly */
438 440
439 at->head=head; 441 at->head = head;
440 at->clone.head = &head->clone; 442 at->clone.head = &head->clone;
441 if(last_more!=NULL) { 443 if (last_more != NULL)
442 last_more->more=at; 444 {
445 last_more->more = at;
443 last_more->clone.more = &at->clone; 446 last_more->clone.more = &at->clone;
444 } 447 }
445 last_more=at; 448 last_more = at;
446 449
447 /* If this multipart image is still composed of individual small 450 /* If this multipart image is still composed of individual small
448 * images, don't set the tail_.. values. We can't use them anyways, 451 * 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 452 * 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. 453 * easier as just looking at the head, we know what to do.
451 */ 454 */
452 if (at->clone.face != head->clone.face) { 455 if (at->clone.face != head->clone.face)
453 head->tail_x = 0; 456 {
454 head->tail_y = 0; 457 head->tail_x = 0;
455 } else { 458 head->tail_y = 0;
456 if (at->clone.x > head->tail_x) head->tail_x = at->clone.x; 459 }
457 if (at->clone.y > head->tail_y) head->tail_y = at->clone.y; 460 else
458 } 461 {
459 break; 462 if (at->clone.x > head->tail_x)
463 head->tail_x = at->clone.x;
464 if (at->clone.y > head->tail_y)
465 head->tail_y = at->clone.y;
466 }
467 break;
460 468
461 } 469 }
462 470
463 at=get_archetype_struct(); 471 at = new archetype;
464 clear_object(op); 472
465 op->arch=at; 473 at->clone.arch = at;
466 } 474 }
467 free(at); 475
468 free_object(op); 476 delete at;
469} 477}
470 478
471/* 479/*
472 * Reads the archetype file once more, and links all pointers between 480 * Reads the archetype file once more, and links all pointers between
473 * archetypes. 481 * archetypes.
474 */ 482 */
475 483
476void second_arch_pass(FILE *fp) { 484void
485second_arch_pass (object_thawer & thawer)
486{
477 char buf[MAX_BUF],*variable=buf,*argument,*cp; 487 char buf[MAX_BUF], *variable = buf, *argument, *cp;
478 archetype *at=NULL,*other; 488 archetype *at = NULL, *other;
479 489
480 while(fgets(buf,MAX_BUF,fp)!=NULL) { 490 while (fgets (buf, MAX_BUF, thawer) != NULL)
491 {
481 if(*buf=='#') 492 if (*buf == '#')
482 continue; 493 continue;
483 if((argument=strchr(buf,' '))!=NULL) { 494 if ((argument = strchr (buf, ' ')) != NULL)
495 {
484 *argument='\0',argument++; 496 *argument = '\0', argument++;
485 cp = argument + strlen(argument)-1; 497 cp = argument + strlen (argument) - 1;
486 while (isspace(*cp)) { 498 while (isspace (*cp))
487 *cp='\0'; 499 {
488 cp--; 500 *cp = '\0';
489 } 501 cp--;
490 } 502 }
503 }
491 if(!strcmp("Object",variable)) { 504 if (!strcmp ("Object", variable))
505 {
492 if((at=find_archetype(argument))==NULL) 506 if ((at = archetype::find (argument)) == NULL)
493 LOG(llevError,"Warning: failed to find arch %s\n",argument); 507 LOG (llevError, "Warning: failed to find arch %s\n", argument);
508 }
494 } else if(!strcmp("other_arch",variable)) { 509 else if (!strcmp ("other_arch", variable))
510 {
495 if(at!=NULL&&at->clone.other_arch==NULL) { 511 if (at != NULL && at->clone.other_arch == NULL)
512 {
496 if((other=find_archetype(argument))==NULL) 513 if ((other = archetype::find (argument)) == NULL)
497 LOG(llevError,"Warning: failed to find other_arch %s\n",argument); 514 LOG (llevError, "Warning: failed to find other_arch %s\n", argument);
498 else if(at!=NULL) 515 else if (at != NULL)
499 at->clone.other_arch=other; 516 at->clone.other_arch = other;
517 }
500 } 518 }
501 } else if(!strcmp("randomitems",variable)) { 519 else if (!strcmp ("randomitems", variable))
520 {
502 if(at!=NULL) { 521 if (at != NULL)
522 {
503 treasurelist *tl=find_treasurelist(argument); 523 treasurelist *tl = find_treasurelist (argument);
524
504 if(tl==NULL) 525 if (tl == NULL)
505 LOG(llevError,"Failed to link treasure to arch (%s): %s\n",at->name, argument); 526 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
506 else 527 else
507 at->clone.randomitems=tl; 528 at->clone.randomitems = tl;
529 }
508 } 530 }
509 }
510 } 531 }
511} 532}
512 533
513#ifdef DEBUG 534#ifdef DEBUG
535void
514void check_generators(void) { 536check_generators (void)
537{
515 archetype *at; 538 archetype *at;
539
516 for(at=first_archetype;at!=NULL;at=at->next) 540 for (at = first_archetype; at != NULL; at = at->next)
517 if(QUERY_FLAG(&at->clone,FLAG_GENERATOR)&&at->clone.other_arch==NULL) 541 if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL)
518 LOG(llevError,"Warning: %s is generator but lacks other_arch.\n", 542 LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);
519 at->name);
520} 543}
521#endif 544#endif
522 545
523/* 546/*
524 * First initialises the archtype hash-table (init_archetable()). 547 * First initialises the archtype hash-table (init_archetable()).
525 * Reads and parses the archetype file (with the first and second-pass 548 * Reads and parses the archetype file (with the first and second-pass
526 * functions). 549 * functions).
527 * Then initialises treasures by calling load_treasures(). 550 * Then initialises treasures by calling load_treasures().
528 */ 551 */
529 552
553void
530void load_archetypes(void) { 554load_archetypes (void)
531 FILE *fp; 555{
532 char filename[MAX_BUF]; 556 char filename[MAX_BUF];
533 int comp; 557
534#if TIME_ARCH_LOAD 558 sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
535 struct timeval tv1,tv2; 559 LOG (llevDebug, "Reading archetypes from %s:\n", filename);
560
561 {
562 object_thawer
563 thawer (filename);
564
565 clear_archetable ();
566 LOG (llevDebug, " arch-pass 1...\n");
567 first_arch_pass (thawer);
568 LOG (llevDebug, " done\n");
569 }
570
571 init_archetable ();
572 warn_archetypes = 1;
573
574 {
575 object_thawer
576 thawer (filename);
577
578 LOG (llevDebug, " loading treasure...\n");
579 load_treasures ();
580 LOG (llevDebug, " done\n");
581 LOG (llevDebug, " arch-pass 2...\n");
582 second_arch_pass (thawer);
583 LOG (llevDebug, " done\n");
584#ifdef DEBUG
585 check_generators ();
536#endif 586#endif
537
538 sprintf(filename,"%s/%s",settings.datadir,settings.archetypes);
539 LOG(llevDebug,"Reading archetypes from %s...\n",filename);
540 if((fp=open_and_uncompress(filename,0,&comp))==NULL) {
541 LOG(llevError," Can't open archetype file.\n");
542 return;
543 } 587 }
544 clear_archetable();
545 LOG(llevDebug," arch-pass 1...\n");
546#if TIME_ARCH_LOAD
547 GETTIMEOFDAY(&tv1);
548#endif
549 first_arch_pass(fp);
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"); 588 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} 589}
581 590
582/* 591/*
583 * Creates and returns a new object which is a copy of the given archetype. 592 * Creates and returns a new object which is a copy of the given archetype.
584 * This function returns NULL on failure. 593 * This function returns NULL on failure.
585 */ 594 */
586 595object *
587object *arch_to_object(archetype *at) { 596arch_to_object (archetype *at)
597{
588 object *op; 598 object *op;
599
589 if(at==NULL) { 600 if (at == NULL)
601 {
590 if(warn_archetypes) 602 if (warn_archetypes)
591 LOG(llevError,"Couldn't find archetype.\n"); 603 LOG (llevError, "Couldn't find archetype.\n");
604
592 return NULL; 605 return NULL;
593 } 606 }
594 op=get_object(); 607
595 copy_object(&at->clone,op); 608 op = at->clone.clone ();
609 op->arch = at;
596 op->instantiate (); 610 op->instantiate ();
597 op->arch=at;
598 return op; 611 return op;
599} 612}
600 613
601/* 614/*
602 * Creates an object. This function is called by get_archetype() 615 * Creates an object. This function is called by get_archetype()
603 * if it fails to find the appropriate archetype. 616 * if it fails to find the appropriate archetype.
604 * Thus get_archetype() will be guaranteed to always return 617 * Thus get_archetype() will be guaranteed to always return
605 * an object, and never NULL. 618 * an object, and never NULL.
606 */ 619 */
607 620object *
608object *create_singularity(const char *name) { 621create_singularity (const char *name)
622{
609 object *op; 623 object *op;
610 char buf[MAX_BUF]; 624 char buf[MAX_BUF];
625
611 sprintf(buf,"%s (%s)",ARCH_SINGULARITY,name); 626 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
612 op = get_object(); 627 op = object::create ();
613 op->name = add_string(buf); 628 op->name = op->name_pl = buf;
614 op->name_pl = add_string(buf);
615 SET_FLAG(op,FLAG_NO_PICK); 629 SET_FLAG (op, FLAG_NO_PICK);
616 return op; 630 return op;
617} 631}
618 632
619/* 633/*
620 * Finds which archetype matches the given name, and returns a new 634 * Finds which archetype matches the given name, and returns a new
621 * object containing a copy of the archetype. 635 * object containing a copy of the archetype.
622 */ 636 */
623 637object *
624object *get_archetype(const char *name) { 638get_archetype (const char *name)
625 archetype *at; 639{
626 at = find_archetype(name); 640 archetype *at = archetype::find (name);
627 if (at == NULL) 641
642 if (!at)
628 return create_singularity(name); 643 return create_singularity (name);
644
629 return arch_to_object(at); 645 return arch_to_object (at);
630} 646}
631 647
632/* 648/*
633 * Hash-function used by the arch-hashtable. 649 * Hash-function used by the arch-hashtable.
634 */ 650 */
635 651
636unsigned long 652unsigned long
637hasharch(const char *str, int tablesize) { 653hasharch (const char *str, int tablesize)
654{
638 unsigned long hash = 0; 655 unsigned long hash = 0;
639 int i = 0; 656 unsigned int i = 0;
640 const char *p; 657 const char *p;
641 658
642 /* use the one-at-a-time hash function, which supposedly is 659 /* use the one-at-a-time hash function, which supposedly is
643 * better than the djb2-like one used by perl5.005, but 660 * better than the djb2-like one used by perl5.005, but
644 * certainly is better then the bug used here before. 661 * certainly is better then the bug used here before.
645 * see http://burtleburtle.net/bob/hash/doobs.html 662 * see http://burtleburtle.net/bob/hash/doobs.html
646 */ 663 */
647 for (p = str; i < MAXSTRING && *p; p++, i++) { 664 for (p = str; i < MAXSTRING && *p; p++, i++)
665 {
648 hash += *p; 666 hash += *p;
649 hash += hash << 10; 667 hash += hash << 10;
650 hash ^= hash >> 6; 668 hash ^= hash >> 6;
651 } 669 }
670
652 hash += hash << 3; 671 hash += hash << 3;
653 hash ^= hash >> 11; 672 hash ^= hash >> 11;
654 hash += hash << 15; 673 hash += hash << 15;
674
655 return hash % tablesize; 675 return hash % tablesize;
656} 676}
657 677
658/* 678/*
659 * Finds, using the hashtable, which archetype matches the given name. 679 * Finds, using the hashtable, which archetype matches the given name.
660 * returns a pointer to the found archetype, otherwise NULL. 680 * returns a pointer to the found archetype, otherwise NULL.
661 */ 681 */
662 682
683archetype *
663archetype *find_archetype(const char *name) { 684archetype::find (const char *name)
685{
686 if (!name)
687 return 0;
688
689#if USE_UNORDERED_MAP
690 AUTODECL (i, ht.find ((size_t) name));
691
692 if (i == ht.end ())
693 return 0;
694 else
695 return i->second;
696#endif
697
664 archetype *at; 698 archetype *at;
665 unsigned long index; 699 unsigned long index;
666 700
667 if (name == NULL)
668 return (archetype *) NULL;
669
670 index=hasharch(name, ARCHTABLE); 701 index = hasharch (name, ARCHTABLE);
671 arch_search++; 702 arch_search++;
672 for(;;) { 703 for (;;)
704 {
673 at = arch_table[index]; 705 at = arch_table[index];
706
674 if (at==NULL) { 707 if (at == NULL)
708 {
675 if(warn_archetypes) 709 if (warn_archetypes)
676 LOG(llevError,"Couldn't find archetype %s\n",name); 710 LOG (llevError, "Couldn't find archetype %s\n", name);
711
677 return NULL; 712 return NULL;
678 } 713 }
714
679 arch_cmp++; 715 arch_cmp++;
716
680 if (!strcmp(at->name,name)) 717 if (!strcmp ((const char *) at->name, name))
681 return at; 718 return at;
719
682 if(++index>=ARCHTABLE) 720 if (++index >= ARCHTABLE)
683 index=0; 721 index = 0;
684 } 722 }
685} 723}
686 724
687/* 725/*
688 * Adds an archetype to the hashtable. 726 * Adds an archetype to the hashtable.
689 */ 727 */
728void
729archetype::hash_add ()
730{
731#if USE_UNORDERED_MAP
732 ht.insert (std::make_pair ((size_t) (const char *) name, this));
733#else
690 734
691static void add_arch(archetype *at) {
692 int index=hasharch(at->name, ARCHTABLE),org_index=index; 735 int index = hasharch ((const char *) name, ARCHTABLE), org_index = index;
736
693 for(;;) { 737 for (;;)
738 {
694 if(arch_table[index]==NULL) { 739 if (!arch_table[index])
740 {
695 arch_table[index]=at; 741 arch_table[index] = this;
696 return; 742 break;
697 } 743 }
744
698 if(++index==ARCHTABLE) 745 if (++index == ARCHTABLE)
699 index=0; 746 index = 0;
747
700 if(index==org_index) 748 if (index == org_index)
701 fatal(ARCHTABLE_TOO_SMALL); 749 fatal (ARCHTABLE_TOO_SMALL);
702 } 750 }
751#endif
752}
753
754void
755archetype::hash_del ()
756{
757#if USE_UNORDERED_MAP
758# error remove this from HT
759#else
760
761 int index = hasharch ((const char *) name, ARCHTABLE), org_index = index;
762
763 for (;;)
764 {
765 if (arch_table[index] == this)
766 {
767 arch_table[index] = 0;
768 break;
769 }
770
771 if (++index == ARCHTABLE)
772 index = 0;
773
774 if (index == org_index)
775 break;
776 }
777#endif
703} 778}
704 779
705/* 780/*
706 * Returns the first archetype using the given type. 781 * Returns the first archetype using the given type.
707 * Used in treasure-generation. 782 * Used in treasure-generation.
708 */ 783 */
709 784
785archetype *
710archetype *type_to_archetype(int type) { 786type_to_archetype (int type)
787{
711 archetype *at; 788 archetype *at;
712 789
713 for(at=first_archetype;at!=NULL;at=(at->more==NULL)?at->next:at->more) 790 for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more)
714 if(at->clone.type==type) 791 if (at->clone.type == type)
715 return at; 792 return at;
793
716 return NULL; 794 return 0;
717} 795}
718 796
719/* 797/*
720 * Returns a new object copied from the first archetype matching 798 * Returns a new object copied from the first archetype matching
721 * the given type. 799 * the given type.
722 * Used in treasure-generation. 800 * Used in treasure-generation.
723 */ 801 */
724 802
803object *
725object *clone_arch(int type) { 804clone_arch (int type)
805{
726 archetype *at; 806 archetype *at;
727 object *op=get_object();
728 807
729 if((at=type_to_archetype(type))==NULL) { 808 if ((at = type_to_archetype (type)) == NULL)
809 {
730 LOG(llevError,"Can't clone archetype %d\n",type); 810 LOG (llevError, "Can't clone archetype %d\n", type);
731 free_object(op);
732 return NULL; 811 return 0;
733 } 812 }
734 copy_object(&at->clone,op); 813
814 object *op = at->clone.clone ();
815 op->instantiate ();
735 return op; 816 return op;
736} 817}
737 818
738/* 819/*
739 * member: make instance from class 820 * member: make instance from class
740 */ 821 */
741 822
823object *
742object *object_create_arch (archetype * at) 824object_create_arch (archetype *at)
743{ 825{
744 object *op, *prev = NULL, *head = NULL; 826 object *op, *prev = 0, *head = 0;
745 827
746 while (at) { 828 while (at)
829 {
747 op = arch_to_object (at); 830 op = arch_to_object (at);
748 op->x = at->clone.x; 831 op->x = at->clone.x;
749 op->y = at->clone.y; 832 op->y = at->clone.y;
833
750 if (head) 834 if (head)
751 op->head = head, prev->more = op; 835 op->head = head, prev->more = op;
836
752 if (!head) 837 if (!head)
753 head = op; 838 head = op;
839
754 prev = op; 840 prev = op;
755 at = at->more; 841 at = at->more;
756 } 842 }
843
757 return (head); 844 return (head);
758} 845}
759 846
760/*** end of arch.c ***/

Diff Legend

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