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.249 by root, Tue Jul 15 20:41:58 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.
… …
1236 * job preparing multi-part monsters. 1238 * job preparing multi-part monsters.
1237 */ 1239 */
1238object * 1240object *
1239insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1241insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1240{ 1242{
1243 op->remove ();
1244
1241 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1245 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1242 { 1246 {
1243 tmp->x = x + tmp->arch->x; 1247 tmp->x = x + tmp->arch->x;
1244 tmp->y = y + tmp->arch->y; 1248 tmp->y = y + tmp->arch->y;
1245 } 1249 }
… …
1268 * just 'op' otherwise 1272 * just 'op' otherwise
1269 */ 1273 */
1270object * 1274object *
1271insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1275insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1272{ 1276{
1277 if (op->is_on_map ())
1278 {
1279 LOG (llevError, "insert_ob_in_map called for object already on map");
1280 abort ();
1281 }
1282
1283 if (op->env)
1284 {
1285 LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1273 op->remove (); 1286 op->remove ();
1287 }
1288
1289 if (op->face && !face_info (op->face))//D TODO: remove soon
1290 {//D
1291 LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
1292 op->face = 1;//D
1293 }//D
1274 1294
1275 /* Ideally, the caller figures this out. However, it complicates a lot 1295 /* 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 1296 * of areas of callers (eg, anything that uses find_free_spot would now
1277 * need extra work 1297 * need extra work
1278 */ 1298 */
… …
1522 1542
1523 nrof -= nr; 1543 nrof -= nr;
1524 1544
1525 if (nrof) 1545 if (nrof)
1526 { 1546 {
1527 adjust_weight (env, -weight * nr); // carrying == 0 1547 adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1528 1548
1529 if (object *pl = visible_to ()) 1549 if (object *pl = visible_to ())
1530 esrv_update_item (UPD_NROF, pl, this); 1550 esrv_update_item (UPD_NROF, pl, this);
1531 1551
1532 return true; 1552 return true;
1533 } 1553 }
1534 else 1554 else
1535 { 1555 {
1536 destroy (1); 1556 destroy ();
1537 return false; 1557 return false;
1538 } 1558 }
1539} 1559}
1540 1560
1541/* 1561/*
… …
2417{ 2437{
2418 char flagdesc[512]; 2438 char flagdesc[512];
2419 char info2[256 * 4]; 2439 char info2[256 * 4];
2420 char *p = info; 2440 char *p = info;
2421 2441
2422 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}", 2442 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2423 count, 2443 count,
2424 uuid.c_str (), 2444 uuid.c_str (),
2425 &name, 2445 &name,
2426 title ? "\",title:\"" : "", 2446 title ? ",title:\"" : "",
2427 title ? (const char *)title : "", 2447 title ? (const char *)title : "",
2448 title ? "\"" : "",
2428 flag_desc (flagdesc, 512), type); 2449 flag_desc (flagdesc, 512), type);
2429 2450
2430 if (!flag[FLAG_REMOVED] && env) 2451 if (!flag[FLAG_REMOVED] && env)
2431 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2452 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2432 2453

Diff Legend

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