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.137 by root, Mon Apr 16 06:23:40 2007 UTC vs.
Revision 1.143 by root, Tue May 1 05:48:20 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 * 7 *
… …
324sum_weight (object *op) 324sum_weight (object *op)
325{ 325{
326 long sum; 326 long sum;
327 object *inv; 327 object *inv;
328 328
329 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 329 for (sum = 0, inv = op->inv; inv; inv = inv->below)
330 { 330 {
331 if (inv->inv) 331 if (inv->inv)
332 sum_weight (inv); 332 sum_weight (inv);
333
333 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 334 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
334 } 335 }
335 336
336 if (op->type == CONTAINER && op->stats.Str) 337 if (op->type == CONTAINER && op->stats.Str)
337 sum = (sum * (100 - op->stats.Str)) / 100; 338 sum = (sum * (100 - op->stats.Str)) / 100;
… …
835 836
836 if (flag [FLAG_IS_LINKED]) 837 if (flag [FLAG_IS_LINKED])
837 remove_button_link (this); 838 remove_button_link (this);
838 839
839 if (flag [FLAG_FRIENDLY]) 840 if (flag [FLAG_FRIENDLY])
840 {
841 remove_friendly_object (this); 841 remove_friendly_object (this);
842
843 if (type == GOLEM
844 && owner
845 && owner->type == PLAYER
846 && owner->contr->ranges[range_golem] == this)
847 owner->contr->ranges[range_golem] = 0;
848 }
849 842
850 if (!flag [FLAG_REMOVED]) 843 if (!flag [FLAG_REMOVED])
851 remove (); 844 remove ();
852 845
853 destroy_inv (true); 846 destroy_inv (true);
… …
1110 return top; 1103 return top;
1111 } 1104 }
1112 } 1105 }
1113 1106
1114 return 0; 1107 return 0;
1108}
1109
1110void
1111object::expand_tail ()
1112{
1113 if (more)
1114 return;
1115
1116 object *prev = this;
1117
1118 for (archetype *at = arch->more; at; at = at->more)
1119 {
1120 object *op = arch_to_object (at);
1121
1122 op->name = name;
1123 op->name_pl = name_pl;
1124 op->title = title;
1125
1126 op->head = this;
1127 prev->more = op;
1128
1129 prev = op;
1130 }
1115} 1131}
1116 1132
1117/* 1133/*
1118 * same as insert_ob_in_map except it handles separate coordinates and does a clean 1134 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1119 * job preparing multi-part monsters. 1135 * job preparing multi-part monsters.
… …
1151 * just 'op' otherwise 1167 * just 'op' otherwise
1152 */ 1168 */
1153object * 1169object *
1154insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1170insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1155{ 1171{
1172 assert (!op->flag [FLAG_FREED]);
1173
1156 object *tmp, *top, *floor = NULL; 1174 object *tmp, *top, *floor = NULL;
1157 1175
1158 if (QUERY_FLAG (op, FLAG_FREED))
1159 {
1160 LOG (llevError, "Trying to insert freed object!\n");
1161 return NULL;
1162 }
1163
1164 if (!QUERY_FLAG (op, FLAG_REMOVED))
1165 LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
1166
1167 op->remove (); 1176 op->remove ();
1168 1177
1169 if (!m) 1178#if 0
1170 { 1179 if (!m->active != !op->active)
1171 char *dump = dump_object (op); 1180 if (m->active)
1172 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1181 op->activate_recursive ();
1173 free (dump); 1182 else
1174 return op; 1183 op->deactivate_recursive ();
1175 } 1184#endif
1176 1185
1177 if (out_of_map (m, op->x, op->y)) 1186 if (out_of_map (m, op->x, op->y))
1178 { 1187 {
1179 char *dump = dump_object (op);
1180 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump); 1188 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1181#ifdef MANY_CORES 1189#ifdef MANY_CORES
1182 /* Better to catch this here, as otherwise the next use of this object 1190 /* Better to catch this here, as otherwise the next use of this object
1183 * is likely to cause a crash. Better to find out where it is getting 1191 * is likely to cause a crash. Better to find out where it is getting
1184 * improperly inserted. 1192 * improperly inserted.
1185 */ 1193 */
1186 abort (); 1194 abort ();
1187#endif 1195#endif
1188 free (dump);
1189 return op; 1196 return op;
1190 } 1197 }
1191 1198
1192 if (object *more = op->more) 1199 if (object *more = op->more)
1193 { 1200 {
… …
1430 tmp1->x = op->x; 1437 tmp1->x = op->x;
1431 tmp1->y = op->y; 1438 tmp1->y = op->y;
1432 insert_ob_in_map (tmp1, op->map, op, 0); 1439 insert_ob_in_map (tmp1, op->map, op, 0);
1433} 1440}
1434 1441
1435// XXX: function not returning object*
1436object * 1442object *
1437object::insert_at (object *where, object *originator, int flags) 1443object::insert_at (object *where, object *originator, int flags)
1438{ 1444{
1439 where->map->insert (this, where->x, where->y, originator, flags); 1445 return where->map->insert (this, where->x, where->y, originator, flags);
1440} 1446}
1441 1447
1442/* 1448/*
1443 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1449 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1444 * is returned contains nr objects, and the remaining parts contains 1450 * is returned contains nr objects, and the remaining parts contains
… …
1484 * the amount of an object. If the amount reaches 0, the object 1490 * the amount of an object. If the amount reaches 0, the object
1485 * is subsequently removed and freed. 1491 * is subsequently removed and freed.
1486 * 1492 *
1487 * Return value: 'op' if something is left, NULL if the amount reached 0 1493 * Return value: 'op' if something is left, NULL if the amount reached 0
1488 */ 1494 */
1489
1490object * 1495object *
1491decrease_ob_nr (object *op, uint32 i) 1496decrease_ob_nr (object *op, uint32 i)
1492{ 1497{
1493 object *tmp; 1498 object *tmp;
1494 1499
… …
1569 1574
1570/* 1575/*
1571 * add_weight(object, weight) adds the specified weight to an object, 1576 * add_weight(object, weight) adds the specified weight to an object,
1572 * and also updates how much the environment(s) is/are carrying. 1577 * and also updates how much the environment(s) is/are carrying.
1573 */ 1578 */
1574
1575void 1579void
1576add_weight (object *op, signed long weight) 1580add_weight (object *op, signed long weight)
1577{ 1581{
1578 while (op != NULL) 1582 while (op != NULL)
1579 { 1583 {
… …
1611 * inside the object environment. 1615 * inside the object environment.
1612 * 1616 *
1613 * The function returns now pointer to inserted item, and return value can 1617 * The function returns now pointer to inserted item, and return value can
1614 * be != op, if items are merged. -Tero 1618 * be != op, if items are merged. -Tero
1615 */ 1619 */
1616
1617object * 1620object *
1618object::insert (object *op) 1621object::insert (object *op)
1619{ 1622{
1620 object *tmp, *otmp; 1623 object *tmp, *otmp;
1621 1624
… …
2581} 2584}
2582 2585
2583const char * 2586const char *
2584object::debug_desc () const 2587object::debug_desc () const
2585{ 2588{
2586 static char info[256 * 4]; 2589 static char info[3][256 * 4];
2590 static int info_idx;
2591
2587 return debug_desc (info); 2592 return debug_desc (info [++info_idx % 3]);
2588}
2589
2590const char *
2591object::debug_desc2 () const
2592{
2593 static char info[256 * 4];
2594 return debug_desc (info);
2595} 2593}
2596 2594
2597struct region * 2595struct region *
2598object::region () const 2596object::region () const
2599{ 2597{

Diff Legend

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