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.24 by root, Mon Sep 4 16:46:32 2006 UTC vs.
Revision 1.25 by root, Mon Sep 4 17:36:12 2006 UTC

1/* 1/*
2 * static char *rcsid_map_c = 2 * static char *rcsid_map_c =
3 * "$Id: map.C,v 1.24 2006/09/04 16:46:32 root Exp $"; 3 * "$Id: map.C,v 1.25 2006/09/04 17:36:12 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
1536 if (flags & MAP_PLAYER_UNIQUE) 1536 if (flags & MAP_PLAYER_UNIQUE)
1537 LOG(llevDebug, "Trying to load map %s.\n", name); 1537 LOG(llevDebug, "Trying to load map %s.\n", name);
1538 else 1538 else
1539 LOG(llevDebug, "Trying to load map %s.\n", create_pathname(name)); 1539 LOG(llevDebug, "Trying to load map %s.\n", create_pathname(name));
1540 1540
1541 //0.427459955215454 /var/crossfire/players/Saladon/_scorn_apartment_apartments
1542 //0.414906024932861
1543 //0.427063941955566
1544 eval_pv ("$x = Event::time", 1);//D 1541 //eval_pv ("$x = Event::time", 1);//D
1545 if (!(m = load_original_map(name, (flags & MAP_PLAYER_UNIQUE)))) 1542 if (!(m = load_original_map(name, (flags & MAP_PLAYER_UNIQUE))))
1546 return (NULL); 1543 return (NULL);
1547 eval_pv ("warn \"LOAD \", Event::time - $x", 1);//D 1544 //eval_pv ("warn \"LOAD \", Event::time - $x", 1);//D
1548 1545
1549 fix_auto_apply(m); /* Chests which open as default */ 1546 fix_auto_apply(m); /* Chests which open as default */
1550 1547
1551 /* If a player unique map, no extra unique object file to load. 1548 /* If a player unique map, no extra unique object file to load.
1552 * if from the editor, likewise. 1549 * if from the editor, likewise.

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines