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

Comparing deliantra/server/random_maps/monster.C (file contents):
Revision 1.23 by root, Sun May 4 08:25:33 2008 UTC vs.
Revision 1.28 by root, Sun Mar 28 22:29:50 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 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/* place some monsters into the map. */ 29/* place some monsters into the map. */
29void 30void
30place_monsters (maptile *map, char *monsterstyle, int difficulty, random_map_params *RP) 31place_monsters (maptile *map, char *monsterstyle, int difficulty, random_map_params *RP)
31{ 32{
32 char styledirname[1024];
33 maptile *style_map = 0;
34 int failed_placements; 33 int failed_placements;
35 sint64 exp_per_sq, total_experience; 34 sint64 exp_per_sq, total_experience;
36 int number_monsters = 0; 35 int number_monsters = 0;
37 archetype *at; 36 archetype *at;
38 37
39 sprintf (styledirname, "%s", "/styles/monsterstyles");
40 style_map = find_style (styledirname, monsterstyle, difficulty); 38 maptile *style_map = find_style ("/styles/monsterstyles", monsterstyle, difficulty);
41 if (!style_map) 39 if (!style_map)
42 return; 40 return;
43 41
44 /* fill up the map with random monsters from the monster style */ 42 /* fill up the map with random monsters from the monster style */
45 43
46 total_experience = 0; 44 total_experience = 0;
47 failed_placements = 0; 45 failed_placements = 0;
48 exp_per_sq = 0; 46 exp_per_sq = 0;
49 while (exp_per_sq <= level_exp (difficulty, 1.0) && failed_placements < 100 && number_monsters < (RP->Xsize * RP->Ysize) / 8) 47 while (exp_per_sq <= level_exp (difficulty, 1.0) && failed_placements < 100 && number_monsters < (RP->Xsize * RP->Ysize) / 8)
50 { 48 {
51 object *this_monster = style_map->pick_random_object (); 49 object *this_monster = style_map->pick_random_object (rmg_rndm);
52 int x, y, freeindex; 50 int x, y, freeindex;
53 51
54 if (this_monster == NULL) 52 if (this_monster == NULL)
55 return; /* no monster?? */ 53 return; /* no monster?? */
56 54
57 x = rndm (RP->Xsize); 55 x = rmg_rndm (RP->Xsize);
58 y = rndm (RP->Ysize); 56 y = rmg_rndm (RP->Ysize);
59 freeindex = find_first_free_spot (this_monster, map, x, y); 57 freeindex = find_first_free_spot (this_monster, map, x, y);
60 if (freeindex != -1) 58 if (freeindex != -1)
61 { 59 {
62 object *new_monster = this_monster->deep_clone (); 60 object *new_monster = this_monster->deep_clone ();
63 x += freearr_x[freeindex]; 61 x += freearr_x[freeindex];

Diff Legend

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