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

Comparing deliantra/server/random_maps/exit.C (file contents):
Revision 1.23 by pippijn, Mon Jan 15 21:06:19 2007 UTC vs.
Revision 1.25 by root, Sat Feb 17 23:32:11 2007 UTC

38 *fx = -1; 38 *fx = -1;
39 *fy = -1; 39 *fy = -1;
40 40
41 /* if a starting point isn't given, pick one */ 41 /* if a starting point isn't given, pick one */
42 if (mode < 1 || mode > 4) 42 if (mode < 1 || mode > 4)
43 M = RANDOM () % 4 + 1; 43 M = rndm (4) + 1;
44 else 44 else
45 M = mode; 45 M = mode;
46 46
47 /* four different search starting points and methods so that 47 /* four different search starting points and methods so that
48 we can do something different for symmetrical maps instead of 48 we can do something different for symmetrical maps instead of
133 if (RP->exit_on_final_map) 133 if (RP->exit_on_final_map)
134 if (strstr (RP->exit_on_final_map, "no")) 134 if (strstr (RP->exit_on_final_map, "no"))
135 final_map_exit = 0; 135 final_map_exit = 0;
136 136
137 if (!orientation) 137 if (!orientation)
138 orientation = RANDOM () % 6 + 1; 138 orientation = rndm (6) + 1;
139 139
140 switch (orientation) 140 switch (orientation)
141 { 141 {
142 case 1: 142 case 1:
143 { 143 {
171 171
172 else 172 else
173 { 173 {
174 object *tmp; 174 object *tmp;
175 175
176 tmp = pick_random_object (style_map_up); 176 tmp = style_map_up->pick_random_object ();
177 the_exit_up = arch_to_object (tmp->arch); 177 the_exit_up = arch_to_object (tmp->arch);
178 } 178 }
179 179
180 /* we need a down exit only if we're recursing. */ 180 /* we need a down exit only if we're recursing. */
181 if (RP->dungeon_level < RP->dungeon_depth || RP->final_map[0] != 0) 181 if (RP->dungeon_level < RP->dungeon_depth || RP->final_map[0] != 0)
184 184
185 else 185 else
186 { 186 {
187 object *tmp; 187 object *tmp;
188 188
189 tmp = pick_random_object (style_map_down); 189 tmp = style_map_down->pick_random_object ();
190 the_exit_down = arch_to_object (tmp->arch); 190 the_exit_down = arch_to_object (tmp->arch);
191 } 191 }
192 else 192 else
193 the_exit_down = 0; 193 the_exit_down = 0;
194 194

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines