ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.270 by root, Sat Dec 27 02:31:19 2008 UTC vs.
Revision 1.271 by root, Sat Dec 27 04:07:44 2008 UTC

32#include <bitset> 32#include <bitset>
33 33
34UUID UUID::cur; 34UUID UUID::cur;
35static uint64_t seq_next_save; 35static uint64_t seq_next_save;
36static const uint64 UUID_GAP = 1<<19; 36static const uint64 UUID_GAP = 1<<19;
37uint32_t mapspace::smellcount;
37 38
38objectvec objects; 39objectvec objects;
39activevec actives; 40activevec actives;
40 41
41short freearr_x[SIZEOFFREE] = { 42short freearr_x[SIZEOFFREE] = {
1096 1097
1097 if (object *pl = ms.player ()) 1098 if (object *pl = ms.player ())
1098 { 1099 {
1099 if (is_player ()) 1100 if (is_player ())
1100 { 1101 {
1101 ms.smell = pticks; // remember the smell of the player 1102 ms.smell = ++mapspace::smellcount; // remember the smell of the player
1102 1103
1103 // leaving a spot always closes any open container on the ground 1104 // leaving a spot always closes any open container on the ground
1104 if (container && !container->env) 1105 if (container && !container->env)
1105 // this causes spurious floorbox updates, but it ensures 1106 // this causes spurious floorbox updates, but it ensures
1106 // that the CLOSE event is being sent. 1107 // that the CLOSE event is being sent.

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines