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.246 by root, Thu May 22 15:37:44 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.
… …
904 * drop on that space. 905 * drop on that space.
905 */ 906 */
906 if (!drop_to_ground 907 if (!drop_to_ground
907 || !map 908 || !map
908 || map->in_memory != MAP_ACTIVE 909 || map->in_memory != MAP_ACTIVE
909 || map->nodrop 910 || map->no_drop
910 || ms ().move_block == MOVE_ALL) 911 || ms ().move_block == MOVE_ALL)
911 { 912 {
912 while (inv) 913 while (inv)
913 { 914 {
914 inv->destroy_inv (false); 915 inv->destroy_inv (false);
… …
943 944
944static struct freed_map : maptile 945static struct freed_map : maptile
945{ 946{
946 freed_map () 947 freed_map ()
947 { 948 {
948 path = "<freed objects map>"; 949 path = "<freed objects map>";
949 name = "/internal/freed_objects_map"; 950 name = "/internal/freed_objects_map";
950 width = 3; 951 width = 3;
951 height = 3; 952 height = 3;
952 nodrop = 1; 953 no_drop = 1;
954 no_reset = 1;
953 955
954 alloc (); 956 alloc ();
955 in_memory = MAP_ACTIVE; 957 in_memory = MAP_ACTIVE;
956 } 958 }
957 959
… …
1235 * job preparing multi-part monsters. 1237 * job preparing multi-part monsters.
1236 */ 1238 */
1237object * 1239object *
1238insert_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)
1239{ 1241{
1242 op->remove ();
1243
1240 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1244 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1241 { 1245 {
1242 tmp->x = x + tmp->arch->x; 1246 tmp->x = x + tmp->arch->x;
1243 tmp->y = y + tmp->arch->y; 1247 tmp->y = y + tmp->arch->y;
1244 } 1248 }
… …
1267 * just 'op' otherwise 1271 * just 'op' otherwise
1268 */ 1272 */
1269object * 1273object *
1270insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1274insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1271{ 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)");
1272 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
1273 1293
1274 /* Ideally, the caller figures this out. However, it complicates a lot 1294 /* 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 1295 * of areas of callers (eg, anything that uses find_free_spot would now
1276 * need extra work 1296 * need extra work
1277 */ 1297 */
… …
1309 if (!QUERY_FLAG (op, FLAG_ALIVE)) 1329 if (!QUERY_FLAG (op, FLAG_ALIVE))
1310 CLEAR_FLAG (op, FLAG_NO_STEAL); 1330 CLEAR_FLAG (op, FLAG_NO_STEAL);
1311 1331
1312 if (flag & INS_BELOW_ORIGINATOR) 1332 if (flag & INS_BELOW_ORIGINATOR)
1313 { 1333 {
1314 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)
1315 { 1335 {
1316 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");
1317 abort (); 1337 abort ();
1318 } 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 ());
1319 1343
1320 op->above = originator; 1344 op->above = originator;
1321 op->below = originator->below; 1345 op->below = originator->below;
1322 originator->below = op; 1346 originator->below = op;
1323 1347
… …
1390 } /* If objects on this space */ 1414 } /* If objects on this space */
1391 1415
1392 if (flag & INS_ABOVE_FLOOR_ONLY) 1416 if (flag & INS_ABOVE_FLOOR_ONLY)
1393 top = floor; 1417 top = floor;
1394 1418
1395 /* Top is the object that our object (op) is going to get inserted above. 1419 // insert object above top, or bottom-most if top = 0
1396 */
1397
1398 /* no top found, insert on top */
1399 if (!top) 1420 if (!top)
1400 { 1421 {
1401 op->above = 0; 1422 op->below = 0;
1402 op->below = ms.top; 1423 op->above = ms.bot;
1403 ms.top = op; 1424 ms.bot = op;
1404 1425
1405 *(op->below ? &op->below->above : &ms.bot) = op; 1426 *(op->above ? &op->above->below : &ms.top) = op;
1406 } 1427 }
1407 else 1428 else
1408 { /* get inserted into the stack above top */ 1429 {
1409 op->above = top->above; 1430 op->above = top->above;
1410 top->above = op; 1431 top->above = op;
1411 1432
1412 op->below = top; 1433 op->below = top;
1413 *(op->above ? &op->above->below : &ms.top) = op; 1434 *(op->above ? &op->above->below : &ms.top) = op;
1414 } 1435 }
1415 } /* else not INS_BELOW_ORIGINATOR */ 1436 }
1416 1437
1417 if (op->type == PLAYER) 1438 if (op->type == PLAYER)
1418 { 1439 {
1419 op->contr->do_los = 1; 1440 op->contr->do_los = 1;
1420 ++op->map->players; 1441 ++op->map->players;
… …
2415{ 2436{
2416 char flagdesc[512]; 2437 char flagdesc[512];
2417 char info2[256 * 4]; 2438 char info2[256 * 4];
2418 char *p = info; 2439 char *p = info;
2419 2440
2420 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}",
2421 count, 2442 count,
2422 uuid.c_str (), 2443 uuid.c_str (),
2423 &name, 2444 &name,
2424 title ? "\",title:\"" : "", 2445 title ? ",title:\"" : "",
2425 title ? (const char *)title : "", 2446 title ? (const char *)title : "",
2447 title ? "\"" : "",
2426 flag_desc (flagdesc, 512), type); 2448 flag_desc (flagdesc, 512), type);
2427 2449
2428 if (!flag[FLAG_REMOVED] && env) 2450 if (!flag[FLAG_REMOVED] && env)
2429 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2451 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2430 2452

Diff Legend

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