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.38 by root, Fri Feb 2 21:50:43 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines