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.5 by elmex, Sun Aug 20 20:57:34 2006 UTC vs.
Revision 1.20 by root, Sun Sep 3 00:18:40 2006 UTC

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

Diff Legend

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