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.1 by elmex, Sun Aug 13 17:16:00 2006 UTC vs.
Revision 1.40 by root, Fri Feb 2 22:08:23 2007 UTC

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

Diff Legend

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