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.152 by root, Sun Apr 18 12:50:07 2010 UTC vs.
Revision 1.154 by root, Wed Apr 21 05:48:35 2010 UTC

… …
122 122
123 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y))) 123 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y)))
124 return; 124 return;
125 } 125 }
126 126
127 this->x = x; 127 newmap->insert (this, x, y, 0, INS_NO_WALK_ON);
128 this->y = y;
129 map = newmap;
130
131 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON);
132 128
133 enemy = 0; 129 enemy = 0;
134 130
135 if (contr) 131 if (contr)
136 { 132 {

Diff Legend

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