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

Comparing cf.schmorp.de/server/random_maps/decor.C (file contents):
Revision 1.10 by pippijn, Sat Jan 6 14:42:30 2007 UTC vs.
Revision 1.13 by root, Sat Jan 27 02:19:37 2007 UTC

1
2/* 1/*
3 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
4 3 *
5 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
6 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
7 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
8 7 *
9 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
10 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
11 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
12 (at your option) any later version. 11 * (at your option) any later version.
13 12 *
14 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,
15 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17 GNU General Public License for more details. 16 * GNU General Public License for more details.
18 17 *
19 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
20 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
21 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 21 *
23 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
24*/ 23 */
25 24
26 25
27#include <global.h> 26#include <global.h>
28#include <random_map.h> 27#include <random_map.h>
29#include <rproto.h> 28#include <rproto.h>
52 char style_name[1024]; 51 char style_name[1024];
53 52
54 sprintf (style_name, "/styles/decorstyles"); 53 sprintf (style_name, "/styles/decorstyles");
55 54
56 decor_map = find_style (style_name, decorstyle, -1); 55 decor_map = find_style (style_name, decorstyle, -1);
57 if (decor_map == NULL) 56 if (!decor_map)
58 return; 57 return;
58
59 /* pick a random option, only 1 option right now. */ 59 /* pick a random option, only 1 option right now. */
60 if (decor_option == 0) 60 if (decor_option == 0)
61 decor_option = RANDOM () % NR_DECOR_OPTIONS + 1; 61 decor_option = rndm (NR_DECOR_OPTIONS) + 1;
62
62 switch (decor_option) 63 switch (decor_option)
63 { 64 {
64 case 0: 65 case 0:
65 break; 66 break;
66 case 1: 67 case 1:
67 { /* random placement of decor objects. */ 68 { /* random placement of decor objects. */
68 int number_to_place = RANDOM () % ((RP->Xsize * RP->Ysize) / 5); 69 int number_to_place = rndm (RP->Xsize * RP->Ysize / 5);
69 int failures = 0; 70 int failures = 0;
70 object *new_decor_object; 71 object *new_decor_object;
71 72
72 while (failures < 100 && number_to_place > 0) 73 while (failures < 100 && number_to_place > 0)
73 { 74 {
74 int x, y; 75 int x, y;
75 76
76 x = RANDOM () % (RP->Xsize - 2) + 1; 77 x = rndm (RP->Xsize - 2) + 1;
77 y = RANDOM () % (RP->Ysize - 2) + 1; 78 y = rndm (RP->Ysize - 2) + 1;
78 if (maze[x][y] == 0 && obj_count_in_map (map, x, y) < 2) 79 if (maze[x][y] == 0 && obj_count_in_map (map, x, y) < 2)
79 { /* empty */ 80 { /* empty */
80 object *this_object; 81 object *this_object;
81 82
82 new_decor_object = pick_random_object (decor_map); 83 new_decor_object = pick_random_object (decor_map);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines