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.2 by root, Tue Aug 29 07:34:01 2006 UTC vs.
Revision 1.4 by root, Sun Sep 3 00:18:43 2006 UTC

1 1
2/* 2/*
3 * static char *rcsid_item_c = 3 * static char *rcsid_item_c =
4 * "$Id: item.C,v 1.2 2006/08/29 07:34:01 root Exp $"; 4 * "$Id: item.C,v 1.4 2006/09/03 00:18:43 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 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) ;
225 225
226 sl.buf= (unsigned char *) malloc(MAXSOCKBUF); 226 sl.buf= (unsigned char *) malloc(MAXSOCKBUF);
227 227
… …
230 sl.len=strlen((char*)sl.buf); 230 sl.len=strlen((char*)sl.buf);
231 231
232 SockList_AddInt(&sl, 0); 232 SockList_AddInt(&sl, 0);
233 233
234 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))
235 esrv_send_face(&pl->contr->socket, empty_face->number,0); 235 esrv_send_face(&pl->contr->socket, empty_face->number,0);
236 236
237 if (pl->contr->socket.look_position) { 237 if (pl->contr->socket.look_position) {
238 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));
239 SockList_AddInt(&sl, 0); 239 SockList_AddInt(&sl, 0);
240 SockList_AddInt(&sl, (uint32) -1); 240 SockList_AddInt(&sl, (uint32) -1);
241 SockList_AddInt(&sl, empty_face->number); 241 SockList_AddInt(&sl, empty_face->number);
242 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);
243 add_stringlen_to_sockbuf(buf, &sl); 243 add_stringlen_to_sockbuf(buf, &sl);
244 SockList_AddShort(&sl,0);
245 SockList_AddChar(&sl, 0);
246 SockList_AddInt(&sl, 0);
247 if (pl->contr->socket.itemcmd == 2)
248 SockList_AddShort(&sl, 0); 244 SockList_AddShort(&sl,0);
245 SockList_AddChar(&sl, 0);
246 SockList_AddInt(&sl, 0);
247 if (pl->contr->socket.itemcmd == 2)
248 SockList_AddShort(&sl, 0);
249 } 249 }
250 250
251 for (last=NULL; tmp!=last; tmp=tmp->below) { 251 for (last=NULL; tmp!=last; tmp=tmp->below) {
252 object *head; 252 object *head;
253 253
254 if (QUERY_FLAG(tmp, FLAG_IS_FLOOR) && !last) { 254 if (QUERY_FLAG(tmp, FLAG_IS_FLOOR) && !last) {
255 last = tmp->below; /* assumes double floor mode */ 255 last = tmp->below; /* assumes double floor mode */
256 if (last && QUERY_FLAG(last, FLAG_IS_FLOOR)) 256 if (last && QUERY_FLAG(last, FLAG_IS_FLOOR))
257 last = last->below; 257 last = last->below;
258 } 258 }
259 if (LOOK_OBJ(tmp)) { 259 if (LOOK_OBJ(tmp)) {
260 if (++start_look < pl->contr->socket.look_position) continue; 260 if (++start_look < pl->contr->socket.look_position) continue;
261 end_look++; 261 end_look++;
262 if (end_look > NUM_LOOK_OBJECTS) { 262 if (end_look > NUM_LOOK_OBJECTS) {
263 /* 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,
264 * we notice the special tag the object has, and act accordingly. 264 * we notice the special tag the object has, and act accordingly.
265 */ 265 */
266 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));
267 SockList_AddInt(&sl, 0); 267 SockList_AddInt(&sl, 0);
268 SockList_AddInt(&sl, (uint32) -1); 268 SockList_AddInt(&sl, (uint32) -1);
269 SockList_AddInt(&sl, empty_face->number); 269 SockList_AddInt(&sl, empty_face->number);
270 sprintf(buf,"Click here to see next group of items"); 270 sprintf(buf,"Click here to see next group of items");
271 add_stringlen_to_sockbuf(buf, &sl); 271 add_stringlen_to_sockbuf(buf, &sl);
272 SockList_AddShort(&sl,0); 272 SockList_AddShort(&sl,0);
273 SockList_AddChar(&sl, 0); 273 SockList_AddChar(&sl, 0);
274 SockList_AddInt(&sl, 0); 274 SockList_AddInt(&sl, 0);
275 if (pl->contr->socket.itemcmd == 2) 275 if (pl->contr->socket.itemcmd == 2)
276 SockList_AddShort(&sl, 0); 276 SockList_AddShort(&sl, 0);
277 break; 277 break;
278 } 278 }
279 if (tmp->head) head = tmp->head; 279 if (tmp->head) head = tmp->head;
280 else head = tmp; 280 else head = tmp;
281 281
282 add_object_to_socklist(&pl->contr->socket, &sl, head); 282 add_object_to_socklist(&pl->contr->socket, &sl, head);
283 got_one++; 283 got_one++;
284 284
285 if (sl.len >= (MAXSOCKBUF-MAXITEMLEN)) { 285 if (sl.len >= (MAXSOCKBUF-MAXITEMLEN)) {
286 Send_With_Handling(&pl->contr->socket, &sl); 286 Send_With_Handling(&pl->contr->socket, &sl);
287 sprintf((char*)sl.buf,"item%d ", pl->contr->socket.itemcmd); 287 sprintf((char*)sl.buf,"item%d ", pl->contr->socket.itemcmd);
288 sl.len=strlen((char*)sl.buf); 288 sl.len=strlen((char*)sl.buf);
289 SockList_AddInt(&sl, 0); 289 SockList_AddInt(&sl, 0);
290 got_one=0; 290 got_one=0;
291 } 291 }
292 } /* If LOOK_OBJ() */ 292 } /* If LOOK_OBJ() */
293 } 293 }
294 if (got_one) 294 if (got_one)
295 Send_With_Handling(&pl->contr->socket, &sl); 295 Send_With_Handling(&pl->contr->socket, &sl);
296 296
297 free(sl.buf); 297 free(sl.buf);
298} 298}
299 299
300/** 300/**
… …
316 sl.len=strlen((char*)sl.buf); 316 sl.len=strlen((char*)sl.buf);
317 317
318 SockList_AddInt(&sl, op->count); 318 SockList_AddInt(&sl, op->count);
319 319
320 for (tmp=op->inv; tmp; tmp=tmp->below) { 320 for (tmp=op->inv; tmp; tmp=tmp->below) {
321 object *head; 321 object *head;
322 322
323 if (tmp->head) head = tmp->head; 323 if (tmp->head) head = tmp->head;
324 else head = tmp; 324 else head = tmp;
325 325
326 if (LOOK_OBJ(head)) { 326 if (LOOK_OBJ(head)) {
327 add_object_to_socklist(&pl->contr->socket, &sl, head); 327 add_object_to_socklist(&pl->contr->socket, &sl, head);
328 328
329 got_one++; 329 got_one++;
330 330
331 /* IT is possible for players to accumulate a huge amount of 331 /* IT is possible for players to accumulate a huge amount of
332 * items (especially with some of the bags out there) to 332 * items (especially with some of the bags out there) to
333 * overflow the buffer. IF so, send multiple item commands. 333 * overflow the buffer. IF so, send multiple item commands.
334 */ 334 */
335 if (sl.len >= (MAXSOCKBUF-MAXITEMLEN)) { 335 if (sl.len >= (MAXSOCKBUF-MAXITEMLEN)) {
336 Send_With_Handling(&pl->contr->socket, &sl); 336 Send_With_Handling(&pl->contr->socket, &sl);
337 sprintf((char*)sl.buf,"item%d ", pl->contr->socket.itemcmd); 337 sprintf((char*)sl.buf,"item%d ", pl->contr->socket.itemcmd);
338 sl.len=strlen((char*)sl.buf); 338 sl.len=strlen((char*)sl.buf);
339 SockList_AddInt(&sl, op->count); 339 SockList_AddInt(&sl, op->count);
340 got_one=0; 340 got_one=0;
341 } 341 }
342 } /* If LOOK_OBJ() */ 342 } /* If LOOK_OBJ() */
343 } 343 }
344 if (got_one) 344 if (got_one)
345 Send_With_Handling(&pl->contr->socket, &sl); 345 Send_With_Handling(&pl->contr->socket, &sl);
346 free(sl.buf); 346 free(sl.buf);
347} 347}
348 348
349/** 349/**
350 * Updates object *op for player *pl. 350 * Updates object *op for player *pl.
… …
358{ 358{
359 SockList sl; 359 SockList sl;
360 360
361 /* 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. */
362 if (op!=pl) { 362 if (op!=pl) {
363 if (! LOOK_OBJ(op)) 363 if (! LOOK_OBJ(op))
364 return; 364 return;
365 /* 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
366 * is hopefully in the same place, so the client should preserve 366 * is hopefully in the same place, so the client should preserve
367 * order. 367 * order.
368 */ 368 */
369 } 369 }
370 if (!QUERY_FLAG(op, FLAG_CLIENT_SENT)) { 370 if (!QUERY_FLAG(op, FLAG_CLIENT_SENT)) {
371 /* 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
372 * 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
373 * and track back the call. 373 * and track back the call.
374 */ 374 */
375 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);
376 } 376 }
377 sl.buf= (unsigned char *) malloc(MAXSOCKBUF); 377 sl.buf= (unsigned char *) malloc(MAXSOCKBUF);
378 378
379 strcpy((char*)sl.buf,"upditem "); 379 strcpy((char*)sl.buf,"upditem ");
380 sl.len=strlen((char*)sl.buf); 380 sl.len=strlen((char*)sl.buf);
… …
384 if (op->head) op=op->head; 384 if (op->head) op=op->head;
385 385
386 SockList_AddInt(&sl, op->count); 386 SockList_AddInt(&sl, op->count);
387 387
388 if (flags & UPD_LOCATION) 388 if (flags & UPD_LOCATION)
389 SockList_AddInt(&sl, op->env? op->env->count:0); 389 SockList_AddInt(&sl, op->env? op->env->count:0);
390 390
391 if (flags & UPD_FLAGS) 391 if (flags & UPD_FLAGS)
392 SockList_AddInt(&sl, query_flags(op)); 392 SockList_AddInt(&sl, query_flags(op));
393 393
394 if (flags & UPD_WEIGHT) { 394 if (flags & UPD_WEIGHT) {
395 sint32 weight = WEIGHT(op); 395 sint32 weight = WEIGHT(op);
396 396
397 SockList_AddInt(&sl, QUERY_FLAG(op, FLAG_NO_PICK) ? -1 : weight); 397 SockList_AddInt(&sl, QUERY_FLAG(op, FLAG_NO_PICK) ? -1 : weight);
398 if (pl == op) { 398 if (pl == op) {
399 op->contr->last_weight = weight; 399 op->contr->last_weight = weight;
400 } 400 }
401 } 401 }
402 402
403 if (flags & UPD_FACE) { 403 if (flags & UPD_FACE) {
404 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))
405 esrv_send_face(&pl->contr->socket, op->face->number,0); 405 esrv_send_face(&pl->contr->socket, op->face->number,0);
406 SockList_AddInt(&sl, op->face->number); 406 SockList_AddInt(&sl, op->face->number);
407 } 407 }
408 if (flags & UPD_NAME) { 408 if (flags & UPD_NAME) {
409 int len; 409 int len;
410 const char *item_p; 410 const char *item_p;
411 char item_n[MAX_BUF]; 411 char item_n[MAX_BUF];
412 412
413 if (!op->custom_name) { 413 if (!op->custom_name) {
414 strncpy(item_n,query_base_name(op, 0),127); 414 strncpy(item_n,query_base_name(op, 0),127);
415 item_n[127]=0; 415 item_n[127]=0;
416 len=strlen(item_n); 416 len=strlen(item_n);
417 item_p=query_base_name(op, 1); 417 item_p=query_base_name(op, 1);
418 } 418 }
419 else { 419 else {
420 strncpy(item_n,op->custom_name,127); 420 strncpy(item_n,op->custom_name,127);
421 item_n[127]=0; 421 item_n[127]=0;
422 len=strlen(item_n); 422 len=strlen(item_n);
423 item_p=op->custom_name; 423 item_p=op->custom_name;
424 } 424 }
425 425
426 strncpy(item_n+len+1, item_p, 127); 426 strncpy(item_n+len+1, item_p, 127);
427 item_n[254]=0; 427 item_n[254]=0;
428 len += strlen(item_n+1+len) + 1; 428 len += strlen(item_n+1+len) + 1;
429 SockList_AddChar(&sl, (char)len); 429 SockList_AddChar(&sl, (char)len);
430 memcpy(sl.buf+sl.len, item_n, len); 430 memcpy(sl.buf+sl.len, item_n, len);
431 sl.len += len; 431 sl.len += len;
432 } 432 }
433 if (flags & UPD_ANIM) 433 if (flags & UPD_ANIM)
434 SockList_AddShort(&sl,op->animation_id); 434 SockList_AddShort(&sl,op->animation_id);
435 435
436 if (flags & UPD_ANIMSPEED) { 436 if (flags & UPD_ANIMSPEED) {
437 int anim_speed=0; 437 int anim_speed=0;
438 if (QUERY_FLAG(op,FLAG_ANIMATE)) { 438 if (QUERY_FLAG(op,FLAG_ANIMATE)) {
439 if (op->anim_speed) anim_speed=op->anim_speed; 439 if (op->anim_speed) anim_speed=op->anim_speed;
440 else { 440 else {
441 if (FABS(op->speed)<0.001) anim_speed=255; 441 if (FABS(op->speed)<0.001) anim_speed=255;
442 else if (FABS(op->speed)>=1.0) anim_speed=1; 442 else if (FABS(op->speed)>=1.0) anim_speed=1;
443 else anim_speed = (int) (1.0/FABS(op->speed)); 443 else anim_speed = (int) (1.0/FABS(op->speed));
444 } 444 }
445 if (anim_speed>255) anim_speed=255; 445 if (anim_speed>255) anim_speed=255;
446 } 446 }
447 SockList_AddChar(&sl, (char)anim_speed); 447 SockList_AddChar(&sl, (char)anim_speed);
448 } 448 }
449 if (flags & UPD_NROF) 449 if (flags & UPD_NROF)
450 SockList_AddInt(&sl, op->nrof); 450 SockList_AddInt(&sl, op->nrof);
451 451
452 Send_With_Handling(&pl->contr->socket, &sl); 452 Send_With_Handling(&pl->contr->socket, &sl);
453 free(sl.buf); 453 free(sl.buf);
454} 454}
455 455
… …
460{ 460{
461 SockList sl; 461 SockList sl;
462 462
463 /* If this is not the player object, do some more checks */ 463 /* If this is not the player object, do some more checks */
464 if (op!=pl) { 464 if (op!=pl) {
465 /* We only send 'visibile' objects to the client */ 465 /* We only send 'visibile' objects to the client */
466 if (! LOOK_OBJ(op)) 466 if (! LOOK_OBJ(op))
467 return; 467 return;
468 /* 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
469 * be updated. 469 * be updated.
470 */ 470 */
471 if (!op->env) { 471 if (!op->env) {
472 pl->contr->socket.update_look=1; 472 pl->contr->socket.update_look=1;
473 return; 473 return;
474 } 474 }
475 } 475 }
476 476
477 sl.buf= (unsigned char *) malloc(MAXSOCKBUF); 477 sl.buf= (unsigned char *) malloc(MAXSOCKBUF);
478 478
479 sprintf((char*)sl.buf,"item%d ", pl->contr->socket.itemcmd); 479 sprintf((char*)sl.buf,"item%d ", pl->contr->socket.itemcmd);
… …
524object *esrv_get_ob_from_count(object *pl, tag_t count) 524object *esrv_get_ob_from_count(object *pl, tag_t count)
525{ 525{
526 object *op, *tmp; 526 object *op, *tmp;
527 527
528 if (pl->count == count) 528 if (pl->count == count)
529 return pl; 529 return pl;
530 530
531 for(op = pl->inv; op; op = op->below) 531 for(op = pl->inv; op; op = op->below)
532 if (op->count == count) 532 if (op->count == count)
533 return op; 533 return op;
534 else if (op->type == CONTAINER && pl->container == op) 534 else if (op->type == CONTAINER && pl->container == op)
535 for(tmp = op->inv; tmp; tmp = tmp->below) 535 for(tmp = op->inv; tmp; tmp = tmp->below)
536 if (tmp->count == count) 536 if (tmp->count == count)
537 return tmp; 537 return tmp;
538 538
539 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)
540 if (op->head != NULL && op->head->count == count) 540 if (op->head != NULL && op->head->count == count)
541 return op; 541 return op;
542 else if (op->count == count) 542 else if (op->count == count)
543 return op; 543 return op;
544 else if (op->type == CONTAINER && pl->container == op) 544 else if (op->type == CONTAINER && pl->container == op)
545 for(tmp = op->inv; tmp; tmp = tmp->below) 545 for(tmp = op->inv; tmp; tmp = tmp->below)
546 if (tmp->count == count) 546 if (tmp->count == count)
547 return tmp; 547 return tmp;
548 548
549 return NULL; 549 return NULL;
550} 550}
551 551
552 552
… …
555{ 555{
556 long tag = atoi(buf); 556 long tag = atoi(buf);
557 object *op = esrv_get_ob_from_count(pl->ob, tag); 557 object *op = esrv_get_ob_from_count(pl->ob, tag);
558 558
559 if (!op) { 559 if (!op) {
560 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", &pl->ob->name, tag);
561 pl->ob->name, tag); 561 return;
562 return;
563 } 562 }
564 examine (pl->ob, op); 563 examine (pl->ob, op);
565} 564}
566 565
567/** Client wants to apply some object. Lets do so. */ 566/** Client wants to apply some object. Lets do so. */
… …
575 */ 574 */
576 if (QUERY_FLAG(pl->ob, FLAG_REMOVED)) return; 575 if (QUERY_FLAG(pl->ob, FLAG_REMOVED)) return;
577 576
578 /* If the high bit is set, player applied a pseudo object. */ 577 /* If the high bit is set, player applied a pseudo object. */
579 if (tag & 0x80000000) { 578 if (tag & 0x80000000) {
580 pl->socket.look_position = tag & 0x7fffffff; 579 pl->socket.look_position = tag & 0x7fffffff;
581 pl->socket.update_look = 1; 580 pl->socket.update_look = 1;
582 return; 581 return;
583 } 582 }
584 583
585 if (!op) { 584 if (!op) {
586 LOG(llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", 585 LOG(llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag);
587 pl->ob->name, tag); 586 return;
588 return;
589 } 587 }
590 player_apply (pl->ob, op, 0, 0); 588 player_apply (pl->ob, op, 0, 0);
591} 589}
592 590
593/** Client wants to apply some object. Lets do so. */ 591/** Client wants to apply some object. Lets do so. */
… …
599 flag = data[0]; 597 flag = data[0];
600 tag = GetInt_String(data+1); 598 tag = GetInt_String(data+1);
601 op = esrv_get_ob_from_count(pl->ob, tag); 599 op = esrv_get_ob_from_count(pl->ob, tag);
602 600
603 if (!op) { 601 if (!op) {
604 new_draw_info(NDI_UNIQUE, 0, pl->ob,"Could not find object to lock/unlock"); 602 new_draw_info(NDI_UNIQUE, 0, pl->ob,"Could not find object to lock/unlock");
605 return; 603 return;
606 } 604 }
607 if (!flag) 605 if (!flag)
608 CLEAR_FLAG(op,FLAG_INV_LOCKED); 606 CLEAR_FLAG(op,FLAG_INV_LOCKED);
609 else 607 else
610 SET_FLAG(op,FLAG_INV_LOCKED); 608 SET_FLAG(op,FLAG_INV_LOCKED);
611 esrv_update_item(UPD_FLAGS, pl->ob, op); 609 esrv_update_item(UPD_FLAGS, pl->ob, op);
612} 610}
613 611
614/** Client wants to apply some object. Lets do so. */ 612/** Client wants to apply some object. Lets do so. */
615void MarkItem(uint8 *data, int len,player *pl) 613void MarkItem(uint8 *data, int len,player *pl)
… …
618 object *op; 616 object *op;
619 617
620 tag = GetInt_String(data); 618 tag = GetInt_String(data);
621 op = esrv_get_ob_from_count(pl->ob, tag); 619 op = esrv_get_ob_from_count(pl->ob, tag);
622 if (!op) { 620 if (!op) {
623 new_draw_info(NDI_UNIQUE, 0, pl->ob,"Could not find object to mark"); 621 new_draw_info(NDI_UNIQUE, 0, pl->ob,"Could not find object to mark");
624 return; 622 return;
625 } 623 }
626 pl->mark = op; 624 pl->mark = op;
627 pl->mark_count = op->count; 625 pl->mark_count = op->count;
628 new_draw_info_format(NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name(op)); 626 new_draw_info_format(NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name(op));
629} 627}
… …
648 646
649 m = get_map_from_coord(op->map, &x, &y); 647 m = get_map_from_coord(op->map, &x, &y);
650 if (!m) return; 648 if (!m) return;
651 649
652 for(tmp=get_map_ob(m, x ,y);tmp!=NULL&&tmp->above!=NULL; 650 for(tmp=get_map_ob(m, x ,y);tmp!=NULL&&tmp->above!=NULL;
653 tmp=tmp->above); 651 tmp=tmp->above);
654 652
655 for ( ; tmp != NULL; tmp=tmp->below ) { 653 for ( ; tmp != NULL; tmp=tmp->below ) {
656 if (tmp->invisible && !QUERY_FLAG(op, FLAG_WIZ)) continue; 654 if (tmp->invisible && !QUERY_FLAG(op, FLAG_WIZ)) continue;
657 655
658 if(!flag) { 656 if(!flag) {
659 if(dx||dy) 657 if(dx||dy)
660 new_draw_info(NDI_UNIQUE, 0,op,"There you see:"); 658 new_draw_info(NDI_UNIQUE, 0,op,"There you see:");
661 else { 659 else {
662 clear_win_info(op); 660 clear_win_info(op);
663 new_draw_info(NDI_UNIQUE, 0,op,"You see:"); 661 new_draw_info(NDI_UNIQUE, 0,op,"You see:");
664 } 662 }
665 flag=1; 663 flag=1;
666 } 664 }
667 665
668 if (QUERY_FLAG(op, FLAG_WIZ)) 666 if (QUERY_FLAG(op, FLAG_WIZ))
669 new_draw_info_format(NDI_UNIQUE,0, op, "- %s (%d).",query_name(tmp),tmp->count); 667 new_draw_info_format(NDI_UNIQUE,0, op, "- %s (%d).",query_name(tmp),tmp->count);
670 else 668 else
671 new_draw_info_format(NDI_UNIQUE,0, op, "- %s.",query_name(tmp)); 669 new_draw_info_format(NDI_UNIQUE,0, op, "- %s.",query_name(tmp));
672 670
673 if (((tmp->inv!=NULL || (tmp->head && tmp->head->inv)) && 671 if (((tmp->inv!=NULL || (tmp->head && tmp->head->inv)) &&
674 (tmp->type != CONTAINER && tmp->type!=FLESH)) || QUERY_FLAG(op, FLAG_WIZ)) 672 (tmp->type != CONTAINER && tmp->type!=FLESH)) || QUERY_FLAG(op, FLAG_WIZ))
675 inventory(op,tmp->head==NULL?tmp:tmp->head); 673 inventory(op,tmp->head==NULL?tmp:tmp->head);
676 674
677 if(QUERY_FLAG(tmp, FLAG_IS_FLOOR)&&!QUERY_FLAG(op, FLAG_WIZ)) /* don't continue under the floor */ 675 if(QUERY_FLAG(tmp, FLAG_IS_FLOOR)&&!QUERY_FLAG(op, FLAG_WIZ)) /* don't continue under the floor */
678 break; 676 break;
679 } 677 }
680 678
681 if(!flag) { 679 if(!flag) {
682 if(dx||dy) 680 if(dx||dy)
683 new_draw_info(NDI_UNIQUE, 0,op,"You see nothing there."); 681 new_draw_info(NDI_UNIQUE, 0,op,"You see nothing there.");
684 else 682 else
685 new_draw_info(NDI_UNIQUE, 0,op,"You see nothing."); 683 new_draw_info(NDI_UNIQUE, 0,op,"You see nothing.");
686 } 684 }
687} 685}
688 686
689 687
690 688
… …
694 int dx, dy; 692 int dx, dy;
695 char *cp; 693 char *cp;
696 694
697 dx=atoi(buf); 695 dx=atoi(buf);
698 if (!(cp=strchr(buf,' '))) { 696 if (!(cp=strchr(buf,' '))) {
699 return; 697 return;
700 } 698 }
701 dy=atoi(cp); 699 dy=atoi(cp);
702 700
703 if (FABS(dx) > pl->socket.mapx / 2 || FABS(dy) > pl->socket.mapy / 2) 701 if (FABS(dx) > pl->socket.mapx / 2 || FABS(dy) > pl->socket.mapy / 2)
704 return; 702 return;
… …
714{ 712{
715 object *op, *env; 713 object *op, *env;
716 714
717 op = esrv_get_ob_from_count(pl, tag); 715 op = esrv_get_ob_from_count(pl, tag);
718 if (!op) { 716 if (!op) {
719 LOG(llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", 717 LOG(llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);
720 pl->name, tag); 718 return;
721 return;
722 } 719 }
723 720
724 if (!to) { /* drop it to the ground */ 721 if (!to) { /* drop it to the ground */
725/* LOG(llevDebug, "Drop it on the ground.\n");*/ 722/* LOG(llevDebug, "Drop it on the ground.\n");*/
726 723
727 if (op->map && !op->env) { 724 if (op->map && !op->env) {
728/* LOG(llevDebug,"Dropping object to ground that is already on ground\n");*/ 725/* LOG(llevDebug,"Dropping object to ground that is already on ground\n");*/
729 return; 726 return;
730 } 727 }
731 /* If it is an active container, then we should drop all objects 728 /* If it is an active container, then we should drop all objects
732 * in the container and not the container itself. 729 * in the container and not the container itself.
733 */ 730 */
734 if (op->inv && QUERY_FLAG(op, FLAG_APPLIED)) { 731 if (op->inv && QUERY_FLAG(op, FLAG_APPLIED)) {
735 object *current, *next; 732 object *current, *next;
736 for (current=op->inv; current!=NULL; current=next) { 733 for (current=op->inv; current!=NULL; current=next) {
737 next=current->below; 734 next=current->below;
738 drop_object(pl, current, 0); 735 drop_object(pl, current, 0);
739 } 736 }
740 esrv_update_item(UPD_WEIGHT, pl, op); 737 esrv_update_item(UPD_WEIGHT, pl, op);
741 } 738 }
742 else { 739 else {
743 drop_object (pl, op, nrof); 740 drop_object (pl, op, nrof);
744 } 741 }
745 return; 742 return;
746 } else if (to == pl->count) { /* pick it up to the inventory */ 743 } else if (to == pl->count) { /* pick it up to the inventory */
747 /* return if player has already picked it up */ 744 /* return if player has already picked it up */
748 if (op->env == pl) return; 745 if (op->env == pl) return;
749 746
750 pl->contr->count = nrof; 747 pl->contr->count = nrof;
751 pick_up(pl, op); 748 pick_up(pl, op);
752 return ; 749 return ;
753 } 750 }
754 env = esrv_get_ob_from_count(pl, to); 751 env = esrv_get_ob_from_count(pl, to);
755 if (!env) { 752 if (!env) {
756 LOG(llevDebug, 753 LOG(llevDebug,
757 "Player '%s' tried to move object to the unknown location (%d)\n", 754 "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
758 pl->name, to);
759 return; 755 return;
760 } 756 }
761 /* put_object_in_sack presumes that necessary sanity checking 757 /* put_object_in_sack presumes that necessary sanity checking
762 * has already been done (eg, it can be picked up and fits in 758 * 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 759 * in a sack, so check for those things. We should also check

Diff Legend

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