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.2 by elmex, Tue Aug 15 15:00:20 2006 UTC vs.
Revision 1.22 by root, Mon Sep 4 11:07:59 2006 UTC

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

Diff Legend

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