| … | |
… | |
| 148 | { |
148 | { |
| 149 | client &socket = *pl->ns; |
149 | client &socket = *pl->ns; |
| 150 | object *ob = pl->ob; |
150 | object *ob = pl->ob; |
| 151 | char buf[MAX_BUF]; /* eauugggh */ |
151 | char buf[MAX_BUF]; /* eauugggh */ |
| 152 | |
152 | |
| 153 | if (socket.force_newmap) |
153 | if (socket.current_map != ob->map || socket.force_newmap) |
| 154 | { |
|
|
| 155 | // force newmap is used for clients that do not redraw their map |
|
|
| 156 | // after image uploads. |
|
|
| 157 | socket.current_map = ob->map; |
|
|
| 158 | clear_map (pl); |
|
|
| 159 | } |
|
|
| 160 | else if (socket.current_map != ob->map) |
|
|
| 161 | { |
154 | { |
| 162 | clear_map (pl); |
155 | clear_map (pl); |
| 163 | socket.current_map = ob->map; |
156 | socket.current_map = ob->map; |
| 164 | |
157 | |
| 165 | if (socket.mapinfocmd) |
158 | if (socket.mapinfocmd) |
| … | |
… | |
| 1190 | |
1183 | |
| 1191 | mapspace &ms = m->at (nx, ny); |
1184 | mapspace &ms = m->at (nx, ny); |
| 1192 | |
1185 | |
| 1193 | if (socket.extmap) |
1186 | if (socket.extmap) |
| 1194 | { |
1187 | { |
| 1195 | uint8 stat_hp = 0; |
1188 | uint8 stat_hp = 0; |
| 1196 | uint8 stat_width = 0; |
1189 | uint8 stat_width = 0; |
| 1197 | uint8 flags = 0; |
1190 | uint8 flags = 0; |
| 1198 | UUID player = 0; |
1191 | tag_t player = 0; |
| 1199 | |
1192 | |
| 1200 | // send hp information, if applicable |
1193 | // send hp information, if applicable |
| 1201 | if (object *op = ms.faces_obj [0]) |
1194 | if (object *op = ms.faces_obj [0]) |
| 1202 | { |
1195 | { |
| 1203 | if (op->head || op->invisible) |
1196 | if (op->head || op->invisible) |
| … | |
… | |
| 1244 | |
1237 | |
| 1245 | mask |= 0x8; |
1238 | mask |= 0x8; |
| 1246 | *last_ext |= 0x80; |
1239 | *last_ext |= 0x80; |
| 1247 | last_ext = &sl[sl.length ()]; |
1240 | last_ext = &sl[sl.length ()]; |
| 1248 | |
1241 | |
| 1249 | sl << uint8 (0x47) << uint8 (8) << (uint64)player; |
1242 | sl << uint8 (0x47) << uint8 (4) << (uint32)player; |
| 1250 | } |
1243 | } |
| 1251 | |
1244 | |
| 1252 | if (lastcell.flags != flags) |
1245 | if (lastcell.flags != flags) |
| 1253 | { |
1246 | { |
| 1254 | lastcell.flags = flags; |
1247 | lastcell.flags = flags; |
