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.28 by root, Sun Mar 28 22:29:50 2010 UTC vs.
Revision 1.36 by root, Sat Nov 17 23:40:02 2018 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 (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team 6 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 Frank Tore Johansen 7 * Copyright (©) 1992 Frank Tore Johansen
7 * 8 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 9 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 10 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 11 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 12 * option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 17 * GNU General Public License for more details.
17 * 18 *
18 * You should have received a copy of the Affero GNU General Public License 19 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 20 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 21 * <http://www.gnu.org/licenses/>.
21 * 22 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 23 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 24 */
24 25
25#include <global.h> 26#include <global.h>
26#include <random_map.h> 27#include <rmg.h>
27#include <rproto.h> 28#include <rproto.h>
28 29
29/* place some monsters into the map. */ 30/* place some monsters into the map. */
30void 31void
31place_monsters (maptile *map, char *monsterstyle, int difficulty, random_map_params *RP) 32place_monsters (maptile *map, const char *monsterstyle, int difficulty, random_map_params *RP)
32{ 33{
33 int failed_placements; 34 int failed_placements;
34 sint64 exp_per_sq, total_experience; 35 sint64 exp_per_sq, total_experience;
35 int number_monsters = 0; 36 int number_monsters = 0;
36 archetype *at; 37 archetype *at;
56 y = rmg_rndm (RP->Ysize); 57 y = rmg_rndm (RP->Ysize);
57 freeindex = find_first_free_spot (this_monster, map, x, y); 58 freeindex = find_first_free_spot (this_monster, map, x, y);
58 if (freeindex != -1) 59 if (freeindex != -1)
59 { 60 {
60 object *new_monster = this_monster->deep_clone (); 61 object *new_monster = this_monster->deep_clone ();
61 x += freearr_x[freeindex]; 62 x += DIRX (freeindex);
62 y += freearr_y[freeindex]; 63 y += DIRY (freeindex);
63 map->insert (new_monster, x, y, 0, INS_NO_MERGE | INS_NO_WALK_ON); 64 map->insert (new_monster, x, y, 0, INS_NO_MERGE | INS_NO_WALK_ON);
64 65
65 if (new_monster->is_alive ()) 66 if (new_monster->is_alive ())
66 { 67 {
67 total_experience += this_monster->stats.exp; 68 total_experience += this_monster->stats.exp;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines