ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/map.h
(Generate patch)

Comparing deliantra/server/include/map.h (file contents):
Revision 1.89 by root, Sun Sep 30 20:22:18 2007 UTC vs.
Revision 1.98 by root, Sun Aug 17 22:46:26 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002-2005,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002-2005,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT 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 3 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,
… …
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, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24/* 24/*
25 * The maptile is allocated each time a new map is opened. 25 * The maptile is allocated each time a new map is opened.
26 * It contains pointers (very indirectly) to all objects on the map. 26 * It contains pointers (very indirectly) to all objects on the map.
… …
47#define MAGIC_MAP_SIZE 50 47#define MAGIC_MAP_SIZE 50
48#define MAGIC_MAP_HALF MAGIC_MAP_SIZE/2 48#define MAGIC_MAP_HALF MAGIC_MAP_SIZE/2
49 49
50#define MAP_LAYERS 3 50#define MAP_LAYERS 3
51 51
52/* Values for in_memory below. Should probably be an enumerations */ 52/* Values for in_memory below */
53enum { 53enum {
54 MAP_IN_MEMORY, 54 MAP_ACTIVE,
55 MAP_INACTIVE, // not used atm.
55 MAP_SWAPPED, 56 MAP_SWAPPED,
56 MAP_LOADING, 57 MAP_LOADING,
57 MAP_SAVING, 58 MAP_SAVING,
58}; 59};
59 60
… …
109 * particular space (was map, floor, floor2, map_ob), 110 * particular space (was map, floor, floor2, map_ob),
110 * have this structure take care of that information. 111 * have this structure take care of that information.
111 * This puts it all in one place, and should also make it easier 112 * This puts it all in one place, and should also make it easier
112 * to extend information about a space. 113 * to extend information about a space.
113 */ 114 */
115INTERFACE_CLASS (mapspace)
114struct mapspace 116struct mapspace
115{ 117{
118 object *ACC (RW, bot);
116 object *bot, *top; /* lowest/highest object on this space */ 119 object *ACC (RW, top); /* lowest/highest object on this space */
117 object *faces_obj[MAP_LAYERS];/* face objects for the 3 layers */ 120 object *ACC (RW, faces_obj[MAP_LAYERS]);/* face objects for the 3 layers */
118 uint8 flags_; /* flags about this space (see the P_ values above) */ 121 uint8 flags_; /* flags about this space (see the P_ values above) */
119 sint8 light; /* How much light this space provides */ 122 sint8 ACC (RW, light); /* How much light this space provides */
120 MoveType move_block; /* What movement types this space blocks */ 123 MoveType ACC (RW, move_block); /* What movement types this space blocks */
121 MoveType move_slow; /* What movement types this space slows */ 124 MoveType ACC (RW, move_slow); /* What movement types this space slows */
122 MoveType move_on; /* What movement types are activated */ 125 MoveType ACC (RW, move_on); /* What movement types are activated */
123 MoveType move_off; /* What movement types are activated */ 126 MoveType ACC (RW, move_off); /* What movement types are activated */
124 127
125 void update_ (); 128 void update_ ();
126 void update () 129 MTH void update ()
127 { 130 {
128 if (!(flags_ & P_UPTODATE)) 131 if (!(flags_ & P_UPTODATE))
129 update_ (); 132 update_ ();
130 } 133 }
131 134
132 uint8 flags () 135 MTH uint8 flags ()
133 { 136 {
134 update (); 137 update ();
135 return flags_; 138 return flags_;
136 } 139 }
137 140
138 // maybe only inline quick flags_ checking?
139 object *player () 141 MTH object *player ()
140 { 142 {
141 // search from the top, because players are usually on top 143 object *op;
142 // make usually == always and this non-amortized O(1) 144
143 // could gte rid of P_PLAYER, too, then
144 if (flags () & P_PLAYER) 145 if (flags () & P_PLAYER)
145 for (object *op = top; op; op = op->below) 146 for (op = top; op->type != PLAYER; op = op->below)
146 if (op->type == PLAYER) 147 ;
147 return op; 148 else
149 op = 0;
148 150
149 return 0; 151 return op;
150 } 152 }
151 153
152 // return the item volume on this mapspace in cm³ 154 // return the item volume on this mapspace in cm³
153 uint64 volume () const; 155 MTH uint64 volume () const;
154 156
155 bool blocks (MoveType mt) const 157 bool blocks (MoveType mt) const
156 { 158 {
157 return move_block && (mt & move_block) == mt; 159 return move_block && (mt & move_block) == mt;
160 }
161
162 bool blocks (object *op) const
163 {
164 return blocks (op->move_type);
158 } 165 }
159}; 166};
160 167
161struct shopitems : zero_initialised 168struct shopitems : zero_initialised
162{ 169{
… …
215 uint16 ACC (RW, difficulty); /* What level the player should be to play here */ 222 uint16 ACC (RW, difficulty); /* What level the player should be to play here */
216 223
217 bool ACC (RW, per_player); 224 bool ACC (RW, per_player);
218 bool ACC (RW, per_party); 225 bool ACC (RW, per_party);
219 bool ACC (RW, outdoor); /* True if an outdoor map */ 226 bool ACC (RW, outdoor); /* True if an outdoor map */
220 bool ACC (RW, nodrop); /* avoid dropping anything on this map */ 227 bool ACC (RW, no_drop); /* avoid auto-dropping (on death) anything on this map */
221 uint8 ACC (RW, darkness); /* indicates level of darkness of map */ 228 uint8 ACC (RW, darkness); /* indicates level of darkness of map */
222 229
223 uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */ 230 uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */
224 uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */ 231 uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */
225 oblinkpt *buttons; /* Linked list of linked lists of buttons */ 232 oblinkpt *buttons; /* Linked list of linked lists of buttons */
… …
261 268
262 MTH void play_sound (faceidx sound, int x, int y) const; 269 MTH void play_sound (faceidx sound, int x, int y) const;
263 270
264 // set the given flag on all objects in the map 271 // set the given flag on all objects in the map
265 MTH void set_object_flag (int flag, int value = 1); 272 MTH void set_object_flag (int flag, int value = 1);
273 MTH void post_load_original ();
266 274
267 MTH void link_multipart_objects (); 275 MTH void link_multipart_objects ();
268 MTH void clear_unique_items (); 276 MTH void clear_unique_items ();
269 277
270 MTH void clear_header (); 278 MTH void clear_header ();
… …
324 bool generate_random_map (random_map_params *RP); 332 bool generate_random_map (random_map_params *RP);
325 333
326 static maptile *find_async (const char *path, maptile *original = 0, bool load = true);//PERL 334 static maptile *find_async (const char *path, maptile *original = 0, bool load = true);//PERL
327 static maptile *find_sync (const char *path, maptile *original = 0);//PERL 335 static maptile *find_sync (const char *path, maptile *original = 0);//PERL
328 static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL 336 static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL
329 MTH object *pick_random_object () const; 337 object *pick_random_object (rand_gen &gen = rndm) const;
330 338
331 mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; } 339 mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
332 mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; } 340 mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; }
333}; 341};
334 342
… …
419 bool normalise () 427 bool normalise ()
420 { 428 {
421 return xy_normalise (m, x, y); 429 return xy_normalise (m, x, y);
422 } 430 }
423 431
432 mapspace &ms () const
433 {
434 return m->at (x, y);
435 }
436
424 object *insert (object *op, object *originator = 0, int flags = 0) const 437 object *insert (object *op, object *originator = 0, int flags = 0) const
425 { 438 {
426 m->insert (op, x, y, originator, flags); 439 return m->insert (op, x, y, originator, flags);
427 } 440 }
428}; 441};
429 442
430inline const mapxy & 443inline const mapxy &
431object::operator =(const mapxy &pos) 444object::operator =(const mapxy &pos)

Diff Legend

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