… | |
… | |
459 | char tmpbuf[20]; |
459 | char tmpbuf[20]; |
460 | int q = atoi (param); |
460 | int q = atoi (param); |
461 | |
461 | |
462 | if (is_valid_faceset (q)) |
462 | if (is_valid_faceset (q)) |
463 | ns->faceset = q; |
463 | ns->faceset = q; |
|
|
464 | |
464 | sprintf (tmpbuf, "%d", ns->faceset); |
465 | sprintf (tmpbuf, "%d", ns->faceset); |
465 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
466 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
466 | /* if the client is using faceset, it knows about image2 command */ |
467 | /* if the client is using faceset, it knows about image2 command */ |
467 | ns->image2 = 1; |
468 | ns->image2 = 1; |
468 | } |
469 | } |
… | |
… | |
1269 | * but that started to get a bit messy to look at. |
1270 | * but that started to get a bit messy to look at. |
1270 | */ |
1271 | */ |
1271 | max_x = pl->x + (socket.mapx + 1) / 2; |
1272 | max_x = pl->x + (socket.mapx + 1) / 2; |
1272 | max_y = pl->y + (socket.mapy + 1) / 2; |
1273 | max_y = pl->y + (socket.mapy + 1) / 2; |
1273 | |
1274 | |
|
|
1275 | maptile *plmap = pl->map; |
|
|
1276 | |
1274 | for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) |
1277 | for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) |
1275 | { |
1278 | { |
1276 | ax = 0; |
1279 | ax = 0; |
1277 | for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) |
1280 | for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) |
1278 | { |
1281 | { |
… | |
… | |
1284 | /* If the coordinates are not valid, or it is too dark to see, |
1287 | /* If the coordinates are not valid, or it is too dark to see, |
1285 | * we tell the client as such |
1288 | * we tell the client as such |
1286 | */ |
1289 | */ |
1287 | nx = x; |
1290 | nx = x; |
1288 | ny = y; |
1291 | ny = y; |
1289 | m = get_map_from_coord (pl->map, &nx, &ny); |
1292 | m = get_map_from_coord (plmap, &nx, &ny); |
1290 | |
1293 | |
1291 | if (!m) |
1294 | if (!m) |
1292 | { |
1295 | { |
1293 | /* space is out of map. Update space and clear values |
1296 | /* space is out of map. Update space and clear values |
1294 | * if this hasn't already been done. If the space is out |
1297 | * if this hasn't already been done. If the space is out |