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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.241 by root, Wed May 7 19:19:09 2008 UTC vs.
Revision 1.251 by root, Sun Jul 20 16:56:34 2008 UTC

… …
206 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 206 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
207 207
208 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 208 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
209 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 209 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
210 210
211 if (ob1->arch->name != ob2->arch->name 211 if (ob1->arch->archname != ob2->arch->archname
212 || ob1->name != ob2->name 212 || ob1->name != ob2->name
213 || ob1->title != ob2->title 213 || ob1->title != ob2->title
214 || ob1->msg != ob2->msg 214 || ob1->msg != ob2->msg
215 || ob1->weight != ob2->weight 215 || ob1->weight != ob2->weight
216 || ob1->attacktype != ob2->attacktype 216 || ob1->attacktype != ob2->attacktype
217 || ob1->magic != ob2->magic 217 || ob1->magic != ob2->magic
218 || ob1->slaying != ob2->slaying 218 || ob1->slaying != ob2->slaying
219 || ob1->skill != ob2->skill 219 || ob1->skill != ob2->skill
220 || ob1->value != ob2->value 220 || ob1->value != ob2->value
221 || ob1->animation_id != ob2->animation_id 221 || ob1->animation_id != ob2->animation_id
222 || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
222 || ob1->client_type != ob2->client_type 223 || ob1->client_type != ob2->client_type
223 || ob1->materialname != ob2->materialname 224 || ob1->materialname != ob2->materialname
224 || ob1->lore != ob2->lore 225 || ob1->lore != ob2->lore
225 || ob1->subtype != ob2->subtype 226 || ob1->subtype != ob2->subtype
226 || ob1->move_type != ob2->move_type 227 || ob1->move_type != ob2->move_type
… …
344 else 345 else
345 { 346 {
346 // maybe there is a player standing on the same mapspace 347 // maybe there is a player standing on the same mapspace
347 // this will catch the case where "this" is a player 348 // this will catch the case where "this" is a player
348 if (object *pl = ms ().player ()) 349 if (object *pl = ms ().player ())
350 if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
349 if (!pl->container || this == pl->container) 351 || this == pl->container)
350 return pl; 352 return pl;
351 } 353 }
352 } 354 }
353 355
354 return 0; 356 return 0;
… …
478 */ 480 */
479object * 481object *
480find_object_name (const char *str) 482find_object_name (const char *str)
481{ 483{
482 shstr_cmp str_ (str); 484 shstr_cmp str_ (str);
483 object *op;
484 485
486 if (str_)
485 for_all_objects (op) 487 for_all_objects (op)
486 if (op->name == str_) 488 if (op->name == str_)
487 break; 489 return op;
488 490
489 return op; 491 return 0;
490} 492}
491 493
492/* 494/*
493 * Sets the owner and sets the skill and exp pointers to owner's current 495 * Sets the owner and sets the skill and exp pointers to owner's current
494 * skill and experience objects. 496 * skill and experience objects.
… …
908 || map->in_memory != MAP_ACTIVE 910 || map->in_memory != MAP_ACTIVE
909 || map->no_drop 911 || map->no_drop
910 || ms ().move_block == MOVE_ALL) 912 || ms ().move_block == MOVE_ALL)
911 { 913 {
912 while (inv) 914 while (inv)
913 {
914 inv->destroy_inv (false);
915 inv->destroy (); 915 inv->destroy (true);
916 }
917 } 916 }
918 else 917 else
919 { /* Put objects in inventory onto this space */ 918 { /* Put objects in inventory onto this space */
920 while (inv) 919 while (inv)
921 { 920 {
… …
1236 * job preparing multi-part monsters. 1235 * job preparing multi-part monsters.
1237 */ 1236 */
1238object * 1237object *
1239insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1238insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1240{ 1239{
1240 op->remove ();
1241
1241 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1242 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1242 { 1243 {
1243 tmp->x = x + tmp->arch->x; 1244 tmp->x = x + tmp->arch->x;
1244 tmp->y = y + tmp->arch->y; 1245 tmp->y = y + tmp->arch->y;
1245 } 1246 }
… …
1268 * just 'op' otherwise 1269 * just 'op' otherwise
1269 */ 1270 */
1270object * 1271object *
1271insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1272insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1272{ 1273{
1274 if (op->is_on_map ())
1275 {
1276 LOG (llevError, "insert_ob_in_map called for object already on map");
1277 abort ();
1278 }
1279
1280 if (op->env)
1281 {
1282 LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1273 op->remove (); 1283 op->remove ();
1284 }
1285
1286 if (op->face && !face_info (op->face))//D TODO: remove soon
1287 {//D
1288 LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
1289 op->face = 1;//D
1290 }//D
1274 1291
1275 /* Ideally, the caller figures this out. However, it complicates a lot 1292 /* Ideally, the caller figures this out. However, it complicates a lot
1276 * of areas of callers (eg, anything that uses find_free_spot would now 1293 * of areas of callers (eg, anything that uses find_free_spot would now
1277 * need extra work 1294 * need extra work
1278 */ 1295 */
… …
1518 if (!nr) 1535 if (!nr)
1519 return true; 1536 return true;
1520 1537
1521 nr = min (nr, nrof); 1538 nr = min (nr, nrof);
1522 1539
1540 if (nrof > nr)
1541 {
1523 nrof -= nr; 1542 nrof -= nr;
1524
1525 if (nrof)
1526 {
1527 adjust_weight (env, -weight * nr); // carrying == 0 1543 adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1528 1544
1529 if (object *pl = visible_to ()) 1545 if (object *pl = visible_to ())
1530 esrv_update_item (UPD_NROF, pl, this); 1546 esrv_update_item (UPD_NROF, pl, this);
1531 1547
1532 return true; 1548 return true;
1533 } 1549 }
1534 else 1550 else
1535 { 1551 {
1536 destroy (1); 1552 destroy ();
1537 return false; 1553 return false;
1538 } 1554 }
1539} 1555}
1540 1556
1541/* 1557/*
… …
2417{ 2433{
2418 char flagdesc[512]; 2434 char flagdesc[512];
2419 char info2[256 * 4]; 2435 char info2[256 * 4];
2420 char *p = info; 2436 char *p = info;
2421 2437
2422 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}", 2438 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2423 count, 2439 count,
2424 uuid.c_str (), 2440 uuid.c_str (),
2425 &name, 2441 &name,
2426 title ? "\",title:\"" : "", 2442 title ? ",title:\"" : "",
2427 title ? (const char *)title : "", 2443 title ? (const char *)title : "",
2444 title ? "\"" : "",
2428 flag_desc (flagdesc, 512), type); 2445 flag_desc (flagdesc, 512), type);
2429 2446
2430 if (!flag[FLAG_REMOVED] && env) 2447 if (!flag[FLAG_REMOVED] && env)
2431 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2448 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2432 2449

Diff Legend

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