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.20 by root, Fri May 2 21:01:53 2008 UTC vs.
Revision 1.22 by root, Mon Oct 12 14:00:58 2009 UTC

… …
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
… …
27 28
28#define NR_DECOR_OPTIONS 1 29#define NR_DECOR_OPTIONS 1
29 30
30/* return a simple count of objects in the map at x,y. */ 31/* return a simple count of objects in the map at x,y. */
31 32
32int 33static int
33obj_count_in_map (maptile *map, int x, int y) 34obj_count_in_map (maptile *map, int x, int y)
34{ 35{
35 int count = 0; 36 int count = 0;
36 object *tmp; 37 object *tmp;
37 38
38 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) 39 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
39 count++; 40 ++count;
40 41
41 return count; 42 return count;
42} 43}
43 44
44/* put the decor into the map. Right now, it's very primitive. */ 45/* put the decor into the map. Right now, it's very primitive. */
… …
55 if (!decor_map) 56 if (!decor_map)
56 return; 57 return;
57 58
58 /* pick a random option, only 1 option right now. */ 59 /* pick a random option, only 1 option right now. */
59 if (decor_option == 0) 60 if (decor_option == 0)
60 decor_option = rndm (NR_DECOR_OPTIONS) + 1; 61 decor_option = rmg_rndm (NR_DECOR_OPTIONS) + 1;
61 62
62 switch (decor_option) 63 switch (decor_option)
63 { 64 {
64 case 0: 65 case 0:
65 break; 66 break;
66 67
67 case 1: 68 case 1:
68 { /* random placement of decor objects. */ 69 { /* random placement of decor objects. */
69 int number_to_place = rndm (RP->Xsize * RP->Ysize / 5); 70 int number_to_place = rmg_rndm (RP->Xsize * RP->Ysize / 5);
70 int failures = 0; 71 int failures = 0;
71 72
72 while (failures < 100 && number_to_place > 0) 73 while (failures < 100 && number_to_place > 0)
73 { 74 {
75 coroapi::cede_to_tick ();
76
74 int x = rndm (RP->Xsize - 2) + 1; 77 int x = rmg_rndm (RP->Xsize - 2) + 1;
75 int y = rndm (RP->Ysize - 2) + 1; 78 int y = rmg_rndm (RP->Ysize - 2) + 1;
76 79
77 if (maze[x][y] == 0 && obj_count_in_map (map, x, y) < 2) 80 if (maze[x][y] == 0 && obj_count_in_map (map, x, y) < 2)
78 { 81 {
79 object *this_object = decor_map->pick_random_object ()->clone (); 82 object *this_object = decor_map->pick_random_object (rmg_rndm)->clone ();
80
81 this_object->x = x;
82 this_object->y = y;
83 /* it screws things up if decor can stop people */ 83 /* it screws things up if decor can stop people */
84 this_object->move_block = 0; 84 this_object->move_block = 0;
85 map->insert (this_object, x, y, 0, 0);
85 86
86 insert_ob_in_map (this_object, map, NULL, 0);
87 number_to_place--; 87 number_to_place--;
88 } 88 }
89 else 89 else
90 failures++; 90 failures++;
91 } 91 }
… …
99 for (i = 1; i < RP->Xsize - 1; i++) 99 for (i = 1; i < RP->Xsize - 1; i++)
100 for (j = 1; j < RP->Ysize - 1; j++) 100 for (j = 1; j < RP->Ysize - 1; j++)
101 { 101 {
102 if (maze[i][j] == 0) 102 if (maze[i][j] == 0)
103 { 103 {
104 object *this_object = decor_map->pick_random_object ()->clone (); 104 object *this_object = decor_map->pick_random_object (rmg_rndm)->clone ();
105 105
106 this_object->x = i; 106 this_object->x = i;
107 this_object->y = j; 107 this_object->y = j;
108 /* it screws things up if decor can stop people */ 108 /* it screws things up if decor can stop people */
109 this_object->move_block = 0; 109 this_object->move_block = 0;

Diff Legend

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