… | |
… | |
1637 | rv = &op->stats.exp; |
1637 | rv = &op->stats.exp; |
1638 | *type = CFAPI_LONG; |
1638 | *type = CFAPI_LONG; |
1639 | break; |
1639 | break; |
1640 | |
1640 | |
1641 | case CFAPI_OBJECT_PROP_OWNER: |
1641 | case CFAPI_OBJECT_PROP_OWNER: |
1642 | rv = get_owner (op); |
1642 | rv = op->owner; |
1643 | *type = CFAPI_POBJECT; |
1643 | *type = CFAPI_POBJECT; |
1644 | break; |
1644 | break; |
1645 | |
1645 | |
1646 | case CFAPI_OBJECT_PROP_PRESENT: |
1646 | case CFAPI_OBJECT_PROP_PRESENT: |
1647 | { |
1647 | { |
… | |
… | |
1689 | case CFAPI_OBJECT_PROP_MERGEABLE: |
1689 | case CFAPI_OBJECT_PROP_MERGEABLE: |
1690 | { |
1690 | { |
1691 | object *op2; |
1691 | object *op2; |
1692 | op2 = va_arg (args, object *); |
1692 | op2 = va_arg (args, object *); |
1693 | |
1693 | |
1694 | ri = CAN_MERGE (op, op2); |
1694 | ri = object::can_merge_slow (op, op2); |
1695 | rv = &ri; |
1695 | rv = &ri; |
1696 | } |
1696 | } |
1697 | *type = CFAPI_INT; |
1697 | *type = CFAPI_INT; |
1698 | break; |
1698 | break; |
1699 | |
1699 | |
… | |
… | |
2271 | break; |
2271 | break; |
2272 | |
2272 | |
2273 | case CFAPI_OBJECT_PROP_OWNER: |
2273 | case CFAPI_OBJECT_PROP_OWNER: |
2274 | oparg = va_arg (args, object *); |
2274 | oparg = va_arg (args, object *); |
2275 | |
2275 | |
2276 | set_owner (op, oparg); |
2276 | op->set_owner (oparg); |
2277 | break; |
2277 | break; |
2278 | |
2278 | |
2279 | case CFAPI_OBJECT_PROP_CHEATER: |
2279 | case CFAPI_OBJECT_PROP_CHEATER: |
2280 | set_cheat (op); |
2280 | set_cheat (op); |
2281 | break; |
2281 | break; |
… | |
… | |
2909 | |
2909 | |
2910 | op = va_arg (args, object *); |
2910 | op = va_arg (args, object *); |
2911 | |
2911 | |
2912 | va_end (args); |
2912 | va_end (args); |
2913 | |
2913 | |
2914 | clear_object (op); |
2914 | op->clear (); |
2915 | *type = CFAPI_NONE; |
2915 | *type = CFAPI_NONE; |
2916 | return NULL; |
2916 | return NULL; |
2917 | } |
2917 | } |
2918 | |
2918 | |
2919 | void * |
2919 | void * |