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.4 by elmex, Tue Aug 15 18:12:20 2006 UTC vs.
Revision 1.18 by root, Thu Aug 31 17:54:14 2006 UTC

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

Diff Legend

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