ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/map.C
(Generate patch)

Comparing deliantra/server/common/map.C (file contents):
Revision 1.7 by elmex, Mon Aug 21 02:58:22 2006 UTC vs.
Revision 1.23 by root, Mon Sep 4 15:51:24 2006 UTC

1/* 1/*
2 * static char *rcsid_map_c = 2 * static char *rcsid_map_c =
3 * "$Id: map.C,v 1.7 2006/08/21 02:58:22 elmex Exp $"; 3 * "$Id: map.C,v 1.23 2006/09/04 15:51:24 root Exp $";
4 */ 4 */
5 5
6/* 6/*
7 CrossFire, A Multiplayer game for X-windows 7 CrossFire, A Multiplayer game for X-windows
8 8
… …
38#include "path.h" 38#include "path.h"
39 39
40 40
41extern int nrofallocobjects,nroffreeobjects; 41extern int nrofallocobjects,nroffreeobjects;
42 42
43void (*load_original_map_callback)(mapstruct *map);
44void (*load_temporary_map_callback)(mapstruct *map);
45void (*clean_temporary_map_callback)(mapstruct *map);
46
47/* 43/*
48 * Returns the mapstruct which has a name matching the given argument. 44 * Returns the mapstruct which has a name matching the given argument.
49 * return NULL if no match is found. 45 * return NULL if no match is found.
50 */ 46 */
51 47
52mapstruct *has_been_loaded (const char *name) { 48mapstruct *has_been_loaded (const char *name) {
53 mapstruct *map; 49 mapstruct *map;
54 50
55 if (!name || !*name) 51 if (!name || !*name)
56 return 0; 52 return 0;
57 for (map = first_map; map; map = map->next) 53 for (map = first_map; map; map = map->next)
58 if (!strcmp (name, map->path)) 54 if (!strcmp (name, map->path))
59 break; 55 break;
60 return (map); 56 return (map);
61} 57}
62 58
63/* 59/*
64 * This makes a path absolute outside the world of Crossfire. 60 * This makes a path absolute outside the world of Crossfire.
… …
163 struct stat statbuf; 159 struct stat statbuf;
164 int mode = 0, i; 160 int mode = 0, i;
165#endif 161#endif
166 162
167 if (prepend_dir) 163 if (prepend_dir)
168 strcpy (buf, create_pathname(name)); 164 strcpy (buf, create_pathname(name));
169 else 165 else
170 strcpy(buf, name); 166 strcpy(buf, name);
171#ifdef WIN32 /* ***win32: check this sucker in windows style. */ 167#ifdef WIN32 /* ***win32: check this sucker in windows style. */
172 return(_access(buf,0)); 168 return(_access(buf,0));
173#else 169#else
174 170
175 /* old method (strchr(buf, '\0')) seemd very odd to me - 171 /* old method (strchr(buf, '\0')) seemd very odd to me -
176 * this method should be equivalant and is clearer. 172 * this method should be equivalant and is clearer.
177 * Can not use strcat because we need to cycle through 173 * Can not use strcat because we need to cycle through
178 * all the names. 174 * all the names.
179 */ 175 */
180 endbuf = buf + strlen(buf); 176 endbuf = buf + strlen(buf);
181 177
182 for (i = 0; i < NROF_COMPRESS_METHODS; i++) {
183 if (uncomp[i][0])
184 strcpy(endbuf, uncomp[i][0]);
185 else
186 *endbuf = '\0';
187 if (!stat (buf, &statbuf)) 178 if (stat (buf, &statbuf))
188 break;
189 }
190 if (i == NROF_COMPRESS_METHODS)
191 return (-1); 179 return -1;
192 if (!S_ISREG (statbuf.st_mode)) 180 if (!S_ISREG (statbuf.st_mode))
193 return (-1); 181 return (-1);
194 182
195 if (((statbuf.st_mode & S_IRGRP) && getegid() == statbuf.st_gid) || 183 if (((statbuf.st_mode & S_IRGRP) && getegid() == statbuf.st_gid) ||
196 ((statbuf.st_mode & S_IRUSR) && geteuid() == statbuf.st_uid) || 184 ((statbuf.st_mode & S_IRUSR) && geteuid() == statbuf.st_uid) ||
197 (statbuf.st_mode & S_IROTH)) 185 (statbuf.st_mode & S_IROTH))
198 mode |= 4; 186 mode |= 4;
199 187
200 if ((statbuf.st_mode & S_IWGRP && getegid() == statbuf.st_gid) || 188 if ((statbuf.st_mode & S_IWGRP && getegid() == statbuf.st_gid) ||
201 (statbuf.st_mode & S_IWUSR && geteuid() == statbuf.st_uid) || 189 (statbuf.st_mode & S_IWUSR && geteuid() == statbuf.st_uid) ||
202 (statbuf.st_mode & S_IWOTH)) 190 (statbuf.st_mode & S_IWOTH))
203 mode |= 2; 191 mode |= 2;
204 192
205 return (mode); 193 return (mode);
206#endif 194#endif
207} 195}
208 196
… …
213 */ 201 */
214 202
215void dump_map(const mapstruct *m) { 203void dump_map(const mapstruct *m) {
216 LOG(llevError,"Map %s status: %d.\n",m->path,m->in_memory); 204 LOG(llevError,"Map %s status: %d.\n",m->path,m->in_memory);
217 LOG(llevError,"Size: %dx%d Start: %d,%d\n", 205 LOG(llevError,"Size: %dx%d Start: %d,%d\n",
218 MAP_WIDTH(m), MAP_HEIGHT(m), 206 MAP_WIDTH(m), MAP_HEIGHT(m),
219 MAP_ENTER_X(m), MAP_ENTER_Y(m)); 207 MAP_ENTER_X(m), MAP_ENTER_Y(m));
220 208
221 if(m->msg!=NULL) 209 if(m->msg!=NULL)
222 LOG(llevError,"Message:\n%s",m->msg); 210 LOG(llevError,"Message:\n%s",m->msg);
223 211
224 if(m->maplore!=NULL) 212 if(m->maplore!=NULL)
225 LOG(llevError,"Lore:\n%s",m->maplore); 213 LOG(llevError,"Lore:\n%s",m->maplore);
226 214
227 if(m->tmpname!=NULL) 215 if(m->tmpname!=NULL)
228 LOG(llevError,"Tmpname: %s\n",m->tmpname); 216 LOG(llevError,"Tmpname: %s\n",m->tmpname);
229 217
230 LOG(llevError,"Difficulty: %d\n",m->difficulty); 218 LOG(llevError,"Difficulty: %d\n",m->difficulty);
231 LOG(llevError,"Darkness: %d\n",m->darkness); 219 LOG(llevError,"Darkness: %d\n",m->darkness);
232} 220}
233 221
… …
238 */ 226 */
239 227
240void dump_all_maps(void) { 228void dump_all_maps(void) {
241 mapstruct *m; 229 mapstruct *m;
242 for(m=first_map;m!=NULL;m=m->next) { 230 for(m=first_map;m!=NULL;m=m->next) {
243 dump_map(m); 231 dump_map(m);
244 } 232 }
245} 233}
246 234
247/* This rolls up wall, blocks_magic, blocks_view, etc, all into 235/* This rolls up wall, blocks_magic, blocks_view, etc, all into
248 * one function that just returns a P_.. value (see map.h) 236 * one function that just returns a P_.. value (see map.h)
… …
263 if (out_of_map(oldmap, x, y)) return P_OUT_OF_MAP; 251 if (out_of_map(oldmap, x, y)) return P_OUT_OF_MAP;
264 newx = x; 252 newx = x;
265 newy = y; 253 newy = y;
266 mp = get_map_from_coord(oldmap, &newx, &newy); 254 mp = get_map_from_coord(oldmap, &newx, &newy);
267 if (mp != oldmap) 255 if (mp != oldmap)
268 retval |= P_NEW_MAP; 256 retval |= P_NEW_MAP;
269 if (newmap) *newmap = mp; 257 if (newmap) *newmap = mp;
270 if (nx) *nx = newx; 258 if (nx) *nx = newx;
271 if (ny) *ny = newy; 259 if (ny) *ny = newy;
272 retval |= mp->spaces[newx + mp->width * newy].flags; 260 retval |= mp->spaces[newx + mp->width * newy].flags;
273 261
… …
297 285
298 /* Make sure the coordinates are valid - they should be, as caller should 286 /* Make sure the coordinates are valid - they should be, as caller should
299 * have already checked this. 287 * have already checked this.
300 */ 288 */
301 if (OUT_OF_REAL_MAP(m, sx, sy)) { 289 if (OUT_OF_REAL_MAP(m, sx, sy)) {
302 LOG(llevError,"blocked_link: Passed map, x, y coordinates outside of map\n"); 290 LOG(llevError,"blocked_link: Passed map, x, y coordinates outside of map\n");
303 return 1; 291 return 1;
304 } 292 }
305 293
306 /* Save some cycles - instead of calling get_map_flags(), just get the value 294 /* Save some cycles - instead of calling get_map_flags(), just get the value
307 * directly. 295 * directly.
308 */ 296 */
… …
324 * let the player through (inventory checkers for example) 312 * let the player through (inventory checkers for example)
325 */ 313 */
326 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK(ob, blocked)) return 0; 314 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK(ob, blocked)) return 0;
327 315
328 if(ob->head != NULL) 316 if(ob->head != NULL)
329 ob=ob->head; 317 ob=ob->head;
330 318
331 /* We basically go through the stack of objects, and if there is 319 /* We basically go through the stack of objects, and if there is
332 * some other object that has NO_PASS or FLAG_ALIVE set, return 320 * some other object that has NO_PASS or FLAG_ALIVE set, return
333 * true. If we get through the entire stack, that must mean 321 * true. If we get through the entire stack, that must mean
334 * ob is blocking it, so return 0. 322 * ob is blocking it, so return 0.
335 */ 323 */
336 for(tmp = GET_MAP_OB(m,sx,sy); tmp!= NULL; tmp = tmp->above) { 324 for(tmp = GET_MAP_OB(m,sx,sy); tmp!= NULL; tmp = tmp->above) {
337 325
338 /* This must be before the checks below. Code for inventory checkers. */ 326 /* This must be before the checks below. Code for inventory checkers. */
339 if (tmp->type==CHECK_INV && OB_MOVE_BLOCK(ob, tmp)) { 327 if (tmp->type==CHECK_INV && OB_MOVE_BLOCK(ob, tmp)) {
340 /* If last_sp is set, the player/monster needs an object, 328 /* If last_sp is set, the player/monster needs an object,
341 * so we check for it. If they don't have it, they can't 329 * so we check for it. If they don't have it, they can't
342 * pass through this space. 330 * pass through this space.
343 */ 331 */
344 if (tmp->last_sp) { 332 if (tmp->last_sp) {
345 if (check_inv_recursive(ob,tmp)==NULL) 333 if (check_inv_recursive(ob,tmp)==NULL)
346 return 1; 334 return 1;
347 else 335 else
348 continue; 336 continue;
349 } else { 337 } else {
350 /* In this case, the player must not have the object - 338 /* In this case, the player must not have the object -
351 * if they do, they can't pass through. 339 * if they do, they can't pass through.
352 */ 340 */
353 if (check_inv_recursive(ob,tmp)!=NULL) /* player has object */ 341 if (check_inv_recursive(ob,tmp)!=NULL) /* player has object */
354 return 1; 342 return 1;
355 else 343 else
356 continue; 344 continue;
357 } 345 }
358 } /* if check_inv */ 346 } /* if check_inv */
359 else { 347 else {
360 /* Broke apart a big nasty if into several here to make 348 /* Broke apart a big nasty if into several here to make
361 * this more readable. first check - if the space blocks 349 * this more readable. first check - if the space blocks
362 * movement, can't move here. 350 * movement, can't move here.
363 * second - if a monster, can't move there, unles it is a 351 * second - if a monster, can't move there, unles it is a
364 * hidden dm 352 * hidden dm
365 */ 353 */
366 if (OB_MOVE_BLOCK(ob, tmp)) return 1; 354 if (OB_MOVE_BLOCK(ob, tmp)) return 1;
367 if (QUERY_FLAG(tmp,FLAG_ALIVE) && tmp->head != ob && tmp != ob && 355 if (QUERY_FLAG(tmp,FLAG_ALIVE) && tmp->head != ob && tmp != ob &&
368 tmp->type != DOOR && !(QUERY_FLAG(tmp,FLAG_WIZ) && tmp->contr->hidden)) 356 tmp->type != DOOR && !(QUERY_FLAG(tmp,FLAG_WIZ) && tmp->contr->hidden))
369 return 1; 357 return 1;
370 } 358 }
371 359
372 } 360 }
373 return 0; 361 return 0;
374} 362}
375 363
… …
406 int flag; 394 int flag;
407 mapstruct *m1; 395 mapstruct *m1;
408 sint16 sx, sy; 396 sint16 sx, sy;
409 397
410 if(ob==NULL) { 398 if(ob==NULL) {
411 flag= get_map_flags(m,&m1, x,y, &sx, &sy); 399 flag= get_map_flags(m,&m1, x,y, &sx, &sy);
412 if (flag & P_OUT_OF_MAP) return P_OUT_OF_MAP; 400 if (flag & P_OUT_OF_MAP) return P_OUT_OF_MAP;
413 401
414 /* don't have object, so don't know what types would block */ 402 /* don't have object, so don't know what types would block */
415 return(GET_MAP_MOVE_BLOCK(m1, sx, sy)); 403 return(GET_MAP_MOVE_BLOCK(m1, sx, sy));
416 } 404 }
417 405
418 for(tmp=ob->arch; tmp!=NULL;tmp=tmp->more) { 406 for(tmp=ob->arch; tmp!=NULL;tmp=tmp->more) {
419 flag = get_map_flags(m, &m1, x+tmp->clone.x,y+tmp->clone.y, &sx, &sy); 407 flag = get_map_flags(m, &m1, x+tmp->clone.x,y+tmp->clone.y, &sx, &sy);
420 408
421 if (flag & P_OUT_OF_MAP) return P_OUT_OF_MAP; 409 if (flag & P_OUT_OF_MAP) return P_OUT_OF_MAP;
422 if (flag & P_IS_ALIVE) return P_IS_ALIVE; 410 if (flag & P_IS_ALIVE) return P_IS_ALIVE;
423 411
424 /* find_first_free_spot() calls this function. However, often 412 /* find_first_free_spot() calls this function. However, often
425 * ob doesn't have any move type (when used to place exits) 413 * ob doesn't have any move type (when used to place exits)
426 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 414 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
427 */ 415 */
428 416
429 if (ob->move_type == 0 && GET_MAP_MOVE_BLOCK(m1, sx, sy) != MOVE_ALL) continue; 417 if (ob->move_type == 0 && GET_MAP_MOVE_BLOCK(m1, sx, sy) != MOVE_ALL) continue;
430 418
431 /* Note it is intentional that we check ob - the movement type of the 419 /* Note it is intentional that we check ob - the movement type of the
432 * head of the object should correspond for the entire object. 420 * head of the object should correspond for the entire object.
433 */ 421 */
434 if (OB_TYPE_MOVE_BLOCK(ob, GET_MAP_MOVE_BLOCK(m1, sx, sy))) 422 if (OB_TYPE_MOVE_BLOCK(ob, GET_MAP_MOVE_BLOCK(m1, sx, sy)))
435 return AB_NO_PASS; 423 return AB_NO_PASS;
436 424
437 } 425 }
438 return 0; 426 return 0;
439} 427}
440 428
… …
449{ 437{
450 object *tmp=container->inv, *next; 438 object *tmp=container->inv, *next;
451 439
452 container->inv=NULL; 440 container->inv=NULL;
453 while (tmp!=NULL) { 441 while (tmp!=NULL) {
454 next = tmp->below; 442 next = tmp->below;
455 if (tmp->inv) 443 if (tmp->inv)
456 fix_container(tmp); 444 fix_container(tmp);
457 (void) insert_ob_in_ob(tmp,container); 445 (void) insert_ob_in_ob(tmp,container);
458 tmp = next; 446 tmp = next;
459 } 447 }
460 /* sum_weight will go through and calculate what all the containers are 448 /* sum_weight will go through and calculate what all the containers are
461 * carrying. 449 * carrying.
462 */ 450 */
463 sum_weight(container); 451 sum_weight(container);
… …
472 460
473static void link_multipart_objects(mapstruct *m) 461static void link_multipart_objects(mapstruct *m)
474{ 462{
475 int x,y; 463 int x,y;
476 object *tmp, *op, *last, *above; 464 object *tmp, *op, *last, *above;
477 archetype *at; 465 archetype *at;
478 466
479 for(x=0;x<MAP_WIDTH(m);x++) 467 for(x=0;x<MAP_WIDTH(m);x++)
480 for(y=0;y<MAP_HEIGHT(m);y++) 468 for(y=0;y<MAP_HEIGHT(m);y++)
481 for(tmp=get_map_ob(m,x,y);tmp!=NULL;tmp=above) { 469 for(tmp=get_map_ob(m,x,y);tmp!=NULL;tmp=above) {
482 above=tmp->above; 470 above=tmp->above;
483 471
484 /* already multipart - don't do anything more */ 472 /* already multipart - don't do anything more */
485 if (tmp->head || tmp->more) continue; 473 if (tmp->head || tmp->more) continue;
486 474
487 /* If there is nothing more to this object, this for loop 475 /* If there is nothing more to this object, this for loop
488 * won't do anything. 476 * won't do anything.
489 */ 477 */
490 for (at = tmp->arch->more, last=tmp; at != NULL; at=at->more, last=op) { 478 for (at = tmp->arch->more, last=tmp; at != NULL; at=at->more, last=op) {
491 op = arch_to_object(at); 479 op = arch_to_object(at);
492 480
493 /* update x,y coordinates */ 481 /* update x,y coordinates */
494 op->x += tmp->x; 482 op->x += tmp->x;
495 op->y += tmp->y; 483 op->y += tmp->y;
496 op->head = tmp; 484 op->head = tmp;
497 op->map = m; 485 op->map = m;
498 last->more = op; 486 last->more = op;
499 if (tmp->name != op->name) { 487 op->name = tmp->name;
500 if (op->name) free_string(op->name); 488 op->title = tmp->title;
501 op->name = add_string(tmp->name);
502 }
503 if (tmp->title != op->title) {
504 if (op->title) free_string(op->title);
505 op->title = add_string(tmp->title);
506 }
507 /* we could link all the parts onto tmp, and then just 489 /* we could link all the parts onto tmp, and then just
508 * call insert_ob_in_map once, but the effect is the same, 490 * call insert_ob_in_map once, but the effect is the same,
509 * as insert_ob_in_map will call itself with each part, and 491 * as insert_ob_in_map will call itself with each part, and
510 * the coding is simpler to just to it here with each part. 492 * the coding is simpler to just to it here with each part.
511 */ 493 */
512 insert_ob_in_map(op, op->map, tmp,INS_NO_MERGE|INS_ABOVE_FLOOR_ONLY|INS_NO_WALK_ON); 494 insert_ob_in_map(op, op->map, tmp,INS_NO_MERGE|INS_ABOVE_FLOOR_ONLY|INS_NO_WALK_ON);
513 } /* for at = tmp->arch->more */ 495 } /* for at = tmp->arch->more */
514 } /* for objects on this space */ 496 } /* for objects on this space */
515} 497}
516 498
517 499
518 500
519/* 501/*
520 * Loads (ands parses) the objects into a given map from the specified 502 * Loads (ands parses) the objects into a given map from the specified
521 * file pointer. 503 * file pointer.
522 * mapflags is the same as we get with load_original_map 504 * mapflags is the same as we get with load_original_map
523 */ 505 */
524 506
525void load_objects (mapstruct *m, FILE *fp, int mapflags) { 507void load_objects (mapstruct *m, object_thawer &fp, int mapflags) {
526 int i,j,bufstate=LO_NEWFILE; 508 int i,j;
527 int unique; 509 int unique;
528 object *op, *prev=NULL,*last_more=NULL, *otmp; 510 object *op, *prev=NULL,*last_more=NULL, *otmp;
529 511
530 op=get_object(); 512 op=get_object();
531 op->map = m; /* To handle buttons correctly */ 513 op->map = m; /* To handle buttons correctly */
532 514
533 while((i=load_object(fp,op,bufstate, mapflags))) { 515 while((i = load_object (fp, op, mapflags))) {
534 /* Since the loading of the map header does not load an object
535 * anymore, we need to pass LO_NEWFILE for the first object loaded,
536 * and then switch to LO_REPEAT for faster loading.
537 */
538 bufstate = LO_REPEAT;
539
540 /* if the archetype for the object is null, means that we 516 /* if the archetype for the object is null, means that we
541 * got an invalid object. Don't do anything with it - the game 517 * got an invalid object. Don't do anything with it - the game
542 * or editor will not be able to do anything with it either. 518 * or editor will not be able to do anything with it either.
543 */ 519 */
544 if (op->arch==NULL) { 520 if (op->arch==NULL) {
545 LOG(llevDebug,"Discarding object without arch: %s\n", op->name?op->name:"(null)"); 521 LOG(llevDebug,"Discarding object without arch: %s\n", op->name?(const char *)op->name:"(null)");
546 continue; 522 continue;
547 } 523 }
548 524
549 525
550 switch(i) { 526 switch(i) {
551 case LL_NORMAL: 527 case LL_NORMAL:
552 /* if we are loading an overlay, put the floors on the bottom */ 528 /* if we are loading an overlay, put the floors on the bottom */
553 if ((QUERY_FLAG(op, FLAG_IS_FLOOR) || 529 if ((QUERY_FLAG(op, FLAG_IS_FLOOR) ||
554 QUERY_FLAG(op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY) 530 QUERY_FLAG(op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY)
555 insert_ob_in_map(op,m,op,INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY | INS_MAP_LOAD); 531 insert_ob_in_map(op,m,op,INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY | INS_MAP_LOAD);
556 else 532 else
557 insert_ob_in_map(op,m,op,INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 533 insert_ob_in_map(op,m,op,INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
558 534
559 if (op->inv) 535 if (op->inv)
560 sum_weight(op); 536 sum_weight(op);
561 537
562 prev=op,last_more=op; 538 prev=op,last_more=op;
563 break; 539 break;
564 540
565 case LL_MORE: 541 case LL_MORE:
566 insert_ob_in_map(op,m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 542 insert_ob_in_map(op,m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY);
567 op->head=prev,last_more->more=op,last_more=op; 543 op->head=prev,last_more->more=op,last_more=op;
568 break; 544 break;
569 } 545 }
570 if (mapflags & MAP_STYLE) { 546 if (mapflags & MAP_STYLE) {
571 remove_from_active_list(op); 547 remove_from_active_list(op);
572 } 548 }
573 op=get_object(); 549 op=get_object();
574 op->map = m; 550 op->map = m;
575 } 551 }
576 for (i=0;i<m->width;i++){ 552 for (i=0;i<m->width;i++){
577 for (j=0;j<m->height;j++){ 553 for (j=0;j<m->height;j++){
578 unique =0; 554 unique =0;
579 /* check for unique items, or unique squares */ 555 /* check for unique items, or unique squares */
580 for (otmp = get_map_ob(m, i, j); otmp; otmp = otmp->above) { 556 for (otmp = get_map_ob(m, i, j); otmp; otmp = otmp->above) {
581 if (QUERY_FLAG(otmp, FLAG_UNIQUE) || QUERY_FLAG(otmp, FLAG_OBJ_SAVE_ON_OVL)) 557 if (QUERY_FLAG(otmp, FLAG_UNIQUE) || QUERY_FLAG(otmp, FLAG_OBJ_SAVE_ON_OVL))
582 unique = 1; 558 unique = 1;
583 if (!(mapflags & (MAP_OVERLAY|MAP_PLAYER_UNIQUE) || unique)) 559 if (!(mapflags & (MAP_OVERLAY|MAP_PLAYER_UNIQUE) || unique))
584 SET_FLAG(otmp, FLAG_OBJ_ORIGINAL); 560 SET_FLAG(otmp, FLAG_OBJ_ORIGINAL);
585 } 561 }
586 } 562 }
587 } 563 }
588 free_object(op); 564 free_object(op);
589 link_multipart_objects(m); 565 link_multipart_objects(m);
590} 566}
591 567
592/* This saves all the objects on the map in a non destructive fashion. 568/* This saves all the objects on the map in a non destructive fashion.
593 * Modified by MSW 2001-07-01 to do in a single pass - reduces code, 569 * Modified by MSW 2001-07-01 to do in a single pass - reduces code,
594 * and we only save the head of multi part objects - this is needed 570 * and we only save the head of multi part objects - this is needed
595 * in order to do map tiling properly. 571 * in order to do map tiling properly.
596 */ 572 */
597void save_objects (mapstruct *m, FILE *fp, FILE *fp2, int flag) { 573void save_objects (mapstruct *m, object_freezer &fp, object_freezer &fp2, int flag) {
598 int i, j = 0,unique=0; 574 int i, j = 0,unique=0;
599 object *op; 575 object *op;
600 /* first pass - save one-part objects */ 576 /* first pass - save one-part objects */
601 for(i = 0; i < MAP_WIDTH(m); i++) 577 for(i = 0; i < MAP_WIDTH(m); i++)
602 for (j = 0; j < MAP_HEIGHT(m); j++) { 578 for (j = 0; j < MAP_HEIGHT(m); j++) {
603 unique=0; 579 unique=0;
604 for(op = get_map_ob (m, i, j); op; op = op->above) { 580 for(op = get_map_ob (m, i, j); op; op = op->above) {
605 if (QUERY_FLAG(op,FLAG_IS_FLOOR) && QUERY_FLAG(op, FLAG_UNIQUE)) 581 if (QUERY_FLAG(op,FLAG_IS_FLOOR) && QUERY_FLAG(op, FLAG_UNIQUE))
606 unique=1; 582 unique=1;
607 583
608 if(op->type == PLAYER) { 584 if(op->type == PLAYER) {
609 LOG(llevDebug, "Player on map that is being saved\n"); 585 LOG(llevDebug, "Player on map that is being saved\n");
610 continue; 586 continue;
611 } 587 }
612 588
613 if (op->head || op->owner) 589 if (op->head || op->owner)
614 continue; 590 continue;
615 591
616 if (unique || QUERY_FLAG(op, FLAG_UNIQUE)) 592 if (unique || QUERY_FLAG(op, FLAG_UNIQUE))
617 save_object( fp2 , op, 3); 593 save_object (fp2, op, 3);
618 else 594 else
619 if (flag == 0 || 595 if (flag == 0 ||
620 (flag == 2 && (!QUERY_FLAG(op, FLAG_OBJ_ORIGINAL) && 596 (flag == 2 && (!QUERY_FLAG(op, FLAG_OBJ_ORIGINAL) &&
621 !QUERY_FLAG(op, FLAG_UNPAID)))) 597 !QUERY_FLAG(op, FLAG_UNPAID))))
622 save_object(fp, op, 3); 598 save_object(fp, op, 3);
623 599
624 } /* for this space */ 600 } /* for this space */
625 } /* for this j */ 601 } /* for this j */
626} 602}
627 603
628/* 604/*
629 * Allocates, initialises, and returns a pointer to a mapstruct. 605 * Allocates, initialises, and returns a pointer to a mapstruct.
630 * Modified to no longer take a path option which was not being 606 * Modified to no longer take a path option which was not being
631 * used anyways. MSW 2001-07-01 607 * used anyways. MSW 2001-07-01
632 */ 608 */
633 609
634mapstruct *get_linked_map(void) { 610mapstruct *get_linked_map(void) {
635 mapstruct *map=(mapstruct *) calloc(1,sizeof(mapstruct)); 611 mapstruct *map = new mapstruct;
636 mapstruct *mp; 612 mapstruct *mp;
637
638 if(map==NULL)
639 fatal(OUT_OF_MEMORY);
640 613
641 for(mp=first_map;mp!=NULL&&mp->next!=NULL;mp=mp->next); 614 for(mp=first_map;mp!=NULL&&mp->next!=NULL;mp=mp->next);
642 if(mp==NULL) 615 if(mp==NULL)
643 first_map=map; 616 first_map=map;
644 else 617 else
645 mp->next=map; 618 mp->next=map;
646 619
647 map->in_memory=MAP_SWAPPED; 620 map->in_memory=MAP_SWAPPED;
648 /* The maps used to pick up default x and y values from the 621 /* The maps used to pick up default x and y values from the
649 * map archetype. Mimic that behaviour. 622 * map archetype. Mimic that behaviour.
650 */ 623 */
… …
652 MAP_HEIGHT(map)=16; 625 MAP_HEIGHT(map)=16;
653 MAP_RESET_TIMEOUT(map)=0; 626 MAP_RESET_TIMEOUT(map)=0;
654 MAP_TIMEOUT(map)=300; 627 MAP_TIMEOUT(map)=300;
655 MAP_ENTER_X(map)=0; 628 MAP_ENTER_X(map)=0;
656 MAP_ENTER_Y(map)=0; 629 MAP_ENTER_Y(map)=0;
657 /*set part to -1 indicating conversion to weather map not yet done*/ 630 /*set part to -1 indicating conversion to weather map not yet done*/
658 MAP_WORLDPARTX(map)=-1; 631 MAP_WORLDPARTX(map)=-1;
659 MAP_WORLDPARTY(map)=-1; 632 MAP_WORLDPARTY(map)=-1;
660 return map; 633 return map;
661} 634}
662 635
663/* 636/*
664 * Allocates the arrays contained in a mapstruct. 637 * Allocates the arrays contained in a mapstruct.
… …
671 /* Log this condition and free the storage. We could I suppose 644 /* Log this condition and free the storage. We could I suppose
672 * realloc, but if the caller is presuming the data will be intact, 645 * realloc, but if the caller is presuming the data will be intact,
673 * that is their poor assumption. 646 * that is their poor assumption.
674 */ 647 */
675 if (m->spaces) { 648 if (m->spaces) {
676 LOG(llevError,"allocate_map called with already allocated map (%s)\n", m->path); 649 LOG(llevError,"allocate_map called with already allocated map (%s)\n", m->path);
677 free(m->spaces); 650 free(m->spaces);
678 } 651 }
679 652
680 m->spaces = (MapSpace *) calloc(1, MAP_WIDTH(m) * MAP_HEIGHT(m) * sizeof(MapSpace)); 653 m->spaces = (MapSpace *) calloc(1, MAP_WIDTH(m) * MAP_HEIGHT(m) * sizeof(MapSpace));
681 654
682 if(m->spaces==NULL) 655 if(m->spaces==NULL)
683 fatal(OUT_OF_MEMORY); 656 fatal(OUT_OF_MEMORY);
684} 657}
685 658
686/* Create and returns a map of the specific size. Used 659/* Create and returns a map of the specific size. Used
687 * in random map code and the editor. 660 * in random map code and the editor.
688 */ 661 */
… …
709 682
710 shop_string=strdup_local(input_string); 683 shop_string=strdup_local(input_string);
711 p=shop_string; 684 p=shop_string;
712 /* first we'll count the entries, we'll need that for allocating the array shortly */ 685 /* first we'll count the entries, we'll need that for allocating the array shortly */
713 while (p) { 686 while (p) {
714 p=strchr(p, ';'); 687 p=strchr(p, ';');
715 number_of_entries++; 688 number_of_entries++;
716 if (p) p++; 689 if (p) p++;
717 } 690 }
718 p=shop_string; 691 p=shop_string;
719 strip_endline(p); 692 strip_endline(p);
720 items=(shopitems *) CALLOC(number_of_entries+1, sizeof(shopitems)); 693 items=(shopitems *) CALLOC(number_of_entries+1, sizeof(shopitems));
721 memset(items, 0, (sizeof(shopitems) * number_of_entries+1)); 694 memset(items, 0, (sizeof(shopitems) * number_of_entries+1));
722 for (i=0; i<number_of_entries; i++) { 695 for (i=0; i<number_of_entries; i++) {
723 if (!p) { 696 if (!p) {
724 LOG(llevError, "parse_shop_string: I seem to have run out of string, that shouldn't happen.\n"); 697 LOG(llevError, "parse_shop_string: I seem to have run out of string, that shouldn't happen.\n");
725 break; 698 break;
726 } 699 }
727 next_semicolon=strchr(p, ';'); 700 next_semicolon=strchr(p, ';');
728 next_colon=strchr(p, ':'); 701 next_colon=strchr(p, ':');
729 /* if there is a stregth specified, figure out what it is, we'll need it soon. */ 702 /* if there is a stregth specified, figure out what it is, we'll need it soon. */
730 if (next_colon &&( !next_semicolon || next_colon<next_semicolon)) 703 if (next_colon &&( !next_semicolon || next_colon<next_semicolon))
731 items[i].strength=atoi(strchr(p,':')+1); 704 items[i].strength=atoi(strchr(p,':')+1);
732 705
733 if (isdigit(*p) || *p=='*') { 706 if (isdigit(*p) || *p=='*') {
734 items[i].typenum = atoi(p); /* atoi returns 0 when we have an asterisk */ 707 items[i].typenum = atoi(p); /* atoi returns 0 when we have an asterisk */
735 current_type=get_typedata(items[i].typenum); 708 current_type=get_typedata(items[i].typenum);
736 if (current_type) { 709 if (current_type) {
737 items[i].name=current_type->name; 710 items[i].name=current_type->name;
738 items[i].name_pl=current_type->name_pl; 711 items[i].name_pl=current_type->name_pl;
739 } 712 }
740 } 713 }
741 else { /*we have a named type, let's figure out what it is */ 714 else { /*we have a named type, let's figure out what it is */
742 q=strpbrk(p,";:"); 715 q=strpbrk(p,";:");
743 if (q) *q='\0'; 716 if (q) *q='\0';
744
745 current_type=get_typedata_by_name(p);
746 if (current_type) {
747 items[i].name=current_type->name;
748 items[i].typenum=current_type->number;
749 items[i].name_pl=current_type->name_pl;
750 }
751 else { /* oh uh, something's wrong, let's free up this one, and try
752 * the next entry while we're at it, better print a warning
753 */
754 LOG(llevError, "invalid type %s defined in shopitems in string %s\n",
755 p, input_string);
756 }
757 } 717
718 current_type=get_typedata_by_name(p);
719 if (current_type) {
720 items[i].name=current_type->name;
721 items[i].typenum=current_type->number;
722 items[i].name_pl=current_type->name_pl;
723 }
724 else { /* oh uh, something's wrong, let's free up this one, and try
725 * the next entry while we're at it, better print a warning
726 */
727 LOG(llevError, "invalid type %s defined in shopitems in string %s\n",
728 p, input_string);
729 }
730 }
758 items[i].index=number_of_entries; 731 items[i].index=number_of_entries;
759 if (next_semicolon) p=++next_semicolon; 732 if (next_semicolon) p=++next_semicolon;
760 else p=NULL; 733 else p=NULL;
761 } 734 }
762 free(shop_string); 735 free(shop_string);
763 return items; 736 return items;
764} 737}
765 738
… …
768static void print_shop_string(mapstruct *m, char *output_string) { 741static void print_shop_string(mapstruct *m, char *output_string) {
769 int i; 742 int i;
770 char tmp[MAX_BUF]; 743 char tmp[MAX_BUF];
771 strcpy(output_string, ""); 744 strcpy(output_string, "");
772 for (i=0; i< m->shopitems[0].index; i++) { 745 for (i=0; i< m->shopitems[0].index; i++) {
773 if (m->shopitems[i].typenum) { 746 if (m->shopitems[i].typenum) {
774 if (m->shopitems[i].strength) { 747 if (m->shopitems[i].strength) {
775 sprintf(tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 748 sprintf(tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
776 } 749 }
777 else sprintf(tmp, "%s;", m->shopitems[i].name); 750 else sprintf(tmp, "%s;", m->shopitems[i].name);
778 } 751 }
779 else { 752 else {
780 if (m->shopitems[i].strength) { 753 if (m->shopitems[i].strength) {
781 sprintf(tmp, "*:%d;", m->shopitems[i].strength); 754 sprintf(tmp, "*:%d;", m->shopitems[i].strength);
782 } 755 }
783 else sprintf(tmp, "*"); 756 else sprintf(tmp, "*");
784 } 757 }
785 strcat(output_string, tmp); 758 strcat(output_string, tmp);
786 } 759 }
787} 760}
788 761
789/* This loads the header information of the map. The header 762/* This loads the header information of the map. The header
790 * contains things like difficulty, size, timeout, etc. 763 * contains things like difficulty, size, timeout, etc.
… …
797 * currently, there are few enough fields this is not a big deal. 770 * currently, there are few enough fields this is not a big deal.
798 * MSW 2001-07-01 771 * MSW 2001-07-01
799 * return 0 on success, 1 on failure. 772 * return 0 on success, 1 on failure.
800 */ 773 */
801 774
802static int load_map_header(FILE *fp, mapstruct *m) 775static int load_map_header(object_thawer &fp, mapstruct *m)
803{ 776{
804 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key=NULL, *value, *end; 777 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key=NULL, *value, *end;
805 int msgpos=0; 778 int msgpos=0;
806 int maplorepos=0; 779 int maplorepos=0;
807 780
808 while (fgets(buf, HUGE_BUF-1, fp)!=NULL) { 781 while (fgets(buf, HUGE_BUF-1, fp)!=NULL) {
809 buf[HUGE_BUF-1] = 0; 782 buf[HUGE_BUF-1] = 0;
810 key = buf; 783 key = buf;
811 while (isspace(*key)) key++; 784 while (isspace(*key)) key++;
812 if (*key == 0) continue; /* empty line */ 785 if (*key == 0) continue; /* empty line */
813 value = strchr(key, ' '); 786 value = strchr(key, ' ');
814 if (!value) { 787 if (!value) {
815 end = strchr(key, '\n'); 788 end = strchr(key, '\n');
816 if (end != NULL) { 789 if (end != NULL) {
817 *end = 0; 790 *end = 0;
818 } 791 }
819 } else { 792 } else {
820 *value = 0; 793 *value = 0;
821 value++; 794 value++;
822 end = strchr(value, '\n'); 795 end = strchr(value, '\n');
823 while (isspace(*value)) { 796 while (isspace(*value)) {
824 value++; 797 value++;
825 if (*value == '\0' || value == end) { 798 if (*value == '\0' || value == end) {
826 /* Nothing but spaces. */ 799 /* Nothing but spaces. */
827 value = NULL; 800 value = NULL;
828 break; 801 break;
829 } 802 }
830 } 803 }
831 } 804 }
832 if (!end) { 805
806 if (!end) {
833 LOG(llevError, "Error loading map header - did not find a newline - perhaps file is truncated? Buf=%s\n", 807 LOG(llevError, "Error loading map header - did not find a newline - perhaps file is truncated? Buf=%s\n",
834 buf); 808 buf);
835 return 1; 809 return 1;
836 } 810 }
837
838 811
839 /* key is the field name, value is what it should be set 812 /* key is the field name, value is what it should be set
840 * to. We've already done the work to null terminate key, 813 * to. We've already done the work to null terminate key,
841 * and strip off any leading spaces for both of these. 814 * and strip off any leading spaces for both of these.
842 * We have not touched the newline at the end of the line - 815 * We have not touched the newline at the end of the line -
843 * these are needed for some values. the end pointer 816 * these are needed for some values. the end pointer
844 * points to the first of the newlines. 817 * points to the first of the newlines.
845 * value could be NULL! It would be easy enough to just point 818 * value could be NULL! It would be easy enough to just point
846 * this to "" to prevent cores, but that would let more errors slide 819 * this to "" to prevent cores, but that would let more errors slide
847 * through. 820 * through.
848 * 821 *
849 * First check for entries that do not use the value parameter, then 822 * First check for entries that do not use the value parameter, then
850 * validate that value is given and check for the remaining entries 823 * validate that value is given and check for the remaining entries
851 * that use the parameter. 824 * that use the parameter.
852 */ 825 */
853 826
854 if (!strcmp(key,"msg")) { 827 if (!strcmp(key,"msg")) {
855 while (fgets(buf, HUGE_BUF-1, fp)!=NULL) { 828 while (fgets(buf, HUGE_BUF-1, fp)!=NULL) {
856 if (!strcmp(buf,"endmsg\n")) break; 829 if (!strcmp(buf,"endmsg\n")) break;
857 else { 830 else {
858 /* slightly more efficient than strcat */ 831 /* slightly more efficient than strcat */
859 strcpy(msgbuf+msgpos, buf); 832 strcpy(msgbuf+msgpos, buf);
860 msgpos += strlen(buf); 833 msgpos += strlen(buf);
861 } 834 }
862 } 835 }
863 /* There are lots of maps that have empty messages (eg, msg/endmsg 836 /* There are lots of maps that have empty messages (eg, msg/endmsg
864 * with nothing between). There is no reason in those cases to 837 * with nothing between). There is no reason in those cases to
865 * keep the empty message. Also, msgbuf contains garbage data 838 * keep the empty message. Also, msgbuf contains garbage data
866 * when msgpos is zero, so copying it results in crashes 839 * when msgpos is zero, so copying it results in crashes
867 */ 840 */
868 if (msgpos != 0) 841 if (msgpos != 0)
869 m->msg = strdup_local(msgbuf); 842 m->msg = strdup_local(msgbuf);
870 } 843 }
871 else if (!strcmp(key,"maplore")) { 844 else if (!strcmp(key,"maplore")) {
872 while (fgets(buf, HUGE_BUF-1, fp)!=NULL) { 845 while (fgets(buf, HUGE_BUF-1, fp)!=NULL) {
873 if (!strcmp(buf,"endmaplore\n")) break; 846 if (!strcmp(buf,"endmaplore\n")) break;
874 else { 847 else {
875 /* slightly more efficient than strcat */ 848 /* slightly more efficient than strcat */
876 strcpy(maplorebuf+maplorepos, buf); 849 strcpy(maplorebuf+maplorepos, buf);
877 maplorepos += strlen(buf); 850 maplorepos += strlen(buf);
878 } 851 }
879 } 852 }
880 if (maplorepos != 0) 853 if (maplorepos != 0)
881 m->maplore = strdup_local(maplorebuf); 854 m->maplore = strdup_local(maplorebuf);
882 } 855 }
883 else if (!strcmp(key,"end")) { 856 else if (!strcmp(key,"end")) {
884 break; 857 break;
885 } 858 }
886 else if (value == NULL) { 859 else if (value == NULL) {
887 LOG(llevError, "Got '%s' line without parameter in map header\n", key); 860 LOG(llevError, "Got '%s' line without parameter in map header\n", key);
888 } 861 }
889 else if (!strcmp(key, "arch")) { 862 else if (!strcmp(key, "arch")) {
890 /* This is an oddity, but not something we care about much. */ 863 /* This is an oddity, but not something we care about much. */
891 if (strcmp(value,"map\n")) 864 if (strcmp(value,"map\n"))
892 LOG(llevError,"loading map and got a non 'arch map' line(%s %s)?\n",key,value); 865 LOG(llevError,"loading map and got a non 'arch map' line(%s %s)?\n",key,value);
893 } 866 }
894 else if (!strcmp(key,"name")) { 867 else if (!strcmp(key,"name")) {
895 *end=0; 868 *end=0;
896 m->name = strdup_local(value); 869 m->name = strdup_local(value);
897 } 870 }
898 /* first strcmp value on these are old names supported 871 /* first strcmp value on these are old names supported
899 * for compatibility reasons. The new values (second) are 872 * for compatibility reasons. The new values (second) are
900 * what really should be used. 873 * what really should be used.
901 */ 874 */
875 else if (!strcmp(key,"oid")) {
876 fp.get (m, atoi(value));
877 } else if (!strcmp(key, "attach")) {
878 m->attach = value;
902 else if (!strcmp(key,"hp") || !strcmp(key, "enter_x")) { 879 } else if (!strcmp(key,"hp") || !strcmp(key, "enter_x")) {
903 m->enter_x = atoi(value); 880 m->enter_x = atoi(value);
904 } else if (!strcmp(key,"sp") || !strcmp(key, "enter_y")) { 881 } else if (!strcmp(key,"sp") || !strcmp(key, "enter_y")) {
905 m->enter_y = atoi(value); 882 m->enter_y = atoi(value);
906 } else if (!strcmp(key,"x") || !strcmp(key, "width")) { 883 } else if (!strcmp(key,"x") || !strcmp(key, "width")) {
907 m->width = atoi(value); 884 m->width = atoi(value);
908 } else if (!strcmp(key,"y") || !strcmp(key, "height")) { 885 } else if (!strcmp(key,"y") || !strcmp(key, "height")) {
909 m->height = atoi(value); 886 m->height = atoi(value);
910 } else if (!strcmp(key,"weight") || !strcmp(key, "reset_timeout")) { 887 } else if (!strcmp(key,"weight") || !strcmp(key, "reset_timeout")) {
911 m->reset_timeout = atoi(value); 888 m->reset_timeout = atoi(value);
912 } else if (!strcmp(key,"value") || !strcmp(key, "swap_time")) { 889 } else if (!strcmp(key,"value") || !strcmp(key, "swap_time")) {
913 m->timeout = atoi(value); 890 m->timeout = atoi(value);
914 } else if (!strcmp(key,"level") || !strcmp(key, "difficulty")) { 891 } else if (!strcmp(key,"level") || !strcmp(key, "difficulty")) {
915 m->difficulty = atoi(value); 892 m->difficulty = atoi(value);
916 } else if (!strcmp(key,"invisible") || !strcmp(key, "darkness")) { 893 } else if (!strcmp(key,"invisible") || !strcmp(key, "darkness")) {
917 m->darkness = atoi(value); 894 m->darkness = atoi(value);
918 } else if (!strcmp(key,"stand_still") || !strcmp(key, "fixed_resettime")) { 895 } else if (!strcmp(key,"stand_still") || !strcmp(key, "fixed_resettime")) {
919 m->fixed_resettime = atoi(value); 896 m->fixed_resettime = atoi(value);
920 } else if (!strcmp(key,"unique")) { 897 } else if (!strcmp(key,"unique")) {
921 m->unique = atoi(value); 898 m->unique = atoi(value);
922 } else if (!strcmp(key,"template")) { 899 } else if (!strcmp(key,"template")) {
923 m->templatemap = atoi(value); 900 m->templatemap = atoi(value);
924 } else if (!strcmp(key,"region")) { 901 } else if (!strcmp(key,"region")) {
925 m->region = get_region_by_name(value); 902 m->region = get_region_by_name(value);
926 } else if (!strcmp(key,"shopitems")) { 903 } else if (!strcmp(key,"shopitems")) {
927 *end=0; 904 *end=0;
928 m->shopitems = parse_shop_string(value); 905 m->shopitems = parse_shop_string(value);
929 } else if (!strcmp(key,"shopgreed")) { 906 } else if (!strcmp(key,"shopgreed")) {
930 m->shopgreed = atof(value); 907 m->shopgreed = atof(value);
931 } else if (!strcmp(key,"shopmin")) { 908 } else if (!strcmp(key,"shopmin")) {
932 m->shopmin = atol(value); 909 m->shopmin = atol(value);
933 } else if (!strcmp(key,"shopmax")) { 910 } else if (!strcmp(key,"shopmax")) {
934 m->shopmax = atol(value); 911 m->shopmax = atol(value);
935 } else if (!strcmp(key,"shoprace")) { 912 } else if (!strcmp(key,"shoprace")) {
936 *end=0; 913 *end=0;
937 m->shoprace = strdup_local(value); 914 m->shoprace = strdup_local(value);
938 } else if (!strcmp(key,"outdoor")) { 915 } else if (!strcmp(key,"outdoor")) {
939 m->outdoor = atoi(value); 916 m->outdoor = atoi(value);
940 } else if (!strcmp(key, "temp")) { 917 } else if (!strcmp(key, "temp")) {
941 m->temp = atoi(value); 918 m->temp = atoi(value);
942 } else if (!strcmp(key, "pressure")) { 919 } else if (!strcmp(key, "pressure")) {
943 m->pressure = atoi(value); 920 m->pressure = atoi(value);
944 } else if (!strcmp(key, "humid")) { 921 } else if (!strcmp(key, "humid")) {
945 m->humid = atoi(value); 922 m->humid = atoi(value);
946 } else if (!strcmp(key, "windspeed")) { 923 } else if (!strcmp(key, "windspeed")) {
947 m->windspeed = atoi(value); 924 m->windspeed = atoi(value);
948 } else if (!strcmp(key, "winddir")) { 925 } else if (!strcmp(key, "winddir")) {
949 m->winddir = atoi(value); 926 m->winddir = atoi(value);
950 } else if (!strcmp(key, "sky")) { 927 } else if (!strcmp(key, "sky")) {
951 m->sky = atoi(value); 928 m->sky = atoi(value);
952 } else if (!strcmp(key, "nosmooth")) { 929 } else if (!strcmp(key, "nosmooth")) {
953 m->nosmooth = atoi(value); 930 m->nosmooth = atoi(value);
954 } else if (!strcmp(key, "safe_map")) { 931 }
955 m->safe_map = atoi(value);
956 }
957 else if (!strncmp(key,"tile_path_", 10)) { 932 else if (!strncmp(key,"tile_path_", 10)) {
958 int tile=atoi(key+10); 933 int tile=atoi(key+10);
959 934
960 if (tile<1 || tile>4) { 935 if (tile<1 || tile>4) {
961 LOG(llevError,"load_map_header: tile location %d out of bounds (%s)\n", 936 LOG(llevError,"load_map_header: tile location %d out of bounds (%s)\n",
962 tile, m->path); 937 tile, m->path);
963 } else { 938 } else {
964 char *path; 939 char *path;
965 940
966 *end = 0; 941 *end = 0;
967 942
968 if (m->tile_path[tile-1]) { 943 if (m->tile_path[tile-1]) {
969 LOG(llevError,"load_map_header: tile location %d duplicated (%s)\n", 944 LOG(llevError,"load_map_header: tile location %d duplicated (%s)\n",
970 tile, m->path); 945 tile, m->path);
971 free(m->tile_path[tile-1]); 946 free(m->tile_path[tile-1]);
972 m->tile_path[tile-1] = NULL; 947 m->tile_path[tile-1] = NULL;
973 } 948 }
974 949
975 if (check_path(value, 1) != -1) { 950 if (check_path(value, 1) != -1) {
976 /* The unadorned path works. */ 951 /* The unadorned path works. */
977 path = value; 952 path = value;
978 } else { 953 } else {
979 /* Try again; it could be a relative exit. */ 954 /* Try again; it could be a relative exit. */
980 955
981 path = path_combine_and_normalize(m->path, value); 956 path = path_combine_and_normalize(m->path, value);
982 957
983 if (check_path(path, 1) == -1) { 958 if (check_path(path, 1) == -1) {
984 LOG(llevError, "get_map_header: Bad tile path %s %s\n", m->path, value); 959 LOG(llevError, "get_map_header: Bad tile path %s %s\n", m->path, value);
985 path = NULL; 960 path = NULL;
986 } 961 }
987 } 962 }
988 963
989 if (editor) { 964 if (editor) {
990 /* Use the value as in the file. */ 965 /* Use the value as in the file. */
991 m->tile_path[tile-1] = strdup_local(value); 966 m->tile_path[tile-1] = strdup_local(value);
992 } else if (path != NULL) { 967 } else if (path != NULL) {
993 /* Use the normalized value. */ 968 /* Use the normalized value. */
994 m->tile_path[tile-1] = strdup_local(path); 969 m->tile_path[tile-1] = strdup_local(path);
995 } 970 }
996 } /* end if tile direction (in)valid */ 971 } /* end if tile direction (in)valid */
997 } 972 }
998 else { 973 else {
999 LOG(llevError,"Got unknown value in map header: %s %s\n", key, value); 974 LOG(llevError,"Got unknown value in map header: %s %s\n", key, value);
1000 } 975 }
1001 } 976 }
1002 if (!key || strcmp(key,"end")) { 977 if (!key || strcmp(key,"end")) {
1003 LOG(llevError,"Got premature eof on map header!\n"); 978 LOG(llevError,"Got premature eof on map header!\n");
1004 return 1; 979 return 1;
1005 } 980 }
1006 return 0; 981 return 0;
1007} 982}
1008 983
1009/* 984/*
… …
1013 * flags correspond to those in map.h. Main ones used are 988 * flags correspond to those in map.h. Main ones used are
1014 * MAP_PLAYER_UNIQUE, in which case we don't do any name changes, and 989 * MAP_PLAYER_UNIQUE, in which case we don't do any name changes, and
1015 * MAP_BLOCK, in which case we block on this load. This happens in all 990 * MAP_BLOCK, in which case we block on this load. This happens in all
1016 * cases, no matter if this flag is set or not. 991 * cases, no matter if this flag is set or not.
1017 * MAP_STYLE: style map - don't add active objects, don't add to server 992 * MAP_STYLE: style map - don't add active objects, don't add to server
1018 * managed map list. 993 * managed map list.
1019 */ 994 */
1020 995
1021mapstruct *load_original_map(const char *filename, int flags) { 996mapstruct *load_original_map(const char *filename, int flags) {
1022 FILE *fp;
1023 mapstruct *m; 997 mapstruct *m;
1024 int comp;
1025 char pathname[MAX_BUF]; 998 char pathname[MAX_BUF];
1026 999
1027 LOG(llevDebug, "load_original_map: %s (%x)\n", filename,flags);
1028 if (flags & MAP_PLAYER_UNIQUE) 1000 if (flags & MAP_PLAYER_UNIQUE)
1029 strcpy(pathname, filename); 1001 strcpy(pathname, filename);
1030 else if (flags & MAP_OVERLAY) 1002 else if (flags & MAP_OVERLAY)
1031 strcpy(pathname, create_overlay_pathname(filename)); 1003 strcpy(pathname, create_overlay_pathname(filename));
1032 else 1004 else
1033 strcpy(pathname, create_pathname(filename)); 1005 strcpy(pathname, create_pathname(filename));
1034 1006
1035 if((fp=open_and_uncompress(pathname, 0, &comp))==NULL) { 1007 LOG(llevDebug, "load_original_map(%x): %s (%s)\n", flags, filename, pathname);
1036 LOG(llevError, "Can't open %s: %s\n", pathname, strerror_local(errno)); 1008
1037 return (NULL); 1009 object_thawer thawer (pathname);
1038 } 1010
1011 if (!thawer)
1012 return 0;
1039 1013
1040 m = get_linked_map(); 1014 m = get_linked_map();
1041 1015
1042 strcpy (m->path, filename); 1016 strcpy (m->path, filename);
1043 if (load_map_header(fp, m)) { 1017 if (load_map_header(thawer, m)) {
1044 LOG(llevError,"Error loading map header for %s, flags=%d\n", 1018 LOG(llevError,"Error loading map header for %s, flags=%d\n",
1045 filename, flags); 1019 filename, flags);
1046 delete_map(m); 1020 delete_map(m);
1047 return NULL; 1021 return NULL;
1048 } 1022 }
1049 1023
1050 allocate_map(m); 1024 allocate_map(m);
1051 m->compressed = comp;
1052 1025
1053 m->in_memory=MAP_LOADING; 1026 m->in_memory=MAP_LOADING;
1054 load_objects (m, fp, flags & (MAP_BLOCK|MAP_STYLE)); 1027 load_objects (m, thawer, flags & (MAP_BLOCK|MAP_STYLE));
1055 close_and_delete(fp, comp); 1028
1056 m->in_memory=MAP_IN_MEMORY; 1029 m->in_memory=MAP_IN_MEMORY;
1057 if (!MAP_DIFFICULTY(m)) 1030 if (!MAP_DIFFICULTY(m))
1058 MAP_DIFFICULTY(m)=calculate_difficulty(m); 1031 MAP_DIFFICULTY(m)=calculate_difficulty(m);
1059 set_map_reset_time(m); 1032 set_map_reset_time(m);
1060 if (load_original_map_callback) 1033 m->instantiate ();
1061 load_original_map_callback(m);
1062 return (m); 1034 return (m);
1063} 1035}
1064 1036
1065/* 1037/*
1066 * Loads a map, which has been loaded earlier, from file. 1038 * Loads a map, which has been loaded earlier, from file.
1067 * Return the map object we load into (this can change from the passed 1039 * Return the map object we load into (this can change from the passed
1068 * option if we can't find the original map) 1040 * option if we can't find the original map)
1069 */ 1041 */
1070 1042
1071static mapstruct *load_temporary_map(mapstruct *m) { 1043static mapstruct *load_temporary_map(mapstruct *m) {
1072 FILE *fp;
1073 int comp; 1044 int comp;
1074 char buf[MAX_BUF]; 1045 char buf[MAX_BUF];
1075 1046
1076 if (!m->tmpname) { 1047 if (!m->tmpname) {
1077 LOG(llevError, "No temporary filename for map %s\n", m->path); 1048 LOG(llevError, "No temporary filename for map %s\n", m->path);
1078 strcpy(buf, m->path); 1049 strcpy(buf, m->path);
1079 delete_map(m); 1050 delete_map(m);
1080 m = load_original_map(buf, 0); 1051 m = load_original_map(buf, 0);
1081 if(m==NULL) return NULL; 1052 if(m==NULL) return NULL;
1082 fix_auto_apply(m); /* Chests which open as default */ 1053 fix_auto_apply(m); /* Chests which open as default */
1083 return m; 1054 return m;
1084 } 1055 }
1085 1056
1086 if((fp=open_and_uncompress(m->tmpname,0, &comp))==NULL) { 1057 object_thawer thawer (m->tmpname);
1087 LOG(llevError, "Cannot open %s: %s\n",m->tmpname, strerror_local(errno)); 1058
1059 if (!thawer)
1060 {
1088 strcpy(buf, m->path); 1061 strcpy (buf, m->path);
1089 delete_map(m); 1062 delete_map (m);
1090 m = load_original_map(buf, 0); 1063 m = load_original_map (buf, 0);
1091 if(m==NULL) return NULL; 1064 if (!m) return NULL;
1092 fix_auto_apply(m); /* Chests which open as default */ 1065 fix_auto_apply (m); /* Chests which open as default */
1093 return m; 1066 return m;
1094 } 1067 }
1095
1096 1068
1097 if (load_map_header(fp, m)) { 1069 if (load_map_header(thawer, m)) {
1098 LOG(llevError,"Error loading map header for %s (%s)\n", 1070 LOG(llevError,"Error loading map header for %s (%s)\n",
1099 m->path, m->tmpname); 1071 m->path, m->tmpname);
1100 delete_map(m); 1072 delete_map(m);
1101 m = load_original_map(m->path, 0); 1073 m = load_original_map(m->path, 0);
1102 return NULL; 1074 return NULL;
1103 } 1075 }
1104 m->compressed = comp;
1105 allocate_map(m); 1076 allocate_map(m);
1106 1077
1107 m->in_memory=MAP_LOADING; 1078 m->in_memory=MAP_LOADING;
1108 load_objects (m, fp, 0); 1079 load_objects (m, thawer, 0);
1109 close_and_delete(fp, comp); 1080
1110 m->in_memory=MAP_IN_MEMORY; 1081 m->in_memory=MAP_IN_MEMORY;
1111 if (load_temporary_map_callback) 1082 INVOKE_MAP (SWAPIN, m);
1112 load_temporary_map_callback(m);
1113 return m; 1083 return m;
1114} 1084}
1115 1085
1116/* 1086/*
1117 * Loads a map, which has been loaded earlier, from file. 1087 * Loads a map, which has been loaded earlier, from file.
1118 * Return the map object we load into (this can change from the passed 1088 * Return the map object we load into (this can change from the passed
1119 * option if we can't find the original map) 1089 * option if we can't find the original map)
1120 */ 1090 */
1121 1091
1122mapstruct *load_overlay_map(const char *filename, mapstruct *m) { 1092mapstruct *load_overlay_map(const char *filename, mapstruct *m) {
1123 FILE *fp;
1124 int comp;
1125 char pathname[MAX_BUF]; 1093 char pathname[MAX_BUF];
1126 1094
1127 strcpy(pathname, create_overlay_pathname(filename)); 1095 strcpy(pathname, create_overlay_pathname(filename));
1128 1096
1129 if((fp=open_and_uncompress(pathname, 0, &comp))==NULL) { 1097 object_thawer thawer (pathname);
1130/* LOG(llevDebug,"Can't open overlay %s\n", pathname);*/ 1098
1131 return m; 1099 if (!thawer)
1132 } 1100 return m;
1133 1101
1134 if (load_map_header(fp, m)) { 1102 if (load_map_header(thawer, m)) {
1135 LOG(llevError,"Error loading map header for overlay %s (%s)\n", 1103 LOG(llevError,"Error loading map header for overlay %s (%s)\n",
1136 m->path, pathname); 1104 m->path, pathname);
1137 delete_map(m); 1105 delete_map(m);
1138 m = load_original_map(m->path, 0); 1106 m = load_original_map(m->path, 0);
1139 return NULL; 1107 return NULL;
1140 } 1108 }
1141 m->compressed = comp;
1142 /*allocate_map(m);*/ 1109 /*allocate_map(m);*/
1143 1110
1144 m->in_memory=MAP_LOADING; 1111 m->in_memory=MAP_LOADING;
1145 load_objects (m, fp, MAP_OVERLAY); 1112 load_objects (m, thawer, MAP_OVERLAY);
1146 close_and_delete(fp, comp); 1113
1147 m->in_memory=MAP_IN_MEMORY; 1114 m->in_memory=MAP_IN_MEMORY;
1148 return m; 1115 return m;
1149} 1116}
1150 1117
1151/****************************************************************************** 1118/******************************************************************************
… …
1157{ 1124{
1158 int i,j,unique; 1125 int i,j,unique;
1159 object *op, *next; 1126 object *op, *next;
1160 1127
1161 for(i=0; i<MAP_WIDTH(m); i++) 1128 for(i=0; i<MAP_WIDTH(m); i++)
1162 for(j=0; j<MAP_HEIGHT(m); j++) { 1129 for(j=0; j<MAP_HEIGHT(m); j++) {
1163 unique=0; 1130 unique=0;
1164 for (op=get_map_ob(m, i, j); op; op=next) { 1131 for (op=get_map_ob(m, i, j); op; op=next) {
1165 next = op->above; 1132 next = op->above;
1166 if (QUERY_FLAG(op, FLAG_IS_FLOOR) && QUERY_FLAG(op, FLAG_UNIQUE)) 1133 if (QUERY_FLAG(op, FLAG_IS_FLOOR) && QUERY_FLAG(op, FLAG_UNIQUE))
1167 unique=1; 1134 unique=1;
1168 if(op->head == NULL && (QUERY_FLAG(op, FLAG_UNIQUE) || unique)) { 1135 if(op->head == NULL && (QUERY_FLAG(op, FLAG_UNIQUE) || unique)) {
1169 clean_object(op); 1136 clean_object(op);
1170 if (QUERY_FLAG(op, FLAG_IS_LINKED)) 1137 if (QUERY_FLAG(op, FLAG_IS_LINKED))
1171 remove_button_link(op); 1138 remove_button_link(op);
1172 remove_ob(op); 1139 remove_ob(op);
1173 free_object(op); 1140 free_object(op);
1174 } 1141 }
1175 } 1142 }
1176 } 1143 }
1177} 1144}
1178 1145
1179 1146
1180/* 1147/*
1181 * Loads unique objects from file(s) into the map which is in memory 1148 * Loads unique objects from file(s) into the map which is in memory
1182 * m is the map to load unique items into. 1149 * m is the map to load unique items into.
1183 */ 1150 */
1184static void load_unique_objects(mapstruct *m) { 1151static void load_unique_objects(mapstruct *m) {
1185 FILE *fp;
1186 int comp,count; 1152 int count;
1187 char firstname[MAX_BUF]; 1153 char firstname[MAX_BUF];
1188 1154
1189 for (count=0; count<10; count++) { 1155 for (count=0; count<10; count++) {
1190 sprintf(firstname, "%s.v%02d", create_items_path(m->path), count); 1156 sprintf(firstname, "%s.v%02d", create_items_path(m->path), count);
1191 if (!access(firstname, R_OK)) break; 1157 if (!access(firstname, R_OK)) break;
1192 } 1158 }
1193 /* If we get here, we did not find any map */ 1159 /* If we get here, we did not find any map */
1194 if (count==10) return; 1160 if (count==10) return;
1195 1161
1196 if ((fp=open_and_uncompress(firstname, 0, &comp))==NULL) { 1162 object_thawer thawer (firstname);
1197 /* There is no expectation that every map will have unique items, but this 1163
1198 * is debug output, so leave it in. 1164 if (!thawer)
1199 */ 1165 return;
1200 LOG(llevDebug, "Can't open unique items file for %s\n", create_items_path(m->path));
1201 return;
1202 }
1203 1166
1204 m->in_memory=MAP_LOADING; 1167 m->in_memory=MAP_LOADING;
1205 if (m->tmpname == NULL) /* if we have loaded unique items from */ 1168 if (m->tmpname == NULL) /* if we have loaded unique items from */
1206 delete_unique_items(m); /* original map before, don't duplicate them */ 1169 delete_unique_items(m); /* original map before, don't duplicate them */
1207 load_object(fp, NULL, LO_NOREAD,0);
1208 load_objects (m, fp, 0); 1170 load_objects (m, thawer, 0);
1209 close_and_delete(fp, comp); 1171
1210 m->in_memory=MAP_IN_MEMORY; 1172 m->in_memory=MAP_IN_MEMORY;
1211} 1173}
1212 1174
1213 1175
1214/* 1176/*
… …
1218 * The temporary filename will be stored in the mapstructure. 1180 * The temporary filename will be stored in the mapstructure.
1219 * If the map is unique, we also save to the filename in the map 1181 * If the map is unique, we also save to the filename in the map
1220 * (this should have been updated when first loaded) 1182 * (this should have been updated when first loaded)
1221 */ 1183 */
1222 1184
1185int
1223int new_save_map(mapstruct *m, int flag) { 1186new_save_map (mapstruct * m, int flag)
1224 FILE *fp, *fp2; 1187{
1225 char filename[MAX_BUF],buf[MAX_BUF], buf_s[MAX_BUF], 1188 char filename[MAX_BUF], buf[MAX_BUF], buf_s[MAX_BUF], shop[MAX_BUF];
1226 shop[MAX_BUF], filename_s[MAX_BUF];
1227 int i; 1189 int i;
1228 1190
1229 if (flag && !*m->path) { 1191 if (flag && !*m->path)
1192 {
1230 LOG(llevError,"Tried to save map without path.\n"); 1193 LOG (llevError, "Tried to save map without path.\n");
1231 return -1; 1194 return -1;
1232 }
1233 1195 }
1196
1234 if (flag || (m->unique) || (m->templatemap)) { 1197 if (flag || (m->unique) || (m->templatemap))
1235 if (!m->unique && !m->templatemap) { /* flag is set */ 1198 {
1199 if (!m->unique && !m->templatemap)
1200 { /* flag is set */
1236 if (flag == 2) 1201 if (flag == 2)
1237 strcpy(filename, create_overlay_pathname(m->path)); 1202 strcpy (filename, create_overlay_pathname (m->path));
1238 else 1203 else
1239 strcpy (filename, create_pathname (m->path)); 1204 strcpy (filename, create_pathname (m->path));
1240 } else 1205 }
1206 else
1241 strcpy (filename, m->path); 1207 strcpy (filename, m->path);
1242 1208
1243 /* If the compression suffix already exists on the filename, don't
1244 * put it on again. This nasty looking strcmp checks to see if the
1245 * compression suffix is at the end of the filename already.
1246 */
1247 if (m->compressed &&
1248 strcmp((filename + strlen(filename)-strlen(uncomp[m->compressed][0])),
1249 uncomp[m->compressed][0]))
1250 strcat(filename, uncomp[m->compressed][0]);
1251 make_path_to_file(filename); 1209 make_path_to_file (filename);
1252 } else { 1210 }
1211 else
1212 {
1253 if (!m->tmpname) 1213 if (!m->tmpname)
1254 m->tmpname = tempnam_local(settings.tmpdir,NULL); 1214 m->tmpname = tempnam_local (settings.tmpdir, NULL);
1215
1255 strcpy(filename, m->tmpname); 1216 strcpy (filename, m->tmpname);
1256 } 1217 }
1218
1257 LOG(llevDebug,"Saving map %s to %s\n", m->path, filename); 1219 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename);
1258 m->in_memory = MAP_SAVING; 1220 m->in_memory = MAP_SAVING;
1259 1221
1260 sprintf (filename_s, "%s~", filename); 1222 object_freezer freezer;
1261 1223
1262 /* Compress if it isn't a temporary save. Do compress if unique */
1263 if (m->compressed && (m->unique || m->templatemap || flag)) {
1264 char buf[MAX_BUF];
1265 strcpy(buf, uncomp[m->compressed][2]);
1266 strcat(buf, " > ");
1267 strcat(buf, filename_s);
1268 fp = popen(buf, "w");
1269 } else
1270 fp = fopen(filename_s, "w");
1271
1272 if(fp == NULL) {
1273 LOG(llevError, "Cannot write %s: %s\n", filename_s, strerror_local(errno));
1274 return -1;
1275 }
1276
1277 /* legacy */ 1224 /* legacy */
1278 fprintf(fp,"arch map\n"); 1225 fprintf (freezer, "arch map\n");
1226 if (m->name)
1279 if (m->name) fprintf(fp,"name %s\n", m->name); 1227 fprintf (freezer, "name %s\n", m->name);
1228 if (!flag)
1280 if (!flag) fprintf(fp,"swap_time %d\n", m->swap_time); 1229 fprintf (freezer, "swap_time %d\n", m->swap_time);
1230 if (m->reset_timeout)
1281 if (m->reset_timeout) fprintf(fp,"reset_timeout %d\n", m->reset_timeout); 1231 fprintf (freezer, "reset_timeout %d\n", m->reset_timeout);
1232 if (m->fixed_resettime)
1282 if (m->fixed_resettime) fprintf(fp,"fixed_resettime %d\n", m->fixed_resettime); 1233 fprintf (freezer, "fixed_resettime %d\n", m->fixed_resettime);
1283 /* we unfortunately have no idea if this is a value the creator set 1234 /* we unfortunately have no idea if this is a value the creator set
1284 * or a difficulty value we generated when the map was first loaded 1235 * or a difficulty value we generated when the map was first loaded
1285 */ 1236 */
1237 if (m->difficulty)
1286 if (m->difficulty) fprintf(fp,"difficulty %d\n", m->difficulty); 1238 fprintf (freezer, "difficulty %d\n", m->difficulty);
1239 if (m->region)
1287 if (m->region) fprintf(fp,"region %s\n", m->region->name); 1240 fprintf (freezer, "region %s\n", m->region->name);
1288 if (m->shopitems) { 1241 if (m->shopitems)
1242 {
1289 print_shop_string(m, shop); 1243 print_shop_string (m, shop);
1290 fprintf(fp,"shopitems %s\n", shop); 1244 fprintf (freezer, "shopitems %s\n", shop);
1291 } 1245 }
1246 if (m->shopgreed)
1292 if (m->shopgreed) fprintf(fp,"shopgreed %f\n", m->shopgreed); 1247 fprintf (freezer, "shopgreed %f\n", m->shopgreed);
1293#ifndef WIN32 1248#ifndef WIN32
1249 if (m->shopmin)
1294 if (m->shopmin) fprintf(fp,"shopmin %llu\n", m->shopmin); 1250 fprintf (freezer, "shopmin %llu\n", m->shopmin);
1251 if (m->shopmax)
1295 if (m->shopmax) fprintf(fp,"shopmax %llu\n", m->shopmax); 1252 fprintf (freezer, "shopmax %llu\n", m->shopmax);
1296#else 1253#else
1254 if (m->shopmin)
1297 if (m->shopmin) fprintf(fp,"shopmin %I64u\n", m->shopmin); 1255 fprintf (freezer, "shopmin %I64u\n", m->shopmin);
1256 if (m->shopmax)
1298 if (m->shopmax) fprintf(fp,"shopmax %I64u\n", m->shopmax); 1257 fprintf (freezer, "shopmax %I64u\n", m->shopmax);
1299#endif 1258#endif
1259 if (m->shoprace)
1300 if (m->shoprace) fprintf(fp,"shoprace %s\n", m->shoprace); 1260 fprintf (freezer, "shoprace %s\n", m->shoprace);
1261 if (m->darkness)
1301 if (m->darkness) fprintf(fp,"darkness %d\n", m->darkness); 1262 fprintf (freezer, "darkness %d\n", m->darkness);
1263 if (m->width)
1302 if (m->width) fprintf(fp,"width %d\n", m->width); 1264 fprintf (freezer, "width %d\n", m->width);
1265 if (m->height)
1303 if (m->height) fprintf(fp,"height %d\n", m->height); 1266 fprintf (freezer, "height %d\n", m->height);
1267 if (m->enter_x)
1304 if (m->enter_x) fprintf(fp,"enter_x %d\n", m->enter_x); 1268 fprintf (freezer, "enter_x %d\n", m->enter_x);
1269 if (m->enter_y)
1305 if (m->enter_y) fprintf(fp,"enter_y %d\n", m->enter_y); 1270 fprintf (freezer, "enter_y %d\n", m->enter_y);
1271 if (m->msg)
1306 if (m->msg) fprintf(fp,"msg\n%sendmsg\n", m->msg); 1272 fprintf (freezer, "msg\n%sendmsg\n", m->msg);
1273 if (m->maplore)
1307 if (m->maplore) fprintf(fp,"maplore\n%sendmaplore\n", m->maplore); 1274 fprintf (freezer, "maplore\n%sendmaplore\n", m->maplore);
1275 if (m->unique)
1308 if (m->unique) fprintf(fp,"unique %d\n", m->unique); 1276 fprintf (freezer, "unique %d\n", m->unique);
1277 if (m->templatemap)
1309 if (m->templatemap) fprintf(fp,"template %d\n", m->templatemap); 1278 fprintf (freezer, "template %d\n", m->templatemap);
1279 if (m->outdoor)
1310 if (m->outdoor) fprintf(fp,"outdoor %d\n", m->outdoor); 1280 fprintf (freezer, "outdoor %d\n", m->outdoor);
1281 if (m->temp)
1311 if (m->temp) fprintf(fp, "temp %d\n", m->temp); 1282 fprintf (freezer, "temp %d\n", m->temp);
1283 if (m->pressure)
1312 if (m->pressure) fprintf(fp, "pressure %d\n", m->pressure); 1284 fprintf (freezer, "pressure %d\n", m->pressure);
1285 if (m->humid)
1313 if (m->humid) fprintf(fp, "humid %d\n", m->humid); 1286 fprintf (freezer, "humid %d\n", m->humid);
1287 if (m->windspeed)
1314 if (m->windspeed) fprintf(fp, "windspeed %d\n", m->windspeed); 1288 fprintf (freezer, "windspeed %d\n", m->windspeed);
1289 if (m->winddir)
1315 if (m->winddir) fprintf(fp, "winddir %d\n", m->winddir); 1290 fprintf (freezer, "winddir %d\n", m->winddir);
1291 if (m->sky)
1316 if (m->sky) fprintf(fp, "sky %d\n", m->sky); 1292 fprintf (freezer, "sky %d\n", m->sky);
1293 if (m->nosmooth)
1317 if (m->nosmooth) fprintf(fp, "nosmooth %d\n", m->nosmooth); 1294 fprintf (freezer, "nosmooth %d\n", m->nosmooth);
1318 if (m->safe_map) fprintf(fp, "safe_map %d\n", m->safe_map);
1319 1295
1320 /* Save any tiling information, except on overlays */ 1296 /* Save any tiling information, except on overlays */
1321 if (flag != 2) 1297 if (flag != 2)
1322 for (i=0; i<4; i++) 1298 for (i = 0; i < 4; i++)
1323 if (m->tile_path[i]) 1299 if (m->tile_path[i])
1324 fprintf(fp,"tile_path_%d %s\n", i+1, m->tile_path[i]); 1300 fprintf (freezer, "tile_path_%d %s\n", i + 1, m->tile_path[i]);
1325 1301
1302 freezer.put (m);
1326 fprintf(fp,"end\n"); 1303 fprintf (freezer, "end\n");
1327 1304
1328 /* In the game save unique items in the different file, but 1305 /* In the game save unique items in the different file, but
1329 * in the editor save them to the normal map file. 1306 * in the editor save them to the normal map file.
1330 * If unique map, save files in the proper destination (set by 1307 * If unique map, save files in the proper destination (set by
1331 * player) 1308 * player)
1332 */ 1309 */
1333 if ((flag == 0 || flag == 2) && !m->unique && !m->templatemap) { 1310 if ((flag == 0 || flag == 2) && !m->unique && !m->templatemap)
1311 {
1312 object_freezer unique;
1313
1314 if (flag == 2)
1315 save_objects (m, freezer, unique, 2);
1316 else
1317 save_objects (m, freezer, unique, 0);
1318
1334 sprintf (buf,"%s.v00",create_items_path (m->path)); 1319 sprintf (buf, "%s.v00", create_items_path (m->path));
1335 sprintf (buf_s, "%s~", buf); 1320
1336 if ((fp2 = fopen (buf_s, "w")) == NULL) { 1321 unique.save (buf);
1337 LOG(llevError, "Can't open unique items file %s\n", buf_s);
1338 }
1339 if (flag == 2)
1340 save_objects(m, fp, fp2, 2);
1341 else
1342 save_objects (m, fp, fp2, 0);
1343 if (fp2 != NULL) {
1344 if (ftell (fp2) == 0) {
1345 fclose (fp2);
1346 rename (buf_s, buf);
1347 unlink (buf);
1348 } else {
1349 fclose (fp2);
1350 rename (buf_s, buf);
1351 chmod (buf, SAVE_MODE);
1352 } 1322 }
1353 }
1354 } else { /* save same file when not playing, like in editor */
1355 save_objects(m, fp, fp, 0);
1356 }
1357
1358 if (m->compressed && (m->unique || m->templatemap || flag))
1359 pclose(fp);
1360 else 1323 else
1361 fclose(fp); 1324 { /* save same file when not playing, like in editor */
1325 save_objects (m, freezer, freezer, 0);
1326 }
1362 1327
1363 rename (filename_s, filename); 1328 freezer.save (filename);
1364 1329
1365 chmod (filename, SAVE_MODE);
1366 return 0; 1330 return 0;
1367} 1331}
1368 1332
1369 1333
1370/* 1334/*
1371 * Remove and free all objects in the inventory of the given object. 1335 * Remove and free all objects in the inventory of the given object.
… …
1376{ 1340{
1377 object *tmp, *next; 1341 object *tmp, *next;
1378 1342
1379 for(tmp = op->inv; tmp; tmp = next) 1343 for(tmp = op->inv; tmp; tmp = next)
1380 { 1344 {
1381 next = tmp->below; 1345 next = tmp->below;
1382 clean_object(tmp); 1346 clean_object(tmp);
1383 if (QUERY_FLAG(tmp, FLAG_IS_LINKED)) 1347 if (QUERY_FLAG(tmp, FLAG_IS_LINKED))
1384 remove_button_link(tmp); 1348 remove_button_link(tmp);
1385 remove_ob(tmp); 1349 remove_ob(tmp);
1386 free_object(tmp); 1350 free_object(tmp);
1387 } 1351 }
1388} 1352}
1389 1353
1390/* 1354/*
1391 * Remove and free all objects in the given map. 1355 * Remove and free all objects in the given map.
… …
1394void free_all_objects(mapstruct *m) { 1358void free_all_objects(mapstruct *m) {
1395 int i,j; 1359 int i,j;
1396 object *op; 1360 object *op;
1397 1361
1398 for(i=0;i<MAP_WIDTH(m);i++) 1362 for(i=0;i<MAP_WIDTH(m);i++)
1399 for(j=0;j<MAP_HEIGHT(m);j++) { 1363 for(j=0;j<MAP_HEIGHT(m);j++) {
1400 object *previous_obj=NULL; 1364 object *previous_obj=NULL;
1401 while((op=GET_MAP_OB(m,i,j))!=NULL) { 1365 while((op=GET_MAP_OB(m,i,j))!=NULL) {
1402 if (op==previous_obj) { 1366 if (op==previous_obj) {
1403 LOG(llevDebug, "free_all_objects: Link error, bailing out.\n"); 1367 LOG(llevDebug, "free_all_objects: Link error, bailing out.\n");
1404 break; 1368 break;
1405 } 1369 }
1406 previous_obj=op; 1370 previous_obj=op;
1407 if(op->head!=NULL) 1371 if(op->head!=NULL)
1408 op = op->head; 1372 op = op->head;
1409 1373
1410 /* If the map isn't in memory, free_object will remove and 1374 /* If the map isn't in memory, free_object will remove and
1411 * free objects in op's inventory. So let it do the job. 1375 * free objects in op's inventory. So let it do the job.
1412 */ 1376 */
1413 if (m->in_memory==MAP_IN_MEMORY) 1377 if (m->in_memory==MAP_IN_MEMORY)
1414 clean_object(op); 1378 clean_object(op);
1415 remove_ob(op); 1379 remove_ob(op);
1416 free_object(op); 1380 free_object(op);
1417 } 1381 }
1418 } 1382 }
1419#ifdef MANY_CORES
1420 /* I see periodic cores on metalforge where a map has been swapped out, but apparantly
1421 * an item on that map was not saved - look for that condition and die as appropriate -
1422 * this leaves more of the map data intact for better debugging.
1423 */
1424 for (op=objects; op!=NULL; op=op->next) {
1425 if (!QUERY_FLAG(op, FLAG_REMOVED) && op->map == m) {
1426 LOG(llevDebug,"free_all_objects: object %s still on map after it should have been freed\n", op->name);
1427 abort();
1428 }
1429 }
1430#endif
1431} 1383}
1432 1384
1433/* 1385/*
1434 * Frees everything allocated by the given mapstructure. 1386 * Frees everything allocated by the given mapstructure.
1435 * don't free tmpname - our caller is left to do that 1387 * don't free tmpname - our caller is left to do that
… …
1437 1389
1438void free_map(mapstruct *m,int flag) { 1390void free_map(mapstruct *m,int flag) {
1439 int i; 1391 int i;
1440 1392
1441 if (!m->in_memory) { 1393 if (!m->in_memory) {
1442 LOG(llevError,"Trying to free freed map.\n"); 1394 LOG(llevError,"Trying to free freed map.\n");
1443 return; 1395 return;
1444 } 1396 }
1445 if (flag && m->spaces) free_all_objects(m); 1397 if (flag && m->spaces) free_all_objects(m);
1446 if (m->name) FREE_AND_CLEAR(m->name); 1398 if (m->name) FREE_AND_CLEAR(m->name);
1447 if (m->spaces) FREE_AND_CLEAR(m->spaces); 1399 if (m->spaces) FREE_AND_CLEAR(m->spaces);
1448 if (m->msg) FREE_AND_CLEAR(m->msg); 1400 if (m->msg) FREE_AND_CLEAR(m->msg);
1449 if (m->maplore) FREE_AND_CLEAR(m->maplore); 1401 if (m->maplore) FREE_AND_CLEAR(m->maplore);
1450 if (m->shopitems) FREE_AND_CLEAR(m->shopitems); 1402 if (m->shopitems) FREE_AND_CLEAR(m->shopitems);
1451 if (m->shoprace) FREE_AND_CLEAR(m->shoprace); 1403 if (m->shoprace) FREE_AND_CLEAR(m->shoprace);
1452 if (m->buttons) 1404 if (m->buttons)
1453 free_objectlinkpt(m->buttons); 1405 free_objectlinkpt(m->buttons);
1454 m->buttons = NULL; 1406 m->buttons = NULL;
1455 for (i=0; i<4; i++) { 1407 for (i=0; i<4; i++) {
1456 if (m->tile_path[i]) FREE_AND_CLEAR(m->tile_path[i]); 1408 if (m->tile_path[i]) FREE_AND_CLEAR(m->tile_path[i]);
1457 m->tile_map[i] = NULL; 1409 m->tile_map[i] = NULL;
1458 } 1410 }
1459 m->in_memory = MAP_SWAPPED; 1411 m->in_memory = MAP_SWAPPED;
1460} 1412}
1461 1413
1462/* 1414/*
… …
1470 mapstruct *tmp, *last; 1422 mapstruct *tmp, *last;
1471 int i; 1423 int i;
1472 1424
1473 if (!m) 1425 if (!m)
1474 return; 1426 return;
1427
1428 m->clear ();
1429
1475 if (m->in_memory == MAP_IN_MEMORY) { 1430 if (m->in_memory == MAP_IN_MEMORY) {
1476 /* change to MAP_SAVING, even though we are not, 1431 /* change to MAP_SAVING, even though we are not,
1477 * so that remove_ob doesn't do as much work. 1432 * so that remove_ob doesn't do as much work.
1478 */ 1433 */
1479 m->in_memory = MAP_SAVING; 1434 m->in_memory = MAP_SAVING;
1480 free_map (m, 1); 1435 free_map (m, 1);
1481 } 1436 }
1482 /* move this out of free_map, since tmpname can still be needed if 1437 /* move this out of free_map, since tmpname can still be needed if
1483 * the map is swapped out. 1438 * the map is swapped out.
1484 */ 1439 */
1485 if (m->tmpname) { 1440 if (m->tmpname) {
1486 free(m->tmpname); 1441 free(m->tmpname);
1487 m->tmpname=NULL; 1442 m->tmpname=NULL;
1488 } 1443 }
1489 last = NULL; 1444 last = NULL;
1490 /* We need to look through all the maps and see if any maps 1445 /* We need to look through all the maps and see if any maps
1491 * are pointing at this one for tiling information. Since 1446 * are pointing at this one for tiling information. Since
1492 * tiling can be assymetric, we just can not look to see which 1447 * tiling can be assymetric, we just can not look to see which
1493 * maps this map tiles with and clears those. 1448 * maps this map tiles with and clears those.
1494 */ 1449 */
1495 for (tmp = first_map; tmp != NULL; tmp = tmp->next) { 1450 for (tmp = first_map; tmp != NULL; tmp = tmp->next) {
1496 if (tmp->next == m) last = tmp; 1451 if (tmp->next == m) last = tmp;
1497 1452
1498 /* This should hopefully get unrolled on a decent compiler */ 1453 /* This should hopefully get unrolled on a decent compiler */
1499 for (i=0; i<4; i++) 1454 for (i=0; i<4; i++)
1500 if (tmp->tile_map[i] == m) tmp->tile_map[i]=NULL; 1455 if (tmp->tile_map[i] == m) tmp->tile_map[i]=NULL;
1501 } 1456 }
1502 1457
1503 /* If last is null, then this should be the first map in the list */ 1458 /* If last is null, then this should be the first map in the list */
1504 if (!last) { 1459 if (!last) {
1505 if (m == first_map) 1460 if (m == first_map)
1506 first_map = m->next; 1461 first_map = m->next;
1507 else 1462 else
1508 /* m->path is a static char, so should hopefully still have 1463 /* m->path is a static char, so should hopefully still have
1509 * some useful data in it. 1464 * some useful data in it.
1510 */ 1465 */
1511 LOG(llevError,"delete_map: Unable to find map %s in list\n", 1466 LOG(llevError,"delete_map: Unable to find map %s in list\n",
1512 m->path); 1467 m->path);
1513 } 1468 }
1514 else 1469 else
1515 last->next = m->next; 1470 last->next = m->next;
1516 1471
1517 free (m); 1472 delete m;
1518} 1473}
1519 1474
1520 1475
1521 1476
1522/* 1477/*
… …
1540 /* Have we been at this level before? */ 1495 /* Have we been at this level before? */
1541 m = has_been_loaded (name); 1496 m = has_been_loaded (name);
1542 1497
1543 /* Map is good to go, so just return it */ 1498 /* Map is good to go, so just return it */
1544 if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY)) { 1499 if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY)) {
1545 return m; 1500 return m;
1546 } 1501 }
1547 1502
1548 /* unique maps always get loaded from their original location, and never 1503 /* unique maps always get loaded from their original location, and never
1549 * a temp location. Likewise, if map_flush is set, or we have never loaded 1504 * a temp location. Likewise, if map_flush is set, or we have never loaded
1550 * this map, load it now. I removed the reset checking from here - 1505 * this map, load it now. I removed the reset checking from here -
… …
1553 * a bit cleaner (and players probably shouldn't rely on exact timing for 1508 * a bit cleaner (and players probably shouldn't rely on exact timing for
1554 * resets in any case - if they really care, they should use the 'maps command. 1509 * resets in any case - if they really care, they should use the 'maps command.
1555 */ 1510 */
1556 if ((flags & (MAP_FLUSH|MAP_PLAYER_UNIQUE)) || !m) { 1511 if ((flags & (MAP_FLUSH|MAP_PLAYER_UNIQUE)) || !m) {
1557 1512
1558 /* first visit or time to reset */ 1513 /* first visit or time to reset */
1559 if (m) { 1514 if (m) {
1560 clean_tmp_map(m); /* Doesn't make much difference */ 1515 clean_tmp_map(m); /* Doesn't make much difference */
1561 delete_map(m); 1516 delete_map(m);
1562 } 1517 }
1563 1518
1564 /* create and load a map */ 1519 /* create and load a map */
1565 if (flags & MAP_PLAYER_UNIQUE) 1520 if (flags & MAP_PLAYER_UNIQUE)
1566 LOG(llevDebug, "Trying to load map %s.\n", name); 1521 LOG(llevDebug, "Trying to load map %s.\n", name);
1567 else 1522 else
1568 LOG(llevDebug, "Trying to load map %s.\n", create_pathname(name)); 1523 LOG(llevDebug, "Trying to load map %s.\n", create_pathname(name));
1569 1524
1525 //0.427459955215454 /var/crossfire/players/Saladon/_scorn_apartment_apartments
1526 //0.414906024932861
1527 //0.427063941955566
1528 eval_pv ("$x = Event::time", 1);//D
1570 if (!(m = load_original_map(name, (flags & MAP_PLAYER_UNIQUE)))) 1529 if (!(m = load_original_map(name, (flags & MAP_PLAYER_UNIQUE))))
1571 return (NULL); 1530 return (NULL);
1531 eval_pv ("warn \"LOAD \", Event::time - $x", 1);//D
1572 1532
1573 fix_auto_apply(m); /* Chests which open as default */ 1533 fix_auto_apply(m); /* Chests which open as default */
1574 1534
1575 /* If a player unique map, no extra unique object file to load. 1535 /* If a player unique map, no extra unique object file to load.
1576 * if from the editor, likewise. 1536 * if from the editor, likewise.
1577 */ 1537 */
1578 if (! (flags & (MAP_FLUSH|MAP_PLAYER_UNIQUE))) 1538 if (! (flags & (MAP_FLUSH|MAP_PLAYER_UNIQUE)))
1579 load_unique_objects(m); 1539 load_unique_objects(m);
1580 1540
1581 if (! (flags & (MAP_FLUSH|MAP_PLAYER_UNIQUE|MAP_OVERLAY))) { 1541 if (! (flags & (MAP_FLUSH|MAP_PLAYER_UNIQUE|MAP_OVERLAY))) {
1582 m=load_overlay_map(name, m); 1542 m=load_overlay_map(name, m);
1583 if (m==NULL) 1543 if (m==NULL)
1584 return NULL; 1544 return NULL;
1585 } 1545 }
1546
1547 if (flags & MAP_PLAYER_UNIQUE)
1548 INVOKE_MAP (SWAPIN, m);
1586 1549
1587 } else { 1550 } else {
1588 /* If in this loop, we found a temporary map, so load it up. */ 1551 /* If in this loop, we found a temporary map, so load it up. */
1589 1552
1590 m=load_temporary_map (m); 1553 m=load_temporary_map (m);
1591 if(m==NULL) return NULL; 1554 if(m==NULL) return NULL;
1592 load_unique_objects(m); 1555 load_unique_objects(m);
1593 1556
1594 clean_tmp_map(m); 1557 clean_tmp_map(m);
1595 m->in_memory = MAP_IN_MEMORY; 1558 m->in_memory = MAP_IN_MEMORY;
1596 /* tempnam() on sun systems (probably others) uses malloc 1559 /* tempnam() on sun systems (probably others) uses malloc
1597 * to allocated space for the string. Free it here. 1560 * to allocated space for the string. Free it here.
1598 * In some cases, load_temporary_map above won't find the 1561 * In some cases, load_temporary_map above won't find the
1599 * temporary map, and so has reloaded a new map. If that 1562 * temporary map, and so has reloaded a new map. If that
1600 * is the case, tmpname is now null 1563 * is the case, tmpname is now null
1601 */ 1564 */
1602 if (m->tmpname) free(m->tmpname); 1565 if (m->tmpname) free(m->tmpname);
1603 m->tmpname = NULL; 1566 m->tmpname = NULL;
1604 /* It's going to be saved anew anyway */ 1567 /* It's going to be saved anew anyway */
1605 } 1568 }
1606 1569
1607 /* Below here is stuff common to both first time loaded maps and 1570 /* Below here is stuff common to both first time loaded maps and
1608 * temp maps. 1571 * temp maps.
1609 */ 1572 */
1610 1573
1611 decay_objects(m); /* start the decay */ 1574 decay_objects(m); /* start the decay */
1612 /* In case other objects press some buttons down */ 1575 /* In case other objects press some buttons down */
1613 update_buttons(m); 1576 update_buttons(m);
1614 if (m->outdoor) 1577 if (m->outdoor)
1615 set_darkness_map(m); 1578 set_darkness_map(m);
1616 /* run the weather over this map */ 1579 /* run the weather over this map */
1617 weather_effect(name); 1580 weather_effect(name);
1618 return m; 1581 return m;
1619} 1582}
1620 1583
… …
1680 return 1; 1643 return 1;
1681} 1644}
1682 1645
1683void clean_tmp_map(mapstruct *m) { 1646void clean_tmp_map(mapstruct *m) {
1684 if(m->tmpname == NULL) 1647 if(m->tmpname == NULL)
1685 return; 1648 return;
1686 if (clean_temporary_map_callback) 1649 INVOKE_MAP (CLEAN, m);
1687 clean_temporary_map_callback (m);
1688 (void) unlink(m->tmpname); 1650 (void) unlink(m->tmpname);
1689} 1651}
1690 1652
1691void free_all_maps(void) 1653void free_all_maps(void)
1692{ 1654{
1693 int real_maps=0; 1655 int real_maps=0;
1694 1656
1695 while (first_map) { 1657 while (first_map) {
1696 /* I think some of the callers above before it gets here set this to be 1658 /* I think some of the callers above before it gets here set this to be
1697 * saving, but we still want to free this data 1659 * saving, but we still want to free this data
1698 */ 1660 */
1699 if (first_map->in_memory == MAP_SAVING) first_map->in_memory = MAP_IN_MEMORY; 1661 if (first_map->in_memory == MAP_SAVING) first_map->in_memory = MAP_IN_MEMORY;
1700 delete_map(first_map); 1662 delete_map(first_map);
1701 real_maps++; 1663 real_maps++;
1702 } 1664 }
1703 LOG(llevDebug,"free_all_maps: Freed %d maps\n", real_maps); 1665 LOG(llevDebug,"free_all_maps: Freed %d maps\n", real_maps);
1704} 1666}
1705 1667
1706/* change_map_light() - used to change map light level (darkness) 1668/* change_map_light() - used to change map light level (darkness)
… …
1720 return 0; 1682 return 0;
1721 } 1683 }
1722 1684
1723 /* inform all players on the map */ 1685 /* inform all players on the map */
1724 if (change>0) 1686 if (change>0)
1725 new_info_map(NDI_BLACK|NDI_UNIQUE, m,"It becomes darker."); 1687 new_info_map(NDI_BLACK|NDI_UNIQUE, m,"It becomes darker.");
1726 else 1688 else
1727 new_info_map(NDI_BLACK|NDI_UNIQUE, m,"It becomes brighter."); 1689 new_info_map(NDI_BLACK|NDI_UNIQUE, m,"It becomes brighter.");
1728 1690
1729 /* Do extra checking. since m->darkness is a unsigned value, 1691 /* Do extra checking. since m->darkness is a unsigned value,
1730 * we need to be extra careful about negative values. 1692 * we need to be extra careful about negative values.
1731 * In general, the checks below are only needed if change 1693 * In general, the checks below are only needed if change
1732 * is not +/-1 1694 * is not +/-1
… …
1750void update_position (mapstruct *m, int x, int y) { 1712void update_position (mapstruct *m, int x, int y) {
1751 object *tmp, *last = NULL; 1713 object *tmp, *last = NULL;
1752 uint8 flags = 0, oldflags, light=0, anywhere=0; 1714 uint8 flags = 0, oldflags, light=0, anywhere=0;
1753 New_Face *top,*floor, *middle; 1715 New_Face *top,*floor, *middle;
1754 object *top_obj, *floor_obj, *middle_obj; 1716 object *top_obj, *floor_obj, *middle_obj;
1755 MoveType move_block=0, move_slow=0, move_on=0, move_off=0, move_allow=0; 1717 MoveType move_block=0, move_slow=0, move_on=0, move_off=0, move_allow=0;
1756 1718
1757 oldflags = GET_MAP_FLAGS(m,x,y); 1719 oldflags = GET_MAP_FLAGS(m,x,y);
1758 if (!(oldflags & P_NEED_UPDATE)) { 1720 if (!(oldflags & P_NEED_UPDATE)) {
1759 LOG(llevDebug,"update_position called with P_NEED_UPDATE not set: %s (%d, %d)\n", 1721 LOG(llevDebug,"update_position called with P_NEED_UPDATE not set: %s (%d, %d)\n",
1760 m->path, x, y); 1722 m->path, x, y);
1761 return; 1723 return;
1762 } 1724 }
1763 1725
1764 middle=blank_face; 1726 middle=blank_face;
1765 top=blank_face; 1727 top=blank_face;
1766 floor=blank_face; 1728 floor=blank_face;
… …
1769 top_obj = NULL; 1731 top_obj = NULL;
1770 floor_obj = NULL; 1732 floor_obj = NULL;
1771 1733
1772 for (tmp = get_map_ob (m, x, y); tmp; last = tmp, tmp = tmp->above) { 1734 for (tmp = get_map_ob (m, x, y); tmp; last = tmp, tmp = tmp->above) {
1773 1735
1774 /* This could be made additive I guess (two lights better than 1736 /* This could be made additive I guess (two lights better than
1775 * one). But if so, it shouldn't be a simple additive - 2 1737 * one). But if so, it shouldn't be a simple additive - 2
1776 * light bulbs do not illuminate twice as far as once since 1738 * light bulbs do not illuminate twice as far as once since
1777 * it is a disapation factor that is squared (or is it cubed?) 1739 * it is a disapation factor that is squared (or is it cubed?)
1778 */ 1740 */
1779 if (tmp->glow_radius > light) light = tmp->glow_radius; 1741 if (tmp->glow_radius > light) light = tmp->glow_radius;
1780 1742
1781 /* This call is needed in order to update objects the player 1743 /* This call is needed in order to update objects the player
1782 * is standing in that have animations (ie, grass, fire, etc). 1744 * is standing in that have animations (ie, grass, fire, etc).
1783 * However, it also causes the look window to be re-drawn 1745 * However, it also causes the look window to be re-drawn
1784 * 3 times each time the player moves, because many of the 1746 * 3 times each time the player moves, because many of the
1785 * functions the move_player calls eventualy call this. 1747 * functions the move_player calls eventualy call this.
1786 * 1748 *
1787 * Always put the player down for drawing. 1749 * Always put the player down for drawing.
1788 */ 1750 */
1789 if (!tmp->invisible) { 1751 if (!tmp->invisible) {
1790 if ((tmp->type==PLAYER || QUERY_FLAG(tmp, FLAG_MONSTER))) { 1752 if ((tmp->type==PLAYER || QUERY_FLAG(tmp, FLAG_MONSTER))) {
1791 top = tmp->face; 1753 top = tmp->face;
1792 top_obj = tmp; 1754 top_obj = tmp;
1793 } 1755 }
1794 else if (QUERY_FLAG(tmp,FLAG_IS_FLOOR)) { 1756 else if (QUERY_FLAG(tmp,FLAG_IS_FLOOR)) {
1795 /* If we got a floor, that means middle and top were below it, 1757 /* If we got a floor, that means middle and top were below it,
1796 * so should not be visible, so we clear them. 1758 * so should not be visible, so we clear them.
1797 */ 1759 */
1798 middle=blank_face; 1760 middle=blank_face;
1799 top=blank_face; 1761 top=blank_face;
1800 floor = tmp->face; 1762 floor = tmp->face;
1801 floor_obj = tmp; 1763 floor_obj = tmp;
1802 } 1764 }
1803 /* Flag anywhere have high priority */ 1765 /* Flag anywhere have high priority */
1804 else if (QUERY_FLAG(tmp, FLAG_SEE_ANYWHERE)) { 1766 else if (QUERY_FLAG(tmp, FLAG_SEE_ANYWHERE)) {
1805 middle = tmp->face; 1767 middle = tmp->face;
1806 1768
1807 middle_obj = tmp; 1769 middle_obj = tmp;
1808 anywhere =1; 1770 anywhere =1;
1809 } 1771 }
1810 /* Find the highest visible face around. If equal 1772 /* Find the highest visible face around. If equal
1811 * visibilities, we still want the one nearer to the 1773 * visibilities, we still want the one nearer to the
1812 * top 1774 * top
1813 */ 1775 */
1814 else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere)) { 1776 else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere)) {
1815 middle = tmp->face; 1777 middle = tmp->face;
1816 middle_obj = tmp; 1778 middle_obj = tmp;
1817 } 1779 }
1818 } 1780 }
1819 if (tmp==tmp->above) { 1781 if (tmp==tmp->above) {
1820 LOG(llevError, "Error in structure of map\n"); 1782 LOG(llevError, "Error in structure of map\n");
1821 exit (-1); 1783 exit (-1);
1822 } 1784 }
1823 1785
1824 move_slow |= tmp->move_slow; 1786 move_slow |= tmp->move_slow;
1825 move_block |= tmp->move_block; 1787 move_block |= tmp->move_block;
1826 move_on |= tmp->move_on; 1788 move_on |= tmp->move_on;
1827 move_off |= tmp->move_off; 1789 move_off |= tmp->move_off;
1828 move_allow |= tmp->move_allow; 1790 move_allow |= tmp->move_allow;
1829 1791
1830 if (QUERY_FLAG(tmp,FLAG_ALIVE)) 1792 if (QUERY_FLAG(tmp,FLAG_ALIVE))
1831 flags |= P_IS_ALIVE; 1793 flags |= P_IS_ALIVE;
1832 if (QUERY_FLAG(tmp,FLAG_NO_MAGIC)) 1794 if (QUERY_FLAG(tmp,FLAG_NO_MAGIC))
1833 flags |= P_NO_MAGIC; 1795 flags |= P_NO_MAGIC;
1834 if (QUERY_FLAG(tmp,FLAG_DAMNED)) 1796 if (QUERY_FLAG(tmp,FLAG_DAMNED))
1835 flags |= P_NO_CLERIC; 1797 flags |= P_NO_CLERIC;
1836 if (tmp->type == SAFE_GROUND) 1798 if (tmp->type == SAFE_GROUND)
1837 flags |= P_SAFE | P_NO_CLERIC | P_NO_MAGIC; 1799 flags |= P_SAFE | P_NO_CLERIC | P_NO_MAGIC;
1838 1800
1839 if (QUERY_FLAG(tmp,FLAG_BLOCKSVIEW)) 1801 if (QUERY_FLAG(tmp,FLAG_BLOCKSVIEW))
1840 flags |= P_BLOCKSVIEW; 1802 flags |= P_BLOCKSVIEW;
1841 } /* for stack of objects */ 1803 } /* for stack of objects */
1842 1804
1843 /* we don't want to rely on this function to have accurate flags, but 1805 /* we don't want to rely on this function to have accurate flags, but
1844 * since we're already doing the work, we calculate them here. 1806 * since we're already doing the work, we calculate them here.
1845 * if they don't match, logic is broken someplace. 1807 * if they don't match, logic is broken someplace.
1846 */ 1808 */
1847 if (((oldflags & ~(P_NEED_UPDATE|P_NO_ERROR)) != flags) && 1809 if (((oldflags & ~(P_NEED_UPDATE|P_NO_ERROR)) != flags) &&
1848 (!(oldflags & P_NO_ERROR))) { 1810 (!(oldflags & P_NO_ERROR))) {
1849 LOG(llevDebug,"update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n", 1811 LOG(llevDebug,"update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n",
1850 m->path, x, y, 1812 m->path, x, y,
1851 (oldflags & ~P_NEED_UPDATE), flags); 1813 (oldflags & ~P_NEED_UPDATE), flags);
1852 } 1814 }
1853 SET_MAP_FLAGS(m, x, y, flags); 1815 SET_MAP_FLAGS(m, x, y, flags);
1854 SET_MAP_MOVE_BLOCK(m, x, y, move_block & ~move_allow); 1816 SET_MAP_MOVE_BLOCK(m, x, y, move_block & ~move_allow);
1855 SET_MAP_MOVE_ON(m, x, y, move_on); 1817 SET_MAP_MOVE_ON(m, x, y, move_on);
… …
1877 * 2) middle is set, need to set top. 1839 * 2) middle is set, need to set top.
1878 * 3) neither middle or top is set - need to set both. 1840 * 3) neither middle or top is set - need to set both.
1879 */ 1841 */
1880 1842
1881 for (tmp=last; tmp; tmp=tmp->below) { 1843 for (tmp=last; tmp; tmp=tmp->below) {
1882 /* Once we get to a floor, stop, since we already have a floor object */ 1844 /* Once we get to a floor, stop, since we already have a floor object */
1883 if (QUERY_FLAG(tmp,FLAG_IS_FLOOR)) break; 1845 if (QUERY_FLAG(tmp,FLAG_IS_FLOOR)) break;
1884 1846
1885 /* If two top faces are already set, quit processing */ 1847 /* If two top faces are already set, quit processing */
1886 if ((top != blank_face) && (middle != blank_face)) break; 1848 if ((top != blank_face) && (middle != blank_face)) break;
1887 1849
1888 /* Only show visible faces, unless its the editor - show all */ 1850 /* Only show visible faces, unless its the editor - show all */
1889 if (!tmp->invisible || editor) { 1851 if (!tmp->invisible || editor) {
1890 /* Fill in top if needed */ 1852 /* Fill in top if needed */
1891 if (top == blank_face) { 1853 if (top == blank_face) {
1892 top = tmp->face; 1854 top = tmp->face;
1893 top_obj = tmp; 1855 top_obj = tmp;
1894 if (top == middle) middle=blank_face; 1856 if (top == middle) middle=blank_face;
1895 } else { 1857 } else {
1896 /* top is already set - we should only get here if 1858 /* top is already set - we should only get here if
1897 * middle is not set 1859 * middle is not set
1898 * 1860 *
1899 * Set the middle face and break out, since there is nothing 1861 * Set the middle face and break out, since there is nothing
1900 * more to fill in. We don't check visiblity here, since 1862 * more to fill in. We don't check visiblity here, since
1901 * 1863 *
1902 */ 1864 */
1903 if (tmp->face != top ) { 1865 if (tmp->face != top ) {
1904 middle = tmp->face; 1866 middle = tmp->face;
1905 middle_obj = tmp; 1867 middle_obj = tmp;
1906 break; 1868 break;
1907 } 1869 }
1908 } 1870 }
1909 } 1871 }
1910 } 1872 }
1911 if (middle == floor) middle = blank_face; 1873 if (middle == floor) middle = blank_face;
1912 if (top == middle) middle = blank_face; 1874 if (top == middle) middle = blank_face;
1913 SET_MAP_FACE(m,x,y,top,0); 1875 SET_MAP_FACE(m,x,y,top,0);
1914 if(top != blank_face) 1876 if(top != blank_face)
… …
1954 1916
1955 orig_map->tile_map[tile_num] = ready_map_name(path, 0); 1917 orig_map->tile_map[tile_num] = ready_map_name(path, 0);
1956 1918
1957 /* need to do a strcmp here as the orig_map->path is not a shared string */ 1919 /* need to do a strcmp here as the orig_map->path is not a shared string */
1958 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] && 1920 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] &&
1959 !strcmp(orig_map->tile_map[tile_num]->tile_path[dest_tile], orig_map->path)) 1921 !strcmp(orig_map->tile_map[tile_num]->tile_path[dest_tile], orig_map->path))
1960 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map; 1922 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1961 1923
1962 return orig_map->tile_map[tile_num]; 1924 return orig_map->tile_map[tile_num];
1963} 1925}
1964 1926
1965/* this returns TRUE if the coordinates (x,y) are out of 1927/* this returns TRUE if the coordinates (x,y) are out of
… …
1980 * map loads fail below, it could happen. 1942 * map loads fail below, it could happen.
1981 */ 1943 */
1982 if (!m) return 0; 1944 if (!m) return 0;
1983 1945
1984 if (x<0) { 1946 if (x<0) {
1985 if (!m->tile_path[3]) return 1; 1947 if (!m->tile_path[3]) return 1;
1986 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) { 1948 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) {
1987 load_and_link_tiled_map(m, 3); 1949 load_and_link_tiled_map(m, 3);
1988 } 1950 }
1989 return (out_of_map(m->tile_map[3], x + MAP_WIDTH(m->tile_map[3]), y)); 1951 return (out_of_map(m->tile_map[3], x + MAP_WIDTH(m->tile_map[3]), y));
1990 } 1952 }
1991 if (x>=MAP_WIDTH(m)) { 1953 if (x>=MAP_WIDTH(m)) {
1992 if (!m->tile_path[1]) return 1; 1954 if (!m->tile_path[1]) return 1;
1993 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) { 1955 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) {
1994 load_and_link_tiled_map(m, 1); 1956 load_and_link_tiled_map(m, 1);
1995 } 1957 }
1996 return (out_of_map(m->tile_map[1], x - MAP_WIDTH(m), y)); 1958 return (out_of_map(m->tile_map[1], x - MAP_WIDTH(m), y));
1997 } 1959 }
1998 if (y<0) { 1960 if (y<0) {
1999 if (!m->tile_path[0]) return 1; 1961 if (!m->tile_path[0]) return 1;
2000 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) { 1962 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) {
2001 load_and_link_tiled_map(m, 0); 1963 load_and_link_tiled_map(m, 0);
2002 } 1964 }
2003 return (out_of_map(m->tile_map[0], x, y + MAP_HEIGHT(m->tile_map[0]))); 1965 return (out_of_map(m->tile_map[0], x, y + MAP_HEIGHT(m->tile_map[0])));
2004 } 1966 }
2005 if (y>=MAP_HEIGHT(m)) { 1967 if (y>=MAP_HEIGHT(m)) {
2006 if (!m->tile_path[2]) return 1; 1968 if (!m->tile_path[2]) return 1;
2007 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) { 1969 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) {
2008 load_and_link_tiled_map(m, 2); 1970 load_and_link_tiled_map(m, 2);
2009 } 1971 }
2010 return (out_of_map(m->tile_map[2], x, y - MAP_HEIGHT(m))); 1972 return (out_of_map(m->tile_map[2], x, y - MAP_HEIGHT(m)));
2011 } 1973 }
2012 1974
2013 /* Simple case - coordinates are within this local 1975 /* Simple case - coordinates are within this local
2014 * map. 1976 * map.
2015 */ 1977 */
… …
2026 */ 1988 */
2027mapstruct *get_map_from_coord(mapstruct *m, sint16 *x, sint16 *y) 1989mapstruct *get_map_from_coord(mapstruct *m, sint16 *x, sint16 *y)
2028{ 1990{
2029 1991
2030 if (*x<0) { 1992 if (*x<0) {
2031 if (!m->tile_path[3]) return NULL; 1993 if (!m->tile_path[3]) return NULL;
2032 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1994 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2033 load_and_link_tiled_map(m, 3); 1995 load_and_link_tiled_map(m, 3);
2034 1996
2035 *x += MAP_WIDTH(m->tile_map[3]); 1997 *x += MAP_WIDTH(m->tile_map[3]);
2036 return (get_map_from_coord(m->tile_map[3], x, y)); 1998 return (get_map_from_coord(m->tile_map[3], x, y));
2037 } 1999 }
2038 if (*x>=MAP_WIDTH(m)) { 2000 if (*x>=MAP_WIDTH(m)) {
2039 if (!m->tile_path[1]) return NULL; 2001 if (!m->tile_path[1]) return NULL;
2040 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 2002 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2041 load_and_link_tiled_map(m, 1); 2003 load_and_link_tiled_map(m, 1);
2042 2004
2043 *x -= MAP_WIDTH(m); 2005 *x -= MAP_WIDTH(m);
2044 return (get_map_from_coord(m->tile_map[1], x, y)); 2006 return (get_map_from_coord(m->tile_map[1], x, y));
2045 } 2007 }
2046 if (*y<0) { 2008 if (*y<0) {
2047 if (!m->tile_path[0]) return NULL; 2009 if (!m->tile_path[0]) return NULL;
2048 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 2010 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2049 load_and_link_tiled_map(m, 0); 2011 load_and_link_tiled_map(m, 0);
2050 2012
2051 *y += MAP_HEIGHT(m->tile_map[0]); 2013 *y += MAP_HEIGHT(m->tile_map[0]);
2052 return (get_map_from_coord(m->tile_map[0], x, y)); 2014 return (get_map_from_coord(m->tile_map[0], x, y));
2053 } 2015 }
2054 if (*y>=MAP_HEIGHT(m)) { 2016 if (*y>=MAP_HEIGHT(m)) {
2055 if (!m->tile_path[2]) return NULL; 2017 if (!m->tile_path[2]) return NULL;
2056 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 2018 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2057 load_and_link_tiled_map(m, 2); 2019 load_and_link_tiled_map(m, 2);
2058 2020
2059 *y -= MAP_HEIGHT(m); 2021 *y -= MAP_HEIGHT(m);
2060 return (get_map_from_coord(m->tile_map[2], x, y)); 2022 return (get_map_from_coord(m->tile_map[2], x, y));
2061 } 2023 }
2062 2024
2063 /* Simple case - coordinates are within this local 2025 /* Simple case - coordinates are within this local
2064 * map. 2026 * map.
2065 */ 2027 */
… …
2209 retval->distance_x = 32767; 2171 retval->distance_x = 32767;
2210 retval->distance_y = 32767; 2172 retval->distance_y = 32767;
2211 retval->direction = 0; 2173 retval->direction = 0;
2212 retval->part = 0; 2174 retval->part = 0;
2213 } else { 2175 } else {
2214 retval->distance_x += op2->x-x; 2176 retval->distance_x += op2->x-x;
2215 retval->distance_y += op2->y-y; 2177 retval->distance_y += op2->y-y;
2216 2178
2217 retval->part = NULL; 2179 retval->part = NULL;
2218 retval->distance = isqrt(retval->distance_x*retval->distance_x+retval->distance_y*retval->distance_y); 2180 retval->distance = isqrt(retval->distance_x*retval->distance_x+retval->distance_y*retval->distance_y);
2219 retval->direction = find_dir_2(-retval->distance_x, -retval->distance_y); 2181 retval->direction = find_dir_2(-retval->distance_x, -retval->distance_y);
2220 } 2182 }

Diff Legend

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