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.11 by root, Sun Sep 3 22:45:55 2006 UTC vs.
Revision 1.39 by root, Fri Feb 2 22:07:51 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines