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.91 by root, Tue Apr 15 14:21:04 2008 UTC vs.
Revision 1.96 by root, Mon Jul 14 16:42:49 2008 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra 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
… …
154 uint64 volume () const; 154 uint64 volume () const;
155 155
156 bool blocks (MoveType mt) const 156 bool blocks (MoveType mt) const
157 { 157 {
158 return move_block && (mt & move_block) == mt; 158 return move_block && (mt & move_block) == mt;
159 }
160
161 bool blocks (object *op) const
162 {
163 return blocks (op->move_type);
159 } 164 }
160}; 165};
161 166
162struct shopitems : zero_initialised 167struct shopitems : zero_initialised
163{ 168{
… …
216 uint16 ACC (RW, difficulty); /* What level the player should be to play here */ 221 uint16 ACC (RW, difficulty); /* What level the player should be to play here */
217 222
218 bool ACC (RW, per_player); 223 bool ACC (RW, per_player);
219 bool ACC (RW, per_party); 224 bool ACC (RW, per_party);
220 bool ACC (RW, outdoor); /* True if an outdoor map */ 225 bool ACC (RW, outdoor); /* True if an outdoor map */
221 bool ACC (RW, nodrop); /* avoid dropping anything on this map */ 226 bool ACC (RW, no_drop); /* avoid auto-dropping (on death) anything on this map */
222 uint8 ACC (RW, darkness); /* indicates level of darkness of map */ 227 uint8 ACC (RW, darkness); /* indicates level of darkness of map */
223 228
224 uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */ 229 uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */
225 uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */ 230 uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */
226 oblinkpt *buttons; /* Linked list of linked lists of buttons */ 231 oblinkpt *buttons; /* Linked list of linked lists of buttons */
… …
262 267
263 MTH void play_sound (faceidx sound, int x, int y) const; 268 MTH void play_sound (faceidx sound, int x, int y) const;
264 269
265 // set the given flag on all objects in the map 270 // set the given flag on all objects in the map
266 MTH void set_object_flag (int flag, int value = 1); 271 MTH void set_object_flag (int flag, int value = 1);
272 MTH void post_load_original ();
267 273
268 MTH void link_multipart_objects (); 274 MTH void link_multipart_objects ();
269 MTH void clear_unique_items (); 275 MTH void clear_unique_items ();
270 276
271 MTH void clear_header (); 277 MTH void clear_header ();
… …
325 bool generate_random_map (random_map_params *RP); 331 bool generate_random_map (random_map_params *RP);
326 332
327 static maptile *find_async (const char *path, maptile *original = 0, bool load = true);//PERL 333 static maptile *find_async (const char *path, maptile *original = 0, bool load = true);//PERL
328 static maptile *find_sync (const char *path, maptile *original = 0);//PERL 334 static maptile *find_sync (const char *path, maptile *original = 0);//PERL
329 static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL 335 static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL
330 MTH object *pick_random_object () const; 336 object *pick_random_object (rand_gen &gen = rndm) const;
331 337
332 mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; } 338 mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
333 mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; } 339 mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; }
334}; 340};
335 341
… …
420 bool normalise () 426 bool normalise ()
421 { 427 {
422 return xy_normalise (m, x, y); 428 return xy_normalise (m, x, y);
423 } 429 }
424 430
431 mapspace &ms () const
432 {
433 return m->at (x, y);
434 }
435
425 object *insert (object *op, object *originator = 0, int flags = 0) const 436 object *insert (object *op, object *originator = 0, int flags = 0) const
426 { 437 {
427 m->insert (op, x, y, originator, flags); 438 return m->insert (op, x, y, originator, flags);
428 } 439 }
429}; 440};
430 441
431inline const mapxy & 442inline const mapxy &
432object::operator =(const mapxy &pos) 443object::operator =(const mapxy &pos)

Diff Legend

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