| … | |
… | |
| 53 | // write a nop to the socket at least every IDLE_NOP seconds. |
53 | // write a nop to the socket at least every IDLE_NOP seconds. |
| 54 | if (!outputbuffer.len) |
54 | if (!outputbuffer.len) |
| 55 | { |
55 | { |
| 56 | if (last_send + IDLE_PING <= NOW && pl && pl->active) |
56 | if (last_send + IDLE_PING <= NOW && pl && pl->active) |
| 57 | { |
57 | { |
| 58 | // this is a bit ugly, but map1/map1a seem to be the only |
58 | // this is a bit ugly, but map1a seem to be the only |
| 59 | // nop'able commands and they are quite small. |
59 | // nop'able commands and they are quite small. |
| 60 | packet sl (mapmode == Map1Cmd ? "map1" : "map1a"); |
60 | packet sl ("map1a"); |
| 61 | send_packet (sl); |
61 | send_packet (sl); |
| 62 | } |
62 | } |
| 63 | else |
63 | else |
| 64 | return; |
64 | return; |
| 65 | } |
65 | } |
| … | |
… | |
| 177 | {"apply", PC(ApplyCmd) PF_PLAYING }, |
177 | {"apply", PC(ApplyCmd) PF_PLAYING }, |
| 178 | {"lookat", PC(LookAt) PF_PLAYING }, |
178 | {"lookat", PC(LookAt) PF_PLAYING }, |
| 179 | {"lock", PC(LockItem) PF_PLAYING }, |
179 | {"lock", PC(LockItem) PF_PLAYING }, |
| 180 | {"mark", PC(MarkItem) PF_PLAYING }, |
180 | {"mark", PC(MarkItem) PF_PLAYING }, |
| 181 | {"move", PC(MoveCmd) PF_PLAYING }, |
181 | {"move", PC(MoveCmd) PF_PLAYING }, |
| 182 | {"ext", PC(ExtCmd) 0 }, // CF+ |
182 | {"ext", PC(ExtCmd) 0 }, // CF+/Deliantra |
| 183 | {"mapredraw", PC(MapRedrawCmd) 0 }, |
183 | {"mapredraw", PC(MapRedrawCmd) 0 }, |
| 184 | {"mapinfo", PC(MapInfoCmd) 0 }, // CF+ |
184 | {"mapinfo", PC(MapInfoCmd) 0 }, // CF+/Deliantra |
| 185 | |
185 | |
| 186 | {"reply", SC(ReplyCmd) 0 }, |
186 | {"reply", SC(ReplyCmd) 0 }, |
| 187 | {"exti", SC(ExtiCmd) 0 }, // CF+ |
187 | {"exti", SC(ExtiCmd) 0 }, // CF+/Deliantra |
| 188 | {"addme", SC(AddMeCmd) 0 }, |
188 | {"addme", SC(AddMeCmd) 0 }, |
| 189 | {"askface", SC(AskFaceCmd) 0 }, |
189 | {"askface", SC(AskFaceCmd) 0 }, |
| 190 | {"requestinfo", SC(RequestInfo) 0 }, |
190 | {"requestinfo", SC(RequestInfo) 0 }, |
| 191 | {"setsound", SC(SetSound) 0 }, |
191 | {"setsound", SC(SetSound) 0 }, |
| 192 | {"setup", SC(SetUp) 0 }, |
192 | {"setup", SC(SetUp) 0 }, |
| 193 | {"version", SC(VersionCmd) 0 }, |
193 | {"version", SC(VersionCmd) 0 }, |
| 194 | |
194 | |
| 195 | {"toggleextendedtext", SC(NopCmd) 0 }, |
195 | {"toggleextendedtext", SC(NopCmd) 0 }, // deliantra: disabled |
| 196 | }; |
196 | }; |
| 197 | |
197 | |
| 198 | bool |
198 | bool |
| 199 | client::may_execute (const packet_type *pkt) const |
199 | client::may_execute (const packet_type *pkt) const |
| 200 | { |
200 | { |
| … | |
… | |
| 286 | { |
286 | { |
| 287 | data = (char *)inbuf + 2; // better read garbage than segfault |
287 | data = (char *)inbuf + 2; // better read garbage than segfault |
| 288 | datalen = 0; |
288 | datalen = 0; |
| 289 | } |
289 | } |
| 290 | |
290 | |
| 291 | for (packet_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt) |
291 | for (packet_type *pkt = packets; pkt < packets + array_length (packets); ++pkt) |
| 292 | if (!strcmp ((char *)inbuf + 2, pkt->name)) |
292 | if (!strcmp ((char *)inbuf + 2, pkt->name)) |
| 293 | { |
293 | { |
| 294 | if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen)) |
294 | if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen)) |
| 295 | queue_command (pkt, data, datalen); |
295 | queue_command (pkt, data, datalen); |
| 296 | else |
296 | else |
| … | |
… | |
| 528 | *cur++ = ' '; |
528 | *cur++ = ' '; |
| 529 | } |
529 | } |
| 530 | |
530 | |
| 531 | packet &packet::operator <<(const ber32 v) |
531 | packet &packet::operator <<(const ber32 v) |
| 532 | { |
532 | { |
| 533 | enum { maxlen = 32 / 7 + 1}; |
533 | enum { maxlen = 32 / 7 + 1 }; |
| 534 | uint8 buf[maxlen]; |
534 | uint8 buf[maxlen]; |
| 535 | uint8 *p = buf + maxlen; |
535 | uint8 *p = buf + maxlen; |
| 536 | uint32 val = v.val; |
536 | uint32 val = v.val; |
| 537 | |
537 | |
| 538 | *--p = val & 0x7F; |
538 | *--p = val & 0x7F; |
