| … | |
… | |
| 67 | { |
67 | { |
| 68 | int idx = 0, pri = 0; |
68 | int idx = 0, pri = 0; |
| 69 | |
69 | |
| 70 | sscanf (buf, "%d %d", &idx, &pri); |
70 | sscanf (buf, "%d %d", &idx, &pri); |
| 71 | |
71 | |
|
|
72 | //TODO: somehow fetch default priority from send_fx here |
|
|
73 | |
| 72 | const facedata *d = face_data (idx, ns->faceset); |
74 | const facedata *d = face_data (idx, ns->faceset); |
| 73 | |
75 | |
| 74 | if (!d) |
76 | if (!d) |
| 75 | return; // doh |
77 | return; // doh |
| 76 | |
78 | |
| … | |
… | |
| 292 | { |
294 | { |
| 293 | LOG (llevError, "client::send_image (%d) out of bounds??\n", facenum); |
295 | LOG (llevError, "client::send_image (%d) out of bounds??\n", facenum); |
| 294 | return; |
296 | return; |
| 295 | } |
297 | } |
| 296 | |
298 | |
| 297 | //TODO: check type here? |
|
|
| 298 | |
|
|
| 299 | if (force_image_newmap) |
299 | if (force_image_newmap) |
| 300 | force_newmap = true; |
300 | force_newmap = true; |
| 301 | |
301 | |
| 302 | packet sl; |
302 | packet sl; |
| 303 | |
303 | |
| … | |
… | |
| 441 | * however, if this really happens, we probably just want to cut down the |
441 | * however, if this really happens, we probably just want to cut down the |
| 442 | * size to less than 1000, since that is what we claim the protocol would |
442 | * size to less than 1000, since that is what we claim the protocol would |
| 443 | * support. |
443 | * support. |
| 444 | */ |
444 | */ |
| 445 | //TODO: taken care of above, should simply abort or make sure the above code is correct |
445 | //TODO: taken care of above, should simply abort or make sure the above code is correct |
| 446 | if (sl.length () >= MAXSOCKBUF) |
446 | if (sl.length () > MAXSOCKBUF) |
| 447 | { |
447 | { |
| 448 | LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF); |
448 | LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF); |
| 449 | abort (); |
449 | abort (); |
| 450 | } |
450 | } |
| 451 | |
451 | |
