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.11 by pippijn, Mon Jan 15 21:06:19 2007 UTC vs.
Revision 1.18 by root, Fri Apr 11 21:09:53 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your 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 GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24
25 23
26#include <global.h> 24#include <global.h>
27#include <random_map.h> 25#include <random_map.h>
28#include <rproto.h> 26#include <rproto.h>
29 27
… …
51 char style_name[1024]; 49 char style_name[1024];
52 50
53 sprintf (style_name, "/styles/decorstyles"); 51 sprintf (style_name, "/styles/decorstyles");
54 52
55 decor_map = find_style (style_name, decorstyle, -1); 53 decor_map = find_style (style_name, decorstyle, -1);
56 if (decor_map == NULL) 54 if (!decor_map)
57 return; 55 return;
56
58 /* pick a random option, only 1 option right now. */ 57 /* pick a random option, only 1 option right now. */
59 if (decor_option == 0) 58 if (decor_option == 0)
60 decor_option = RANDOM () % NR_DECOR_OPTIONS + 1; 59 decor_option = rndm (NR_DECOR_OPTIONS) + 1;
60
61 switch (decor_option) 61 switch (decor_option)
62 { 62 {
63 case 0: 63 case 0:
64 break; 64 break;
65 case 1: 65 case 1:
66 { /* random placement of decor objects. */ 66 { /* random placement of decor objects. */
67 int number_to_place = RANDOM () % ((RP->Xsize * RP->Ysize) / 5); 67 int number_to_place = rndm (RP->Xsize * RP->Ysize / 5);
68 int failures = 0; 68 int failures = 0;
69 object *new_decor_object; 69 object *new_decor_object;
70 70
71 while (failures < 100 && number_to_place > 0) 71 while (failures < 100 && number_to_place > 0)
72 { 72 {
73 int x, y; 73 int x, y;
74 74
75 x = RANDOM () % (RP->Xsize - 2) + 1; 75 x = rndm (RP->Xsize - 2) + 1;
76 y = RANDOM () % (RP->Ysize - 2) + 1; 76 y = rndm (RP->Ysize - 2) + 1;
77 if (maze[x][y] == 0 && obj_count_in_map (map, x, y) < 2) 77 if (maze[x][y] == 0 && obj_count_in_map (map, x, y) < 2)
78 { /* empty */ 78 { /* empty */
79 object *this_object; 79 object *this_object;
80 80
81 new_decor_object = pick_random_object (decor_map); 81 new_decor_object = decor_map->pick_random_object ();
82 this_object = arch_to_object (new_decor_object->arch); 82 this_object = arch_to_object (new_decor_object->arch);
83 new_decor_object->copy_to (this_object); 83 new_decor_object->copy_to (this_object);
84 this_object->x = x; 84 this_object->x = x;
85 this_object->y = y; 85 this_object->y = y;
86 /* it screws things up if decor can stop people */ 86 /* it screws things up if decor can stop people */
87 this_object->move_block = MOVE_BLOCK_DEFAULT; 87 this_object->move_block = 0;
88 insert_ob_in_map (this_object, map, NULL, 0); 88 insert_ob_in_map (this_object, map, NULL, 0);
89 number_to_place--; 89 number_to_place--;
90 } 90 }
91 else 91 else
92 failures++; 92 failures++;
… …
102 { 102 {
103 if (maze[i][j] == 0) 103 if (maze[i][j] == 0)
104 { 104 {
105 object *new_decor_object, *this_object; 105 object *new_decor_object, *this_object;
106 106
107 new_decor_object = pick_random_object (decor_map); 107 new_decor_object = decor_map->pick_random_object ();
108 this_object = arch_to_object (new_decor_object->arch); 108 this_object = arch_to_object (new_decor_object->arch);
109 new_decor_object->copy_to (this_object); 109 new_decor_object->copy_to (this_object);
110 this_object->x = i; 110 this_object->x = i;
111 this_object->y = j; 111 this_object->y = j;
112 /* it screws things up if decor can stop people */ 112 /* it screws things up if decor can stop people */
113 this_object->move_block = MOVE_BLOCK_DEFAULT; 113 this_object->move_block = 0;
114 insert_ob_in_map (this_object, map, NULL, 0); 114 insert_ob_in_map (this_object, map, NULL, 0);
115 } 115 }
116 } 116 }
117 break; 117 break;
118 } 118 }

Diff Legend

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