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

Comparing deliantra/server/server/main.C (file contents):
Revision 1.159 by root, Sun Apr 25 10:45:38 2010 UTC vs.
Revision 1.160 by root, Wed Apr 28 11:19:09 2010 UTC

… …
122 return false; 122 return false;
123 } 123 }
124 124
125 enemy = 0; 125 enemy = 0;
126 126
127 newmap->insert (this, x, y); 127 //newmap->insert (this, x, y);
128 newmap->insert (this, x, y, 0, INS_NO_AUTO_EXIT);
128 129
129 if (map == newmap) // see if we actually arrived there - insert might trigger a teleport 130 if (map == newmap) // see if we actually arrived there - insert might trigger a teleport
130 { 131 {
131 if (contr) 132 if (contr)
132 { 133 {

Diff Legend

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