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.237 by root, Tue May 6 21:04:37 2008 UTC vs.
Revision 1.248 by root, Mon Jul 14 23:47:06 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.
… …
904 * drop on that space. 906 * drop on that space.
905 */ 907 */
906 if (!drop_to_ground 908 if (!drop_to_ground
907 || !map 909 || !map
908 || map->in_memory != MAP_ACTIVE 910 || map->in_memory != MAP_ACTIVE
909 || map->nodrop 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 { 915 {
914 inv->destroy_inv (false); 916 inv->destroy_inv (false);
… …
943 945
944static struct freed_map : maptile 946static struct freed_map : maptile
945{ 947{
946 freed_map () 948 freed_map ()
947 { 949 {
948 path = "<freed objects map>"; 950 path = "<freed objects map>";
949 name = "/internal/freed_objects_map"; 951 name = "/internal/freed_objects_map";
950 width = 3; 952 width = 3;
951 height = 3; 953 height = 3;
952 nodrop = 1; 954 no_drop = 1;
955 no_reset = 1;
953 956
954 alloc (); 957 alloc ();
955 in_memory = MAP_ACTIVE; 958 in_memory = MAP_ACTIVE;
956 } 959 }
957 960
… …
1235 * job preparing multi-part monsters. 1238 * job preparing multi-part monsters.
1236 */ 1239 */
1237object * 1240object *
1238insert_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)
1239{ 1242{
1243 op->remove ();
1244
1240 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1245 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1241 { 1246 {
1242 tmp->x = x + tmp->arch->x; 1247 tmp->x = x + tmp->arch->x;
1243 tmp->y = y + tmp->arch->y; 1248 tmp->y = y + tmp->arch->y;
1244 } 1249 }
… …
1267 * just 'op' otherwise 1272 * just 'op' otherwise
1268 */ 1273 */
1269object * 1274object *
1270insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1275insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1271{ 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)");
1272 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
1273 1294
1274 /* Ideally, the caller figures this out. However, it complicates a lot 1295 /* Ideally, the caller figures this out. However, it complicates a lot
1275 * 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
1276 * need extra work 1297 * need extra work
1277 */ 1298 */
… …
1309 if (!QUERY_FLAG (op, FLAG_ALIVE)) 1330 if (!QUERY_FLAG (op, FLAG_ALIVE))
1310 CLEAR_FLAG (op, FLAG_NO_STEAL); 1331 CLEAR_FLAG (op, FLAG_NO_STEAL);
1311 1332
1312 if (flag & INS_BELOW_ORIGINATOR) 1333 if (flag & INS_BELOW_ORIGINATOR)
1313 { 1334 {
1314 if (originator->map != op->map || originator->x != op->x || originator->y != op->y || !originator->is_on_map ()) 1335 if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1315 { 1336 {
1316 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1337 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1317 abort (); 1338 abort ();
1318 } 1339 }
1340
1341 if (!originator->is_on_map ())
1342 LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1343 op->debug_desc (), originator->debug_desc ());
1319 1344
1320 op->above = originator; 1345 op->above = originator;
1321 op->below = originator->below; 1346 op->below = originator->below;
1322 originator->below = op; 1347 originator->below = op;
1323 1348
… …
1390 } /* If objects on this space */ 1415 } /* If objects on this space */
1391 1416
1392 if (flag & INS_ABOVE_FLOOR_ONLY) 1417 if (flag & INS_ABOVE_FLOOR_ONLY)
1393 top = floor; 1418 top = floor;
1394 1419
1395 /* Top is the object that our object (op) is going to get inserted above. 1420 // insert object above top, or bottom-most if top = 0
1396 */
1397
1398 /* no top found, insert on top */
1399 if (!top) 1421 if (!top)
1400 { 1422 {
1401 op->above = 0; 1423 op->below = 0;
1402 op->below = ms.top; 1424 op->above = ms.bot;
1403 ms.top = op; 1425 ms.bot = op;
1404 1426
1405 *(op->below ? &op->below->above : &ms.bot) = op; 1427 *(op->above ? &op->above->below : &ms.top) = op;
1406 } 1428 }
1407 else 1429 else
1408 { /* get inserted into the stack above top */ 1430 {
1409 op->above = top->above; 1431 op->above = top->above;
1410 top->above = op; 1432 top->above = op;
1411 1433
1412 op->below = top; 1434 op->below = top;
1413 *(op->above ? &op->above->below : &ms.top) = op; 1435 *(op->above ? &op->above->below : &ms.top) = op;
1414 } 1436 }
1415 } /* else not INS_BELOW_ORIGINATOR */ 1437 }
1416 1438
1417 if (op->type == PLAYER) 1439 if (op->type == PLAYER)
1418 { 1440 {
1419 op->contr->do_los = 1; 1441 op->contr->do_los = 1;
1420 ++op->map->players; 1442 ++op->map->players;
… …
1520 1542
1521 nrof -= nr; 1543 nrof -= nr;
1522 1544
1523 if (nrof) 1545 if (nrof)
1524 { 1546 {
1525 adjust_weight (env, -weight * nr); // carrying == 0 1547 adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1526 1548
1527 if (object *pl = visible_to ()) 1549 if (object *pl = visible_to ())
1528 esrv_update_item (UPD_NROF, pl, this); 1550 esrv_update_item (UPD_NROF, pl, this);
1529 1551
1530 return true; 1552 return true;
… …
2415{ 2437{
2416 char flagdesc[512]; 2438 char flagdesc[512];
2417 char info2[256 * 4]; 2439 char info2[256 * 4];
2418 char *p = info; 2440 char *p = info;
2419 2441
2420 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}",
2421 count, 2443 count,
2422 uuid.c_str (), 2444 uuid.c_str (),
2423 &name, 2445 &name,
2424 title ? "\",title:\"" : "", 2446 title ? ",title:\"" : "",
2425 title ? (const char *)title : "", 2447 title ? (const char *)title : "",
2448 title ? "\"" : "",
2426 flag_desc (flagdesc, 512), type); 2449 flag_desc (flagdesc, 512), type);
2427 2450
2428 if (!flag[FLAG_REMOVED] && env) 2451 if (!flag[FLAG_REMOVED] && env)
2429 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2452 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2430 2453

Diff Legend

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