| … | |
… | |
| 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 | |
| 139 | void |
139 | void |
| 140 | UUID::init () |
140 | UUID::init () |
| 141 | { |
141 | { |
| 142 | read_uuid (); |
142 | read_uuid (); |
|
|
143 | } |
|
|
144 | |
|
|
145 | bool |
|
|
146 | UUID::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 | |
|
|
170 | char * |
|
|
171 | UUID::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 | |
|
|
202 | char * |
|
|
203 | UUID::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. */ |
| 146 | static bool |
211 | static bool |
| 147 | compare_ob_value_lists_one (const object *wants, const object *has) |
212 | compare_ob_value_lists_one (const object *wants, const object *has) |
| … | |
… | |
| 186 | bool object::can_merge_slow (object *ob1, object *ob2) |
251 | bool object::can_merge_slow (object *ob1, object *ob2) |
| 187 | { |
252 | { |
| 188 | /* A couple quicksanity checks */ |
253 | /* A couple quicksanity checks */ |
| 189 | if (ob1 == ob2 |
254 | if (ob1 == ob2 |
| 190 | || ob1->type != ob2->type |
255 | || ob1->type != ob2->type |
| 191 | || ob1->speed != ob2->speed |
256 | || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED |
| 192 | || ob1->value != ob2->value |
257 | || ob1->value != ob2->value |
| 193 | || ob1->name != ob2->name) |
258 | || ob1->name != ob2->name) |
| 194 | return 0; |
259 | return 0; |
| 195 | |
260 | |
| 196 | /* Do not merge objects if nrof would overflow, assume nrof |
261 | /* Do not merge objects if nrof would overflow, assume nrof |
| … | |
… | |
| 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 |
| 232 | || ob1->move_on != ob2->move_on |
297 | || ob1->move_on != ob2->move_on |
| 233 | || ob1->move_off != ob2->move_off |
298 | || ob1->move_off != ob2->move_off |
| 234 | || ob1->move_slow != ob2->move_slow |
299 | || ob1->move_slow != ob2->move_slow |
| 235 | || ob1->move_slow_penalty != ob2->move_slow_penalty |
300 | || fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f) |
| 236 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
301 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
| 237 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
302 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
| 238 | return 0; |
303 | return 0; |
| 239 | |
304 | |
| 240 | if ((ob1->flag ^ ob2->flag) |
305 | if ((ob1->flag ^ ob2->flag) |
| … | |
… | |
| 679 | * This function needs to be called whenever the speed of an object changes. |
744 | * This function needs to be called whenever the speed of an object changes. |
| 680 | */ |
745 | */ |
| 681 | void |
746 | void |
| 682 | object::set_speed (float speed) |
747 | object::set_speed (float speed) |
| 683 | { |
748 | { |
| 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; |
749 | this->speed = speed; |
| 691 | |
750 | |
| 692 | if (has_active_speed ()) |
751 | if (has_active_speed ()) |
| 693 | activate (); |
752 | activate (); |
| 694 | else |
753 | else |
| … | |
… | |
| 744 | |
803 | |
| 745 | if (!(m.flags_ & P_UPTODATE)) |
804 | if (!(m.flags_ & P_UPTODATE)) |
| 746 | /* nop */; |
805 | /* nop */; |
| 747 | else if (action == UP_OBJ_INSERT) |
806 | else if (action == UP_OBJ_INSERT) |
| 748 | { |
807 | { |
|
|
808 | #if 0 |
| 749 | // this is likely overkill, TODO: revisit (schmorp) |
809 | // this is likely overkill, TODO: revisit (schmorp) |
| 750 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
810 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
| 751 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
811 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
| 752 | || (op->is_player () && !(m.flags_ & P_PLAYER)) |
812 | || (op->is_player () && !(m.flags_ & P_PLAYER)) |
| 753 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
813 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
| … | |
… | |
| 758 | || (m.move_slow | op->move_slow) != m.move_slow |
818 | || (m.move_slow | op->move_slow) != m.move_slow |
| 759 | /* This isn't perfect, but I don't expect a lot of objects to |
819 | /* This isn't perfect, but I don't expect a lot of objects to |
| 760 | * have move_allow right now. |
820 | * have move_allow right now. |
| 761 | */ |
821 | */ |
| 762 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
822 | || ((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 (); |
823 | m.invalidate (); |
|
|
824 | #else |
|
|
825 | // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp) |
|
|
826 | m.invalidate (); |
|
|
827 | #endif |
| 765 | } |
828 | } |
| 766 | /* if the object is being removed, we can't make intelligent |
829 | /* if the object is being removed, we can't make intelligent |
| 767 | * decisions, because remove_ob can't really pass the object |
830 | * decisions, because remove_ob can't really pass the object |
| 768 | * that is being removed. |
831 | * that is being removed. |
| 769 | */ |
832 | */ |
| … | |
… | |
| 1503 | { |
1566 | { |
| 1504 | if (where->env) |
1567 | if (where->env) |
| 1505 | return where->env->insert (this); |
1568 | return where->env->insert (this); |
| 1506 | else |
1569 | else |
| 1507 | return where->map->insert (this, where->x, where->y, originator, flags); |
1570 | return where->map->insert (this, where->x, where->y, originator, flags); |
|
|
1571 | } |
|
|
1572 | |
|
|
1573 | // check whether we can put this into the map, respect max_volume, max_items |
|
|
1574 | bool |
|
|
1575 | object::can_drop_at (maptile *m, int x, int y, object *originator) |
|
|
1576 | { |
|
|
1577 | mapspace &ms = m->at (x, y); |
|
|
1578 | |
|
|
1579 | int items = ms.items (); |
|
|
1580 | |
|
|
1581 | if (!items // testing !items ensures we can drop at least one item |
|
|
1582 | || (items < m->max_items |
|
|
1583 | && ms.volume () < m->max_volume)) |
|
|
1584 | return true; |
|
|
1585 | |
|
|
1586 | if (originator && originator->is_player ()) |
|
|
1587 | originator->contr->failmsg (format ( |
|
|
1588 | "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>", |
|
|
1589 | query_name () |
|
|
1590 | )); |
|
|
1591 | |
|
|
1592 | return false; |
| 1508 | } |
1593 | } |
| 1509 | |
1594 | |
| 1510 | /* |
1595 | /* |
| 1511 | * decrease(object, number) decreases a specified number from |
1596 | * decrease(object, number) decreases a specified number from |
| 1512 | * the amount of an object. If the amount reaches 0, the object |
1597 | * the amount of an object. If the amount reaches 0, the object |
