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.299 by root, Sun Nov 8 20:55:39 2009 UTC vs.
Revision 1.308 by root, Sun Nov 29 17:26:28 2009 UTC

… …
77 CALL_CALL ("cf::write_uuid", G_DISCARD); 77 CALL_CALL ("cf::write_uuid", G_DISCARD);
78 CALL_END; 78 CALL_END;
79} 79}
80 80
81static void 81static void
82read_uuid (void) 82read_uuid ()
83{ 83{
84 char filename[MAX_BUF]; 84 char filename[MAX_BUF];
85 85
86 sprintf (filename, "%s/uuid", settings.localdir); 86 sprintf (filename, "%s/uuid", settings.localdir);
87 87
… …
101 101
102 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 102 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
103 _exit (1); 103 _exit (1);
104 } 104 }
105 105
106 UUID::BUF buf; 106 char buf [UUID::MAX_LEN];
107 buf[0] = 0; 107 buf[0] = 0;
108 fgets (buf, sizeof (buf), fp); 108 fgets (buf, sizeof (buf), fp);
109 109
110 if (!UUID::cur.parse (buf)) 110 if (!UUID::cur.parse (buf))
111 { 111 {
… …
138 138
139void 139void
140UUID::init () 140UUID::init ()
141{ 141{
142 read_uuid (); 142 read_uuid ();
143}
144
145bool
146UUID::parse (const char *s)
147{
148 if (*s++ != '<' || *s++ != '1' || *s++ != '.')
149 return false;
150
151 seq = 0;
152
153 while (*s != '>')
154 {
155 if (*s < '0')
156 return false;
157
158 // this gives nice branchless code with gcc
159 assert ('0' < 'a' && '0' == 48 && 'a' == 97);
160 int digit = (*s + (*s & 0x40 ? 9 : 0)) & 15;
161
162 seq = (seq << 4) | digit;
163
164 ++s;
165 }
166
167 return true;
168}
169
170char *
171UUID::append (char *buf) const
172{
173 *buf++ = '<';
174 *buf++ = '1';
175 *buf++ = '.';
176
177 uint64_t seq = this->seq;
178 const int bits = 64;
179 char nz = 0;
180 static const char tohex [] = "0123456789abcdef";
181
182 // assert (len >= 3 + bits / 4 + 1 + 1);
183 for (int i = bits / 4; --i; )
184 {
185 uint8_t digit = seq >> (bits - 4);
186
187 *buf = tohex [digit];
188 nz |= digit;
189 buf += nz ? 1 : 0;
190 seq <<= 4;
191 }
192
193 // last digit is special - always emit
194 uint8_t digit = seq >> (bits - 4);
195 *buf++ = tohex [digit];
196
197 *buf++ = '>';
198
199 return buf;
200}
201
202char *
203UUID::c_str () const
204{
205 static char buf [MAX_LEN];
206 *append (buf) = 0;
207 return buf;
143} 208}
144 209
145/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 210/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
146static bool 211static bool
147compare_ob_value_lists_one (const object *wants, const object *has) 212compare_ob_value_lists_one (const object *wants, const object *has)
… …
221 || ob1->skill != ob2->skill 286 || ob1->skill != ob2->skill
222 || ob1->value != ob2->value 287 || ob1->value != ob2->value
223 || ob1->animation_id != ob2->animation_id 288 || ob1->animation_id != ob2->animation_id
224 || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other 289 || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
225 || ob1->client_type != ob2->client_type 290 || ob1->client_type != ob2->client_type
226 || ob1->materialname != ob2->materialname 291 || ob1->material != ob2->material
227 || ob1->lore != ob2->lore 292 || ob1->lore != ob2->lore
228 || ob1->subtype != ob2->subtype 293 || ob1->subtype != ob2->subtype
229 || ob1->move_type != ob2->move_type 294 || ob1->move_type != ob2->move_type
230 || ob1->move_block != ob2->move_block 295 || ob1->move_block != ob2->move_block
231 || ob1->move_allow != ob2->move_allow 296 || ob1->move_allow != ob2->move_allow
… …
622 tail = new_link; 687 tail = new_link;
623 } 688 }
624 } 689 }
625 } 690 }
626 691
627 if (speed < 0)
628 dst->speed_left -= rndm ();
629
630 dst->activate (); 692 dst->activate ();
631} 693}
632 694
633void 695void
634object::instantiate () 696object::instantiate ()
635{ 697{
636 if (!uuid.seq) // HACK 698 if (!uuid.seq) // HACK
637 uuid = UUID::gen (); 699 uuid = UUID::gen ();
638 700
701 // TODO: unclean state changes, should nt be done in copy_to AND instantiate
702 if (flag [FLAG_RANDOM_SPEED] && speed)
703 speed_left = - speed - rndm (); // TODO animation
704 else
639 speed_left = -0.1f; 705 speed_left = -1.;
706
640 /* copy the body_info to the body_used - this is only really 707 /* 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. 708 * 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 709 * by doing so, when a monster is created, it has good starting
643 * values for the body_used info, so when items are created 710 * values for the body_used info, so when items are created
644 * for it, they can be properly equipped. 711 * for it, they can be properly equipped.
… …
652object * 719object *
653object::clone () 720object::clone ()
654{ 721{
655 object *neu = create (); 722 object *neu = create ();
656 copy_to (neu); 723 copy_to (neu);
724
725 // TODO: unclean state changes, should not be done in clone AND instantiate
726 if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
727 neu->speed_left = - neu->speed - rndm (); // TODO animation
728
657 neu->map = map; // not copied by copy_to 729 neu->map = map; // not copied by copy_to
658 return neu; 730 return neu;
659} 731}
660 732
661/* 733/*
… …
779object::object () 851object::object ()
780{ 852{
781 SET_FLAG (this, FLAG_REMOVED); 853 SET_FLAG (this, FLAG_REMOVED);
782 854
783 //expmul = 1.0; declared const for the time being 855 //expmul = 1.0; declared const for the time being
784 face = blank_face; 856 face = blank_face;
857 material = MATERIAL_NULL;
785} 858}
786 859
787object::~object () 860object::~object ()
788{ 861{
789 unlink (); 862 unlink ();
… …
1060 1133
1061 above = 0; 1134 above = 0;
1062 below = 0; 1135 below = 0;
1063 env = 0; 1136 env = 0;
1064 1137
1065 /* NO_FIX_PLAYER is set when a great many changes are being 1138 if (pl && pl->is_player ())
1066 * made to players inventory. If set, avoiding the call
1067 * to save cpu time.
1068 */
1069 if (pl)
1070 if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
1071 { 1139 {
1072 pl->update_stats (); 1140 pl->contr->queue_stats_update ();
1073 1141
1074 if (glow_radius && pl->is_on_map ()) 1142 if (glow_radius && pl->is_on_map ())
1075 update_all_los (pl->map, pl->x, pl->y); 1143 update_all_los (pl->map, pl->x, pl->y);
1076 } 1144 }
1077 } 1145 }
1078 else if (map) 1146 else if (map)
1079 { 1147 {
1080 map->dirty = true; 1148 map->dirty = true;
1081 mapspace &ms = this->ms (); 1149 mapspace &ms = this->ms ();
… …
1486 1554
1487 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 1555 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1488 if (tmp->arch->archname == archname) /* same archetype */ 1556 if (tmp->arch->archname == archname) /* same archetype */
1489 tmp->destroy (); 1557 tmp->destroy ();
1490 1558
1491 object *tmp = arch_to_object (archetype::find (archname)); 1559 object *tmp = archetype::find (archname)->instance ();
1492 1560
1493 tmp->x = op->x; 1561 tmp->x = op->x;
1494 tmp->y = op->y; 1562 tmp->y = op->y;
1495 1563
1496 insert_ob_in_map (tmp, op->map, op, 0); 1564 insert_ob_in_map (tmp, op->map, op, 0);
… …
1503 return where->env->insert (this); 1571 return where->env->insert (this);
1504 else 1572 else
1505 return where->map->insert (this, where->x, where->y, originator, flags); 1573 return where->map->insert (this, where->x, where->y, originator, flags);
1506} 1574}
1507 1575
1508// check whether we can put this into the map, respect max_nrof, max_volume, max_items 1576// check whether we can put this into the map, respect max_volume, max_items
1509bool 1577bool
1510object::can_drop_at (maptile *m, int x, int y, object *originator) 1578object::can_drop_at (maptile *m, int x, int y, object *originator)
1511{ 1579{
1512 mapspace &ms = m->at (x, y); 1580 mapspace &ms = m->at (x, y);
1513 1581
1514 int items = ms.items (); 1582 int items = ms.items ();
1515 1583
1516 if (!items // testing !items ensures we can drop at least one item 1584 if (!items // testing !items ensures we can drop at least one item
1517 || (items < m->max_items 1585 || (items < m->max_items
1518 && ms.volume () < m->max_volume 1586 && ms.volume () < m->max_volume))
1519 && nrof <= m->max_nrof))
1520 return true; 1587 return true;
1521 1588
1522 if (originator && originator->is_player ()) 1589 if (originator && originator->is_player ())
1523 originator->contr->failmsg (format ( 1590 originator->contr->failmsg (format (
1524 "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>", 1591 "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
… …
1673 if (op->glow_radius && is_on_map ()) 1740 if (op->glow_radius && is_on_map ())
1674 { 1741 {
1675 update_stats (); 1742 update_stats ();
1676 update_all_los (map, x, y); 1743 update_all_los (map, x, y);
1677 } 1744 }
1678 else if (is_player () && !flag [FLAG_NO_FIX_PLAYER]) 1745 else if (is_player ())
1679 // if this is a player's inventory, update stats 1746 // if this is a player's inventory, update stats
1680 update_stats (); 1747 contr->queue_stats_update ();
1681 1748
1682 INVOKE_OBJECT (INSERT, this); 1749 INVOKE_OBJECT (INSERT, this);
1683 1750
1684 return op; 1751 return op;
1685} 1752}
… …
2453{ 2520{
2454 return map ? map->region (x, y) 2521 return map ? map->region (x, y)
2455 : region::default_region (); 2522 : region::default_region ();
2456} 2523}
2457 2524
2458const materialtype_t *
2459object::dominant_material () const
2460{
2461 if (materialtype_t *mt = name_to_material (materialname))
2462 return mt;
2463
2464 return name_to_material (shstr_unknown);
2465}
2466
2467void 2525void
2468object::open_container (object *new_container) 2526object::open_container (object *new_container)
2469{ 2527{
2470 if (container == new_container) 2528 if (container == new_container)
2471 return; 2529 return;

Diff Legend

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