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

Comparing deliantra/server/random_maps/decor.C (file contents):
Revision 1.14 by root, Sat Feb 17 23:32:11 2007 UTC vs.
Revision 1.15 by elmex, Sun Apr 15 14:15:14 2007 UTC

84 this_object = arch_to_object (new_decor_object->arch); 84 this_object = arch_to_object (new_decor_object->arch);
85 new_decor_object->copy_to (this_object); 85 new_decor_object->copy_to (this_object);
86 this_object->x = x; 86 this_object->x = x;
87 this_object->y = y; 87 this_object->y = y;
88 /* it screws things up if decor can stop people */ 88 /* it screws things up if decor can stop people */
89 this_object->move_block = MOVE_BLOCK_DEFAULT; 89 this_object->move_block = 0;
90 insert_ob_in_map (this_object, map, NULL, 0); 90 insert_ob_in_map (this_object, map, NULL, 0);
91 number_to_place--; 91 number_to_place--;
92 } 92 }
93 else 93 else
94 failures++; 94 failures++;
110 this_object = arch_to_object (new_decor_object->arch); 110 this_object = arch_to_object (new_decor_object->arch);
111 new_decor_object->copy_to (this_object); 111 new_decor_object->copy_to (this_object);
112 this_object->x = i; 112 this_object->x = i;
113 this_object->y = j; 113 this_object->y = j;
114 /* it screws things up if decor can stop people */ 114 /* it screws things up if decor can stop people */
115 this_object->move_block = MOVE_BLOCK_DEFAULT; 115 this_object->move_block = 0;
116 insert_ob_in_map (this_object, map, NULL, 0); 116 insert_ob_in_map (this_object, map, NULL, 0);
117 } 117 }
118 } 118 }
119 break; 119 break;
120 } 120 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines