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.1 by elmex, Sun Aug 13 17:16:00 2006 UTC vs.
Revision 1.21 by root, Sun Sep 3 22:45:55 2006 UTC

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

Diff Legend

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