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.119 by root, Sun Nov 8 16:14:28 2009 UTC vs.
Revision 1.120 by root, Sun Nov 8 20:55:39 2009 UTC

131 sint8 ACC (RW, light); /* How much light this space provides */ 131 sint8 ACC (RW, light); /* How much light this space provides */
132 MoveType ACC (RW, move_block); /* What movement types this space blocks */ 132 MoveType ACC (RW, move_block); /* What movement types this space blocks */
133 MoveType ACC (RW, move_slow); /* What movement types this space slows */ 133 MoveType ACC (RW, move_slow); /* What movement types this space slows */
134 MoveType ACC (RW, move_on); /* What movement types are activated */ 134 MoveType ACC (RW, move_on); /* What movement types are activated */
135 MoveType ACC (RW, move_off); /* What movement types are activated */ 135 MoveType ACC (RW, move_off); /* What movement types are activated */
136 uint16_t ACC (RW, nrof_); // saturates at 64k 136 uint16_t ACC (RW, items_); // saturates at 64k
137 uint32_t ACC (RW, volume_); // ~dm³ (not cm³) (factor is actually 1024) 137 uint32_t ACC (RW, volume_); // ~dm³ (not cm³) (factor is actually 1024)
138 uint32_t ACC (RW, smell); // the last count a player was seen here, or 0 138 uint32_t ACC (RW, smell); // the last count a player was seen here, or 0
139 static uint32_t ACC (RW, smellcount); // global smell counter 139 static uint32_t ACC (RW, smellcount); // global smell counter
140 140
141 uint32_t pad1_, pad2_; // pad to 64 bytes on 64 bit systems 141 uint32_t pad1_, pad2_; // pad to 64 bytes on 64 bit systems
180 op = 0; 180 op = 0;
181 181
182 return op; 182 return op;
183 } 183 }
184 184
185 MTH uint32 nrof () 185 MTH uint32 items()
186 { 186 {
187 update (); 187 update ();
188 return nrof_; 188 return items_;
189 } 189 }
190 190
191 // return the item volume on this mapspace in cm³ 191 // return the item volume on this mapspace in cm³
192 MTH uint64 volume () 192 MTH uint64 volume ()
193 { 193 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines