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.163 by root, Tue May 4 20:25:59 2010 UTC vs.
Revision 1.164 by root, Thu May 13 12:25:12 2010 UTC

103 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE); 103 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE);
104 } 104 }
105 105
106 if (i >= 0) 106 if (i >= 0)
107 { 107 {
108 maptile *m = newmap;
108 sint16 nx = x + freearr_x[i]; 109 sint16 nx = x + freearr_x[i];
109 sint16 ny = y + freearr_y[i]; 110 sint16 ny = y + freearr_y[i];
110 111
111 if (xy_normalise (newmap, nx, ny)) 112 if (xy_normalise (m, nx, ny))
112 { 113 {
114 newmap = m;
113 x = nx; 115 x = nx;
114 y = ny; 116 y = ny;
115 } 117 }
116 } 118 }
117 else 119 else

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines