ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/item.C
(Generate patch)

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.1 by elmex, Sun Aug 13 17:16:06 2006 UTC vs.
Revision 1.3 by root, Tue Aug 29 08:01:38 2006 UTC

1 1
2/* 2/*
3 * static char *rcsid_item_c = 3 * static char *rcsid_item_c =
4 * "$Id: item.C,v 1.1 2006/08/13 17:16:06 elmex Exp $"; 4 * "$Id: item.C,v 1.3 2006/08/29 08:01:38 root Exp $";
5 */ 5 */
6 6
7/* 7/*
8 CrossFire, A Multiplayer game for X-windows 8 CrossFire, A Multiplayer game for X-windows
9 9
… …
80unsigned int query_flags (object *op) 80unsigned int query_flags (object *op)
81{ 81{
82 unsigned int flags = 0; 82 unsigned int flags = 0;
83 83
84 if(QUERY_FLAG(op,FLAG_APPLIED)) { 84 if(QUERY_FLAG(op,FLAG_APPLIED)) {
85 switch(op->type) { 85 switch(op->type) {
86 case BOW: 86 case BOW:
87 case WAND: 87 case WAND:
88 case ROD: 88 case ROD:
89 case HORN: 89 case HORN:
90 flags = a_readied; 90 flags = a_readied;
91 break; 91 break;
92 case WEAPON: 92 case WEAPON:
93 flags = a_wielded; 93 flags = a_wielded;
94 break; 94 break;
95 case SKILL: 95 case SKILL:
96 case ARMOUR: 96 case ARMOUR:
97 case HELMET: 97 case HELMET:
98 case SHIELD: 98 case SHIELD:
99 case RING: 99 case RING:
100 case BOOTS: 100 case BOOTS:
101 case GLOVES: 101 case GLOVES:
102 case AMULET: 102 case AMULET:
103 case GIRDLE: 103 case GIRDLE:
104 case BRACERS: 104 case BRACERS:
105 case CLOAK: 105 case CLOAK:
106 flags = a_worn; 106 flags = a_worn;
107 break; 107 break;
108 case CONTAINER: 108 case CONTAINER:
109 flags = a_active; 109 flags = a_active;
110 break; 110 break;
111 default: 111 default:
112 flags = a_applied; 112 flags = a_applied;
113 break; 113 break;
114 } 114 }
115 } 115 }
116 if (op->type == CONTAINER && ((op->env && op->env->container == op) || 116 if (op->type == CONTAINER && ((op->env && op->env->container == op) ||
117 (!op->env && QUERY_FLAG(op,FLAG_APPLIED)))) 117 (!op->env && QUERY_FLAG(op,FLAG_APPLIED))))
118 flags |= F_OPEN; 118 flags |= F_OPEN;
119 119
120 if (QUERY_FLAG(op,FLAG_KNOWN_CURSED)) { 120 if (QUERY_FLAG(op,FLAG_KNOWN_CURSED)) {
121 if(QUERY_FLAG(op,FLAG_DAMNED)) 121 if(QUERY_FLAG(op,FLAG_DAMNED))
122 flags |= F_DAMNED; 122 flags |= F_DAMNED;
123 else if(QUERY_FLAG(op,FLAG_CURSED)) 123 else if(QUERY_FLAG(op,FLAG_CURSED))
124 flags |= F_CURSED; 124 flags |= F_CURSED;
125 } 125 }
126 if (QUERY_FLAG(op,FLAG_KNOWN_MAGICAL) && !QUERY_FLAG(op,FLAG_IDENTIFIED)) 126 if (QUERY_FLAG(op,FLAG_KNOWN_MAGICAL) && !QUERY_FLAG(op,FLAG_IDENTIFIED))
127 flags |= F_MAGIC; 127 flags |= F_MAGIC;
128 if (QUERY_FLAG(op,FLAG_UNPAID)) 128 if (QUERY_FLAG(op,FLAG_UNPAID))
129 flags |= F_UNPAID; 129 flags |= F_UNPAID;
130 if (QUERY_FLAG(op,FLAG_INV_LOCKED)) 130 if (QUERY_FLAG(op,FLAG_INV_LOCKED))
131 flags |= F_LOCKED; 131 flags |= F_LOCKED;
132 132
133 return flags; 133 return flags;
134} 134}
135 135
136/* Used in the send_look to put object head into SockList 136/* Used in the send_look to put object head into SockList
… …
143 char item_n[MAX_BUF]; 143 char item_n[MAX_BUF];
144 const char *item_p; 144 const char *item_p;
145 145
146 flags = query_flags (head); 146 flags = query_flags (head);
147 if (QUERY_FLAG(head, FLAG_NO_PICK)) 147 if (QUERY_FLAG(head, FLAG_NO_PICK))
148 flags |= F_NOPICK; 148 flags |= F_NOPICK;
149 149
150 if (!(ns->faces_sent[head->face->number] & NS_FACESENT_FACE)) 150 if (!(ns->faces_sent[head->face->number] & NS_FACESENT_FACE))
151 esrv_send_face(ns, head->face->number,0); 151 esrv_send_face(ns, head->face->number,0);
152 152
153 if (QUERY_FLAG(head,FLAG_ANIMATE) && !ns->anims_sent[head->animation_id]) 153 if (QUERY_FLAG(head,FLAG_ANIMATE) && !ns->anims_sent[head->animation_id])
154 esrv_send_animation(ns, head->animation_id); 154 esrv_send_animation(ns, head->animation_id);
155 155
156 SockList_AddInt(sl, head->count); 156 SockList_AddInt(sl, head->count);
157 SockList_AddInt(sl, flags); 157 SockList_AddInt(sl, flags);
158 SockList_AddInt(sl, QUERY_FLAG(head, FLAG_NO_PICK) ? -1 : WEIGHT(head)); 158 SockList_AddInt(sl, QUERY_FLAG(head, FLAG_NO_PICK) ? -1 : WEIGHT(head));
159 SockList_AddInt(sl, head->face->number); 159 SockList_AddInt(sl, head->face->number);
160 160
161 if (!head->custom_name) { 161 if (!head->custom_name) {
162 strncpy(item_n,query_base_name(head, 0),127); 162 strncpy(item_n,query_base_name(head, 0),127);
163 item_n[127]=0; 163 item_n[127]=0;
164 len=strlen(item_n); 164 len=strlen(item_n);
165 item_p=query_base_name(head, 1); 165 item_p=query_base_name(head, 1);
166 } else { 166 } else {
167 strncpy(item_n,head->custom_name,127); 167 strncpy(item_n,head->custom_name,127);
168 item_n[127]=0; 168 item_n[127]=0;
169 len=strlen(item_n); 169 len=strlen(item_n);
170 item_p=head->custom_name; 170 item_p=head->custom_name;
171 } 171 }
172 strncpy(item_n+len+1, item_p, 127); 172 strncpy(item_n+len+1, item_p, 127);
173 item_n[254]=0; 173 item_n[254]=0;
174 len += strlen(item_n+1+len) + 1; 174 len += strlen(item_n+1+len) + 1;
175 SockList_AddChar(sl, (char ) len); 175 SockList_AddChar(sl, (char ) len);
… …
177 sl->len += len; 177 sl->len += len;
178 178
179 SockList_AddShort(sl,head->animation_id); 179 SockList_AddShort(sl,head->animation_id);
180 anim_speed=0; 180 anim_speed=0;
181 if (QUERY_FLAG(head,FLAG_ANIMATE)) { 181 if (QUERY_FLAG(head,FLAG_ANIMATE)) {
182 if (head->anim_speed) anim_speed=head->anim_speed; 182 if (head->anim_speed) anim_speed=head->anim_speed;
183 else { 183 else {
184 if (FABS(head->speed)<0.001) anim_speed=255; 184 if (FABS(head->speed)<0.001) anim_speed=255;
185 else if (FABS(head->speed)>=1.0) anim_speed=1; 185 else if (FABS(head->speed)>=1.0) anim_speed=1;
186 else anim_speed = (int) (1.0/FABS(head->speed)); 186 else anim_speed = (int) (1.0/FABS(head->speed));
187 } 187 }
188 if (anim_speed>255) anim_speed=255; 188 if (anim_speed>255) anim_speed=255;
189 } 189 }
190 SockList_AddChar(sl, (char) anim_speed); 190 SockList_AddChar(sl, (char) anim_speed);
191 SockList_AddInt(sl, head->nrof); 191 SockList_AddInt(sl, head->nrof);
192 192
193 if (ns->itemcmd == 2) 193 if (ns->itemcmd == 2)
194 SockList_AddShort(sl, head->client_type); 194 SockList_AddShort(sl, head->client_type);
195 195
196 SET_FLAG(head, FLAG_CLIENT_SENT); 196 SET_FLAG(head, FLAG_CLIENT_SENT);
197} 197}
198 198
199 199
… …
209 int got_one=0,start_look=0, end_look=0; 209 int got_one=0,start_look=0, end_look=0;
210 SockList sl; 210 SockList sl;
211 char buf[MAX_BUF]; 211 char buf[MAX_BUF];
212 212
213 if (!pl->contr->socket.update_look) { 213 if (!pl->contr->socket.update_look) {
214 LOG(llevDebug,"esrv_draw_look called when update_look was not set\n"); 214 LOG(llevDebug,"esrv_draw_look called when update_look was not set\n");
215 return; 215 return;
216 } else { 216 } else {
217 pl->contr->socket.update_look=0; 217 pl->contr->socket.update_look=0;
218 } 218 }
219 219
220 if(QUERY_FLAG(pl, FLAG_REMOVED) || pl->map == NULL || 220 if(QUERY_FLAG(pl, FLAG_REMOVED) || pl->map == NULL ||
221 pl->map->in_memory != MAP_IN_MEMORY || out_of_map(pl->map,pl->x,pl->y)) 221 pl->map->in_memory != MAP_IN_MEMORY || out_of_map(pl->map,pl->x,pl->y))
222 return; 222 return;
223 223
224 if (pl->contr->transport)
225 for (tmp=pl->contr->transport->inv; tmp && tmp->above;tmp=tmp->above) ;
226 else
227 for (tmp=get_map_ob(pl->map,pl->x,pl->y); tmp && tmp->above;tmp=tmp->above) ; 224 for (tmp=get_map_ob(pl->map,pl->x,pl->y); tmp && tmp->above;tmp=tmp->above) ;
228 225
229 sl.buf= (unsigned char *) malloc(MAXSOCKBUF); 226 sl.buf= (unsigned char *) malloc(MAXSOCKBUF);
230 227
231 Write_String_To_Socket(&pl->contr->socket, "delinv 0", strlen("delinv 0")); 228 Write_String_To_Socket(&pl->contr->socket, "delinv 0", strlen("delinv 0"));
232 sprintf((char*)sl.buf,"item%d ", pl->contr->socket.itemcmd); 229 sprintf((char*)sl.buf,"item%d ", pl->contr->socket.itemcmd);
233 sl.len=strlen((char*)sl.buf); 230 sl.len=strlen((char*)sl.buf);
234 231
235 SockList_AddInt(&sl, 0); 232 SockList_AddInt(&sl, 0);
236 233
237 if (!(pl->contr->socket.faces_sent[empty_face->number]&NS_FACESENT_FACE)) 234 if (!(pl->contr->socket.faces_sent[empty_face->number]&NS_FACESENT_FACE))
238 esrv_send_face(&pl->contr->socket, empty_face->number,0); 235 esrv_send_face(&pl->contr->socket, empty_face->number,0);
239 236
240 if (pl->contr->socket.look_position) { 237 if (pl->contr->socket.look_position) {
241 SockList_AddInt(&sl, 0x80000000 | (pl->contr->socket.look_position- NUM_LOOK_OBJECTS)); 238 SockList_AddInt(&sl, 0x80000000 | (pl->contr->socket.look_position- NUM_LOOK_OBJECTS));
242 SockList_AddInt(&sl, 0); 239 SockList_AddInt(&sl, 0);
243 SockList_AddInt(&sl, (uint32) -1); 240 SockList_AddInt(&sl, (uint32) -1);
244 SockList_AddInt(&sl, empty_face->number); 241 SockList_AddInt(&sl, empty_face->number);
245 sprintf(buf,"Click here to see %d previous items", NUM_LOOK_OBJECTS); 242 sprintf(buf,"Click here to see %d previous items", NUM_LOOK_OBJECTS);
246 add_stringlen_to_sockbuf(buf, &sl); 243 add_stringlen_to_sockbuf(buf, &sl);
247 SockList_AddShort(&sl,0);
248 SockList_AddChar(&sl, 0);
249 SockList_AddInt(&sl, 0);
250 if (pl->contr->socket.itemcmd == 2)
251 SockList_AddShort(&sl, 0); 244 SockList_AddShort(&sl,0);
252 } 245 SockList_AddChar(&sl, 0);
253 246 SockList_AddInt(&sl, 0);
254 if (pl->contr->transport) { 247 if (pl->contr->socket.itemcmd == 2)
255 add_object_to_socklist(&pl->contr->socket, &sl, pl->contr->transport); 248 SockList_AddShort(&sl, 0);
256 got_one++;
257 } 249 }
258 250
259 for (last=NULL; tmp!=last; tmp=tmp->below) { 251 for (last=NULL; tmp!=last; tmp=tmp->below) {
260 object *head; 252 object *head;
261 253
262 if (QUERY_FLAG(tmp, FLAG_IS_FLOOR) && !last) { 254 if (QUERY_FLAG(tmp, FLAG_IS_FLOOR) && !last) {
263 last = tmp->below; /* assumes double floor mode */ 255 last = tmp->below; /* assumes double floor mode */
264 if (last && QUERY_FLAG(last, FLAG_IS_FLOOR)) 256 if (last && QUERY_FLAG(last, FLAG_IS_FLOOR))
265 last = last->below; 257 last = last->below;
266 } 258 }
267 if (LOOK_OBJ(tmp)) { 259 if (LOOK_OBJ(tmp)) {
268 if (++start_look < pl->contr->socket.look_position) continue; 260 if (++start_look < pl->contr->socket.look_position) continue;
269 end_look++; 261 end_look++;
270 if (end_look > NUM_LOOK_OBJECTS) { 262 if (end_look > NUM_LOOK_OBJECTS) {
271 /* What we basically do is make a 'fake' object - when the user applies it, 263 /* What we basically do is make a 'fake' object - when the user applies it,
272 * we notice the special tag the object has, and act accordingly. 264 * we notice the special tag the object has, and act accordingly.
273 */ 265 */
274 SockList_AddInt(&sl, 0x80000000 | (pl->contr->socket.look_position+ NUM_LOOK_OBJECTS)); 266 SockList_AddInt(&sl, 0x80000000 | (pl->contr->socket.look_position+ NUM_LOOK_OBJECTS));
275 SockList_AddInt(&sl, 0); 267 SockList_AddInt(&sl, 0);
276 SockList_AddInt(&sl, (uint32) -1); 268 SockList_AddInt(&sl, (uint32) -1);
277 SockList_AddInt(&sl, empty_face->number); 269 SockList_AddInt(&sl, empty_face->number);
278 sprintf(buf,"Click here to see next group of items"); 270 sprintf(buf,"Click here to see next group of items");
279 add_stringlen_to_sockbuf(buf, &sl); 271 add_stringlen_to_sockbuf(buf, &sl);
280 SockList_AddShort(&sl,0); 272 SockList_AddShort(&sl,0);
281 SockList_AddChar(&sl, 0); 273 SockList_AddChar(&sl, 0);
282 SockList_AddInt(&sl, 0); 274 SockList_AddInt(&sl, 0);
283 if (pl->contr->socket.itemcmd == 2) 275 if (pl->contr->socket.itemcmd == 2)
284 SockList_AddShort(&sl, 0); 276 SockList_AddShort(&sl, 0);
285 break; 277 break;
286 } 278 }
287 if (tmp->head) head = tmp->head; 279 if (tmp->head) head = tmp->head;
288 else head = tmp; 280 else head = tmp;
289 281
290 add_object_to_socklist(&pl->contr->socket, &sl, head); 282 add_object_to_socklist(&pl->contr->socket, &sl, head);
291 got_one++; 283 got_one++;
292 284
293 if (sl.len >= (MAXSOCKBUF-MAXITEMLEN)) { 285 if (sl.len >= (MAXSOCKBUF-MAXITEMLEN)) {
294 Send_With_Handling(&pl->contr->socket, &sl); 286 Send_With_Handling(&pl->contr->socket, &sl);
295 sprintf((char*)sl.buf,"item%d ", pl->contr->socket.itemcmd); 287 sprintf((char*)sl.buf,"item%d ", pl->contr->socket.itemcmd);
296 sl.len=strlen((char*)sl.buf); 288 sl.len=strlen((char*)sl.buf);
297 SockList_AddInt(&sl, 0); 289 SockList_AddInt(&sl, 0);
298 got_one=0; 290 got_one=0;
299 } 291 }
300 } /* If LOOK_OBJ() */ 292 } /* If LOOK_OBJ() */
301 } 293 }
302 if (got_one) 294 if (got_one)
303 Send_With_Handling(&pl->contr->socket, &sl); 295 Send_With_Handling(&pl->contr->socket, &sl);
304 296
305 free(sl.buf); 297 free(sl.buf);
306} 298}
307 299
308/** 300/**
… …
324 sl.len=strlen((char*)sl.buf); 316 sl.len=strlen((char*)sl.buf);
325 317
326 SockList_AddInt(&sl, op->count); 318 SockList_AddInt(&sl, op->count);
327 319
328 for (tmp=op->inv; tmp; tmp=tmp->below) { 320 for (tmp=op->inv; tmp; tmp=tmp->below) {
329 object *head; 321 object *head;
330 322
331 if (tmp->head) head = tmp->head; 323 if (tmp->head) head = tmp->head;
332 else head = tmp; 324 else head = tmp;
333 325
334 if (LOOK_OBJ(head)) { 326 if (LOOK_OBJ(head)) {
335 add_object_to_socklist(&pl->contr->socket, &sl, head); 327 add_object_to_socklist(&pl->contr->socket, &sl, head);
336 328
337 got_one++; 329 got_one++;
338 330
339 /* IT is possible for players to accumulate a huge amount of 331 /* IT is possible for players to accumulate a huge amount of
340 * items (especially with some of the bags out there) to 332 * items (especially with some of the bags out there) to
341 * overflow the buffer. IF so, send multiple item commands. 333 * overflow the buffer. IF so, send multiple item commands.
342 */ 334 */
343 if (sl.len >= (MAXSOCKBUF-MAXITEMLEN)) { 335 if (sl.len >= (MAXSOCKBUF-MAXITEMLEN)) {
344 Send_With_Handling(&pl->contr->socket, &sl); 336 Send_With_Handling(&pl->contr->socket, &sl);
345 sprintf((char*)sl.buf,"item%d ", pl->contr->socket.itemcmd); 337 sprintf((char*)sl.buf,"item%d ", pl->contr->socket.itemcmd);
346 sl.len=strlen((char*)sl.buf); 338 sl.len=strlen((char*)sl.buf);
347 SockList_AddInt(&sl, op->count); 339 SockList_AddInt(&sl, op->count);
348 got_one=0; 340 got_one=0;
349 } 341 }
350 } /* If LOOK_OBJ() */ 342 } /* If LOOK_OBJ() */
351 } 343 }
352 if (got_one) 344 if (got_one)
353 Send_With_Handling(&pl->contr->socket, &sl); 345 Send_With_Handling(&pl->contr->socket, &sl);
354 free(sl.buf); 346 free(sl.buf);
355} 347}
356 348
357/** 349/**
358 * Updates object *op for player *pl. 350 * Updates object *op for player *pl.
… …
366{ 358{
367 SockList sl; 359 SockList sl;
368 360
369 /* If we have a request to send the player item, skip a few checks. */ 361 /* If we have a request to send the player item, skip a few checks. */
370 if (op!=pl) { 362 if (op!=pl) {
371 if (! LOOK_OBJ(op)) 363 if (! LOOK_OBJ(op))
372 return; 364 return;
373 /* we remove the check for op->env, because in theory, the object 365 /* we remove the check for op->env, because in theory, the object
374 * is hopefully in the same place, so the client should preserve 366 * is hopefully in the same place, so the client should preserve
375 * order. 367 * order.
376 */ 368 */
377 } 369 }
378 if (!QUERY_FLAG(op, FLAG_CLIENT_SENT)) { 370 if (!QUERY_FLAG(op, FLAG_CLIENT_SENT)) {
379 /* FLAG_CLIENT_SENT is debug only. We are using it to see where 371 /* FLAG_CLIENT_SENT is debug only. We are using it to see where
380 * this is happening - we can set a breakpoint here in the debugger 372 * this is happening - we can set a breakpoint here in the debugger
381 * and track back the call. 373 * and track back the call.
382 */ 374 */
383 LOG(llevDebug,"We have not sent item %s (%d)\n", op->name, op->count); 375 LOG(llevDebug,"We have not sent item %s (%d)\n", op->name, op->count);
384 } 376 }
385 sl.buf= (unsigned char *) malloc(MAXSOCKBUF); 377 sl.buf= (unsigned char *) malloc(MAXSOCKBUF);
386 378
387 strcpy((char*)sl.buf,"upditem "); 379 strcpy((char*)sl.buf,"upditem ");
388 sl.len=strlen((char*)sl.buf); 380 sl.len=strlen((char*)sl.buf);
… …
392 if (op->head) op=op->head; 384 if (op->head) op=op->head;
393 385
394 SockList_AddInt(&sl, op->count); 386 SockList_AddInt(&sl, op->count);
395 387
396 if (flags & UPD_LOCATION) 388 if (flags & UPD_LOCATION)
397 SockList_AddInt(&sl, op->env? op->env->count:0); 389 SockList_AddInt(&sl, op->env? op->env->count:0);
398 390
399 if (flags & UPD_FLAGS) 391 if (flags & UPD_FLAGS)
400 SockList_AddInt(&sl, query_flags(op)); 392 SockList_AddInt(&sl, query_flags(op));
401 393
402 if (flags & UPD_WEIGHT) { 394 if (flags & UPD_WEIGHT) {
403 sint32 weight = WEIGHT(op); 395 sint32 weight = WEIGHT(op);
404 396
405 /* TRANSPORTS are odd - they sort of look like containers, yet can't be
406 * picked up. So we don't to send the weight, as it is odd that you see
407 * weight sometimes and not other (the draw_look won't send it
408 * for example.
409 */
410 SockList_AddInt(&sl, QUERY_FLAG(op, FLAG_NO_PICK) ? -1 : weight); 397 SockList_AddInt(&sl, QUERY_FLAG(op, FLAG_NO_PICK) ? -1 : weight);
411 if (pl == op) { 398 if (pl == op) {
412 op->contr->last_weight = weight; 399 op->contr->last_weight = weight;
413 } 400 }
414 } 401 }
415 402
416 if (flags & UPD_FACE) { 403 if (flags & UPD_FACE) {
417 if (!(pl->contr->socket.faces_sent[op->face->number] & NS_FACESENT_FACE)) 404 if (!(pl->contr->socket.faces_sent[op->face->number] & NS_FACESENT_FACE))
418 esrv_send_face(&pl->contr->socket, op->face->number,0); 405 esrv_send_face(&pl->contr->socket, op->face->number,0);
419 SockList_AddInt(&sl, op->face->number); 406 SockList_AddInt(&sl, op->face->number);
420 } 407 }
421 if (flags & UPD_NAME) { 408 if (flags & UPD_NAME) {
422 int len; 409 int len;
423 const char *item_p; 410 const char *item_p;
424 char item_n[MAX_BUF]; 411 char item_n[MAX_BUF];
425 412
426 if (!op->custom_name) { 413 if (!op->custom_name) {
427 strncpy(item_n,query_base_name(op, 0),127); 414 strncpy(item_n,query_base_name(op, 0),127);
428 item_n[127]=0; 415 item_n[127]=0;
429 len=strlen(item_n); 416 len=strlen(item_n);
430 item_p=query_base_name(op, 1); 417 item_p=query_base_name(op, 1);
431 } 418 }
432 else { 419 else {
433 strncpy(item_n,op->custom_name,127); 420 strncpy(item_n,op->custom_name,127);
434 item_n[127]=0; 421 item_n[127]=0;
435 len=strlen(item_n); 422 len=strlen(item_n);
436 item_p=op->custom_name; 423 item_p=op->custom_name;
437 } 424 }
438 425
439 strncpy(item_n+len+1, item_p, 127); 426 strncpy(item_n+len+1, item_p, 127);
440 item_n[254]=0; 427 item_n[254]=0;
441 len += strlen(item_n+1+len) + 1; 428 len += strlen(item_n+1+len) + 1;
442 SockList_AddChar(&sl, (char)len); 429 SockList_AddChar(&sl, (char)len);
443 memcpy(sl.buf+sl.len, item_n, len); 430 memcpy(sl.buf+sl.len, item_n, len);
444 sl.len += len; 431 sl.len += len;
445 } 432 }
446 if (flags & UPD_ANIM) 433 if (flags & UPD_ANIM)
447 SockList_AddShort(&sl,op->animation_id); 434 SockList_AddShort(&sl,op->animation_id);
448 435
449 if (flags & UPD_ANIMSPEED) { 436 if (flags & UPD_ANIMSPEED) {
450 int anim_speed=0; 437 int anim_speed=0;
451 if (QUERY_FLAG(op,FLAG_ANIMATE)) { 438 if (QUERY_FLAG(op,FLAG_ANIMATE)) {
452 if (op->anim_speed) anim_speed=op->anim_speed; 439 if (op->anim_speed) anim_speed=op->anim_speed;
453 else { 440 else {
454 if (FABS(op->speed)<0.001) anim_speed=255; 441 if (FABS(op->speed)<0.001) anim_speed=255;
455 else if (FABS(op->speed)>=1.0) anim_speed=1; 442 else if (FABS(op->speed)>=1.0) anim_speed=1;
456 else anim_speed = (int) (1.0/FABS(op->speed)); 443 else anim_speed = (int) (1.0/FABS(op->speed));
457 } 444 }
458 if (anim_speed>255) anim_speed=255; 445 if (anim_speed>255) anim_speed=255;
459 } 446 }
460 SockList_AddChar(&sl, (char)anim_speed); 447 SockList_AddChar(&sl, (char)anim_speed);
461 } 448 }
462 if (flags & UPD_NROF) 449 if (flags & UPD_NROF)
463 SockList_AddInt(&sl, op->nrof); 450 SockList_AddInt(&sl, op->nrof);
464 451
465 Send_With_Handling(&pl->contr->socket, &sl); 452 Send_With_Handling(&pl->contr->socket, &sl);
466 free(sl.buf); 453 free(sl.buf);
467} 454}
468 455
… …
473{ 460{
474 SockList sl; 461 SockList sl;
475 462
476 /* If this is not the player object, do some more checks */ 463 /* If this is not the player object, do some more checks */
477 if (op!=pl) { 464 if (op!=pl) {
478 /* We only send 'visibile' objects to the client */ 465 /* We only send 'visibile' objects to the client */
479 if (! LOOK_OBJ(op)) 466 if (! LOOK_OBJ(op))
480 return; 467 return;
481 /* if the item is on the ground, mark that the look needs to 468 /* if the item is on the ground, mark that the look needs to
482 * be updated. 469 * be updated.
483 */ 470 */
484 if (!op->env) { 471 if (!op->env) {
485 pl->contr->socket.update_look=1; 472 pl->contr->socket.update_look=1;
486 return; 473 return;
487 } 474 }
488 } 475 }
489 476
490 sl.buf= (unsigned char *) malloc(MAXSOCKBUF); 477 sl.buf= (unsigned char *) malloc(MAXSOCKBUF);
491 478
492 sprintf((char*)sl.buf,"item%d ", pl->contr->socket.itemcmd); 479 sprintf((char*)sl.buf,"item%d ", pl->contr->socket.itemcmd);
… …
537object *esrv_get_ob_from_count(object *pl, tag_t count) 524object *esrv_get_ob_from_count(object *pl, tag_t count)
538{ 525{
539 object *op, *tmp; 526 object *op, *tmp;
540 527
541 if (pl->count == count) 528 if (pl->count == count)
542 return pl; 529 return pl;
543 530
544 for(op = pl->inv; op; op = op->below) 531 for(op = pl->inv; op; op = op->below)
545 if (op->count == count) 532 if (op->count == count)
546 return op; 533 return op;
547 else if (op->type == CONTAINER && pl->container == op) 534 else if (op->type == CONTAINER && pl->container == op)
548 for(tmp = op->inv; tmp; tmp = tmp->below) 535 for(tmp = op->inv; tmp; tmp = tmp->below)
549 if (tmp->count == count) 536 if (tmp->count == count)
550 return tmp; 537 return tmp;
551 538
552 for(op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above) 539 for(op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above)
553 if (op->head != NULL && op->head->count == count) 540 if (op->head != NULL && op->head->count == count)
554 return op; 541 return op;
555 else if (op->count == count) 542 else if (op->count == count)
556 return op; 543 return op;
557 else if (op->type == CONTAINER && pl->container == op) 544 else if (op->type == CONTAINER && pl->container == op)
558 for(tmp = op->inv; tmp; tmp = tmp->below) 545 for(tmp = op->inv; tmp; tmp = tmp->below)
559 if (tmp->count == count)
560 return tmp;
561
562 if (pl->contr->transport) {
563 for(tmp = pl->contr->transport->inv; tmp; tmp = tmp->below)
564 if (tmp->count == count) 546 if (tmp->count == count)
565 return tmp; 547 return tmp;
566 } 548
567 return NULL; 549 return NULL;
568} 550}
569 551
570 552
571/** Client wants to examine some object. So lets do so. */ 553/** Client wants to examine some object. So lets do so. */
… …
573{ 555{
574 long tag = atoi(buf); 556 long tag = atoi(buf);
575 object *op = esrv_get_ob_from_count(pl->ob, tag); 557 object *op = esrv_get_ob_from_count(pl->ob, tag);
576 558
577 if (!op) { 559 if (!op) {
578 LOG(llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", 560 LOG(llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n",
579 pl->ob->name, tag); 561 pl->ob->name, tag);
580 return; 562 return;
581 } 563 }
582 examine (pl->ob, op); 564 examine (pl->ob, op);
583} 565}
584 566
585/** Client wants to apply some object. Lets do so. */ 567/** Client wants to apply some object. Lets do so. */
… …
593 */ 575 */
594 if (QUERY_FLAG(pl->ob, FLAG_REMOVED)) return; 576 if (QUERY_FLAG(pl->ob, FLAG_REMOVED)) return;
595 577
596 /* If the high bit is set, player applied a pseudo object. */ 578 /* If the high bit is set, player applied a pseudo object. */
597 if (tag & 0x80000000) { 579 if (tag & 0x80000000) {
598 pl->socket.look_position = tag & 0x7fffffff; 580 pl->socket.look_position = tag & 0x7fffffff;
599 pl->socket.update_look = 1; 581 pl->socket.update_look = 1;
600 return; 582 return;
601 } 583 }
602 584
603 if (!op) { 585 if (!op) {
604 LOG(llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", 586 LOG(llevDebug, "Player '%s' tried to apply the unknown object (%d)\n",
605 pl->ob->name, tag); 587 pl->ob->name, tag);
606 return; 588 return;
607 } 589 }
608 player_apply (pl->ob, op, 0, 0); 590 player_apply (pl->ob, op, 0, 0);
609} 591}
610 592
611/** Client wants to apply some object. Lets do so. */ 593/** Client wants to apply some object. Lets do so. */
… …
617 flag = data[0]; 599 flag = data[0];
618 tag = GetInt_String(data+1); 600 tag = GetInt_String(data+1);
619 op = esrv_get_ob_from_count(pl->ob, tag); 601 op = esrv_get_ob_from_count(pl->ob, tag);
620 602
621 if (!op) { 603 if (!op) {
622 new_draw_info(NDI_UNIQUE, 0, pl->ob,"Could not find object to lock/unlock"); 604 new_draw_info(NDI_UNIQUE, 0, pl->ob,"Could not find object to lock/unlock");
623 return; 605 return;
624 } 606 }
625 if (!flag) 607 if (!flag)
626 CLEAR_FLAG(op,FLAG_INV_LOCKED); 608 CLEAR_FLAG(op,FLAG_INV_LOCKED);
627 else 609 else
628 SET_FLAG(op,FLAG_INV_LOCKED); 610 SET_FLAG(op,FLAG_INV_LOCKED);
629 esrv_update_item(UPD_FLAGS, pl->ob, op); 611 esrv_update_item(UPD_FLAGS, pl->ob, op);
630} 612}
631 613
632/** Client wants to apply some object. Lets do so. */ 614/** Client wants to apply some object. Lets do so. */
633void MarkItem(uint8 *data, int len,player *pl) 615void MarkItem(uint8 *data, int len,player *pl)
… …
636 object *op; 618 object *op;
637 619
638 tag = GetInt_String(data); 620 tag = GetInt_String(data);
639 op = esrv_get_ob_from_count(pl->ob, tag); 621 op = esrv_get_ob_from_count(pl->ob, tag);
640 if (!op) { 622 if (!op) {
641 new_draw_info(NDI_UNIQUE, 0, pl->ob,"Could not find object to mark"); 623 new_draw_info(NDI_UNIQUE, 0, pl->ob,"Could not find object to mark");
642 return; 624 return;
643 } 625 }
644 pl->mark = op; 626 pl->mark = op;
645 pl->mark_count = op->count; 627 pl->mark_count = op->count;
646 new_draw_info_format(NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name(op)); 628 new_draw_info_format(NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name(op));
647} 629}
… …
666 648
667 m = get_map_from_coord(op->map, &x, &y); 649 m = get_map_from_coord(op->map, &x, &y);
668 if (!m) return; 650 if (!m) return;
669 651
670 for(tmp=get_map_ob(m, x ,y);tmp!=NULL&&tmp->above!=NULL; 652 for(tmp=get_map_ob(m, x ,y);tmp!=NULL&&tmp->above!=NULL;
671 tmp=tmp->above); 653 tmp=tmp->above);
672 654
673 for ( ; tmp != NULL; tmp=tmp->below ) { 655 for ( ; tmp != NULL; tmp=tmp->below ) {
674 if (tmp->invisible && !QUERY_FLAG(op, FLAG_WIZ)) continue; 656 if (tmp->invisible && !QUERY_FLAG(op, FLAG_WIZ)) continue;
675 657
676 if(!flag) { 658 if(!flag) {
677 if(dx||dy) 659 if(dx||dy)
678 new_draw_info(NDI_UNIQUE, 0,op,"There you see:"); 660 new_draw_info(NDI_UNIQUE, 0,op,"There you see:");
679 else { 661 else {
680 clear_win_info(op); 662 clear_win_info(op);
681 new_draw_info(NDI_UNIQUE, 0,op,"You see:"); 663 new_draw_info(NDI_UNIQUE, 0,op,"You see:");
682 } 664 }
683 flag=1; 665 flag=1;
684 } 666 }
685 667
686 if (QUERY_FLAG(op, FLAG_WIZ)) 668 if (QUERY_FLAG(op, FLAG_WIZ))
687 new_draw_info_format(NDI_UNIQUE,0, op, "- %s (%d).",query_name(tmp),tmp->count); 669 new_draw_info_format(NDI_UNIQUE,0, op, "- %s (%d).",query_name(tmp),tmp->count);
688 else 670 else
689 new_draw_info_format(NDI_UNIQUE,0, op, "- %s.",query_name(tmp)); 671 new_draw_info_format(NDI_UNIQUE,0, op, "- %s.",query_name(tmp));
690 672
691 if (((tmp->inv!=NULL || (tmp->head && tmp->head->inv)) && 673 if (((tmp->inv!=NULL || (tmp->head && tmp->head->inv)) &&
692 (tmp->type != CONTAINER && tmp->type!=FLESH)) || QUERY_FLAG(op, FLAG_WIZ)) 674 (tmp->type != CONTAINER && tmp->type!=FLESH)) || QUERY_FLAG(op, FLAG_WIZ))
693 inventory(op,tmp->head==NULL?tmp:tmp->head); 675 inventory(op,tmp->head==NULL?tmp:tmp->head);
694 676
695 if(QUERY_FLAG(tmp, FLAG_IS_FLOOR)&&!QUERY_FLAG(op, FLAG_WIZ)) /* don't continue under the floor */ 677 if(QUERY_FLAG(tmp, FLAG_IS_FLOOR)&&!QUERY_FLAG(op, FLAG_WIZ)) /* don't continue under the floor */
696 break; 678 break;
697 } 679 }
698 680
699 if(!flag) { 681 if(!flag) {
700 if(dx||dy) 682 if(dx||dy)
701 new_draw_info(NDI_UNIQUE, 0,op,"You see nothing there."); 683 new_draw_info(NDI_UNIQUE, 0,op,"You see nothing there.");
702 else 684 else
703 new_draw_info(NDI_UNIQUE, 0,op,"You see nothing."); 685 new_draw_info(NDI_UNIQUE, 0,op,"You see nothing.");
704 } 686 }
705} 687}
706 688
707 689
708 690
… …
712 int dx, dy; 694 int dx, dy;
713 char *cp; 695 char *cp;
714 696
715 dx=atoi(buf); 697 dx=atoi(buf);
716 if (!(cp=strchr(buf,' '))) { 698 if (!(cp=strchr(buf,' '))) {
717 return; 699 return;
718 } 700 }
719 dy=atoi(cp); 701 dy=atoi(cp);
720 702
721 if (FABS(dx) > pl->socket.mapx / 2 || FABS(dy) > pl->socket.mapy / 2) 703 if (FABS(dx) > pl->socket.mapx / 2 || FABS(dy) > pl->socket.mapy / 2)
722 return; 704 return;
… …
732{ 714{
733 object *op, *env; 715 object *op, *env;
734 716
735 op = esrv_get_ob_from_count(pl, tag); 717 op = esrv_get_ob_from_count(pl, tag);
736 if (!op) { 718 if (!op) {
737 LOG(llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", 719 LOG(llevDebug, "Player '%s' tried to move an unknown object (%ld)\n",
738 pl->name, tag); 720 pl->name, tag);
739 return; 721 return;
740 } 722 }
741 723
742 /* If on a transport, you don't drop to the ground - you drop to the 724 if (!to) { /* drop it to the ground */
743 * transport. 725/* LOG(llevDebug, "Drop it on the ground.\n");*/
726
727 if (op->map && !op->env) {
728/* LOG(llevDebug,"Dropping object to ground that is already on ground\n");*/
729 return;
730 }
731 /* If it is an active container, then we should drop all objects
732 * in the container and not the container itself.
733 */
734 if (op->inv && QUERY_FLAG(op, FLAG_APPLIED)) {
735 object *current, *next;
736 for (current=op->inv; current!=NULL; current=next) {
737 next=current->below;
738 drop_object(pl, current, 0);
739 }
740 esrv_update_item(UPD_WEIGHT, pl, op);
741 }
742 else {
743 drop_object (pl, op, nrof);
744 }
745 return;
746 } else if (to == pl->count) { /* pick it up to the inventory */
747 /* return if player has already picked it up */
748 if (op->env == pl) return;
749
750 pl->contr->count = nrof;
751 pick_up(pl, op);
752 return ;
753 }
754 env = esrv_get_ob_from_count(pl, to);
755 if (!env) {
756 LOG(llevDebug,
757 "Player '%s' tried to move object to the unknown location (%d)\n",
758 pl->name, to);
759 return;
760 }
761 /* put_object_in_sack presumes that necessary sanity checking
762 * has already been done (eg, it can be picked up and fits in
763 * in a sack, so check for those things. We should also check
764 * an make sure env is in fact a container for that matter.
744 */ 765 */
745 if (!to && !pl->contr->transport) { /* drop it to the ground */
746/* LOG(llevDebug, "Drop it on the ground.\n");*/
747
748 if (op->map && !op->env) {
749/* LOG(llevDebug,"Dropping object to ground that is already on ground\n");*/
750 return;
751 }
752 /* If it is an active container, then we should drop all objects
753 * in the container and not the container itself.
754 */
755 if (op->inv && QUERY_FLAG(op, FLAG_APPLIED)) {
756 object *current, *next;
757 for (current=op->inv; current!=NULL; current=next) {
758 next=current->below;
759 drop_object(pl, current, 0);
760 }
761 esrv_update_item(UPD_WEIGHT, pl, op);
762 }
763 else {
764 drop_object (pl, op, nrof);
765 }
766 return;
767 } else if (to == pl->count) { /* pick it up to the inventory */
768 /* return if player has already picked it up */
769 if (op->env == pl) return;
770
771 pl->contr->count = nrof;
772 pick_up(pl, op);
773 return ;
774 }
775 /* If not dropped or picked up, we are putting it into a sack */
776 if (pl->contr->transport) {
777 if (can_pick(pl, op) && transport_can_hold(pl->contr->transport, op, nrof)) {
778 put_object_in_sack (pl, pl->contr->transport, op, nrof);
779 }
780 } else {
781 env = esrv_get_ob_from_count(pl, to);
782 if (!env) {
783 LOG(llevDebug,
784 "Player '%s' tried to move object to the unknown location (%d)\n",
785 pl->name, to);
786 return;
787 }
788 /* put_object_in_sack presumes that necessary sanity checking
789 * has already been done (eg, it can be picked up and fits in
790 * in a sack, so check for those things. We should also check
791 * an make sure env is in fact a container for that matter.
792 */
793 if (env->type == CONTAINER 766 if (env->type == CONTAINER
794 && can_pick(pl, op) && sack_can_hold(pl, env, op, nrof)) { 767 && can_pick(pl, op) && sack_can_hold(pl, env, op, nrof)) {
795 put_object_in_sack (pl, env, op, nrof); 768 put_object_in_sack (pl, env, op, nrof);
796 }
797 } 769 }
798} 770}
799 771
800 772

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines