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.240 by root, Wed May 7 13:40:30 2008 UTC vs.
Revision 1.247 by root, Mon Jul 14 18:36:43 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
… …
478 */ 479 */
479object * 480object *
480find_object_name (const char *str) 481find_object_name (const char *str)
481{ 482{
482 shstr_cmp str_ (str); 483 shstr_cmp str_ (str);
483 object *op;
484 484
485 if (str_)
485 for_all_objects (op) 486 for_all_objects (op)
486 if (op->name == str_) 487 if (op->name == str_)
487 break; 488 return op;
488 489
489 return op; 490 return 0;
490} 491}
491 492
492/* 493/*
493 * Sets the owner and sets the skill and exp pointers to owner's current 494 * Sets the owner and sets the skill and exp pointers to owner's current
494 * skill and experience objects. 495 * skill and experience objects.
… …
1236 * job preparing multi-part monsters. 1237 * job preparing multi-part monsters.
1237 */ 1238 */
1238object * 1239object *
1239insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1240insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1240{ 1241{
1242 op->remove ();
1243
1241 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1244 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1242 { 1245 {
1243 tmp->x = x + tmp->arch->x; 1246 tmp->x = x + tmp->arch->x;
1244 tmp->y = y + tmp->arch->y; 1247 tmp->y = y + tmp->arch->y;
1245 } 1248 }
… …
1268 * just 'op' otherwise 1271 * just 'op' otherwise
1269 */ 1272 */
1270object * 1273object *
1271insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1274insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1272{ 1275{
1276 if (op->is_on_map ())
1277 {
1278 LOG (llevError, "insert_ob_in_map called for object already on map");
1279 abort ();
1280 }
1281
1282 if (op->env)
1283 {
1284 LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1273 op->remove (); 1285 op->remove ();
1286 }
1287
1288 if (op->face && !face_info (op->face))//D TODO: remove soon
1289 {//D
1290 LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
1291 op->face = 1;//D
1292 }//D
1274 1293
1275 /* Ideally, the caller figures this out. However, it complicates a lot 1294 /* 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 1295 * of areas of callers (eg, anything that uses find_free_spot would now
1277 * need extra work 1296 * need extra work
1278 */ 1297 */
… …
1310 if (!QUERY_FLAG (op, FLAG_ALIVE)) 1329 if (!QUERY_FLAG (op, FLAG_ALIVE))
1311 CLEAR_FLAG (op, FLAG_NO_STEAL); 1330 CLEAR_FLAG (op, FLAG_NO_STEAL);
1312 1331
1313 if (flag & INS_BELOW_ORIGINATOR) 1332 if (flag & INS_BELOW_ORIGINATOR)
1314 { 1333 {
1315 if (originator->map != op->map || originator->x != op->x || originator->y != op->y || !originator->is_on_map ()) 1334 if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1316 { 1335 {
1317 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1336 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1318 abort (); 1337 abort ();
1319 } 1338 }
1339
1340 if (!originator->is_on_map ())
1341 LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1342 op->debug_desc (), originator->debug_desc ());
1320 1343
1321 op->above = originator; 1344 op->above = originator;
1322 op->below = originator->below; 1345 op->below = originator->below;
1323 originator->below = op; 1346 originator->below = op;
1324 1347
… …
1518 1541
1519 nrof -= nr; 1542 nrof -= nr;
1520 1543
1521 if (nrof) 1544 if (nrof)
1522 { 1545 {
1523 adjust_weight (env, -weight * nr); // carrying == 0 1546 adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1524 1547
1525 if (object *pl = visible_to ()) 1548 if (object *pl = visible_to ())
1526 esrv_update_item (UPD_NROF, pl, this); 1549 esrv_update_item (UPD_NROF, pl, this);
1527 1550
1528 return true; 1551 return true;
… …
2413{ 2436{
2414 char flagdesc[512]; 2437 char flagdesc[512];
2415 char info2[256 * 4]; 2438 char info2[256 * 4];
2416 char *p = info; 2439 char *p = info;
2417 2440
2418 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}", 2441 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2419 count, 2442 count,
2420 uuid.c_str (), 2443 uuid.c_str (),
2421 &name, 2444 &name,
2422 title ? "\",title:\"" : "", 2445 title ? ",title:\"" : "",
2423 title ? (const char *)title : "", 2446 title ? (const char *)title : "",
2447 title ? "\"" : "",
2424 flag_desc (flagdesc, 512), type); 2448 flag_desc (flagdesc, 512), type);
2425 2449
2426 if (!flag[FLAG_REMOVED] && env) 2450 if (!flag[FLAG_REMOVED] && env)
2427 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2451 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2428 2452

Diff Legend

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