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.17 by root, Mon Jun 4 13:04:00 2007 UTC vs.
Revision 1.20 by root, Thu Nov 8 19:43:25 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 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 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 23
25#include <global.h> 24#include <global.h>
26#include <random_map.h> 25#include <random_map.h>
27#include <rproto.h> 26#include <rproto.h>
… …
31 30
32void 31void
33insert_multisquare_ob_in_map (object *new_obj, maptile *map) 32insert_multisquare_ob_in_map (object *new_obj, maptile *map)
34{ 33{
35 int x, y; 34 int x, y;
36 archetype *at;
37 object *old_seg; 35 object *old_seg;
38 object *head; 36 object *head;
39 37
40 /* first insert the head */ 38 /* first insert the head */
41 insert_ob_in_map (new_obj, map, new_obj, INS_NO_MERGE | INS_NO_WALK_ON); 39 insert_ob_in_map (new_obj, map, new_obj, INS_NO_MERGE | INS_NO_WALK_ON);
… …
43 x = new_obj->x; 41 x = new_obj->x;
44 y = new_obj->y; 42 y = new_obj->y;
45 old_seg = new_obj; 43 old_seg = new_obj;
46 head = new_obj; 44 head = new_obj;
47 45
48 for (at = new_obj->arch->more; at != NULL; at = at->more) 46 //TODO: use expand_tail + insert instead
47 for (archetype *at = (archetype *)new_obj->arch->more; at; at = (archetype *)at->more)
49 { 48 {
50 object *new_seg; 49 object *new_seg;
51 50
52 new_seg = arch_to_object (at); 51 new_seg = arch_to_object (at);
53 new_seg->x = x + at->x; 52 new_seg->x = x + at->x;
… …
57 new_seg->head = head; 56 new_seg->head = head;
58 old_seg->more = new_seg; 57 old_seg->more = new_seg;
59 old_seg = new_seg; 58 old_seg = new_seg;
60 } 59 }
61 60
62 old_seg->more = NULL; 61 old_seg->more = 0;
63} 62}
64 63
65/* place some monsters into the map. */ 64/* place some monsters into the map. */
66void 65void
67place_monsters (maptile *map, char *monsterstyle, int difficulty, random_map_params *RP) 66place_monsters (maptile *map, char *monsterstyle, int difficulty, random_map_params *RP)
… …
107 106
108 if (new_monster->is_alive ()) 107 if (new_monster->is_alive ())
109 { 108 {
110 total_experience += this_monster->stats.exp; 109 total_experience += this_monster->stats.exp;
111 110
112 for (at = new_monster->arch; at; at = at->more) 111 for (at = new_monster->arch; at; at = (archetype *)at->more)
113 number_monsters++; 112 number_monsters++;
114 113
115 assert (new_monster->stats.hp >= 0); 114 assert (new_monster->stats.hp >= 0);
116 RP->total_map_hp += new_monster->stats.hp; /* a global count */ 115 RP->total_map_hp += new_monster->stats.hp; /* a global count */
117 } 116 }

Diff Legend

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