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

Diff Legend

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