… | |
… | |
167 | |
167 | |
168 | /** |
168 | /** |
169 | * Dispatch table for the server. |
169 | * Dispatch table for the server. |
170 | */ |
170 | */ |
171 | static struct packet_type packets[] = { |
171 | static struct packet_type packets[] = { |
172 | {"ncom", PC(NewPlayerCmd) PF_PLAYING | PF_COMMAND6 }, |
|
|
173 | {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND0 }, |
172 | {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND }, |
174 | |
173 | |
175 | {"examine", PC(ExamineCmd) PF_PLAYING }, |
174 | {"examine", PC(ExamineCmd) PF_PLAYING }, |
176 | {"ex", PC(ExCmd) PF_PLAYING }, |
175 | {"ex", PC(ExCmd) PF_PLAYING }, |
177 | {"apply", PC(ApplyCmd) PF_PLAYING }, |
176 | {"apply", PC(ApplyCmd) PF_PLAYING }, |
178 | {"lookat", PC(LookAt) PF_PLAYING }, |
177 | {"lookat", PC(LookAt) PF_PLAYING }, |
… | |
… | |
208 | // but kept seperate to emphasise the hack aspect, i.e. |
207 | // but kept seperate to emphasise the hack aspect, i.e. |
209 | // do it better, then remove. |
208 | // do it better, then remove. |
210 | static bool |
209 | static bool |
211 | always_immediate (const client *ns, const packet_type *pkt, const char *data, int len) |
210 | always_immediate (const client *ns, const packet_type *pkt, const char *data, int len) |
212 | { |
211 | { |
213 | if (!(pkt->flags & (PF_COMMAND0 | PF_COMMAND6))) |
212 | if (!(pkt->flags & PF_COMMAND)) |
214 | return false; |
213 | return false; |
215 | |
214 | |
216 | if (!ns->pl || !ns->pl->ob || !ns->pl->ob->map) |
215 | if (!ns->pl || !ns->pl->ob || !ns->pl->ob->map) |
217 | return false; |
216 | return false; |
218 | |
|
|
219 | if (pkt->flags & PF_COMMAND6) |
|
|
220 | { |
|
|
221 | data += 6; |
|
|
222 | len -= 6; |
|
|
223 | } |
|
|
224 | |
217 | |
225 | if (len > 4 && data [ 3] == ' ' && !strncmp (data, "say " , 4)) return true; |
218 | if (len > 4 && data [ 3] == ' ' && !strncmp (data, "say " , 4)) return true; |
226 | if (len > 5 && data [ 4] == ' ' && !strncmp (data, "chat " , 5)) return true; |
219 | if (len > 5 && data [ 4] == ' ' && !strncmp (data, "chat " , 5)) return true; |
227 | if (len > 6 && data [ 5] == ' ' && !strncmp (data, "shout " , 6)) return true; |
220 | if (len > 6 && data [ 5] == ' ' && !strncmp (data, "shout " , 6)) return true; |
228 | if (len > 8 && data [ 7] == ' ' && !strncmp (data, "suicide " , 8)) return true; |
221 | if (len > 8 && data [ 7] == ' ' && !strncmp (data, "suicide " , 8)) return true; |