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.296 by root, Fri Nov 6 13:31:47 2009 UTC vs.
Revision 1.311 by root, Sat Jan 16 13:41:37 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
… …
26#include <stdio.h> 26#include <stdio.h>
27#include <sys/types.h> 27#include <sys/types.h>
28#include <sys/uio.h> 28#include <sys/uio.h>
29#include <object.h> 29#include <object.h>
30#include <sproto.h> 30#include <sproto.h>
31#include <loader.h>
32 31
33#include <bitset> 32#include <bitset>
34 33
35UUID UUID::cur; 34UUID UUID::cur;
36static uint64_t seq_next_save; 35static uint64_t seq_next_save;
… …
77 CALL_CALL ("cf::write_uuid", G_DISCARD); 76 CALL_CALL ("cf::write_uuid", G_DISCARD);
78 CALL_END; 77 CALL_END;
79} 78}
80 79
81static void 80static void
82read_uuid (void) 81read_uuid ()
83{ 82{
84 char filename[MAX_BUF]; 83 char filename[MAX_BUF];
85 84
86 sprintf (filename, "%s/uuid", settings.localdir); 85 sprintf (filename, "%s/uuid", settings.localdir);
87 86
… …
101 100
102 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 101 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
103 _exit (1); 102 _exit (1);
104 } 103 }
105 104
106 UUID::BUF buf; 105 char buf [UUID::MAX_LEN];
107 buf[0] = 0; 106 buf[0] = 0;
108 fgets (buf, sizeof (buf), fp); 107 fgets (buf, sizeof (buf), fp);
109 108
110 if (!UUID::cur.parse (buf)) 109 if (!UUID::cur.parse (buf))
111 { 110 {
… …
138 137
139void 138void
140UUID::init () 139UUID::init ()
141{ 140{
142 read_uuid (); 141 read_uuid ();
142}
143
144bool
145UUID::parse (const char *s)
146{
147 if (*s++ != '<' || *s++ != '1' || *s++ != '.')
148 return false;
149
150 seq = 0;
151
152 while (*s != '>')
153 {
154 if (*s < '0')
155 return false;
156
157 // this gives nice branchless code with gcc
158 assert ('0' < 'a' && '0' == 48 && 'a' == 97);
159 int digit = (*s + (*s & 0x40 ? 9 : 0)) & 15;
160
161 seq = (seq << 4) | digit;
162
163 ++s;
164 }
165
166 return true;
167}
168
169char *
170UUID::append (char *buf) const
171{
172 *buf++ = '<';
173 *buf++ = '1';
174 *buf++ = '.';
175
176 uint64_t seq = this->seq;
177 const int bits = 64;
178 char nz = 0;
179 static const char tohex [] = "0123456789abcdef";
180
181 // assert (len >= 3 + bits / 4 + 1 + 1);
182 for (int i = bits / 4; --i; )
183 {
184 uint8_t digit = seq >> (bits - 4);
185
186 *buf = tohex [digit];
187 nz |= digit;
188 buf += nz ? 1 : 0;
189 seq <<= 4;
190 }
191
192 // last digit is special - always emit
193 uint8_t digit = seq >> (bits - 4);
194 *buf++ = tohex [digit];
195
196 *buf++ = '>';
197
198 return buf;
199}
200
201char *
202UUID::c_str () const
203{
204 static char buf [MAX_LEN];
205 *append (buf) = 0;
206 return buf;
143} 207}
144 208
145/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 209/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
146static bool 210static bool
147compare_ob_value_lists_one (const object *wants, const object *has) 211compare_ob_value_lists_one (const object *wants, const object *has)
… …
183 * Improvements made with merge: Better checking on potion, and also 247 * Improvements made with merge: Better checking on potion, and also
184 * check weight 248 * check weight
185 */ 249 */
186bool object::can_merge_slow (object *ob1, object *ob2) 250bool object::can_merge_slow (object *ob1, object *ob2)
187{ 251{
188 /* A couple quicksanity checks */ 252 /* A couple quick sanity checks */
189 if (ob1 == ob2 253 if (ob1 == ob2
190 || ob1->type != ob2->type 254 || ob1->type != ob2->type
191 || ob1->speed != ob2->speed
192 || ob1->value != ob2->value 255 || ob1->value != ob2->value
193 || ob1->name != ob2->name) 256 || ob1->name != ob2->name
257 || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
194 return 0; 258 return 0;
195 259
196 /* Do not merge objects if nrof would overflow, assume nrof 260 /* Do not merge objects if nrof would overflow, assume nrof
197 * is always 0 .. 2**31-1 */ 261 * is always 0 .. 2**31-1 */
198 if (ob1->nrof > 0x7fffffff - ob2->nrof) 262 if (ob1->nrof > 0x7fffffff - ob2->nrof)
… …
219 || ob1->magic != ob2->magic 283 || ob1->magic != ob2->magic
220 || ob1->slaying != ob2->slaying 284 || ob1->slaying != ob2->slaying
221 || ob1->skill != ob2->skill 285 || ob1->skill != ob2->skill
222 || ob1->value != ob2->value 286 || ob1->value != ob2->value
223 || ob1->animation_id != ob2->animation_id 287 || ob1->animation_id != ob2->animation_id
224 || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other 288 || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
225 || ob1->client_type != ob2->client_type 289 || ob1->client_type != ob2->client_type
226 || ob1->materialname != ob2->materialname 290 || ob1->material != ob2->material
227 || ob1->lore != ob2->lore 291 || ob1->lore != ob2->lore
228 || ob1->subtype != ob2->subtype 292 || ob1->subtype != ob2->subtype
229 || ob1->move_type != ob2->move_type 293 || ob1->move_type != ob2->move_type
230 || ob1->move_block != ob2->move_block 294 || ob1->move_block != ob2->move_block
231 || ob1->move_allow != ob2->move_allow 295 || ob1->move_allow != ob2->move_allow
232 || ob1->move_on != ob2->move_on 296 || ob1->move_on != ob2->move_on
233 || ob1->move_off != ob2->move_off 297 || ob1->move_off != ob2->move_off
234 || ob1->move_slow != ob2->move_slow 298 || ob1->move_slow != ob2->move_slow
235 || ob1->move_slow_penalty != ob2->move_slow_penalty 299 || fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
236 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) 300 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
237 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) 301 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
238 return 0; 302 return 0;
239 303
240 if ((ob1->flag ^ ob2->flag) 304 if ((ob1->flag ^ ob2->flag)
… …
622 tail = new_link; 686 tail = new_link;
623 } 687 }
624 } 688 }
625 } 689 }
626 690
627 if (speed < 0)
628 dst->speed_left -= rndm ();
629
630 dst->activate (); 691 dst->activate ();
631} 692}
632 693
633void 694void
634object::instantiate () 695object::instantiate ()
635{ 696{
636 if (!uuid.seq) // HACK 697 if (!uuid.seq) // HACK
637 uuid = UUID::gen (); 698 uuid = UUID::gen ();
638 699
700 // TODO: unclean state changes, should nt be done in copy_to AND instantiate
701 if (flag [FLAG_RANDOM_SPEED] && speed)
702 speed_left = - speed - rndm (); // TODO animation
703 else
639 speed_left = -0.1f; 704 speed_left = -1.;
705
640 /* copy the body_info to the body_used - this is only really 706 /* copy the body_info to the body_used - this is only really
641 * need for monsters, but doesn't hurt to do it for everything. 707 * need for monsters, but doesn't hurt to do it for everything.
642 * by doing so, when a monster is created, it has good starting 708 * by doing so, when a monster is created, it has good starting
643 * values for the body_used info, so when items are created 709 * values for the body_used info, so when items are created
644 * for it, they can be properly equipped. 710 * for it, they can be properly equipped.
… …
652object * 718object *
653object::clone () 719object::clone ()
654{ 720{
655 object *neu = create (); 721 object *neu = create ();
656 copy_to (neu); 722 copy_to (neu);
723
724 // TODO: unclean state changes, should not be done in clone AND instantiate
725 if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
726 neu->speed_left = - neu->speed - rndm (); // TODO animation
727
657 neu->map = map; // not copied by copy_to 728 neu->map = map; // not copied by copy_to
658 return neu; 729 return neu;
659} 730}
660 731
661/* 732/*
… …
679 * This function needs to be called whenever the speed of an object changes. 750 * This function needs to be called whenever the speed of an object changes.
680 */ 751 */
681void 752void
682object::set_speed (float speed) 753object::set_speed (float speed)
683{ 754{
684 if (flag [FLAG_FREED] && speed)
685 {
686 LOG (llevError, "Object %s is freed but has speed.\n", &name);
687 speed = 0;
688 }
689
690 this->speed = speed; 755 this->speed = speed;
691 756
692 if (has_active_speed ()) 757 if (has_active_speed ())
693 activate (); 758 activate ();
694 else 759 else
… …
744 809
745 if (!(m.flags_ & P_UPTODATE)) 810 if (!(m.flags_ & P_UPTODATE))
746 /* nop */; 811 /* nop */;
747 else if (action == UP_OBJ_INSERT) 812 else if (action == UP_OBJ_INSERT)
748 { 813 {
814#if 0
749 // this is likely overkill, TODO: revisit (schmorp) 815 // this is likely overkill, TODO: revisit (schmorp)
750 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 816 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
751 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 817 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
752 || (op->is_player () && !(m.flags_ & P_PLAYER)) 818 || (op->is_player () && !(m.flags_ & P_PLAYER))
753 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 819 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
… …
758 || (m.move_slow | op->move_slow) != m.move_slow 824 || (m.move_slow | op->move_slow) != m.move_slow
759 /* This isn't perfect, but I don't expect a lot of objects to 825 /* This isn't perfect, but I don't expect a lot of objects to
760 * have move_allow right now. 826 * have move_allow right now.
761 */ 827 */
762 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 828 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
763 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
764 m.invalidate (); 829 m.invalidate ();
830#else
831 // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
832 m.invalidate ();
833#endif
765 } 834 }
766 /* if the object is being removed, we can't make intelligent 835 /* if the object is being removed, we can't make intelligent
767 * decisions, because remove_ob can't really pass the object 836 * decisions, because remove_ob can't really pass the object
768 * that is being removed. 837 * that is being removed.
769 */ 838 */
… …
781object::object () 850object::object ()
782{ 851{
783 SET_FLAG (this, FLAG_REMOVED); 852 SET_FLAG (this, FLAG_REMOVED);
784 853
785 //expmul = 1.0; declared const for the time being 854 //expmul = 1.0; declared const for the time being
786 face = blank_face; 855 face = blank_face;
856 material = MATERIAL_NULL;
787} 857}
788 858
789object::~object () 859object::~object ()
790{ 860{
791 unlink (); 861 unlink ();
… …
1062 1132
1063 above = 0; 1133 above = 0;
1064 below = 0; 1134 below = 0;
1065 env = 0; 1135 env = 0;
1066 1136
1067 /* NO_FIX_PLAYER is set when a great many changes are being 1137 if (pl && pl->is_player ())
1068 * made to players inventory. If set, avoiding the call
1069 * to save cpu time.
1070 */
1071 if (pl)
1072 if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
1073 { 1138 {
1074 pl->update_stats (); 1139 pl->contr->queue_stats_update ();
1075 1140
1076 if (glow_radius && pl->is_on_map ()) 1141 if (glow_radius && pl->is_on_map ())
1077 update_all_los (pl->map, pl->x, pl->y); 1142 update_all_los (pl->map, pl->x, pl->y);
1078 } 1143 }
1079 } 1144 }
1080 else if (map) 1145 else if (map)
1081 { 1146 {
1082 map->dirty = true; 1147 map->dirty = true;
1083 mapspace &ms = this->ms (); 1148 mapspace &ms = this->ms ();
… …
1203 1268
1204 object *prev = this; 1269 object *prev = this;
1205 1270
1206 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more) 1271 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1207 { 1272 {
1208 object *op = arch_to_object (at); 1273 object *op = at->instance ();
1209 1274
1210 op->name = name; 1275 op->name = name;
1211 op->name_pl = name_pl; 1276 op->name_pl = name_pl;
1212 op->title = title; 1277 op->title = title;
1213 1278
… …
1488 1553
1489 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 1554 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1490 if (tmp->arch->archname == archname) /* same archetype */ 1555 if (tmp->arch->archname == archname) /* same archetype */
1491 tmp->destroy (); 1556 tmp->destroy ();
1492 1557
1493 object *tmp = arch_to_object (archetype::find (archname)); 1558 object *tmp = archetype::find (archname)->instance ();
1494 1559
1495 tmp->x = op->x; 1560 tmp->x = op->x;
1496 tmp->y = op->y; 1561 tmp->y = op->y;
1497 1562
1498 insert_ob_in_map (tmp, op->map, op, 0); 1563 insert_ob_in_map (tmp, op->map, op, 0);
… …
1503{ 1568{
1504 if (where->env) 1569 if (where->env)
1505 return where->env->insert (this); 1570 return where->env->insert (this);
1506 else 1571 else
1507 return where->map->insert (this, where->x, where->y, originator, flags); 1572 return where->map->insert (this, where->x, where->y, originator, flags);
1573}
1574
1575// check whether we can put this into the map, respect max_volume, max_items
1576bool
1577object::can_drop_at (maptile *m, int x, int y, object *originator)
1578{
1579 mapspace &ms = m->at (x, y);
1580
1581 int items = ms.items ();
1582
1583 if (!items // testing !items ensures we can drop at least one item
1584 || (items < m->max_items
1585 && ms.volume () < m->max_volume))
1586 return true;
1587
1588 if (originator && originator->is_player ())
1589 originator->contr->failmsg (format (
1590 "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
1591 query_name ()
1592 ));
1593
1594 return false;
1508} 1595}
1509 1596
1510/* 1597/*
1511 * decrease(object, number) decreases a specified number from 1598 * decrease(object, number) decreases a specified number from
1512 * the amount of an object. If the amount reaches 0, the object 1599 * the amount of an object. If the amount reaches 0, the object
… …
1652 if (op->glow_radius && is_on_map ()) 1739 if (op->glow_radius && is_on_map ())
1653 { 1740 {
1654 update_stats (); 1741 update_stats ();
1655 update_all_los (map, x, y); 1742 update_all_los (map, x, y);
1656 } 1743 }
1657 else if (is_player () && !flag [FLAG_NO_FIX_PLAYER]) 1744 else if (is_player ())
1658 // if this is a player's inventory, update stats 1745 // if this is a player's inventory, update stats
1659 update_stats (); 1746 contr->queue_stats_update ();
1660 1747
1661 INVOKE_OBJECT (INSERT, this); 1748 INVOKE_OBJECT (INSERT, this);
1662 1749
1663 return op; 1750 return op;
1664} 1751}
… …
2432{ 2519{
2433 return map ? map->region (x, y) 2520 return map ? map->region (x, y)
2434 : region::default_region (); 2521 : region::default_region ();
2435} 2522}
2436 2523
2437const materialtype_t *
2438object::dominant_material () const
2439{
2440 if (materialtype_t *mt = name_to_material (materialname))
2441 return mt;
2442
2443 return name_to_material (shstr_unknown);
2444}
2445
2446void 2524void
2447object::open_container (object *new_container) 2525object::open_container (object *new_container)
2448{ 2526{
2449 if (container == new_container) 2527 if (container == new_container)
2450 return; 2528 return;
… …
2484 // TODO: this does not seem to serve any purpose anymore? 2562 // TODO: this does not seem to serve any purpose anymore?
2485#if 0 2563#if 0
2486 // insert the "Close Container" object. 2564 // insert the "Close Container" object.
2487 if (archetype *closer = new_container->other_arch) 2565 if (archetype *closer = new_container->other_arch)
2488 { 2566 {
2489 object *closer = arch_to_object (new_container->other_arch); 2567 object *closer = new_container->other_arch->instance ();
2490 closer->flag [FLAG_NO_MAP_SAVE] = 1; 2568 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2491 new_container->insert (closer); 2569 new_container->insert (closer);
2492 } 2570 }
2493#endif 2571#endif
2494 2572

Diff Legend

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