ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.199 by root, Thu Nov 8 19:43:23 2007 UTC vs.
Revision 1.201 by root, Tue Jan 22 16:22:45 2008 UTC

935 935
936 freed_map->path = "<freed objects map>"; 936 freed_map->path = "<freed objects map>";
937 freed_map->name = "/internal/freed_objects_map"; 937 freed_map->name = "/internal/freed_objects_map";
938 freed_map->width = 3; 938 freed_map->width = 3;
939 freed_map->height = 3; 939 freed_map->height = 3;
940 freed_map->nodrop = 1;
940 941
941 freed_map->alloc (); 942 freed_map->alloc ();
942 freed_map->in_memory = MAP_IN_MEMORY; 943 freed_map->in_memory = MAP_IN_MEMORY;
943 } 944 }
944 945
2018 2019
2019 /* However, often 2020 /* However, often
2020 * ob doesn't have any move type (when used to place exits) 2021 * ob doesn't have any move type (when used to place exits)
2021 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 2022 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2022 */ 2023 */
2023 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 2024 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2024 { 2025 {
2025 altern [index++] = i; 2026 altern [index++] = i;
2026 continue; 2027 continue;
2027 } 2028 }
2028 2029

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines