1 | /* |
1 | /* |
2 | CrossFire, A Multiplayer game for X-windows |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
3 | |
3 | * |
|
|
4 | * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
4 | Copyright (C) 2001 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2001 Mark Wedel & Crossfire Development Team |
5 | Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (©) 1992 Frank Tore Johansen |
6 | |
7 | * |
7 | This program is free software; you can redistribute it and/or modify |
8 | * Deliantra is free software: you can redistribute it and/or modify it under |
8 | it under the terms of the GNU General Public License as published by |
9 | * the terms of the Affero GNU General Public License as published by the |
9 | the Free Software Foundation; either version 2 of the License, or |
10 | * Free Software Foundation, either version 3 of the License, or (at your |
10 | (at your option) any later version. |
11 | * option) any later version. |
11 | |
12 | * |
12 | This program is distributed in the hope that it will be useful, |
13 | * This program is distributed in the hope that it will be useful, |
13 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
16 | |
17 | * |
17 | You should have received a copy of the GNU General Public License |
18 | * You should have received a copy of the Affero GNU General Public License |
18 | along with this program; if not, write to the Free Software |
19 | * and the GNU General Public License along with this program. If not, see |
19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * <http://www.gnu.org/licenses/>. |
20 | |
21 | * |
21 | The authors can be reached via e-mail at <crossfire@schmorp.de> |
22 | * The authors can be reached via e-mail to <support@deliantra.net> |
22 | */ |
23 | */ |
23 | |
24 | |
24 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
|
|
25 | sub/add_weight will transcend the environment updating the carrying |
|
|
26 | variable. */ |
|
|
27 | #include <global.h> |
25 | #include <global.h> |
28 | #include <stdio.h> |
26 | #include <stdio.h> |
29 | #include <sys/types.h> |
27 | #include <sys/types.h> |
30 | #include <sys/uio.h> |
28 | #include <sys/uio.h> |
31 | #include <object.h> |
29 | #include <object.h> |
32 | #include <funcpoint.h> |
30 | #include <sproto.h> |
33 | #include <loader.h> |
|
|
34 | |
31 | |
35 | #include <bitset> |
32 | #include <bitset> |
36 | |
33 | |
37 | int nrofallocobjects = 0; |
34 | UUID UUID::cur; |
38 | static UUID uuid; |
35 | static uint64_t seq_next_save; |
39 | const uint64 UUID_SKIP = 1<<19; |
36 | static const uint64 UUID_GAP = 1<<19; |
|
|
37 | uint32_t mapspace::smellcount = 10000; |
40 | |
38 | |
41 | object *active_objects; /* List of active objects that need to be processed */ |
39 | objectvec objects; |
|
|
40 | activevec actives; |
42 | |
41 | |
43 | short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, |
42 | freelist_item *object::freelist; |
|
|
43 | uint32_t object::object_count; |
|
|
44 | uint32_t object::free_count; |
|
|
45 | uint32_t object::create_count; |
|
|
46 | uint32_t object::destroy_count; |
|
|
47 | |
|
|
48 | //+GPL |
|
|
49 | |
|
|
50 | short freearr_x[SIZEOFFREE] = { |
|
|
51 | 0, |
|
|
52 | 0, 1, 1, 1, 0, -1, -1, -1, |
|
|
53 | 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, |
44 | 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 |
54 | 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 |
45 | }; |
55 | }; |
46 | short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, |
56 | short freearr_y[SIZEOFFREE] = { |
|
|
57 | 0, |
|
|
58 | -1, -1, 0, 1, 1, 1, 0, -1, |
|
|
59 | -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, |
47 | -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 |
60 | -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 |
48 | }; |
|
|
49 | int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, |
|
|
50 | 48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 |
|
|
51 | }; |
61 | }; |
52 | int freedir[SIZEOFFREE] = { |
62 | int freedir[SIZEOFFREE] = { |
53 | 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, |
63 | 0, |
|
|
64 | 1, 2, 3, 4, 5, 6, 7, 8, |
|
|
65 | 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, |
54 | 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 |
66 | 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 |
55 | }; |
67 | }; |
56 | |
68 | |
|
|
69 | static int maxfree[SIZEOFFREE] = { |
|
|
70 | 0, |
|
|
71 | 9, 10, 13, 14, 17, 18, 21, 22, |
|
|
72 | 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48, |
|
|
73 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 |
|
|
74 | }; |
|
|
75 | |
57 | static void |
76 | static void |
58 | write_uuid (void) |
77 | write_uuid (uval64 skip, bool sync) |
59 | { |
78 | { |
60 | char filename1[MAX_BUF], filename2[MAX_BUF]; |
79 | CALL_BEGIN (2); |
61 | |
80 | CALL_ARG_SV (newSVval64 (skip)); |
62 | sprintf (filename1, "%s/uuid", settings.localdir); |
81 | CALL_ARG_SV (boolSV (sync)); |
63 | sprintf (filename2, "%s/uuid~", settings.localdir); |
82 | CALL_CALL ("cf::write_uuid", G_DISCARD); |
64 | |
83 | CALL_END; |
65 | FILE *fp; |
|
|
66 | |
|
|
67 | if (!(fp = fopen (filename2, "w"))) |
|
|
68 | { |
|
|
69 | LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2); |
|
|
70 | return; |
|
|
71 | } |
|
|
72 | |
|
|
73 | fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2); |
|
|
74 | fclose (fp); |
|
|
75 | rename (filename2, filename1); |
|
|
76 | } |
84 | } |
77 | |
85 | |
78 | static void |
86 | static void |
79 | read_uuid (void) |
87 | read_uuid () |
80 | { |
88 | { |
81 | char filename[MAX_BUF]; |
89 | char filename[MAX_BUF]; |
82 | |
90 | |
83 | sprintf (filename, "%s/uuid", settings.localdir); |
91 | sprintf (filename, "%s/uuid", settings.localdir); |
|
|
92 | |
|
|
93 | seq_next_save = 0; |
84 | |
94 | |
85 | FILE *fp; |
95 | FILE *fp; |
86 | |
96 | |
87 | if (!(fp = fopen (filename, "r"))) |
97 | if (!(fp = fopen (filename, "r"))) |
88 | { |
98 | { |
89 | if (errno == ENOENT) |
99 | if (errno == ENOENT) |
90 | { |
100 | { |
91 | LOG (llevInfo, "RESET uid to 1\n"); |
101 | LOG (llevInfo, "RESET uid to 1\n"); |
92 | uuid.seq = 0; |
102 | UUID::cur.seq = 0; |
93 | write_uuid (); |
103 | write_uuid (UUID_GAP, true); |
94 | return; |
104 | return; |
95 | } |
105 | } |
96 | |
106 | |
97 | LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); |
107 | LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); |
98 | _exit (1); |
108 | _exit (1); |
99 | } |
109 | } |
100 | |
110 | |
101 | int version; |
111 | char buf [UUID::MAX_LEN]; |
102 | unsigned long long uid; |
112 | buf[0] = 0; |
103 | if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1) |
113 | fgets (buf, sizeof (buf), fp); |
|
|
114 | |
|
|
115 | if (!UUID::cur.parse (buf)) |
104 | { |
116 | { |
105 | LOG (llevError, "FATAL: error reading uid from %s!\n", filename); |
117 | LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf); |
106 | _exit (1); |
118 | _exit (1); |
107 | } |
119 | } |
108 | |
120 | |
109 | uuid.seq = uid; |
121 | LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ()); |
110 | write_uuid (); |
122 | |
111 | LOG (llevDebug, "read UID: %" PRId64 "\n", uid); |
123 | write_uuid (UUID_GAP, true); |
112 | fclose (fp); |
124 | fclose (fp); |
113 | } |
125 | } |
114 | |
126 | |
115 | UUID |
127 | UUID |
116 | gen_uuid () |
128 | UUID::gen () |
117 | { |
129 | { |
118 | UUID uid; |
130 | UUID uid; |
119 | |
131 | |
120 | uid.seq = ++uuid.seq; |
132 | uid.seq = ++cur.seq; |
121 | |
133 | |
122 | if (!(uuid.seq & (UUID_SKIP - 1))) |
134 | if (expect_false (cur.seq >= seq_next_save)) |
123 | write_uuid (); |
135 | { |
|
|
136 | seq_next_save = UUID::cur.seq + (UUID_GAP >> 1); |
|
|
137 | write_uuid (UUID_GAP, false); |
|
|
138 | } |
|
|
139 | |
124 | |
140 | |
125 | return uid; |
141 | return uid; |
126 | } |
142 | } |
127 | |
143 | |
128 | void |
144 | void |
129 | init_uuid () |
145 | UUID::init () |
130 | { |
146 | { |
131 | read_uuid (); |
147 | read_uuid (); |
132 | } |
148 | } |
133 | |
149 | |
|
|
150 | bool |
|
|
151 | UUID::parse (const char *s) |
|
|
152 | { |
|
|
153 | if (*s++ != '<' || *s++ != '1' || *s++ != '.') |
|
|
154 | return false; |
|
|
155 | |
|
|
156 | seq = 0; |
|
|
157 | |
|
|
158 | while (*s != '>') |
|
|
159 | { |
|
|
160 | if (*s < '0') |
|
|
161 | return false; |
|
|
162 | |
|
|
163 | // this gives nice branchless code with gcc |
|
|
164 | assert ('0' < 'a' && '0' == 48 && 'a' == 97); |
|
|
165 | int digit = (*s + (*s & 0x40 ? 9 : 0)) & 15; |
|
|
166 | |
|
|
167 | seq = (seq << 4) | digit; |
|
|
168 | |
|
|
169 | ++s; |
|
|
170 | } |
|
|
171 | |
|
|
172 | return true; |
|
|
173 | } |
|
|
174 | |
|
|
175 | char * |
|
|
176 | UUID::append (char *buf) const |
|
|
177 | { |
|
|
178 | *buf++ = '<'; |
|
|
179 | *buf++ = '1'; |
|
|
180 | *buf++ = '.'; |
|
|
181 | |
|
|
182 | uint64_t seq = this->seq; |
|
|
183 | const int bits = 64; |
|
|
184 | char nz = 0; |
|
|
185 | static const char tohex [] = "0123456789abcdef"; |
|
|
186 | |
|
|
187 | // assert (len >= 3 + bits / 4 + 1 + 1); |
|
|
188 | for (int i = bits / 4; --i; ) |
|
|
189 | { |
|
|
190 | uint8_t digit = seq >> (bits - 4); |
|
|
191 | |
|
|
192 | *buf = tohex [digit]; |
|
|
193 | nz |= digit; |
|
|
194 | buf += nz ? 1 : 0; |
|
|
195 | seq <<= 4; |
|
|
196 | } |
|
|
197 | |
|
|
198 | // last digit is special - always emit |
|
|
199 | uint8_t digit = seq >> (bits - 4); |
|
|
200 | *buf++ = tohex [digit]; |
|
|
201 | |
|
|
202 | *buf++ = '>'; |
|
|
203 | |
|
|
204 | return buf; |
|
|
205 | } |
|
|
206 | |
|
|
207 | char * |
|
|
208 | UUID::c_str () const |
|
|
209 | { |
|
|
210 | static char buf [MAX_LEN]; |
|
|
211 | *append (buf) = 0; |
|
|
212 | return buf; |
|
|
213 | } |
|
|
214 | |
134 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
215 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
135 | static int |
216 | static bool |
136 | compare_ob_value_lists_one (const object *wants, const object *has) |
217 | compare_ob_value_lists_one (const object *wants, const object *has) |
137 | { |
218 | { |
138 | key_value *wants_field; |
|
|
139 | |
|
|
140 | /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both |
219 | /* n-squared behaviour (see kv_get), but I'm hoping both |
141 | * objects with lists are rare, and lists stay short. If not, use a |
220 | * objects with lists are rare, and lists stay short. If not, use a |
142 | * different structure or at least keep the lists sorted... |
221 | * different structure or at least keep the lists sorted... |
143 | */ |
222 | */ |
144 | |
223 | |
145 | /* For each field in wants, */ |
224 | /* For each field in wants, */ |
146 | for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next) |
225 | for (key_value *kv = wants->key_values; kv; kv = kv->next) |
147 | { |
226 | if (has->kv_get (kv->key) != kv->value) |
148 | key_value *has_field; |
227 | return false; |
149 | |
|
|
150 | /* Look for a field in has with the same key. */ |
|
|
151 | has_field = get_ob_key_link (has, wants_field->key); |
|
|
152 | |
|
|
153 | if (has_field == NULL) |
|
|
154 | { |
|
|
155 | /* No field with that name. */ |
|
|
156 | return FALSE; |
|
|
157 | } |
|
|
158 | |
|
|
159 | /* Found the matching field. */ |
|
|
160 | if (has_field->value != wants_field->value) |
|
|
161 | { |
|
|
162 | /* Values don't match, so this half of the comparison is false. */ |
|
|
163 | return FALSE; |
|
|
164 | } |
|
|
165 | |
|
|
166 | /* If we get here, we found a match. Now for the next field in wants. */ |
|
|
167 | } |
|
|
168 | |
228 | |
169 | /* If we get here, every field in wants has a matching field in has. */ |
229 | /* If we get here, every field in wants has a matching field in has. */ |
170 | return TRUE; |
230 | return true; |
171 | } |
231 | } |
172 | |
232 | |
173 | /* Returns TRUE if ob1 has the same key_values as ob2. */ |
233 | /* Returns TRUE if ob1 has the same key_values as ob2. */ |
174 | static int |
234 | static bool |
175 | compare_ob_value_lists (const object *ob1, const object *ob2) |
235 | compare_ob_value_lists (const object *ob1, const object *ob2) |
176 | { |
236 | { |
177 | /* However, there may be fields in has which aren't partnered in wants, |
237 | /* However, there may be fields in has which aren't partnered in wants, |
178 | * so we need to run the comparison *twice*. :( |
238 | * so we need to run the comparison *twice*. :( |
179 | */ |
239 | */ |
180 | return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1); |
240 | return compare_ob_value_lists_one (ob1, ob2) |
|
|
241 | && compare_ob_value_lists_one (ob2, ob1); |
181 | } |
242 | } |
182 | |
243 | |
183 | /* Function examines the 2 objects given to it, and returns true if |
244 | /* Function examines the 2 objects given to it, and returns true if |
184 | * they can be merged together. |
245 | * they can be merged together. |
185 | * |
246 | * |
… | |
… | |
190 | * Check nrof variable *before* calling can_merge() |
251 | * Check nrof variable *before* calling can_merge() |
191 | * |
252 | * |
192 | * Improvements made with merge: Better checking on potion, and also |
253 | * Improvements made with merge: Better checking on potion, and also |
193 | * check weight |
254 | * check weight |
194 | */ |
255 | */ |
195 | |
|
|
196 | bool object::can_merge_slow (object *ob1, object *ob2) |
256 | bool object::can_merge_slow (object *ob1, object *ob2) |
197 | { |
257 | { |
198 | /* A couple quicksanity checks */ |
258 | /* A couple quick sanity checks */ |
199 | if (ob1 == ob2 |
259 | if (ob1 == ob2 |
200 | || ob1->type != ob2->type |
260 | || ob1->type != ob2->type |
201 | || ob1->speed != ob2->speed |
|
|
202 | || ob1->value != ob2->value |
261 | || ob1->value != ob2->value |
203 | || ob1->name != ob2->name) |
262 | || ob1->name != ob2->name |
|
|
263 | || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED) |
204 | return 0; |
264 | return 0; |
205 | |
265 | |
206 | //TODO: this ain't working well, use nicer and correct overflow check |
|
|
207 | /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that |
266 | /* Do not merge objects if nrof would overflow, assume nrof |
208 | * value could not be stored in a sint32 (which unfortunately sometimes is |
267 | * is always 0 .. 2**31-1 */ |
209 | * used to store nrof). |
268 | if (ob1->nrof > 0x7fffffff - ob2->nrof) |
210 | */ |
|
|
211 | if (ob1->nrof + ob2->nrof >= 1UL << 31) |
|
|
212 | return 0; |
269 | return 0; |
213 | |
270 | |
214 | /* If the objects have been identified, set the BEEN_APPLIED flag. |
271 | /* If the objects have been identified, set the BEEN_APPLIED flag. |
215 | * This is to the comparison of the flags below will be OK. We |
272 | * This is to the comparison of the flags below will be OK. We |
216 | * just can't ignore the been applied or identified flags, as they |
273 | * just can't ignore the been applied or identified flags, as they |
217 | * are not equal - just if it has been identified, the been_applied |
274 | * are not equal - just if it has been identified, the been_applied |
218 | * flags lose any meaning. |
275 | * flags lose any meaning. |
219 | */ |
276 | */ |
220 | if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) |
277 | if (ob1->flag [FLAG_IDENTIFIED]) |
221 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
278 | ob1->set_flag (FLAG_BEEN_APPLIED); |
222 | |
279 | |
223 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
280 | if (ob2->flag [FLAG_IDENTIFIED]) |
224 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
281 | ob2->set_flag (FLAG_BEEN_APPLIED); |
225 | |
282 | |
226 | if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () |
283 | if (ob1->arch->archname != ob2->arch->archname |
227 | || ob1->arch != ob2->arch |
|
|
228 | || ob1->name != ob2->name |
284 | || ob1->name != ob2->name |
229 | || ob1->title != ob2->title |
285 | || ob1->title != ob2->title |
230 | || ob1->msg != ob2->msg |
286 | || ob1->msg != ob2->msg |
231 | || ob1->weight != ob2->weight |
287 | || ob1->weight != ob2->weight |
232 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
|
|
233 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) ) |
|
|
234 | || ob1->attacktype != ob2->attacktype |
288 | || ob1->attacktype != ob2->attacktype |
235 | || ob1->magic != ob2->magic |
289 | || ob1->magic != ob2->magic |
236 | || ob1->slaying != ob2->slaying |
290 | || ob1->slaying != ob2->slaying |
237 | || ob1->skill != ob2->skill |
291 | || ob1->skill != ob2->skill |
238 | || ob1->value != ob2->value |
292 | || ob1->value != ob2->value |
239 | || ob1->animation_id != ob2->animation_id |
293 | || ob1->animation_id != ob2->animation_id |
|
|
294 | || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other |
240 | || ob1->client_type != ob2->client_type |
295 | || ob1->client_type != ob2->client_type |
241 | || ob1->materialname != ob2->materialname |
296 | || ob1->material != ob2->material |
242 | || ob1->lore != ob2->lore |
297 | || ob1->lore != ob2->lore |
243 | || ob1->subtype != ob2->subtype |
298 | || ob1->subtype != ob2->subtype |
244 | || ob1->move_type != ob2->move_type |
299 | || ob1->move_type != ob2->move_type |
245 | || ob1->move_block != ob2->move_block |
300 | || ob1->move_block != ob2->move_block |
246 | || ob1->move_allow != ob2->move_allow |
301 | || ob1->move_allow != ob2->move_allow |
247 | || ob1->move_on != ob2->move_on |
302 | || ob1->move_on != ob2->move_on |
248 | || ob1->move_off != ob2->move_off |
303 | || ob1->move_off != ob2->move_off |
249 | || ob1->move_slow != ob2->move_slow |
304 | || ob1->move_slow != ob2->move_slow |
250 | || ob1->move_slow_penalty != ob2->move_slow_penalty) |
305 | || fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f) |
|
|
306 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
|
|
307 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
251 | return 0; |
308 | return 0; |
252 | |
309 | |
|
|
310 | if ((ob1->flag ^ ob2->flag) |
|
|
311 | .reset (FLAG_INV_LOCKED) |
|
|
312 | .reset (FLAG_REMOVED) |
|
|
313 | .any ()) |
|
|
314 | return 0; |
|
|
315 | |
253 | /* This is really a spellbook check - really, we should |
316 | /* This is really a spellbook check - we should in general |
254 | * check all objects in the inventory. |
317 | * not merge objects with real inventories, as splitting them |
|
|
318 | * is hard. |
255 | */ |
319 | */ |
256 | if (ob1->inv || ob2->inv) |
320 | if (ob1->inv || ob2->inv) |
257 | { |
321 | { |
258 | /* if one object has inventory but the other doesn't, not equiv */ |
322 | if (!(ob1->inv && ob2->inv)) |
259 | if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) |
323 | return 0; /* inventories differ in length */ |
260 | return 0; |
|
|
261 | |
324 | |
262 | /* Now check to see if the two inventory objects could merge */ |
325 | if (ob1->inv->below || ob2->inv->below) |
|
|
326 | return 0; /* more than one object in inv */ |
|
|
327 | |
263 | if (!object::can_merge (ob1->inv, ob2->inv)) |
328 | if (!object::can_merge (ob1->inv, ob2->inv)) |
264 | return 0; |
329 | return 0; /* inventory objects differ */ |
265 | |
330 | |
266 | /* inventory ok - still need to check rest of this object to see |
331 | /* inventory ok - still need to check rest of this object to see |
267 | * if it is valid. |
332 | * if it is valid. |
268 | */ |
333 | */ |
269 | } |
334 | } |
270 | |
335 | |
271 | /* Don't merge objects that are applied. With the new 'body' code, |
336 | /* Don't merge objects that are applied. With the new 'body' code, |
272 | * it is possible for most any character to have more than one of |
337 | * it is possible for most any character to have more than one of |
273 | * some items equipped, and we don't want those to merge. |
338 | * some items equipped, and we don't want those to merge. |
274 | */ |
339 | */ |
275 | if (QUERY_FLAG (ob1, FLAG_APPLIED) || QUERY_FLAG (ob2, FLAG_APPLIED)) |
340 | if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED]) |
276 | return 0; |
341 | return 0; |
277 | |
342 | |
278 | /* Note sure why the following is the case - either the object has to |
343 | /* Note sure why the following is the case - either the object has to |
279 | * be animated or have a very low speed. Is this an attempted monster |
344 | * be animated or have a very low speed. Is this an attempted monster |
280 | * check? |
345 | * check? |
281 | */ |
346 | */ |
282 | if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED) |
347 | if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ()) |
283 | return 0; |
348 | return 0; |
284 | |
349 | |
285 | switch (ob1->type) |
350 | switch (ob1->type) |
286 | { |
351 | { |
287 | case SCROLL: |
352 | case SCROLL: |
288 | if (ob1->level != ob2->level) |
353 | if (ob1->level != ob2->level) |
289 | return 0; |
354 | return 0; |
290 | break; |
355 | break; |
291 | } |
356 | } |
292 | |
357 | |
293 | if (ob1->key_values != NULL || ob2->key_values != NULL) |
358 | if (ob1->key_values || ob2->key_values) |
294 | { |
359 | { |
295 | /* At least one of these has key_values. */ |
360 | /* At least one of these has key_values. */ |
296 | if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) |
361 | if ((!ob1->key_values) != (!ob2->key_values)) |
297 | /* One has fields, but the other one doesn't. */ |
362 | return 0; /* One has fields, but the other one doesn't. */ |
|
|
363 | |
|
|
364 | if (!compare_ob_value_lists (ob1, ob2)) |
298 | return 0; |
365 | return 0; |
299 | else if (!compare_ob_value_lists (ob1, ob2)) |
|
|
300 | return 0; |
|
|
301 | } |
366 | } |
302 | |
367 | |
303 | //TODO: generate an event or call into perl for additional checks |
|
|
304 | if (ob1->self || ob2->self) |
368 | if (ob1->self || ob2->self) |
305 | { |
369 | { |
306 | ob1->optimise (); |
370 | ob1->optimise (); |
307 | ob2->optimise (); |
371 | ob2->optimise (); |
308 | |
372 | |
309 | if (ob1->self || ob2->self) |
373 | if (ob1->self || ob2->self) |
|
|
374 | { |
|
|
375 | int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0; |
|
|
376 | int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0; |
|
|
377 | |
|
|
378 | if (k1 != k2) |
310 | return 0; |
379 | return 0; |
|
|
380 | |
|
|
381 | if (k1 == 0) |
|
|
382 | return 1; |
|
|
383 | |
|
|
384 | if (!cfperl_can_merge (ob1, ob2)) |
|
|
385 | return 0; |
|
|
386 | } |
311 | } |
387 | } |
312 | |
388 | |
313 | /* Everything passes, must be OK. */ |
389 | /* Everything passes, must be OK. */ |
314 | return 1; |
390 | return 1; |
315 | } |
391 | } |
316 | |
392 | |
|
|
393 | // find player who can see this object |
|
|
394 | object * |
|
|
395 | object::visible_to () const |
|
|
396 | { |
|
|
397 | if (client_visible () && !flag [FLAG_REMOVED]) |
|
|
398 | { |
|
|
399 | // see if we are in a container of sorts |
|
|
400 | if (env) |
|
|
401 | { |
|
|
402 | // the player inventory itself is always visible |
|
|
403 | if (env->is_player ()) |
|
|
404 | return env; |
|
|
405 | |
|
|
406 | // else a player could have our env open |
|
|
407 | object *envest = env->outer_env_or_self (); |
|
|
408 | |
|
|
409 | // the player itself is always on a map, so we will find him here |
|
|
410 | // even if our inv is in a player. |
|
|
411 | if (envest->is_on_map ()) |
|
|
412 | if (object *pl = envest->ms ().player ()) |
|
|
413 | if (pl->container_ () == env) |
|
|
414 | return pl; |
|
|
415 | } |
|
|
416 | else |
|
|
417 | { |
|
|
418 | // maybe there is a player standing on the same mapspace |
|
|
419 | // this will catch the case where "this" is a player |
|
|
420 | if (object *pl = ms ().player ()) |
|
|
421 | if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look) |
|
|
422 | || pl->container_ () == this) |
|
|
423 | return pl; |
|
|
424 | } |
|
|
425 | } |
|
|
426 | |
|
|
427 | return 0; |
|
|
428 | } |
|
|
429 | |
|
|
430 | // adjust weight per container type ("of holding") |
|
|
431 | static sint32 |
|
|
432 | weight_adjust_for (object *op, sint32 weight) |
|
|
433 | { |
|
|
434 | return op->type == CONTAINER |
|
|
435 | ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) |
|
|
436 | : weight; |
|
|
437 | } |
|
|
438 | |
317 | /* |
439 | /* |
|
|
440 | * adjust_weight(object, weight) adds the specified weight to an object, |
|
|
441 | * and also updates how much the environment(s) is/are carrying. |
|
|
442 | */ |
|
|
443 | static void |
|
|
444 | adjust_weight (object *op, sint32 weight) |
|
|
445 | { |
|
|
446 | while (op) |
|
|
447 | { |
|
|
448 | // adjust by actual difference to account for rounding errors |
|
|
449 | // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct |
|
|
450 | weight = weight_adjust_for (op, op->carrying) |
|
|
451 | - weight_adjust_for (op, op->carrying - weight); |
|
|
452 | |
|
|
453 | if (!weight) |
|
|
454 | return; |
|
|
455 | |
|
|
456 | op->carrying += weight; |
|
|
457 | |
|
|
458 | if (object *pl = op->visible_to ()) |
|
|
459 | if (pl != op) // player is handled lazily |
|
|
460 | esrv_update_item (UPD_WEIGHT, pl, op); |
|
|
461 | |
|
|
462 | op = op->env; |
|
|
463 | } |
|
|
464 | } |
|
|
465 | |
|
|
466 | /* |
318 | * sum_weight() is a recursive function which calculates the weight |
467 | * this is a recursive function which calculates the weight |
319 | * an object is carrying. It goes through in figures out how much |
468 | * an object is carrying. It goes through op and figures out how much |
320 | * containers are carrying, and sums it up. |
469 | * containers are carrying, and sums it up. |
321 | */ |
470 | */ |
322 | long |
471 | void |
323 | sum_weight (object *op) |
472 | object::update_weight () |
324 | { |
473 | { |
325 | long sum; |
474 | sint32 sum = 0; |
326 | object *inv; |
|
|
327 | |
475 | |
328 | for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) |
476 | for (object *op = inv; op; op = op->below) |
329 | { |
477 | { |
330 | if (inv->inv) |
478 | if (op->inv) |
331 | sum_weight (inv); |
479 | op->update_weight (); |
332 | sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); |
480 | |
|
|
481 | sum += op->total_weight (); |
|
|
482 | } |
|
|
483 | |
|
|
484 | sum = weight_adjust_for (this, sum); |
|
|
485 | |
|
|
486 | if (sum != carrying) |
333 | } |
487 | { |
334 | |
|
|
335 | if (op->type == CONTAINER && op->stats.Str) |
|
|
336 | sum = (sum * (100 - op->stats.Str)) / 100; |
|
|
337 | |
|
|
338 | if (op->carrying != sum) |
488 | if (carrying != sum)//D |
|
|
489 | LOG (llevDebug, "updating weight got %ld, expected %ld (%s)\n", |
|
|
490 | (long long)sum, (long long)carrying, debug_desc ()); |
|
|
491 | |
339 | op->carrying = sum; |
492 | carrying = sum; |
340 | |
493 | |
341 | return sum; |
494 | if (object *pl = visible_to ()) |
|
|
495 | if (pl != this) // player is handled lazily |
|
|
496 | esrv_update_item (UPD_WEIGHT, pl, this); |
|
|
497 | } |
342 | } |
498 | } |
343 | |
499 | |
344 | /** |
500 | /* |
345 | * Return the outermost environment object for a given object. |
501 | * Used by: Server DM commands: dumpbelow, dump. Some error messages. |
346 | */ |
502 | */ |
347 | |
|
|
348 | object * |
|
|
349 | object_get_env_recursive (object *op) |
|
|
350 | { |
|
|
351 | while (op->env != NULL) |
|
|
352 | op = op->env; |
|
|
353 | return op; |
|
|
354 | } |
|
|
355 | |
|
|
356 | /* |
|
|
357 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
|
|
358 | * Some error messages. |
|
|
359 | * The result of the dump is stored in the static global errmsg array. |
|
|
360 | */ |
|
|
361 | |
|
|
362 | char * |
503 | char * |
363 | dump_object (object *op) |
504 | dump_object (object *op) |
364 | { |
505 | { |
365 | if (!op) |
506 | if (!op) |
366 | return strdup ("[NULLOBJ]"); |
507 | return strdup ("[NULLOBJ]"); |
367 | |
508 | |
368 | object_freezer freezer; |
509 | object_freezer freezer; |
369 | save_object (freezer, op, 3); |
510 | op->write (freezer); |
370 | return freezer.as_string (); |
511 | return freezer.as_string (); |
371 | } |
512 | } |
372 | |
513 | |
373 | /* |
514 | char * |
374 | * get_nearest_part(multi-object, object 2) returns the part of the |
515 | object::as_string () |
375 | * multi-object 1 which is closest to the second object. |
|
|
376 | * If it's not a multi-object, it is returned. |
|
|
377 | */ |
|
|
378 | |
|
|
379 | object * |
|
|
380 | get_nearest_part (object *op, const object *pl) |
|
|
381 | { |
516 | { |
382 | object *tmp, *closest; |
517 | return dump_object (this); |
383 | int last_dist, i; |
|
|
384 | |
|
|
385 | if (op->more == NULL) |
|
|
386 | return op; |
|
|
387 | for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more) |
|
|
388 | if ((i = distance (tmp, pl)) < last_dist) |
|
|
389 | closest = tmp, last_dist = i; |
|
|
390 | return closest; |
|
|
391 | } |
518 | } |
392 | |
519 | |
393 | /* |
520 | /* |
394 | * Returns the object which has the count-variable equal to the argument. |
521 | * Returns the object which has the count-variable equal to the argument. |
|
|
522 | * VERRRY slow. |
395 | */ |
523 | */ |
396 | |
|
|
397 | object * |
524 | object * |
398 | find_object (tag_t i) |
525 | find_object (tag_t i) |
399 | { |
526 | { |
400 | for (object *op = object::first; op; op = op->next) |
527 | for_all_objects (op) |
401 | if (op->count == i) |
528 | if (op->count == i) |
402 | return op; |
529 | return op; |
|
|
530 | |
|
|
531 | return 0; |
|
|
532 | } |
|
|
533 | |
|
|
534 | /* |
|
|
535 | * Returns the object which has the uuid equal to the argument. |
|
|
536 | * MOAR VERRRY slow. |
|
|
537 | */ |
|
|
538 | |
|
|
539 | object * |
|
|
540 | find_object_uuid (UUID i) |
|
|
541 | { |
|
|
542 | for_all_objects (op) |
|
|
543 | if (op->uuid == i) |
|
|
544 | return op; |
403 | |
545 | |
404 | return 0; |
546 | return 0; |
405 | } |
547 | } |
406 | |
548 | |
407 | /* |
549 | /* |
408 | * Returns the first object which has a name equal to the argument. |
550 | * Returns the first object which has a name equal to the argument. |
409 | * Used only by the patch command, but not all that useful. |
551 | * Used only by the patch command, but not all that useful. |
410 | * Enables features like "patch <name-of-other-player> food 999" |
552 | * Enables features like "patch <name-of-other-player> food 999" |
411 | */ |
553 | */ |
412 | |
|
|
413 | object * |
554 | object * |
414 | find_object_name (const char *str) |
555 | find_object_name (const char *str) |
415 | { |
556 | { |
416 | shstr_cmp str_ (str); |
557 | shstr_cmp str_ (str); |
417 | object *op; |
|
|
418 | |
558 | |
419 | for (op = object::first; op != NULL; op = op->next) |
559 | if (str_) |
|
|
560 | for_all_objects (op) |
420 | if (op->name == str_) |
561 | if (op->name == str_) |
421 | break; |
562 | return op; |
422 | |
563 | |
423 | return op; |
564 | return 0; |
424 | } |
|
|
425 | |
|
|
426 | void |
|
|
427 | free_all_object_data () |
|
|
428 | { |
|
|
429 | LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); |
|
|
430 | } |
565 | } |
431 | |
566 | |
432 | /* |
567 | /* |
433 | * Sets the owner and sets the skill and exp pointers to owner's current |
568 | * Sets the owner and sets the skill and exp pointers to owner's current |
434 | * skill and experience objects. |
569 | * skill and experience objects. |
|
|
570 | * ACTUALLY NO! investigate! TODO |
435 | */ |
571 | */ |
436 | void |
572 | void |
437 | object::set_owner (object *owner) |
573 | object::set_owner (object *owner) |
438 | { |
574 | { |
|
|
575 | // allow objects which own objects |
439 | if (!owner) |
576 | if (owner) |
440 | return; |
|
|
441 | |
|
|
442 | /* next line added to allow objects which own objects */ |
|
|
443 | /* Add a check for ownercounts in here, as I got into an endless loop |
|
|
444 | * with the fireball owning a poison cloud which then owned the |
|
|
445 | * fireball. I believe that was caused by one of the objects getting |
|
|
446 | * freed and then another object replacing it. Since the ownercounts |
|
|
447 | * didn't match, this check is valid and I believe that cause is valid. |
|
|
448 | */ |
|
|
449 | while (owner->owner) |
577 | while (owner->owner) |
450 | owner = owner->owner; |
578 | owner = owner->owner; |
|
|
579 | |
|
|
580 | if (flag [FLAG_FREED]) |
|
|
581 | { |
|
|
582 | LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ()); |
|
|
583 | return; |
|
|
584 | } |
451 | |
585 | |
452 | this->owner = owner; |
586 | this->owner = owner; |
453 | } |
587 | } |
454 | |
588 | |
455 | /* Zero the key_values on op, decrementing the shared-string |
589 | /* Zero the key_values on op, decrementing the shared-string |
456 | * refcounts and freeing the links. |
590 | * refcounts and freeing the links. |
457 | */ |
591 | */ |
458 | static void |
592 | static void |
459 | free_key_values (object *op) |
593 | free_key_values (object *op) |
460 | { |
594 | { |
461 | for (key_value *i = op->key_values; i != 0;) |
595 | for (key_value *i = op->key_values; i; ) |
462 | { |
596 | { |
463 | key_value *next = i->next; |
597 | key_value *next = i->next; |
464 | delete i; |
598 | delete i; |
465 | |
599 | |
466 | i = next; |
600 | i = next; |
… | |
… | |
478 | * will point at garbage. |
612 | * will point at garbage. |
479 | */ |
613 | */ |
480 | void |
614 | void |
481 | object::copy_to (object *dst) |
615 | object::copy_to (object *dst) |
482 | { |
616 | { |
483 | bool is_freed = QUERY_FLAG (dst, FLAG_FREED); |
617 | dst->remove (); |
484 | bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); |
|
|
485 | |
|
|
486 | *(object_copy *)dst = *this; |
618 | *(object_copy *)dst = *this; |
487 | |
619 | dst->flag [FLAG_REMOVED] = true; |
488 | if (self || cb) |
|
|
489 | INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst)); |
|
|
490 | |
|
|
491 | if (is_freed) |
|
|
492 | SET_FLAG (dst, FLAG_FREED); |
|
|
493 | |
|
|
494 | if (is_removed) |
|
|
495 | SET_FLAG (dst, FLAG_REMOVED); |
|
|
496 | |
|
|
497 | if (speed < 0) |
|
|
498 | dst->speed_left = speed_left - RANDOM () % 200 / 100.0; |
|
|
499 | |
620 | |
500 | /* Copy over key_values, if any. */ |
621 | /* Copy over key_values, if any. */ |
501 | if (key_values) |
622 | if (key_values) |
502 | { |
623 | { |
503 | key_value *tail = 0; |
624 | key_value *tail = 0; |
504 | key_value *i; |
|
|
505 | |
|
|
506 | dst->key_values = 0; |
625 | dst->key_values = 0; |
507 | |
626 | |
508 | for (i = key_values; i; i = i->next) |
627 | for (key_value *i = key_values; i; i = i->next) |
509 | { |
628 | { |
510 | key_value *new_link = new key_value; |
629 | key_value *new_link = new key_value; |
511 | |
630 | |
512 | new_link->next = 0; |
631 | new_link->next = 0; |
513 | new_link->key = i->key; |
632 | new_link->key = i->key; |
514 | new_link->value = i->value; |
633 | new_link->value = i->value; |
515 | |
634 | |
516 | /* Try and be clever here, too. */ |
635 | /* Try and be clever here, too. */ |
517 | if (!dst->key_values) |
636 | if (!dst->key_values) |
518 | { |
637 | { |
… | |
… | |
525 | tail = new_link; |
644 | tail = new_link; |
526 | } |
645 | } |
527 | } |
646 | } |
528 | } |
647 | } |
529 | |
648 | |
530 | update_ob_speed (dst); |
649 | dst->activate (); |
|
|
650 | } |
|
|
651 | |
|
|
652 | void |
|
|
653 | object::instantiate () |
|
|
654 | { |
|
|
655 | if (!uuid.seq) // HACK |
|
|
656 | uuid = UUID::gen (); |
|
|
657 | |
|
|
658 | // TODO: unclean state changes, should nt be done in copy_to AND instantiate |
|
|
659 | if (flag [FLAG_RANDOM_SPEED] && speed) |
|
|
660 | speed_left = - speed - rndm (); // TODO animation |
|
|
661 | else |
|
|
662 | speed_left = -1.; |
|
|
663 | |
|
|
664 | /* copy the body_info to the body_used - this is only really |
|
|
665 | * need for monsters, but doesn't hurt to do it for everything. |
|
|
666 | * by doing so, when a monster is created, it has good starting |
|
|
667 | * values for the body_used info, so when items are created |
|
|
668 | * for it, they can be properly equipped. |
|
|
669 | */ |
|
|
670 | for (int i = NUM_BODY_LOCATIONS; i--; ) |
|
|
671 | slot[i].used = slot[i].info; |
|
|
672 | |
|
|
673 | attachable::instantiate (); |
531 | } |
674 | } |
532 | |
675 | |
533 | object * |
676 | object * |
534 | object::clone () |
677 | object::clone () |
535 | { |
678 | { |
536 | object *neu = create (); |
679 | object *neu = create (); |
537 | copy_to (neu); |
680 | copy_to (neu); |
|
|
681 | |
|
|
682 | // TODO: unclean state changes, should not be done in clone AND instantiate |
|
|
683 | if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed) |
|
|
684 | neu->speed_left = - neu->speed - rndm (); // TODO animation |
|
|
685 | |
|
|
686 | neu->map = map; // not copied by copy_to |
538 | return neu; |
687 | return neu; |
539 | } |
688 | } |
540 | |
689 | |
541 | /* |
690 | /* |
542 | * If an object with the IS_TURNABLE() flag needs to be turned due |
691 | * If an object with the IS_TURNABLE() flag needs to be turned due |
543 | * to the closest player being on the other side, this function can |
692 | * to the closest player being on the other side, this function can |
544 | * be called to update the face variable, _and_ how it looks on the map. |
693 | * be called to update the face variable, _and_ how it looks on the map. |
545 | */ |
694 | */ |
546 | |
|
|
547 | void |
695 | void |
548 | update_turn_face (object *op) |
696 | update_turn_face (object *op) |
549 | { |
697 | { |
550 | if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) |
698 | if (!op->flag [FLAG_IS_TURNABLE] || !op->arch) |
551 | return; |
699 | return; |
|
|
700 | |
552 | SET_ANIMATION (op, op->direction); |
701 | SET_ANIMATION (op, op->direction); |
553 | update_object (op, UP_OBJ_FACE); |
702 | update_object (op, UP_OBJ_FACE); |
554 | } |
703 | } |
555 | |
704 | |
556 | /* |
705 | /* |
557 | * Updates the speed of an object. If the speed changes from 0 to another |
706 | * Updates the speed of an object. If the speed changes from 0 to another |
558 | * value, or vice versa, then add/remove the object from the active list. |
707 | * value, or vice versa, then add/remove the object from the active list. |
559 | * This function needs to be called whenever the speed of an object changes. |
708 | * This function needs to be called whenever the speed of an object changes. |
560 | */ |
709 | */ |
561 | void |
710 | void |
562 | update_ob_speed (object *op) |
711 | object::set_speed (float speed) |
563 | { |
712 | { |
564 | extern int arch_init; |
713 | this->speed = speed; |
565 | |
714 | |
566 | /* No reason putting the archetypes objects on the speed list, |
715 | if (has_active_speed ()) |
567 | * since they never really need to be updated. |
716 | activate (); |
568 | */ |
|
|
569 | |
|
|
570 | if (QUERY_FLAG (op, FLAG_FREED) && op->speed) |
|
|
571 | { |
|
|
572 | LOG (llevError, "Object %s is freed but has speed.\n", &op->name); |
|
|
573 | #ifdef MANY_CORES |
|
|
574 | abort (); |
|
|
575 | #else |
|
|
576 | op->speed = 0; |
|
|
577 | #endif |
|
|
578 | } |
|
|
579 | |
|
|
580 | if (arch_init) |
|
|
581 | return; |
|
|
582 | |
|
|
583 | if (FABS (op->speed) > MIN_ACTIVE_SPEED) |
|
|
584 | { |
|
|
585 | /* If already on active list, don't do anything */ |
|
|
586 | if (op->active_next || op->active_prev || op == active_objects) |
|
|
587 | return; |
|
|
588 | |
|
|
589 | /* process_events() expects us to insert the object at the beginning |
|
|
590 | * of the list. */ |
|
|
591 | op->active_next = active_objects; |
|
|
592 | |
|
|
593 | if (op->active_next != NULL) |
|
|
594 | op->active_next->active_prev = op; |
|
|
595 | |
|
|
596 | active_objects = op; |
|
|
597 | } |
|
|
598 | else |
717 | else |
599 | { |
718 | deactivate (); |
600 | /* If not on the active list, nothing needs to be done */ |
|
|
601 | if (!op->active_next && !op->active_prev && op != active_objects) |
|
|
602 | return; |
|
|
603 | |
|
|
604 | if (op->active_prev == NULL) |
|
|
605 | { |
|
|
606 | active_objects = op->active_next; |
|
|
607 | |
|
|
608 | if (op->active_next != NULL) |
|
|
609 | op->active_next->active_prev = NULL; |
|
|
610 | } |
|
|
611 | else |
|
|
612 | { |
|
|
613 | op->active_prev->active_next = op->active_next; |
|
|
614 | |
|
|
615 | if (op->active_next) |
|
|
616 | op->active_next->active_prev = op->active_prev; |
|
|
617 | } |
|
|
618 | |
|
|
619 | op->active_next = NULL; |
|
|
620 | op->active_prev = NULL; |
|
|
621 | } |
|
|
622 | } |
|
|
623 | |
|
|
624 | /* This function removes object 'op' from the list of active |
|
|
625 | * objects. |
|
|
626 | * This should only be used for style maps or other such |
|
|
627 | * reference maps where you don't want an object that isn't |
|
|
628 | * in play chewing up cpu time getting processed. |
|
|
629 | * The reverse of this is to call update_ob_speed, which |
|
|
630 | * will do the right thing based on the speed of the object. |
|
|
631 | */ |
|
|
632 | void |
|
|
633 | remove_from_active_list (object *op) |
|
|
634 | { |
|
|
635 | /* If not on the active list, nothing needs to be done */ |
|
|
636 | if (!op->active_next && !op->active_prev && op != active_objects) |
|
|
637 | return; |
|
|
638 | |
|
|
639 | if (op->active_prev == NULL) |
|
|
640 | { |
|
|
641 | active_objects = op->active_next; |
|
|
642 | if (op->active_next != NULL) |
|
|
643 | op->active_next->active_prev = NULL; |
|
|
644 | } |
|
|
645 | else |
|
|
646 | { |
|
|
647 | op->active_prev->active_next = op->active_next; |
|
|
648 | if (op->active_next) |
|
|
649 | op->active_next->active_prev = op->active_prev; |
|
|
650 | } |
|
|
651 | op->active_next = NULL; |
|
|
652 | op->active_prev = NULL; |
|
|
653 | } |
719 | } |
654 | |
720 | |
655 | /* |
721 | /* |
656 | * update_object() updates the the map. |
722 | * update_object() updates the the map. |
657 | * It takes into account invisible objects (and represent squares covered |
723 | * It takes into account invisible objects (and represent squares covered |
… | |
… | |
670 | * UP_OBJ_FACE: only the objects face has changed. |
736 | * UP_OBJ_FACE: only the objects face has changed. |
671 | */ |
737 | */ |
672 | void |
738 | void |
673 | update_object (object *op, int action) |
739 | update_object (object *op, int action) |
674 | { |
740 | { |
675 | MoveType move_on, move_off, move_block, move_slow; |
741 | if (!op) |
676 | |
|
|
677 | if (op == NULL) |
|
|
678 | { |
742 | { |
679 | /* this should never happen */ |
743 | /* this should never happen */ |
680 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
744 | LOG (llevError | logBacktrace, "update_object() called for NULL object.\n"); |
681 | return; |
745 | return; |
682 | } |
746 | } |
683 | |
747 | |
684 | if (op->env) |
748 | if (!op->is_on_map ()) |
685 | { |
749 | { |
686 | /* Animation is currently handled by client, so nothing |
750 | /* Animation is currently handled by client, so nothing |
687 | * to do in this case. |
751 | * to do in this case. |
688 | */ |
752 | */ |
689 | return; |
753 | return; |
690 | } |
754 | } |
691 | |
755 | |
692 | /* If the map is saving, don't do anything as everything is |
|
|
693 | * going to get freed anyways. |
|
|
694 | */ |
|
|
695 | if (!op->map || op->map->in_memory == MAP_SAVING) |
|
|
696 | return; |
|
|
697 | |
|
|
698 | /* make sure the object is within map boundaries */ |
756 | /* make sure the object is within map boundaries */ |
699 | if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map)) |
757 | if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) |
700 | { |
758 | { |
701 | LOG (llevError, "update_object() called for object out of map!\n"); |
759 | LOG (llevError, "update_object() called for object out of map!\n"); |
702 | #ifdef MANY_CORES |
760 | #ifdef MANY_CORES |
703 | abort (); |
761 | abort (); |
704 | #endif |
762 | #endif |
705 | return; |
763 | return; |
706 | } |
764 | } |
707 | |
765 | |
708 | mapspace &m = op->ms (); |
766 | mapspace &m = op->ms (); |
709 | |
767 | |
710 | if (m.flags_ & P_NEED_UPDATE) |
768 | if (!(m.flags_ & P_UPTODATE)) |
711 | /* nop */; |
769 | /* nop */; |
712 | else if (action == UP_OBJ_INSERT) |
770 | else if (action == UP_OBJ_INSERT) |
713 | { |
771 | { |
|
|
772 | #if 0 |
714 | // this is likely overkill, TODO: revisit (schmorp) |
773 | // this is likely overkill, TODO: revisit (schmorp) |
715 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
774 | if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW)) |
716 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
775 | || (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC)) |
717 | || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) |
776 | || (op->is_player () && !(m.flags_ & P_PLAYER)) |
718 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
777 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
719 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
778 | || (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE)) |
720 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
779 | || (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC)) |
721 | || (m.move_on | op->move_on ) != m.move_on |
780 | || (m.move_on | op->move_on ) != m.move_on |
722 | || (m.move_off | op->move_off ) != m.move_off |
781 | || (m.move_off | op->move_off ) != m.move_off |
723 | || (m.move_slow | op->move_slow) != m.move_slow |
782 | || (m.move_slow | op->move_slow) != m.move_slow |
724 | /* This isn't perfect, but I don't expect a lot of objects to |
783 | /* This isn't perfect, but I don't expect a lot of objects to |
725 | * to have move_allow right now. |
784 | * have move_allow right now. |
726 | */ |
785 | */ |
727 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
786 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
|
|
787 | m.invalidate (); |
|
|
788 | #else |
728 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
789 | // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp) |
729 | m.flags_ = P_NEED_UPDATE; |
790 | m.invalidate (); |
|
|
791 | #endif |
730 | } |
792 | } |
731 | /* if the object is being removed, we can't make intelligent |
793 | /* if the object is being removed, we can't make intelligent |
732 | * decisions, because remove_ob can't really pass the object |
794 | * decisions, because remove_ob can't really pass the object |
733 | * that is being removed. |
795 | * that is being removed. |
734 | */ |
796 | */ |
735 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
797 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
736 | m.flags_ = P_NEED_UPDATE; |
798 | m.invalidate (); |
737 | else if (action == UP_OBJ_FACE) |
799 | else if (action == UP_OBJ_FACE) |
738 | /* Nothing to do for that case */ ; |
800 | /* Nothing to do for that case */ ; |
739 | else |
801 | else |
740 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
802 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
741 | |
803 | |
742 | if (op->more) |
804 | if (op->more) |
743 | update_object (op->more, action); |
805 | update_object (op->more, action); |
744 | } |
806 | } |
745 | |
807 | |
746 | object::vector object::mortals; |
|
|
747 | object::vector object::objects; // not yet used |
|
|
748 | object *object::first; |
|
|
749 | |
|
|
750 | void object::free_mortals () |
|
|
751 | { |
|
|
752 | for (AUTODECL (i, mortals.begin ()); i != mortals.end ();) |
|
|
753 | if ((*i)->refcnt) |
|
|
754 | ++i; // further delay freeing |
|
|
755 | else |
|
|
756 | { |
|
|
757 | delete *i; |
|
|
758 | mortals.erase (i); |
|
|
759 | } |
|
|
760 | } |
|
|
761 | |
|
|
762 | object::object () |
808 | object::object () |
763 | { |
809 | { |
764 | SET_FLAG (this, FLAG_REMOVED); |
810 | this->set_flag (FLAG_REMOVED); |
765 | |
811 | |
766 | expmul = 1.0; |
812 | //expmul = 1.0; declared const for the time being |
767 | face = blank_face; |
813 | face = blank_face; |
|
|
814 | material = MATERIAL_NULL; |
768 | } |
815 | } |
769 | |
816 | |
770 | object::~object () |
817 | object::~object () |
771 | { |
818 | { |
|
|
819 | unlink (); |
|
|
820 | |
772 | free_key_values (this); |
821 | free_key_values (this); |
773 | } |
822 | } |
774 | |
823 | |
775 | void object::link () |
824 | void object::link () |
776 | { |
825 | { |
777 | count = ++ob_count; |
826 | assert (!index);//D |
778 | uuid = gen_uuid (); |
827 | uuid = UUID::gen (); |
779 | |
828 | |
780 | prev = 0; |
829 | refcnt_inc (); |
781 | next = object::first; |
830 | objects.insert (this); |
782 | |
831 | |
783 | if (object::first) |
832 | ++create_count; |
784 | object::first->prev = this; |
|
|
785 | |
833 | |
786 | object::first = this; |
|
|
787 | } |
834 | } |
788 | |
835 | |
789 | void object::unlink () |
836 | void object::unlink () |
790 | { |
837 | { |
791 | if (this == object::first) |
838 | if (!index) |
792 | object::first = next; |
|
|
793 | |
|
|
794 | /* Remove this object from the list of used objects */ |
|
|
795 | if (prev) prev->next = next; |
|
|
796 | if (next) next->prev = prev; |
|
|
797 | |
|
|
798 | prev = 0; |
|
|
799 | next = 0; |
|
|
800 | } |
|
|
801 | |
|
|
802 | object *object::create () |
|
|
803 | { |
|
|
804 | object *op = new object; |
|
|
805 | op->link (); |
|
|
806 | return op; |
|
|
807 | } |
|
|
808 | |
|
|
809 | /* |
|
|
810 | * free_object() frees everything allocated by an object, removes |
|
|
811 | * it from the list of used objects, and puts it on the list of |
|
|
812 | * free objects. The IS_FREED() flag is set in the object. |
|
|
813 | * The object must have been removed by remove_ob() first for |
|
|
814 | * this function to succeed. |
|
|
815 | * |
|
|
816 | * If destroy_inventory is set, free inventory as well. Else drop items in |
|
|
817 | * inventory to the ground. |
|
|
818 | */ |
|
|
819 | void object::destroy (bool destroy_inventory) |
|
|
820 | { |
|
|
821 | if (QUERY_FLAG (this, FLAG_FREED)) |
|
|
822 | return; |
839 | return; |
823 | |
840 | |
824 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
841 | ++destroy_count; |
825 | remove_friendly_object (this); |
|
|
826 | |
842 | |
827 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
843 | objects.erase (this); |
828 | remove (); |
844 | refcnt_dec (); |
|
|
845 | } |
829 | |
846 | |
830 | SET_FLAG (this, FLAG_FREED); |
847 | void |
|
|
848 | object::activate () |
|
|
849 | { |
|
|
850 | /* If already on active list, don't do anything */ |
|
|
851 | if (active) |
|
|
852 | return; |
831 | |
853 | |
832 | if (more) |
854 | if (has_active_speed ()) |
833 | { |
|
|
834 | more->destroy (destroy_inventory); |
|
|
835 | more = 0; |
|
|
836 | } |
855 | { |
|
|
856 | if (flag [FLAG_FREED]) |
|
|
857 | LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D |
837 | |
858 | |
|
|
859 | actives.insert (this); |
|
|
860 | } |
|
|
861 | } |
|
|
862 | |
|
|
863 | void |
|
|
864 | object::activate_recursive () |
|
|
865 | { |
|
|
866 | activate (); |
|
|
867 | |
|
|
868 | for (object *op = inv; op; op = op->below) |
|
|
869 | op->activate_recursive (); |
|
|
870 | } |
|
|
871 | |
|
|
872 | /* This function removes object 'op' from the list of active |
|
|
873 | * objects. |
|
|
874 | * This should only be used for style maps or other such |
|
|
875 | * reference maps where you don't want an object that isn't |
|
|
876 | * in play chewing up cpu time getting processed. |
|
|
877 | * The reverse of this is to call update_ob_speed, which |
|
|
878 | * will do the right thing based on the speed of the object. |
|
|
879 | */ |
|
|
880 | void |
|
|
881 | object::deactivate () |
|
|
882 | { |
|
|
883 | /* If not on the active list, nothing needs to be done */ |
|
|
884 | if (!active) |
|
|
885 | return; |
|
|
886 | |
|
|
887 | actives.erase (this); |
|
|
888 | } |
|
|
889 | |
|
|
890 | void |
|
|
891 | object::deactivate_recursive () |
|
|
892 | { |
|
|
893 | for (object *op = inv; op; op = op->below) |
|
|
894 | op->deactivate_recursive (); |
|
|
895 | |
|
|
896 | deactivate (); |
|
|
897 | } |
|
|
898 | |
|
|
899 | void |
|
|
900 | object::set_flag_inv (int flag, int value) |
|
|
901 | { |
|
|
902 | for (object *op = inv; op; op = op->below) |
|
|
903 | { |
|
|
904 | op->flag [flag] = value; |
|
|
905 | op->set_flag_inv (flag, value); |
|
|
906 | } |
|
|
907 | } |
|
|
908 | |
|
|
909 | /* |
|
|
910 | * Remove and free all objects in the inventory of the given object. |
|
|
911 | * object.c ? |
|
|
912 | */ |
|
|
913 | void |
|
|
914 | object::destroy_inv (bool drop_to_ground) |
|
|
915 | { |
|
|
916 | // need to check first, because the checks below might segfault |
|
|
917 | // as we might be on an invalid mapspace and crossfire code |
|
|
918 | // is too buggy to ensure that the inventory is empty. |
|
|
919 | // corollary: if you create arrows etc. with stuff in its inventory, |
|
|
920 | // cf will crash below with off-map x and y |
838 | if (inv) |
921 | if (!inv) |
839 | { |
922 | return; |
|
|
923 | |
840 | /* Only if the space blocks everything do we not process - |
924 | /* Only if the space blocks everything do we not process - |
841 | * if some form of movement is allowed, let objects |
925 | * if some form of movement is allowed, let objects |
842 | * drop on that space. |
926 | * drop on that space. |
843 | */ |
927 | */ |
844 | if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) |
928 | if (!drop_to_ground |
|
|
929 | || !map |
|
|
930 | || map->in_memory != MAP_ACTIVE |
|
|
931 | || map->no_drop |
|
|
932 | || ms ().move_block == MOVE_ALL) |
|
|
933 | { |
|
|
934 | while (inv) |
|
|
935 | inv->destroy (); |
|
|
936 | } |
|
|
937 | else |
|
|
938 | { /* Put objects in inventory onto this space */ |
|
|
939 | while (inv) |
845 | { |
940 | { |
846 | object *op = inv; |
941 | object *op = inv; |
847 | |
942 | |
848 | while (op) |
943 | if (op->flag [FLAG_STARTEQUIP] |
849 | { |
944 | || op->flag [FLAG_NO_DROP] |
850 | object *tmp = op->below; |
945 | || op->type == RUNE |
851 | op->destroy (destroy_inventory); |
946 | || op->type == TRAP |
852 | op = tmp; |
947 | || op->flag [FLAG_IS_A_TEMPLATE] |
853 | } |
948 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
|
|
949 | op->destroy (); |
|
|
950 | else |
|
|
951 | map->insert (op, x, y); |
854 | } |
952 | } |
855 | else |
953 | } |
856 | { /* Put objects in inventory onto this space */ |
954 | } |
857 | object *op = inv; |
|
|
858 | |
955 | |
859 | while (op) |
956 | /* |
860 | { |
957 | * Remove and free all objects in the inventory of the given object. |
861 | object *tmp = op->below; |
958 | * Unlike destroy_inv, this assumes the *this is destroyed as well |
|
|
959 | * well, so we can (and have to!) take shortcuts. |
|
|
960 | */ |
|
|
961 | void |
|
|
962 | object::destroy_inv_fast () |
|
|
963 | { |
|
|
964 | while (object *op = inv) |
|
|
965 | { |
|
|
966 | // remove from object the fast way |
|
|
967 | op->flag [FLAG_REMOVED] = true; |
|
|
968 | op->env = 0; |
|
|
969 | if ((inv = inv->below)) |
|
|
970 | inv->above = 0; |
862 | |
971 | |
863 | op->remove (); |
972 | // then destroy |
864 | |
|
|
865 | if (QUERY_FLAG (op, FLAG_STARTEQUIP) |
|
|
866 | || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) |
|
|
867 | op->destroy (); |
973 | op->destroy (); |
868 | else |
974 | } |
869 | { |
975 | } |
870 | op->x = x; |
|
|
871 | op->y = y; |
|
|
872 | insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ |
|
|
873 | } |
|
|
874 | |
976 | |
875 | op = tmp; |
977 | void |
876 | } |
978 | object::freelist_free (int count) |
877 | } |
979 | { |
|
|
980 | while (count-- && freelist) |
878 | } |
981 | { |
|
|
982 | freelist_item *next = freelist->next; |
|
|
983 | // count is being "destroyed" |
|
|
984 | |
|
|
985 | sfree ((char *)freelist, sizeof (object)); |
|
|
986 | |
|
|
987 | freelist = next; |
|
|
988 | --free_count; |
|
|
989 | } |
|
|
990 | } |
|
|
991 | |
|
|
992 | object * |
|
|
993 | object::create () |
|
|
994 | { |
|
|
995 | object *op; |
|
|
996 | |
|
|
997 | if (freelist) |
|
|
998 | { |
|
|
999 | freelist_item li = *freelist; |
|
|
1000 | memset (freelist, 0, sizeof (object)); |
|
|
1001 | |
|
|
1002 | op = new (freelist) object; |
|
|
1003 | op->count = li.count; |
|
|
1004 | |
|
|
1005 | freelist = li.next; |
|
|
1006 | --free_count; |
|
|
1007 | } |
|
|
1008 | else |
|
|
1009 | { |
|
|
1010 | void *ni = salloc0<char> (sizeof (object)); |
|
|
1011 | |
|
|
1012 | op = new(ni) object; |
|
|
1013 | |
|
|
1014 | op->count = ++object_count; |
|
|
1015 | } |
|
|
1016 | |
|
|
1017 | op->link (); |
|
|
1018 | |
|
|
1019 | return op; |
|
|
1020 | } |
|
|
1021 | |
|
|
1022 | void |
|
|
1023 | object::do_delete () |
|
|
1024 | { |
|
|
1025 | uint32_t count = this->count; |
|
|
1026 | |
|
|
1027 | this->~object (); |
|
|
1028 | |
|
|
1029 | freelist_item *li = (freelist_item *)this; |
|
|
1030 | li->next = freelist; |
|
|
1031 | li->count = count; |
|
|
1032 | |
|
|
1033 | freelist = li; |
|
|
1034 | ++free_count; |
|
|
1035 | } |
|
|
1036 | |
|
|
1037 | static struct freed_map : maptile |
|
|
1038 | { |
|
|
1039 | freed_map () |
|
|
1040 | : maptile (3, 3) |
|
|
1041 | { |
|
|
1042 | path = "<freed objects map>"; |
|
|
1043 | name = "/internal/freed_objects_map"; |
|
|
1044 | no_drop = 1; |
|
|
1045 | no_reset = 1; |
|
|
1046 | |
|
|
1047 | in_memory = MAP_ACTIVE; |
|
|
1048 | } |
|
|
1049 | |
|
|
1050 | ~freed_map () |
|
|
1051 | { |
|
|
1052 | destroy (); |
|
|
1053 | } |
|
|
1054 | } freed_map; // freed objects are moved here to avoid crashes |
|
|
1055 | |
|
|
1056 | void |
|
|
1057 | object::do_destroy () |
|
|
1058 | { |
|
|
1059 | if (flag [FLAG_IS_LINKED]) |
|
|
1060 | remove_link (); |
|
|
1061 | |
|
|
1062 | if (flag [FLAG_FRIENDLY]) |
|
|
1063 | remove_friendly_object (this); |
|
|
1064 | |
|
|
1065 | remove (); |
|
|
1066 | |
|
|
1067 | attachable::do_destroy (); |
|
|
1068 | |
|
|
1069 | deactivate (); |
|
|
1070 | unlink (); |
|
|
1071 | |
|
|
1072 | flag [FLAG_FREED] = 1; |
879 | |
1073 | |
880 | // hack to ensure that freed objects still have a valid map |
1074 | // hack to ensure that freed objects still have a valid map |
881 | { |
|
|
882 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
|
|
883 | |
|
|
884 | if (!freed_map) |
|
|
885 | { |
|
|
886 | freed_map = new maptile; |
|
|
887 | |
|
|
888 | freed_map->name = "/internal/freed_objects_map"; |
|
|
889 | freed_map->width = 3; |
|
|
890 | freed_map->height = 3; |
|
|
891 | |
|
|
892 | freed_map->allocate (); |
|
|
893 | } |
|
|
894 | |
|
|
895 | map = freed_map; |
1075 | map = &freed_map; |
896 | x = 1; |
1076 | x = 1; |
897 | y = 1; |
1077 | y = 1; |
|
|
1078 | |
|
|
1079 | if (more) |
|
|
1080 | { |
|
|
1081 | more->destroy (); |
|
|
1082 | more = 0; |
898 | } |
1083 | } |
899 | |
1084 | |
|
|
1085 | head = 0; |
|
|
1086 | |
900 | // clear those pointers that likely might have circular references to us |
1087 | // clear those pointers that likely might cause circular references |
901 | owner = 0; |
1088 | owner = 0; |
902 | enemy = 0; |
1089 | enemy = 0; |
903 | attacked_by = 0; |
1090 | attacked_by = 0; |
904 | |
1091 | current_weapon = 0; |
905 | // only relevant for players(?), but make sure of it anyways |
|
|
906 | contr = 0; |
|
|
907 | |
|
|
908 | /* Remove object from the active list */ |
|
|
909 | speed = 0; |
|
|
910 | update_ob_speed (this); |
|
|
911 | |
|
|
912 | unlink (); |
|
|
913 | |
|
|
914 | mortals.push_back (this); |
|
|
915 | } |
1092 | } |
916 | |
1093 | |
917 | /* |
|
|
918 | * sub_weight() recursively (outwards) subtracts a number from the |
|
|
919 | * weight of an object (and what is carried by it's environment(s)). |
|
|
920 | */ |
|
|
921 | void |
1094 | void |
922 | sub_weight (object *op, signed long weight) |
1095 | object::destroy () |
923 | { |
1096 | { |
924 | while (op != NULL) |
1097 | if (destroyed ()) |
925 | { |
1098 | return; |
926 | if (op->type == CONTAINER) |
|
|
927 | weight = (signed long) (weight * (100 - op->stats.Str) / 100); |
|
|
928 | |
1099 | |
929 | op->carrying -= weight; |
1100 | if (!is_head () && !head->destroyed ()) |
930 | op = op->env; |
|
|
931 | } |
1101 | { |
|
|
1102 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
|
|
1103 | head->destroy (); |
|
|
1104 | return; |
|
|
1105 | } |
|
|
1106 | |
|
|
1107 | destroy_inv_fast (); |
|
|
1108 | |
|
|
1109 | if (is_head ()) |
|
|
1110 | if (sound_destroy) |
|
|
1111 | play_sound (sound_destroy); |
|
|
1112 | else if (flag [FLAG_MONSTER]) |
|
|
1113 | play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism |
|
|
1114 | |
|
|
1115 | attachable::destroy (); |
932 | } |
1116 | } |
933 | |
1117 | |
934 | /* op->remove (): |
1118 | /* op->remove (): |
935 | * This function removes the object op from the linked list of objects |
1119 | * This function removes the object op from the linked list of objects |
936 | * which it is currently tied to. When this function is done, the |
1120 | * which it is currently tied to. When this function is done, the |
937 | * object will have no environment. If the object previously had an |
1121 | * object will have no environment. If the object previously had an |
938 | * environment, the x and y coordinates will be updated to |
1122 | * environment, the x and y coordinates will be updated to |
939 | * the previous environment. |
1123 | * the previous environment. |
940 | * Beware: This function is called from the editor as well! |
|
|
941 | */ |
1124 | */ |
942 | void |
1125 | void |
943 | object::remove () |
1126 | object::do_remove () |
944 | { |
1127 | { |
945 | object *tmp, *last = 0; |
1128 | if (flag [FLAG_REMOVED]) |
946 | object *otmp; |
|
|
947 | |
|
|
948 | int check_walk_off; |
|
|
949 | |
|
|
950 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
|
|
951 | return; |
1129 | return; |
952 | |
1130 | |
953 | SET_FLAG (this, FLAG_REMOVED); |
1131 | INVOKE_OBJECT (REMOVE, this); |
|
|
1132 | |
|
|
1133 | flag [FLAG_REMOVED] = true; |
954 | |
1134 | |
955 | if (more) |
1135 | if (more) |
956 | more->remove (); |
1136 | more->remove (); |
957 | |
1137 | |
958 | /* |
1138 | /* |
959 | * In this case, the object to be removed is in someones |
1139 | * In this case, the object to be removed is in someones |
960 | * inventory. |
1140 | * inventory. |
961 | */ |
1141 | */ |
962 | if (env) |
1142 | if (env) |
963 | { |
1143 | { |
964 | if (nrof) |
1144 | flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed |
965 | sub_weight (env, weight * nrof); |
1145 | if (object *pl = visible_to ()) |
966 | else |
1146 | esrv_del_item (pl->contr, count); |
967 | sub_weight (env, weight + carrying); |
1147 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
968 | |
1148 | |
969 | /* NO_FIX_PLAYER is set when a great many changes are being |
1149 | adjust_weight (env, -total_weight ()); |
970 | * made to players inventory. If set, avoiding the call |
|
|
971 | * to save cpu time. |
|
|
972 | */ |
|
|
973 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
|
|
974 | otmp->update_stats (); |
|
|
975 | |
1150 | |
976 | if (above != NULL) |
1151 | object *pl = in_player (); |
977 | above->below = below; |
|
|
978 | else |
|
|
979 | env->inv = below; |
|
|
980 | |
|
|
981 | if (below != NULL) |
|
|
982 | below->above = above; |
|
|
983 | |
1152 | |
984 | /* we set up values so that it could be inserted into |
1153 | /* we set up values so that it could be inserted into |
985 | * the map, but we don't actually do that - it is up |
1154 | * the map, but we don't actually do that - it is up |
986 | * to the caller to decide what we want to do. |
1155 | * to the caller to decide what we want to do. |
987 | */ |
1156 | */ |
988 | x = env->x, y = env->y; |
|
|
989 | map = env->map; |
1157 | map = env->map; |
990 | above = 0, below = 0; |
1158 | x = env->x; |
991 | env = 0; |
1159 | y = env->y; |
992 | } |
|
|
993 | else if (map) |
|
|
994 | { |
|
|
995 | /* Re did the following section of code - it looks like it had |
|
|
996 | * lots of logic for things we no longer care about |
|
|
997 | */ |
|
|
998 | |
1160 | |
999 | /* link the object above us */ |
1161 | // make sure cmov optimisation is applicable |
1000 | if (above) |
1162 | *(above ? &above->below : &env->inv) = below; |
1001 | above->below = below; |
1163 | *(below ? &below->above : &above ) = above; // &above is just a dummy |
1002 | else |
|
|
1003 | map->at (x, y).top = below; /* we were top, set new top */ |
|
|
1004 | |
|
|
1005 | /* Relink the object below us, if there is one */ |
|
|
1006 | if (below) |
|
|
1007 | below->above = above; |
|
|
1008 | else |
|
|
1009 | { |
|
|
1010 | /* Nothing below, which means we need to relink map object for this space |
|
|
1011 | * use translated coordinates in case some oddness with map tiling is |
|
|
1012 | * evident |
|
|
1013 | */ |
|
|
1014 | if (GET_MAP_OB (map, x, y) != this) |
|
|
1015 | { |
|
|
1016 | char *dump = dump_object (this); |
|
|
1017 | LOG (llevError, |
|
|
1018 | "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump); |
|
|
1019 | free (dump); |
|
|
1020 | dump = dump_object (GET_MAP_OB (map, x, y)); |
|
|
1021 | LOG (llevError, "%s\n", dump); |
|
|
1022 | free (dump); |
|
|
1023 | } |
|
|
1024 | |
|
|
1025 | map->at (x, y).bottom = above; /* goes on above it. */ |
|
|
1026 | } |
|
|
1027 | |
1164 | |
1028 | above = 0; |
1165 | above = 0; |
1029 | below = 0; |
1166 | below = 0; |
|
|
1167 | env = 0; |
|
|
1168 | |
|
|
1169 | if (pl && pl->is_player ()) |
|
|
1170 | { |
|
|
1171 | if (expect_false (pl->contr->combat_ob == this)) |
|
|
1172 | { |
|
|
1173 | pl->apply (pl->contr->combat_ob, AP_UNAPPLY); |
|
|
1174 | pl->contr->combat_ob = 0; |
|
|
1175 | if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob); |
|
|
1176 | } |
|
|
1177 | |
|
|
1178 | if (expect_false (pl->contr->ranged_ob == this)) |
|
|
1179 | { |
|
|
1180 | pl->apply (pl->contr->ranged_ob, AP_UNAPPLY); |
|
|
1181 | pl->contr->ranged_ob = 0; |
|
|
1182 | if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob); |
|
|
1183 | } |
|
|
1184 | |
|
|
1185 | pl->contr->queue_stats_update (); |
|
|
1186 | |
|
|
1187 | if (expect_false (glow_radius) && pl->is_on_map ()) |
|
|
1188 | update_all_los (pl->map, pl->x, pl->y); |
|
|
1189 | } |
|
|
1190 | } |
|
|
1191 | else if (map) |
|
|
1192 | { |
|
|
1193 | map->dirty = true; |
|
|
1194 | mapspace &ms = this->ms (); |
|
|
1195 | |
|
|
1196 | if (object *pl = ms.player ()) |
|
|
1197 | { |
|
|
1198 | if (is_player ()) |
|
|
1199 | { |
|
|
1200 | if (!flag [FLAG_WIZPASS]) |
|
|
1201 | ms.smell = ++mapspace::smellcount; // remember the smell of the player |
|
|
1202 | |
|
|
1203 | // leaving a spot always closes any open container on the ground |
|
|
1204 | if (container && !container->env) |
|
|
1205 | // this causes spurious floorbox updates, but it ensures |
|
|
1206 | // that the CLOSE event is being sent. |
|
|
1207 | close_container (); |
|
|
1208 | |
|
|
1209 | --map->players; |
|
|
1210 | map->touch (); |
|
|
1211 | } |
|
|
1212 | else if (pl->container_ () == this) |
|
|
1213 | { |
|
|
1214 | // removing a container should close it |
|
|
1215 | close_container (); |
|
|
1216 | } |
|
|
1217 | else |
|
|
1218 | esrv_del_item (pl->contr, count); |
|
|
1219 | } |
|
|
1220 | |
|
|
1221 | /* link the object above us */ |
|
|
1222 | // re-link, make sure compiler can easily use cmove |
|
|
1223 | *(above ? &above->below : &ms.top) = below; |
|
|
1224 | *(below ? &below->above : &ms.bot) = above; |
|
|
1225 | |
|
|
1226 | above = 0; |
|
|
1227 | below = 0; |
|
|
1228 | |
|
|
1229 | ms.invalidate (); |
1030 | |
1230 | |
1031 | if (map->in_memory == MAP_SAVING) |
1231 | if (map->in_memory == MAP_SAVING) |
1032 | return; |
1232 | return; |
1033 | |
1233 | |
1034 | check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); |
1234 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1035 | |
1235 | |
1036 | for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) |
1236 | if (object *pl = ms.player ()) |
1037 | { |
1237 | { |
1038 | /* No point updating the players look faces if he is the object |
1238 | if (pl->container_ () == this) |
1039 | * being removed. |
|
|
1040 | */ |
|
|
1041 | |
|
|
1042 | if (tmp->type == PLAYER && tmp != this) |
|
|
1043 | { |
|
|
1044 | /* If a container that the player is currently using somehow gets |
1239 | /* If a container that the player is currently using somehow gets |
1045 | * removed (most likely destroyed), update the player view |
1240 | * removed (most likely destroyed), update the player view |
1046 | * appropriately. |
1241 | * appropriately. |
1047 | */ |
1242 | */ |
1048 | if (tmp->container == this) |
1243 | pl->close_container (); |
1049 | { |
|
|
1050 | CLEAR_FLAG (this, FLAG_APPLIED); |
|
|
1051 | tmp->container = 0; |
|
|
1052 | } |
|
|
1053 | |
1244 | |
|
|
1245 | //TODO: the floorbox prev/next might need updating |
|
|
1246 | //esrv_del_item (pl->contr, count); |
|
|
1247 | //TODO: update floorbox to preserve ordering |
|
|
1248 | if (pl->contr->ns) |
1054 | tmp->contr->ns->floorbox_update (); |
1249 | pl->contr->ns->floorbox_update (); |
|
|
1250 | } |
|
|
1251 | |
|
|
1252 | if (check_walk_off) |
|
|
1253 | for (object *above, *tmp = ms.bot; tmp; tmp = above) |
|
|
1254 | { |
|
|
1255 | above = tmp->above; |
|
|
1256 | |
|
|
1257 | /* No point updating the players look faces if he is the object |
|
|
1258 | * being removed. |
1055 | } |
1259 | */ |
1056 | |
1260 | |
1057 | /* See if player moving off should effect something */ |
1261 | /* See if object moving off should effect something */ |
1058 | if (check_walk_off |
|
|
1059 | && ((move_type & tmp->move_off) |
1262 | if ((move_type & tmp->move_off) |
1060 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1263 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0) |
1061 | { |
|
|
1062 | move_apply (tmp, this, 0); |
1264 | move_apply (tmp, this, 0); |
1063 | |
|
|
1064 | if (destroyed ()) |
|
|
1065 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
|
|
1066 | } |
1265 | } |
1067 | |
1266 | |
1068 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1267 | if (affects_los ()) |
1069 | |
|
|
1070 | if (tmp->above == tmp) |
|
|
1071 | tmp->above = 0; |
|
|
1072 | |
|
|
1073 | last = tmp; |
|
|
1074 | } |
|
|
1075 | |
|
|
1076 | /* last == NULL of there are no objects on this space */ |
|
|
1077 | if (!last) |
|
|
1078 | map->at (x, y).flags_ = P_NEED_UPDATE; |
|
|
1079 | else |
|
|
1080 | update_object (last, UP_OBJ_REMOVE); |
|
|
1081 | |
|
|
1082 | if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) |
|
|
1083 | update_all_los (map, x, y); |
1268 | update_all_los (map, x, y); |
1084 | } |
1269 | } |
1085 | } |
1270 | } |
1086 | |
1271 | |
1087 | /* |
1272 | /* |
… | |
… | |
1096 | merge_ob (object *op, object *top) |
1281 | merge_ob (object *op, object *top) |
1097 | { |
1282 | { |
1098 | if (!op->nrof) |
1283 | if (!op->nrof) |
1099 | return 0; |
1284 | return 0; |
1100 | |
1285 | |
1101 | if (top == NULL) |
1286 | if (!top) |
1102 | for (top = op; top != NULL && top->above != NULL; top = top->above); |
1287 | for (top = op; top && top->above; top = top->above) |
|
|
1288 | ; |
1103 | |
1289 | |
1104 | for (; top != NULL; top = top->below) |
1290 | for (; top; top = top->below) |
1105 | { |
|
|
1106 | if (top == op) |
|
|
1107 | continue; |
|
|
1108 | |
|
|
1109 | if (object::can_merge (op, top)) |
1291 | if (object::can_merge (op, top)) |
1110 | { |
1292 | { |
1111 | top->nrof += op->nrof; |
1293 | top->nrof += op->nrof; |
1112 | |
1294 | |
1113 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1295 | if (object *pl = top->visible_to ()) |
1114 | op->weight = 0; /* Don't want any adjustements now */ |
1296 | esrv_update_item (UPD_NROF, pl, top); |
|
|
1297 | |
|
|
1298 | op->weight = 0; // cancel the addition above |
|
|
1299 | op->carrying = 0; // must be 0 already |
|
|
1300 | |
1115 | op->destroy (); |
1301 | op->destroy (); |
|
|
1302 | |
1116 | return top; |
1303 | return top; |
1117 | } |
1304 | } |
1118 | } |
|
|
1119 | |
1305 | |
1120 | return 0; |
1306 | return 0; |
1121 | } |
1307 | } |
1122 | |
1308 | |
|
|
1309 | void |
|
|
1310 | object::expand_tail () |
|
|
1311 | { |
|
|
1312 | if (more) |
|
|
1313 | return; |
|
|
1314 | |
|
|
1315 | object *prev = this; |
|
|
1316 | |
|
|
1317 | for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more) |
|
|
1318 | { |
|
|
1319 | object *op = at->instance (); |
|
|
1320 | |
|
|
1321 | op->name = name; |
|
|
1322 | op->name_pl = name_pl; |
|
|
1323 | op->title = title; |
|
|
1324 | |
|
|
1325 | op->head = this; |
|
|
1326 | prev->more = op; |
|
|
1327 | |
|
|
1328 | prev = op; |
|
|
1329 | } |
|
|
1330 | } |
|
|
1331 | |
1123 | /* |
1332 | /* |
1124 | * same as insert_ob_in_map except it handle separate coordinates and do a clean |
1333 | * same as insert_ob_in_map except it handles separate coordinates and does a clean |
1125 | * job preparing multi-part monsters |
1334 | * job preparing multi-part monsters. |
1126 | */ |
1335 | */ |
1127 | object * |
1336 | object * |
1128 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1337 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1129 | { |
1338 | { |
1130 | object *tmp; |
1339 | op->remove (); |
1131 | |
1340 | |
1132 | if (op->head) |
|
|
1133 | op = op->head; |
|
|
1134 | |
|
|
1135 | for (tmp = op; tmp; tmp = tmp->more) |
1341 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1136 | { |
1342 | { |
1137 | tmp->x = x + tmp->arch->clone.x; |
1343 | tmp->x = x + tmp->arch->x; |
1138 | tmp->y = y + tmp->arch->clone.y; |
1344 | tmp->y = y + tmp->arch->y; |
1139 | } |
1345 | } |
1140 | |
1346 | |
1141 | return insert_ob_in_map (op, m, originator, flag); |
1347 | return insert_ob_in_map (op, m, originator, flag); |
1142 | } |
1348 | } |
1143 | |
1349 | |
… | |
… | |
1156 | * Passing 0 for flag gives proper default values, so flag really only needs |
1362 | * Passing 0 for flag gives proper default values, so flag really only needs |
1157 | * to be set if special handling is needed. |
1363 | * to be set if special handling is needed. |
1158 | * |
1364 | * |
1159 | * Return value: |
1365 | * Return value: |
1160 | * new object if 'op' was merged with other object |
1366 | * new object if 'op' was merged with other object |
1161 | * NULL if 'op' was destroyed |
1367 | * NULL if there was an error (destroyed, blocked etc.) |
1162 | * just 'op' otherwise |
1368 | * just 'op' otherwise |
1163 | */ |
1369 | */ |
1164 | |
|
|
1165 | object * |
1370 | object * |
1166 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1371 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1167 | { |
1372 | { |
1168 | object *tmp, *top, *floor = NULL; |
1373 | op->remove (); |
1169 | sint16 x, y; |
|
|
1170 | |
1374 | |
1171 | if (QUERY_FLAG (op, FLAG_FREED)) |
1375 | if (m == &freed_map)//D TODO: remove soon |
1172 | { |
1376 | {//D |
1173 | LOG (llevError, "Trying to insert freed object!\n"); |
1377 | LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D |
1174 | return NULL; |
|
|
1175 | } |
1378 | }//D |
1176 | |
|
|
1177 | if (m == NULL) |
|
|
1178 | { |
|
|
1179 | char *dump = dump_object (op); |
|
|
1180 | LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); |
|
|
1181 | free (dump); |
|
|
1182 | return op; |
|
|
1183 | } |
|
|
1184 | |
|
|
1185 | if (out_of_map (m, op->x, op->y)) |
|
|
1186 | { |
|
|
1187 | char *dump = dump_object (op); |
|
|
1188 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump); |
|
|
1189 | #ifdef MANY_CORES |
|
|
1190 | /* Better to catch this here, as otherwise the next use of this object |
|
|
1191 | * is likely to cause a crash. Better to find out where it is getting |
|
|
1192 | * improperly inserted. |
|
|
1193 | */ |
|
|
1194 | abort (); |
|
|
1195 | #endif |
|
|
1196 | free (dump); |
|
|
1197 | return op; |
|
|
1198 | } |
|
|
1199 | |
|
|
1200 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
|
|
1201 | { |
|
|
1202 | char *dump = dump_object (op); |
|
|
1203 | LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump); |
|
|
1204 | free (dump); |
|
|
1205 | return op; |
|
|
1206 | } |
|
|
1207 | |
|
|
1208 | if (op->more != NULL) |
|
|
1209 | { |
|
|
1210 | /* The part may be on a different map. */ |
|
|
1211 | |
|
|
1212 | object *more = op->more; |
|
|
1213 | |
|
|
1214 | /* We really need the caller to normalize coordinates - if |
|
|
1215 | * we set the map, that doesn't work if the location is within |
|
|
1216 | * a map and this is straddling an edge. So only if coordinate |
|
|
1217 | * is clear wrong do we normalize it. |
|
|
1218 | */ |
|
|
1219 | if (OUT_OF_REAL_MAP (more->map, more->x, more->y)) |
|
|
1220 | more->map = get_map_from_coord (m, &more->x, &more->y); |
|
|
1221 | else if (!more->map) |
|
|
1222 | { |
|
|
1223 | /* For backwards compatibility - when not dealing with tiled maps, |
|
|
1224 | * more->map should always point to the parent. |
|
|
1225 | */ |
|
|
1226 | more->map = m; |
|
|
1227 | } |
|
|
1228 | |
|
|
1229 | if (insert_ob_in_map (more, more->map, originator, flag) == NULL) |
|
|
1230 | { |
|
|
1231 | if (!op->head) |
|
|
1232 | LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); |
|
|
1233 | |
|
|
1234 | return NULL; |
|
|
1235 | } |
|
|
1236 | } |
|
|
1237 | |
|
|
1238 | CLEAR_FLAG (op, FLAG_REMOVED); |
|
|
1239 | |
1379 | |
1240 | /* Ideally, the caller figures this out. However, it complicates a lot |
1380 | /* Ideally, the caller figures this out. However, it complicates a lot |
1241 | * of areas of callers (eg, anything that uses find_free_spot would now |
1381 | * of areas of callers (eg, anything that uses find_free_spot would now |
1242 | * need extra work |
1382 | * need extra work |
1243 | */ |
1383 | */ |
1244 | op->map = get_map_from_coord (m, &op->x, &op->y); |
1384 | maptile *newmap = m; |
1245 | x = op->x; |
1385 | if (!xy_normalise (newmap, op->x, op->y)) |
1246 | y = op->y; |
1386 | { |
|
|
1387 | op->head_ ()->destroy ();// remove head_ once all tail object destroyers found |
|
|
1388 | return 0; |
|
|
1389 | } |
|
|
1390 | |
|
|
1391 | if (object *more = op->more) |
|
|
1392 | if (!insert_ob_in_map (more, m, originator, flag)) |
|
|
1393 | return 0; |
|
|
1394 | |
|
|
1395 | op->flag [FLAG_REMOVED] = false; |
|
|
1396 | op->env = 0; |
|
|
1397 | op->map = newmap; |
|
|
1398 | |
|
|
1399 | mapspace &ms = op->ms (); |
1247 | |
1400 | |
1248 | /* this has to be done after we translate the coordinates. |
1401 | /* this has to be done after we translate the coordinates. |
1249 | */ |
1402 | */ |
1250 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1403 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1251 | for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) |
1404 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1252 | if (object::can_merge (op, tmp)) |
1405 | if (object::can_merge (op, tmp)) |
1253 | { |
1406 | { |
|
|
1407 | // TODO: we actually want to update tmp, not op, |
|
|
1408 | // but some caller surely breaks when we return tmp |
|
|
1409 | // from here :/ |
1254 | op->nrof += tmp->nrof; |
1410 | op->nrof += tmp->nrof; |
1255 | tmp->destroy (); |
1411 | tmp->destroy (); |
1256 | } |
1412 | } |
1257 | |
1413 | |
1258 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1414 | op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1259 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1415 | op->clr_flag (FLAG_INV_LOCKED); |
1260 | |
1416 | |
1261 | if (!QUERY_FLAG (op, FLAG_ALIVE)) |
1417 | if (!op->flag [FLAG_ALIVE]) |
1262 | CLEAR_FLAG (op, FLAG_NO_STEAL); |
1418 | op->clr_flag (FLAG_NO_STEAL); |
1263 | |
1419 | |
1264 | if (flag & INS_BELOW_ORIGINATOR) |
1420 | if (flag & INS_BELOW_ORIGINATOR) |
1265 | { |
1421 | { |
1266 | if (originator->map != op->map || originator->x != op->x || originator->y != op->y) |
1422 | if (originator->map != op->map || originator->x != op->x || originator->y != op->y) |
1267 | { |
1423 | { |
1268 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1424 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1269 | abort (); |
1425 | abort (); |
1270 | } |
1426 | } |
1271 | |
1427 | |
|
|
1428 | if (!originator->is_on_map ()) |
|
|
1429 | { |
|
|
1430 | LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", |
|
|
1431 | op->debug_desc (), originator->debug_desc ()); |
|
|
1432 | abort (); |
|
|
1433 | } |
|
|
1434 | |
1272 | op->above = originator; |
1435 | op->above = originator; |
1273 | op->below = originator->below; |
1436 | op->below = originator->below; |
1274 | |
|
|
1275 | if (op->below) |
|
|
1276 | op->below->above = op; |
|
|
1277 | else |
|
|
1278 | op->ms ().bottom = op; |
|
|
1279 | |
|
|
1280 | /* since *below* originator, no need to update top */ |
|
|
1281 | originator->below = op; |
1437 | originator->below = op; |
|
|
1438 | |
|
|
1439 | *(op->below ? &op->below->above : &ms.bot) = op; |
1282 | } |
1440 | } |
1283 | else |
1441 | else |
1284 | { |
1442 | { |
|
|
1443 | object *floor = 0; |
|
|
1444 | object *top = ms.top; |
|
|
1445 | |
1285 | /* If there are other objects, then */ |
1446 | /* If there are other objects, then */ |
1286 | if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) |
1447 | if (top) |
1287 | { |
1448 | { |
1288 | object *last = NULL; |
|
|
1289 | |
|
|
1290 | /* |
1449 | /* |
1291 | * If there are multiple objects on this space, we do some trickier handling. |
1450 | * If there are multiple objects on this space, we do some trickier handling. |
1292 | * We've already dealt with merging if appropriate. |
1451 | * We've already dealt with merging if appropriate. |
1293 | * Generally, we want to put the new object on top. But if |
1452 | * Generally, we want to put the new object on top. But if |
1294 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
1453 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
… | |
… | |
1297 | * once we get to them. This reduces the need to traverse over all of |
1456 | * once we get to them. This reduces the need to traverse over all of |
1298 | * them when adding another one - this saves quite a bit of cpu time |
1457 | * them when adding another one - this saves quite a bit of cpu time |
1299 | * when lots of spells are cast in one area. Currently, it is presumed |
1458 | * when lots of spells are cast in one area. Currently, it is presumed |
1300 | * that flying non pickable objects are spell objects. |
1459 | * that flying non pickable objects are spell objects. |
1301 | */ |
1460 | */ |
1302 | |
1461 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1303 | while (top != NULL) |
|
|
1304 | { |
1462 | { |
1305 | if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) |
1463 | if (tmp->flag [FLAG_IS_FLOOR] || tmp->flag [FLAG_OVERLAY_FLOOR]) |
1306 | floor = top; |
1464 | floor = tmp; |
1307 | |
1465 | |
1308 | if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) |
1466 | if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR]) |
1309 | { |
1467 | { |
1310 | /* We insert above top, so we want this object below this */ |
1468 | /* We insert above top, so we want this object below this */ |
1311 | top = top->below; |
1469 | top = tmp->below; |
1312 | break; |
1470 | break; |
1313 | } |
1471 | } |
1314 | |
1472 | |
1315 | last = top; |
|
|
1316 | top = top->above; |
1473 | top = tmp; |
1317 | } |
1474 | } |
1318 | |
|
|
1319 | /* Don't want top to be NULL, so set it to the last valid object */ |
|
|
1320 | top = last; |
|
|
1321 | |
1475 | |
1322 | /* We let update_position deal with figuring out what the space |
1476 | /* We let update_position deal with figuring out what the space |
1323 | * looks like instead of lots of conditions here. |
1477 | * looks like instead of lots of conditions here. |
1324 | * makes things faster, and effectively the same result. |
1478 | * makes things faster, and effectively the same result. |
1325 | */ |
1479 | */ |
1326 | |
1480 | |
1327 | /* Have object 'fall below' other objects that block view. |
1481 | /* Have object 'fall below' other objects that block view. |
1328 | * Unless those objects are exits, type 66 |
1482 | * Unless those objects are exits. |
1329 | * If INS_ON_TOP is used, don't do this processing |
1483 | * If INS_ON_TOP is used, don't do this processing |
1330 | * Need to find the object that in fact blocks view, otherwise |
1484 | * Need to find the object that in fact blocks view, otherwise |
1331 | * stacking is a bit odd. |
1485 | * stacking is a bit odd. |
1332 | */ |
1486 | */ |
1333 | if (!(flag & INS_ON_TOP) && |
1487 | if (!(flag & INS_ON_TOP) |
1334 | (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) |
1488 | && ms.flags () & P_BLOCKSVIEW |
|
|
1489 | && (op->face && !faces [op->face].visibility)) |
1335 | { |
1490 | { |
|
|
1491 | object *last; |
|
|
1492 | |
1336 | for (last = top; last != floor; last = last->below) |
1493 | for (last = top; last != floor; last = last->below) |
1337 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1494 | if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT)) |
1338 | break; |
1495 | break; |
|
|
1496 | |
1339 | /* Check to see if we found the object that blocks view, |
1497 | /* Check to see if we found the object that blocks view, |
1340 | * and make sure we have a below pointer for it so that |
1498 | * and make sure we have a below pointer for it so that |
1341 | * we can get inserted below this one, which requires we |
1499 | * we can get inserted below this one, which requires we |
1342 | * set top to the object below us. |
1500 | * set top to the object below us. |
1343 | */ |
1501 | */ |
1344 | if (last && last->below && last != floor) |
1502 | if (last && last->below && last != floor) |
1345 | top = last->below; |
1503 | top = last->below; |
1346 | } |
1504 | } |
1347 | } /* If objects on this space */ |
1505 | } /* If objects on this space */ |
1348 | |
1506 | |
1349 | if (flag & INS_MAP_LOAD) |
|
|
1350 | top = GET_MAP_TOP (op->map, op->x, op->y); |
|
|
1351 | |
|
|
1352 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1507 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1353 | top = floor; |
1508 | top = floor; |
1354 | |
1509 | |
1355 | /* Top is the object that our object (op) is going to get inserted above. |
1510 | // insert object above top, or bottom-most if top = 0 |
1356 | */ |
|
|
1357 | |
|
|
1358 | /* First object on this space */ |
|
|
1359 | if (!top) |
1511 | if (!top) |
1360 | { |
1512 | { |
1361 | op->above = GET_MAP_OB (op->map, op->x, op->y); |
|
|
1362 | |
|
|
1363 | if (op->above) |
|
|
1364 | op->above->below = op; |
|
|
1365 | |
|
|
1366 | op->below = NULL; |
1513 | op->below = 0; |
|
|
1514 | op->above = ms.bot; |
1367 | op->ms ().bottom = op; |
1515 | ms.bot = op; |
|
|
1516 | |
|
|
1517 | *(op->above ? &op->above->below : &ms.top) = op; |
1368 | } |
1518 | } |
1369 | else |
1519 | else |
1370 | { /* get inserted into the stack above top */ |
1520 | { |
1371 | op->above = top->above; |
1521 | op->above = top->above; |
1372 | |
|
|
1373 | if (op->above) |
|
|
1374 | op->above->below = op; |
1522 | top->above = op; |
1375 | |
1523 | |
1376 | op->below = top; |
1524 | op->below = top; |
1377 | top->above = op; |
1525 | *(op->above ? &op->above->below : &ms.top) = op; |
1378 | } |
1526 | } |
|
|
1527 | } |
1379 | |
1528 | |
1380 | if (op->above == NULL) |
1529 | if (op->is_player ()) |
1381 | op->ms ().top = op; |
1530 | { |
1382 | } /* else not INS_BELOW_ORIGINATOR */ |
|
|
1383 | |
|
|
1384 | if (op->type == PLAYER) |
|
|
1385 | op->contr->do_los = 1; |
1531 | op->contr->do_los = 1; |
|
|
1532 | ++op->map->players; |
|
|
1533 | op->map->touch (); |
|
|
1534 | } |
1386 | |
1535 | |
1387 | /* If we have a floor, we know the player, if any, will be above |
1536 | op->map->dirty = true; |
1388 | * it, so save a few ticks and start from there. |
1537 | |
1389 | */ |
|
|
1390 | if (!(flag & INS_MAP_LOAD)) |
|
|
1391 | if (object *pl = op->ms ().player ()) |
1538 | if (object *pl = ms.player ()) |
|
|
1539 | //TODO: the floorbox prev/next might need updating |
|
|
1540 | //esrv_send_item (pl, op); |
|
|
1541 | //TODO: update floorbox to preserve ordering |
|
|
1542 | if (pl->contr->ns) |
1392 | pl->contr->ns->floorbox_update (); |
1543 | pl->contr->ns->floorbox_update (); |
1393 | |
1544 | |
1394 | /* If this object glows, it may affect lighting conditions that are |
1545 | /* If this object glows, it may affect lighting conditions that are |
1395 | * visible to others on this map. But update_all_los is really |
1546 | * visible to others on this map. But update_all_los is really |
1396 | * an inefficient way to do this, as it means los for all players |
1547 | * an inefficient way to do this, as it means los for all players |
1397 | * on the map will get recalculated. The players could very well |
1548 | * on the map will get recalculated. The players could very well |
1398 | * be far away from this change and not affected in any way - |
1549 | * be far away from this change and not affected in any way - |
1399 | * this should get redone to only look for players within range, |
1550 | * this should get redone to only look for players within range, |
1400 | * or just updating the P_NEED_UPDATE for spaces within this area |
1551 | * or just updating the P_UPTODATE for spaces within this area |
1401 | * of effect may be sufficient. |
1552 | * of effect may be sufficient. |
1402 | */ |
1553 | */ |
1403 | if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) |
1554 | if (op->affects_los ()) |
|
|
1555 | { |
|
|
1556 | op->ms ().invalidate (); |
1404 | update_all_los (op->map, op->x, op->y); |
1557 | update_all_los (op->map, op->x, op->y); |
|
|
1558 | } |
1405 | |
1559 | |
1406 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1560 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1407 | update_object (op, UP_OBJ_INSERT); |
1561 | update_object (op, UP_OBJ_INSERT); |
|
|
1562 | |
|
|
1563 | INVOKE_OBJECT (INSERT, op); |
1408 | |
1564 | |
1409 | /* Don't know if moving this to the end will break anything. However, |
1565 | /* Don't know if moving this to the end will break anything. However, |
1410 | * we want to have floorbox_update called before calling this. |
1566 | * we want to have floorbox_update called before calling this. |
1411 | * |
1567 | * |
1412 | * check_move_on() must be after this because code called from |
1568 | * check_move_on() must be after this because code called from |
… | |
… | |
1414 | * blocked() and wall() work properly), and these flags are updated by |
1570 | * blocked() and wall() work properly), and these flags are updated by |
1415 | * update_object(). |
1571 | * update_object(). |
1416 | */ |
1572 | */ |
1417 | |
1573 | |
1418 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1574 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1419 | if (!(flag & INS_NO_WALK_ON) && !op->head) |
1575 | if (!(flag & INS_NO_WALK_ON) && op->is_head ()) |
1420 | { |
1576 | { |
1421 | if (check_move_on (op, originator)) |
1577 | if (check_move_on (op, originator)) |
1422 | return NULL; |
1578 | return 0; |
1423 | |
1579 | |
1424 | /* If we are a multi part object, lets work our way through the check |
1580 | /* If we are a multi part object, lets work our way through the check |
1425 | * walk on's. |
1581 | * walk on's. |
1426 | */ |
1582 | */ |
1427 | for (tmp = op->more; tmp != NULL; tmp = tmp->more) |
1583 | for (object *tmp = op->more; tmp; tmp = tmp->more) |
1428 | if (check_move_on (tmp, originator)) |
1584 | if (check_move_on (tmp, originator)) |
1429 | return NULL; |
1585 | return 0; |
1430 | } |
1586 | } |
1431 | |
1587 | |
1432 | return op; |
1588 | return op; |
1433 | } |
1589 | } |
1434 | |
1590 | |
1435 | /* this function inserts an object in the map, but if it |
1591 | /* this function inserts an object in the map, but if it |
1436 | * finds an object of its own type, it'll remove that one first. |
1592 | * finds an object of its own type, it'll remove that one first. |
1437 | * op is the object to insert it under: supplies x and the map. |
1593 | * op is the object to insert it under: supplies x and the map. |
1438 | */ |
1594 | */ |
1439 | void |
1595 | void |
1440 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1596 | replace_insert_ob_in_map (shstr_tmp archname, object *op) |
1441 | { |
1597 | { |
1442 | object *tmp, *tmp1; |
|
|
1443 | |
|
|
1444 | /* first search for itself and remove any old instances */ |
1598 | /* first search for itself and remove any old instances */ |
1445 | |
1599 | |
1446 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1600 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1447 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1601 | if (tmp->arch->archname == archname) /* same archetype */ |
1448 | tmp->destroy (); |
1602 | tmp->destroy (); |
1449 | |
1603 | |
1450 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1604 | object *tmp = archetype::find (archname)->instance (); |
1451 | |
1605 | |
1452 | tmp1->x = op->x; |
1606 | tmp->x = op->x; |
1453 | tmp1->y = op->y; |
1607 | tmp->y = op->y; |
|
|
1608 | |
1454 | insert_ob_in_map (tmp1, op->map, op, 0); |
1609 | insert_ob_in_map (tmp, op->map, op, 0); |
1455 | } |
1610 | } |
1456 | |
|
|
1457 | /* |
|
|
1458 | * get_split_ob(ob,nr) splits up ob into two parts. The part which |
|
|
1459 | * is returned contains nr objects, and the remaining parts contains |
|
|
1460 | * the rest (or is removed and freed if that number is 0). |
|
|
1461 | * On failure, NULL is returned, and the reason put into the |
|
|
1462 | * global static errmsg array. |
|
|
1463 | */ |
|
|
1464 | |
1611 | |
1465 | object * |
1612 | object * |
1466 | get_split_ob (object *orig_ob, uint32 nr) |
1613 | object::insert_at (object *where, object *originator, int flags) |
1467 | { |
1614 | { |
1468 | object *newob; |
1615 | if (where->env) |
1469 | int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1616 | return where->env->insert (this); |
1470 | |
1617 | else |
1471 | if (orig_ob->nrof < nr) |
1618 | return where->map->insert (this, where->x, where->y, originator, flags); |
1472 | { |
|
|
1473 | sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); |
|
|
1474 | return NULL; |
|
|
1475 | } |
|
|
1476 | |
|
|
1477 | newob = object_create_clone (orig_ob); |
|
|
1478 | |
|
|
1479 | if ((orig_ob->nrof -= nr) < 1) |
|
|
1480 | orig_ob->destroy (1); |
|
|
1481 | else if (!is_removed) |
|
|
1482 | { |
|
|
1483 | if (orig_ob->env != NULL) |
|
|
1484 | sub_weight (orig_ob->env, orig_ob->weight * nr); |
|
|
1485 | if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) |
|
|
1486 | { |
|
|
1487 | strcpy (errmsg, "Tried to split object whose map is not in memory."); |
|
|
1488 | LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n"); |
|
|
1489 | return NULL; |
|
|
1490 | } |
|
|
1491 | } |
|
|
1492 | |
|
|
1493 | newob->nrof = nr; |
|
|
1494 | |
|
|
1495 | return newob; |
|
|
1496 | } |
1619 | } |
1497 | |
1620 | |
|
|
1621 | // check whether we can put this into the map, respect max_volume, max_items |
|
|
1622 | bool |
|
|
1623 | object::can_drop_at (maptile *m, int x, int y, object *originator) |
|
|
1624 | { |
|
|
1625 | mapspace &ms = m->at (x, y); |
|
|
1626 | |
|
|
1627 | int items = ms.items (); |
|
|
1628 | |
|
|
1629 | if (!items // testing !items ensures we can drop at least one item |
|
|
1630 | || (items < m->max_items |
|
|
1631 | && ms.volume () < m->max_volume)) |
|
|
1632 | return true; |
|
|
1633 | |
|
|
1634 | if (originator && originator->is_player ()) |
|
|
1635 | originator->contr->failmsgf ( |
|
|
1636 | "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>", |
|
|
1637 | query_name () |
|
|
1638 | ); |
|
|
1639 | |
|
|
1640 | return false; |
|
|
1641 | } |
|
|
1642 | |
1498 | /* |
1643 | /* |
1499 | * decrease_ob_nr(object, number) decreases a specified number from |
1644 | * decrease(object, number) decreases a specified number from |
1500 | * the amount of an object. If the amount reaches 0, the object |
1645 | * the amount of an object. If the amount reaches 0, the object |
1501 | * is subsequently removed and freed. |
1646 | * is subsequently removed and freed. |
1502 | * |
1647 | * |
1503 | * Return value: 'op' if something is left, NULL if the amount reached 0 |
1648 | * Return value: 'op' if something is left, NULL if the amount reached 0 |
1504 | */ |
1649 | */ |
|
|
1650 | bool |
|
|
1651 | object::decrease (sint32 nr) |
|
|
1652 | { |
|
|
1653 | if (!nr) |
|
|
1654 | return true; |
1505 | |
1655 | |
|
|
1656 | nr = min (nr, nrof); |
|
|
1657 | |
|
|
1658 | if (nrof > nr) |
|
|
1659 | { |
|
|
1660 | nrof -= nr; |
|
|
1661 | adjust_weight (env, -weight * max (1, nr)); // carrying == 0 |
|
|
1662 | |
|
|
1663 | if (object *pl = visible_to ()) |
|
|
1664 | esrv_update_item (UPD_NROF, pl, this); |
|
|
1665 | |
|
|
1666 | return true; |
|
|
1667 | } |
|
|
1668 | else |
|
|
1669 | { |
|
|
1670 | destroy (); |
|
|
1671 | return false; |
|
|
1672 | } |
|
|
1673 | } |
|
|
1674 | |
|
|
1675 | /* |
|
|
1676 | * split(ob,nr) splits up ob into two parts. The part which |
|
|
1677 | * is returned contains nr objects, and the remaining parts contains |
|
|
1678 | * the rest (or is removed and returned if that number is 0). |
|
|
1679 | * On failure, NULL is returned. |
|
|
1680 | */ |
1506 | object * |
1681 | object * |
1507 | decrease_ob_nr (object *op, uint32 i) |
1682 | object::split (sint32 nr) |
1508 | { |
1683 | { |
1509 | object *tmp; |
1684 | int have = number_of (); |
1510 | player *pl; |
|
|
1511 | |
1685 | |
1512 | if (i == 0) /* objects with op->nrof require this check */ |
1686 | if (have < nr) |
1513 | return op; |
1687 | return 0; |
1514 | |
1688 | else if (have == nr) |
1515 | if (i > op->nrof) |
|
|
1516 | i = op->nrof; |
|
|
1517 | |
|
|
1518 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
|
|
1519 | op->nrof -= i; |
|
|
1520 | else if (op->env) |
|
|
1521 | { |
1689 | { |
1522 | /* is this object in the players inventory, or sub container |
|
|
1523 | * therein? |
|
|
1524 | */ |
|
|
1525 | tmp = op->in_player (); |
|
|
1526 | /* nope. Is this a container the player has opened? |
|
|
1527 | * If so, set tmp to that player. |
|
|
1528 | * IMO, searching through all the players will mostly |
|
|
1529 | * likely be quicker than following op->env to the map, |
|
|
1530 | * and then searching the map for a player. |
|
|
1531 | */ |
|
|
1532 | if (!tmp) |
|
|
1533 | { |
|
|
1534 | for (pl = first_player; pl; pl = pl->next) |
|
|
1535 | if (pl->ob->container == op->env) |
|
|
1536 | { |
|
|
1537 | tmp = pl->ob; |
|
|
1538 | break; |
|
|
1539 | } |
|
|
1540 | } |
|
|
1541 | |
|
|
1542 | if (i < op->nrof) |
|
|
1543 | { |
|
|
1544 | sub_weight (op->env, op->weight * i); |
|
|
1545 | op->nrof -= i; |
|
|
1546 | if (tmp) |
|
|
1547 | esrv_send_item (tmp, op); |
|
|
1548 | } |
|
|
1549 | else |
|
|
1550 | { |
|
|
1551 | op->remove (); |
1690 | remove (); |
1552 | op->nrof = 0; |
1691 | return this; |
1553 | if (tmp) |
|
|
1554 | esrv_del_item (tmp->contr, op->count); |
|
|
1555 | } |
|
|
1556 | } |
1692 | } |
1557 | else |
1693 | else |
1558 | { |
1694 | { |
1559 | object *above = op->above; |
1695 | decrease (nr); |
1560 | |
1696 | |
1561 | if (i < op->nrof) |
1697 | object *op = deep_clone (); |
1562 | op->nrof -= i; |
1698 | op->nrof = nr; |
1563 | else |
|
|
1564 | { |
|
|
1565 | op->remove (); |
|
|
1566 | op->nrof = 0; |
|
|
1567 | } |
|
|
1568 | |
|
|
1569 | /* Since we just removed op, op->above is null */ |
|
|
1570 | for (tmp = above; tmp; tmp = tmp->above) |
|
|
1571 | if (tmp->type == PLAYER) |
|
|
1572 | { |
|
|
1573 | if (op->nrof) |
|
|
1574 | esrv_send_item (tmp, op); |
|
|
1575 | else |
|
|
1576 | esrv_del_item (tmp->contr, op->count); |
|
|
1577 | } |
|
|
1578 | } |
|
|
1579 | |
|
|
1580 | if (op->nrof) |
|
|
1581 | return op; |
1699 | return op; |
1582 | else |
|
|
1583 | { |
|
|
1584 | op->destroy (); |
|
|
1585 | return 0; |
|
|
1586 | } |
|
|
1587 | } |
|
|
1588 | |
|
|
1589 | /* |
|
|
1590 | * add_weight(object, weight) adds the specified weight to an object, |
|
|
1591 | * and also updates how much the environment(s) is/are carrying. |
|
|
1592 | */ |
|
|
1593 | |
|
|
1594 | void |
|
|
1595 | add_weight (object *op, signed long weight) |
|
|
1596 | { |
|
|
1597 | while (op != NULL) |
|
|
1598 | { |
|
|
1599 | if (op->type == CONTAINER) |
|
|
1600 | weight = (signed long) (weight * (100 - op->stats.Str) / 100); |
|
|
1601 | |
|
|
1602 | op->carrying += weight; |
|
|
1603 | op = op->env; |
|
|
1604 | } |
1700 | } |
1605 | } |
1701 | } |
1606 | |
1702 | |
1607 | object * |
1703 | object * |
1608 | insert_ob_in_ob (object *op, object *where) |
1704 | insert_ob_in_ob (object *op, object *where) |
… | |
… | |
1613 | LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); |
1709 | LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); |
1614 | free (dump); |
1710 | free (dump); |
1615 | return op; |
1711 | return op; |
1616 | } |
1712 | } |
1617 | |
1713 | |
1618 | if (where->head) |
1714 | if (where->head_ () != where) |
1619 | { |
1715 | { |
1620 | LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); |
1716 | LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n"); |
1621 | where = where->head; |
1717 | where = where->head; |
1622 | } |
1718 | } |
1623 | |
1719 | |
1624 | return where->insert (op); |
1720 | return where->insert (op); |
1625 | } |
1721 | } |
… | |
… | |
1630 | * inside the object environment. |
1726 | * inside the object environment. |
1631 | * |
1727 | * |
1632 | * The function returns now pointer to inserted item, and return value can |
1728 | * The function returns now pointer to inserted item, and return value can |
1633 | * be != op, if items are merged. -Tero |
1729 | * be != op, if items are merged. -Tero |
1634 | */ |
1730 | */ |
1635 | |
|
|
1636 | object * |
1731 | object * |
1637 | object::insert (object *op) |
1732 | object::insert (object *op) |
1638 | { |
1733 | { |
1639 | object *tmp, *otmp; |
|
|
1640 | |
|
|
1641 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
|
|
1642 | op->remove (); |
|
|
1643 | |
|
|
1644 | if (op->more) |
1734 | if (op->more) |
1645 | { |
1735 | { |
1646 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1736 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1647 | return op; |
1737 | return op; |
1648 | } |
1738 | } |
1649 | |
1739 | |
1650 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1740 | op->remove (); |
1651 | CLEAR_FLAG (op, FLAG_REMOVED); |
1741 | |
|
|
1742 | op->flag [FLAG_OBJ_ORIGINAL] = 0; |
|
|
1743 | |
1652 | if (op->nrof) |
1744 | if (op->nrof) |
1653 | { |
|
|
1654 | for (tmp = inv; tmp != NULL; tmp = tmp->below) |
1745 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1655 | if (object::can_merge (tmp, op)) |
1746 | if (object::can_merge (tmp, op)) |
1656 | { |
1747 | { |
1657 | /* return the original object and remove inserted object |
1748 | /* return the original object and remove inserted object |
1658 | (client needs the original object) */ |
1749 | (client needs the original object) */ |
1659 | tmp->nrof += op->nrof; |
1750 | tmp->nrof += op->nrof; |
1660 | /* Weight handling gets pretty funky. Since we are adding to |
1751 | |
1661 | * tmp->nrof, we need to increase the weight. |
1752 | if (object *pl = tmp->visible_to ()) |
1662 | */ |
1753 | esrv_update_item (UPD_NROF, pl, tmp); |
|
|
1754 | |
1663 | add_weight (this, op->weight * op->nrof); |
1755 | adjust_weight (this, op->total_weight ()); |
1664 | SET_FLAG (op, FLAG_REMOVED); |
1756 | |
1665 | op->destroy (); /* free the inserted object */ |
1757 | op->destroy (); |
1666 | op = tmp; |
1758 | op = tmp; |
1667 | op->remove (); /* and fix old object's links */ |
1759 | goto inserted; |
1668 | CLEAR_FLAG (op, FLAG_REMOVED); |
|
|
1669 | break; |
|
|
1670 | } |
1760 | } |
1671 | |
1761 | |
1672 | /* I assume combined objects have no inventory |
1762 | op->owner = 0; // it's his/hers now. period. |
1673 | * We add the weight - this object could have just been removed |
|
|
1674 | * (if it was possible to merge). calling remove_ob will subtract |
|
|
1675 | * the weight, so we need to add it in again, since we actually do |
|
|
1676 | * the linking below |
|
|
1677 | */ |
|
|
1678 | add_weight (this, op->weight * op->nrof); |
|
|
1679 | } |
|
|
1680 | else |
|
|
1681 | add_weight (this, (op->weight + op->carrying)); |
|
|
1682 | |
|
|
1683 | otmp = this->in_player (); |
|
|
1684 | if (otmp && otmp->contr) |
|
|
1685 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
|
|
1686 | otmp->update_stats (); |
|
|
1687 | |
|
|
1688 | op->map = 0; |
1763 | op->map = 0; |
1689 | op->env = this; |
1764 | op->x = 0; |
|
|
1765 | op->y = 0; |
|
|
1766 | |
1690 | op->above = 0; |
1767 | op->above = 0; |
1691 | op->below = 0; |
1768 | op->below = inv; |
1692 | op->x = 0, op->y = 0; |
1769 | op->env = this; |
1693 | |
1770 | |
|
|
1771 | if (inv) |
|
|
1772 | inv->above = op; |
|
|
1773 | |
|
|
1774 | inv = op; |
|
|
1775 | |
|
|
1776 | op->flag [FLAG_REMOVED] = 0; |
|
|
1777 | |
|
|
1778 | if (object *pl = op->visible_to ()) |
|
|
1779 | esrv_send_item (pl, op); |
|
|
1780 | |
|
|
1781 | adjust_weight (this, op->total_weight ()); |
|
|
1782 | |
|
|
1783 | inserted: |
1694 | /* reset the light list and los of the players on the map */ |
1784 | /* reset the light list and los of the players on the map */ |
1695 | if ((op->glow_radius != 0) && map) |
1785 | if (op->glow_radius && is_on_map ()) |
1696 | { |
1786 | { |
1697 | #ifdef DEBUG_LIGHTS |
1787 | update_stats (); |
1698 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
|
|
1699 | #endif /* DEBUG_LIGHTS */ |
|
|
1700 | if (MAP_DARKNESS (map)) |
|
|
1701 | update_all_los (map, x, y); |
1788 | update_all_los (map, x, y); |
1702 | } |
|
|
1703 | |
|
|
1704 | /* Client has no idea of ordering so lets not bother ordering it here. |
|
|
1705 | * It sure simplifies this function... |
|
|
1706 | */ |
|
|
1707 | if (!inv) |
|
|
1708 | inv = op; |
|
|
1709 | else |
|
|
1710 | { |
1789 | } |
1711 | op->below = inv; |
1790 | else if (is_player ()) |
1712 | op->below->above = op; |
1791 | // if this is a player's inventory, update stats |
1713 | inv = op; |
1792 | contr->queue_stats_update (); |
1714 | } |
1793 | |
|
|
1794 | INVOKE_OBJECT (INSERT, this); |
1715 | |
1795 | |
1716 | return op; |
1796 | return op; |
1717 | } |
1797 | } |
1718 | |
1798 | |
1719 | /* |
1799 | /* |
… | |
… | |
1734 | * |
1814 | * |
1735 | * MSW 2001-07-08: Check all objects on space, not just those below |
1815 | * MSW 2001-07-08: Check all objects on space, not just those below |
1736 | * object being inserted. insert_ob_in_map may not put new objects |
1816 | * object being inserted. insert_ob_in_map may not put new objects |
1737 | * on top. |
1817 | * on top. |
1738 | */ |
1818 | */ |
1739 | |
|
|
1740 | int |
1819 | int |
1741 | check_move_on (object *op, object *originator) |
1820 | check_move_on (object *op, object *originator) |
1742 | { |
1821 | { |
|
|
1822 | if (op->flag [FLAG_NO_APPLY]) |
|
|
1823 | return 0; |
|
|
1824 | |
1743 | object *tmp; |
1825 | object *tmp; |
1744 | maptile *m = op->map; |
1826 | maptile *m = op->map; |
1745 | int x = op->x, y = op->y; |
1827 | int x = op->x, y = op->y; |
1746 | |
1828 | |
1747 | MoveType move_on, move_slow, move_block; |
1829 | mapspace &ms = m->at (x, y); |
1748 | |
1830 | |
1749 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1831 | ms.update (); |
1750 | return 0; |
|
|
1751 | |
1832 | |
1752 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
1833 | MoveType move_on = ms.move_on; |
1753 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
1834 | MoveType move_slow = ms.move_slow; |
1754 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
1835 | MoveType move_block = ms.move_block; |
1755 | |
1836 | |
1756 | /* if nothing on this space will slow op down or be applied, |
1837 | /* if nothing on this space will slow op down or be applied, |
1757 | * no need to do checking below. have to make sure move_type |
1838 | * no need to do checking below. have to make sure move_type |
1758 | * is set, as lots of objects don't have it set - we treat that |
1839 | * is set, as lots of objects don't have it set - we treat that |
1759 | * as walking. |
1840 | * as walking. |
… | |
… | |
1770 | return 0; |
1851 | return 0; |
1771 | |
1852 | |
1772 | /* The objects have to be checked from top to bottom. |
1853 | /* The objects have to be checked from top to bottom. |
1773 | * Hence, we first go to the top: |
1854 | * Hence, we first go to the top: |
1774 | */ |
1855 | */ |
1775 | |
1856 | for (object *next, *tmp = ms.top; tmp; tmp = next) |
1776 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) |
|
|
1777 | { |
|
|
1778 | /* Trim the search when we find the first other spell effect |
|
|
1779 | * this helps performance so that if a space has 50 spell objects, |
|
|
1780 | * we don't need to check all of them. |
|
|
1781 | */ |
|
|
1782 | if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK)) |
|
|
1783 | break; |
|
|
1784 | } |
1857 | { |
|
|
1858 | next = tmp->below; |
1785 | |
1859 | |
1786 | for (; tmp; tmp = tmp->below) |
|
|
1787 | { |
|
|
1788 | if (tmp == op) |
1860 | if (tmp == op) |
1789 | continue; /* Can't apply yourself */ |
1861 | continue; /* Can't apply yourself */ |
1790 | |
1862 | |
1791 | /* Check to see if one of the movement types should be slowed down. |
1863 | /* Check to see if one of the movement types should be slowed down. |
1792 | * Second check makes sure that the movement types not being slowed |
1864 | * Second check makes sure that the movement types not being slowed |
1793 | * (~slow_move) is not blocked on this space - just because the |
1865 | * (~slow_move) is not blocked on this space - just because the |
1794 | * space doesn't slow down swimming (for example), if you can't actually |
1866 | * space doesn't slow down swimming (for example), if you can't actually |
1795 | * swim on that space, can't use it to avoid the penalty. |
1867 | * swim on that space, can't use it to avoid the penalty. |
1796 | */ |
1868 | */ |
1797 | if (!QUERY_FLAG (op, FLAG_WIZPASS)) |
1869 | if (!op->flag [FLAG_WIZPASS]) |
1798 | { |
1870 | { |
1799 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1871 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1800 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1872 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1801 | { |
1873 | { |
1802 | |
|
|
1803 | float |
|
|
1804 | diff = tmp->move_slow_penalty * FABS (op->speed); |
1874 | float diff = tmp->move_slow_penalty * fabs (op->speed); |
1805 | |
1875 | |
1806 | if (op->type == PLAYER) |
1876 | if (op->is_player ()) |
1807 | if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || |
1877 | if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) || |
1808 | (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) |
1878 | (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN))) |
1809 | diff /= 4.0; |
1879 | diff /= 4.0; |
1810 | |
1880 | |
1811 | op->speed_left -= diff; |
1881 | op->speed_left -= diff; |
1812 | } |
1882 | } |
1813 | } |
1883 | } |
… | |
… | |
1836 | /* |
1906 | /* |
1837 | * present_arch(arch, map, x, y) searches for any objects with |
1907 | * present_arch(arch, map, x, y) searches for any objects with |
1838 | * a matching archetype at the given map and coordinates. |
1908 | * a matching archetype at the given map and coordinates. |
1839 | * The first matching object is returned, or NULL if none. |
1909 | * The first matching object is returned, or NULL if none. |
1840 | */ |
1910 | */ |
1841 | |
|
|
1842 | object * |
1911 | object * |
1843 | present_arch (const archetype *at, maptile *m, int x, int y) |
1912 | present_arch (const archetype *at, maptile *m, int x, int y) |
1844 | { |
1913 | { |
1845 | object * |
|
|
1846 | tmp; |
|
|
1847 | |
|
|
1848 | if (m == NULL || out_of_map (m, x, y)) |
1914 | if (!m || out_of_map (m, x, y)) |
1849 | { |
1915 | { |
1850 | LOG (llevError, "Present_arch called outside map.\n"); |
1916 | LOG (llevError, "Present_arch called outside map.\n"); |
1851 | return NULL; |
1917 | return NULL; |
1852 | } |
1918 | } |
1853 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1919 | |
1854 | if (tmp->arch == at) |
1920 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
|
|
1921 | if (tmp->arch->archname == at->archname) |
1855 | return tmp; |
1922 | return tmp; |
|
|
1923 | |
1856 | return NULL; |
1924 | return NULL; |
1857 | } |
1925 | } |
1858 | |
1926 | |
1859 | /* |
1927 | /* |
1860 | * present(type, map, x, y) searches for any objects with |
1928 | * present(type, map, x, y) searches for any objects with |
1861 | * a matching type variable at the given map and coordinates. |
1929 | * a matching type variable at the given map and coordinates. |
1862 | * The first matching object is returned, or NULL if none. |
1930 | * The first matching object is returned, or NULL if none. |
1863 | */ |
1931 | */ |
1864 | |
|
|
1865 | object * |
1932 | object * |
1866 | present (unsigned char type, maptile *m, int x, int y) |
1933 | present (unsigned char type, maptile *m, int x, int y) |
1867 | { |
1934 | { |
1868 | object * |
|
|
1869 | tmp; |
|
|
1870 | |
|
|
1871 | if (out_of_map (m, x, y)) |
1935 | if (out_of_map (m, x, y)) |
1872 | { |
1936 | { |
1873 | LOG (llevError, "Present called outside map.\n"); |
1937 | LOG (llevError, "Present called outside map.\n"); |
1874 | return NULL; |
1938 | return NULL; |
1875 | } |
1939 | } |
1876 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1940 | |
|
|
1941 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
1877 | if (tmp->type == type) |
1942 | if (tmp->type == type) |
1878 | return tmp; |
1943 | return tmp; |
|
|
1944 | |
1879 | return NULL; |
1945 | return NULL; |
1880 | } |
1946 | } |
1881 | |
1947 | |
1882 | /* |
1948 | /* |
1883 | * present_in_ob(type, object) searches for any objects with |
1949 | * present_in_ob(type, object) searches for any objects with |
1884 | * a matching type variable in the inventory of the given object. |
1950 | * a matching type variable in the inventory of the given object. |
1885 | * The first matching object is returned, or NULL if none. |
1951 | * The first matching object is returned, or NULL if none. |
1886 | */ |
1952 | */ |
1887 | |
|
|
1888 | object * |
1953 | object * |
1889 | present_in_ob (unsigned char type, const object *op) |
1954 | present_in_ob (unsigned char type, const object *op) |
1890 | { |
1955 | { |
1891 | object * |
|
|
1892 | tmp; |
|
|
1893 | |
|
|
1894 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1956 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1895 | if (tmp->type == type) |
1957 | if (tmp->type == type) |
1896 | return tmp; |
1958 | return tmp; |
|
|
1959 | |
1897 | return NULL; |
1960 | return NULL; |
1898 | } |
1961 | } |
1899 | |
1962 | |
1900 | /* |
1963 | /* |
1901 | * present_in_ob (type, str, object) searches for any objects with |
1964 | * present_in_ob (type, str, object) searches for any objects with |
… | |
… | |
1909 | * str is the string to match against. Note that we match against |
1972 | * str is the string to match against. Note that we match against |
1910 | * the object name, not the archetype name. this is so that the |
1973 | * the object name, not the archetype name. this is so that the |
1911 | * spell code can use one object type (force), but change it's name |
1974 | * spell code can use one object type (force), but change it's name |
1912 | * to be unique. |
1975 | * to be unique. |
1913 | */ |
1976 | */ |
1914 | |
|
|
1915 | object * |
1977 | object * |
1916 | present_in_ob_by_name (int type, const char *str, const object *op) |
1978 | present_in_ob_by_name (int type, const char *str, const object *op) |
1917 | { |
1979 | { |
1918 | object * |
|
|
1919 | tmp; |
|
|
1920 | |
|
|
1921 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1980 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1922 | { |
|
|
1923 | if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) |
1981 | if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) |
1924 | return tmp; |
1982 | return tmp; |
1925 | } |
1983 | |
1926 | return NULL; |
1984 | return 0; |
1927 | } |
1985 | } |
1928 | |
1986 | |
1929 | /* |
1987 | /* |
1930 | * present_arch_in_ob(archetype, object) searches for any objects with |
1988 | * present_arch_in_ob(archetype, object) searches for any objects with |
1931 | * a matching archetype in the inventory of the given object. |
1989 | * a matching archetype in the inventory of the given object. |
1932 | * The first matching object is returned, or NULL if none. |
1990 | * The first matching object is returned, or NULL if none. |
1933 | */ |
1991 | */ |
1934 | |
|
|
1935 | object * |
1992 | object * |
1936 | present_arch_in_ob (const archetype *at, const object *op) |
1993 | present_arch_in_ob (const archetype *at, const object *op) |
1937 | { |
1994 | { |
1938 | object * |
|
|
1939 | tmp; |
|
|
1940 | |
|
|
1941 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1995 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1942 | if (tmp->arch == at) |
1996 | if (tmp->arch->archname == at->archname) |
1943 | return tmp; |
1997 | return tmp; |
|
|
1998 | |
1944 | return NULL; |
1999 | return NULL; |
1945 | } |
2000 | } |
1946 | |
2001 | |
1947 | /* |
2002 | /* |
1948 | * activate recursively a flag on an object inventory |
2003 | * activate recursively a flag on an object inventory |
1949 | */ |
2004 | */ |
1950 | void |
2005 | void |
1951 | flag_inv (object *op, int flag) |
2006 | flag_inv (object *op, int flag) |
1952 | { |
2007 | { |
1953 | object * |
|
|
1954 | tmp; |
|
|
1955 | |
|
|
1956 | if (op->inv) |
|
|
1957 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
2008 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1958 | { |
2009 | { |
1959 | SET_FLAG (tmp, flag); |
2010 | tmp->set_flag (flag); |
1960 | flag_inv (tmp, flag); |
2011 | flag_inv (tmp, flag); |
1961 | } |
2012 | } |
1962 | } /* |
2013 | } |
|
|
2014 | |
|
|
2015 | /* |
1963 | * desactivate recursively a flag on an object inventory |
2016 | * deactivate recursively a flag on an object inventory |
1964 | */ |
2017 | */ |
1965 | void |
2018 | void |
1966 | unflag_inv (object *op, int flag) |
2019 | unflag_inv (object *op, int flag) |
1967 | { |
2020 | { |
1968 | object * |
|
|
1969 | tmp; |
|
|
1970 | |
|
|
1971 | if (op->inv) |
|
|
1972 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
2021 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1973 | { |
2022 | { |
1974 | CLEAR_FLAG (tmp, flag); |
2023 | tmp->clr_flag (flag); |
1975 | unflag_inv (tmp, flag); |
2024 | unflag_inv (tmp, flag); |
1976 | } |
2025 | } |
1977 | } |
|
|
1978 | |
|
|
1979 | /* |
|
|
1980 | * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in |
|
|
1981 | * all it's inventory (recursively). |
|
|
1982 | * If checksums are used, a player will get set_cheat called for |
|
|
1983 | * him/her-self and all object carried by a call to this function. |
|
|
1984 | */ |
|
|
1985 | |
|
|
1986 | void |
|
|
1987 | set_cheat (object *op) |
|
|
1988 | { |
|
|
1989 | SET_FLAG (op, FLAG_WAS_WIZ); |
|
|
1990 | flag_inv (op, FLAG_WAS_WIZ); |
|
|
1991 | } |
2026 | } |
1992 | |
2027 | |
1993 | /* |
2028 | /* |
1994 | * find_free_spot(object, map, x, y, start, stop) will search for |
2029 | * find_free_spot(object, map, x, y, start, stop) will search for |
1995 | * a spot at the given map and coordinates which will be able to contain |
2030 | * a spot at the given map and coordinates which will be able to contain |
… | |
… | |
1997 | * to search (see the freearr_x/y[] definition). |
2032 | * to search (see the freearr_x/y[] definition). |
1998 | * It returns a random choice among the alternatives found. |
2033 | * It returns a random choice among the alternatives found. |
1999 | * start and stop are where to start relative to the free_arr array (1,9 |
2034 | * start and stop are where to start relative to the free_arr array (1,9 |
2000 | * does all 4 immediate directions). This returns the index into the |
2035 | * does all 4 immediate directions). This returns the index into the |
2001 | * array of the free spot, -1 if no spot available (dir 0 = x,y) |
2036 | * array of the free spot, -1 if no spot available (dir 0 = x,y) |
2002 | * Note - this only checks to see if there is space for the head of the |
|
|
2003 | * object - if it is a multispace object, this should be called for all |
|
|
2004 | * pieces. |
|
|
2005 | * Note2: This function does correctly handle tiled maps, but does not |
2037 | * Note: This function does correctly handle tiled maps, but does not |
2006 | * inform the caller. However, insert_ob_in_map will update as |
2038 | * inform the caller. However, insert_ob_in_map will update as |
2007 | * necessary, so the caller shouldn't need to do any special work. |
2039 | * necessary, so the caller shouldn't need to do any special work. |
2008 | * Note - updated to take an object instead of archetype - this is necessary |
2040 | * Note - updated to take an object instead of archetype - this is necessary |
2009 | * because arch_blocked (now ob_blocked) needs to know the movement type |
2041 | * because arch_blocked (now ob_blocked) needs to know the movement type |
2010 | * to know if the space in question will block the object. We can't use |
2042 | * to know if the space in question will block the object. We can't use |
2011 | * the archetype because that isn't correct if the monster has been |
2043 | * the archetype because that isn't correct if the monster has been |
2012 | * customized, changed states, etc. |
2044 | * customized, changed states, etc. |
2013 | */ |
2045 | */ |
2014 | |
|
|
2015 | int |
2046 | int |
2016 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
2047 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
2017 | { |
2048 | { |
2018 | int |
|
|
2019 | i, |
|
|
2020 | index = 0, flag; |
|
|
2021 | static int |
|
|
2022 | altern[SIZEOFFREE]; |
2049 | int altern[SIZEOFFREE]; |
|
|
2050 | int index = 0, flag; |
2023 | |
2051 | |
2024 | for (i = start; i < stop; i++) |
2052 | for (int i = start; i < stop; i++) |
2025 | { |
2053 | { |
2026 | flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); |
2054 | mapxy pos (m, x, y); pos.move (i); |
2027 | if (!flag) |
2055 | |
|
|
2056 | if (!pos.normalise ()) |
|
|
2057 | continue; |
|
|
2058 | |
|
|
2059 | mapspace &ms = *pos; |
|
|
2060 | |
|
|
2061 | if (ms.flags () & P_IS_ALIVE) |
|
|
2062 | continue; |
|
|
2063 | |
|
|
2064 | /* However, often |
|
|
2065 | * ob doesn't have any move type (when used to place exits) |
|
|
2066 | * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. |
|
|
2067 | */ |
|
|
2068 | if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL) |
|
|
2069 | { |
2028 | altern[index++] = i; |
2070 | altern [index++] = i; |
|
|
2071 | continue; |
|
|
2072 | } |
2029 | |
2073 | |
2030 | /* Basically, if we find a wall on a space, we cut down the search size. |
2074 | /* Basically, if we find a wall on a space, we cut down the search size. |
2031 | * In this way, we won't return spaces that are on another side of a wall. |
2075 | * In this way, we won't return spaces that are on another side of a wall. |
2032 | * This mostly work, but it cuts down the search size in all directions - |
2076 | * This mostly work, but it cuts down the search size in all directions - |
2033 | * if the space being examined only has a wall to the north and empty |
2077 | * if the space being examined only has a wall to the north and empty |
2034 | * spaces in all the other directions, this will reduce the search space |
2078 | * spaces in all the other directions, this will reduce the search space |
2035 | * to only the spaces immediately surrounding the target area, and |
2079 | * to only the spaces immediately surrounding the target area, and |
2036 | * won't look 2 spaces south of the target space. |
2080 | * won't look 2 spaces south of the target space. |
2037 | */ |
2081 | */ |
2038 | else if ((flag & P_NO_PASS) && maxfree[i] < stop) |
2082 | if (ms.move_block == MOVE_ALL && maxfree[i] < stop) |
|
|
2083 | { |
2039 | stop = maxfree[i]; |
2084 | stop = maxfree[i]; |
|
|
2085 | continue; |
|
|
2086 | } |
|
|
2087 | |
|
|
2088 | /* Note it is intentional that we check ob - the movement type of the |
|
|
2089 | * head of the object should correspond for the entire object. |
|
|
2090 | */ |
|
|
2091 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
|
|
2092 | continue; |
|
|
2093 | |
|
|
2094 | if (ob->blocked (pos.m, pos.x, pos.y)) |
|
|
2095 | continue; |
|
|
2096 | |
|
|
2097 | altern [index++] = i; |
2040 | } |
2098 | } |
2041 | |
2099 | |
2042 | if (!index) |
2100 | if (!index) |
2043 | return -1; |
2101 | return -1; |
2044 | |
2102 | |
2045 | return altern[RANDOM () % index]; |
2103 | return altern [rndm (index)]; |
2046 | } |
2104 | } |
2047 | |
2105 | |
2048 | /* |
2106 | /* |
2049 | * find_first_free_spot(archetype, maptile, x, y) works like |
2107 | * find_first_free_spot(archetype, maptile, x, y) works like |
2050 | * find_free_spot(), but it will search max number of squares. |
2108 | * find_free_spot(), but it will search max number of squares. |
2051 | * But it will return the first available spot, not a random choice. |
2109 | * But it will return the first available spot, not a random choice. |
2052 | * Changed 0.93.2: Have it return -1 if there is no free spot available. |
2110 | * Changed 0.93.2: Have it return -1 if there is no free spot available. |
2053 | */ |
2111 | */ |
2054 | |
|
|
2055 | int |
2112 | int |
2056 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2113 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2057 | { |
2114 | { |
2058 | int |
|
|
2059 | i; |
|
|
2060 | |
|
|
2061 | for (i = 0; i < SIZEOFFREE; i++) |
2115 | for (int i = 0; i < SIZEOFFREE; i++) |
2062 | { |
|
|
2063 | if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) |
2116 | if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i])) |
2064 | return i; |
2117 | return i; |
2065 | } |
2118 | |
2066 | return -1; |
2119 | return -1; |
2067 | } |
2120 | } |
2068 | |
2121 | |
2069 | /* |
2122 | /* |
2070 | * The function permute(arr, begin, end) randomly reorders the array |
2123 | * The function permute(arr, begin, end) randomly reorders the array |
2071 | * arr[begin..end-1]. |
2124 | * arr[begin..end-1]. |
|
|
2125 | * now uses a fisher-yates shuffle, old permute was broken |
2072 | */ |
2126 | */ |
2073 | static void |
2127 | static void |
2074 | permute (int *arr, int begin, int end) |
2128 | permute (int *arr, int begin, int end) |
2075 | { |
2129 | { |
2076 | int |
2130 | arr += begin; |
2077 | i, |
|
|
2078 | j, |
|
|
2079 | tmp, |
|
|
2080 | len; |
|
|
2081 | |
|
|
2082 | len = end - begin; |
2131 | end -= begin; |
2083 | for (i = begin; i < end; i++) |
|
|
2084 | { |
|
|
2085 | j = begin + RANDOM () % len; |
|
|
2086 | |
2132 | |
2087 | tmp = arr[i]; |
2133 | while (--end) |
2088 | arr[i] = arr[j]; |
2134 | swap (arr [end], arr [rndm (end + 1)]); |
2089 | arr[j] = tmp; |
|
|
2090 | } |
|
|
2091 | } |
2135 | } |
2092 | |
2136 | |
2093 | /* new function to make monster searching more efficient, and effective! |
2137 | /* new function to make monster searching more efficient, and effective! |
2094 | * This basically returns a randomized array (in the passed pointer) of |
2138 | * This basically returns a randomized array (in the passed pointer) of |
2095 | * the spaces to find monsters. In this way, it won't always look for |
2139 | * the spaces to find monsters. In this way, it won't always look for |
… | |
… | |
2098 | * the 3x3 area will be searched, just not in a predictable order. |
2142 | * the 3x3 area will be searched, just not in a predictable order. |
2099 | */ |
2143 | */ |
2100 | void |
2144 | void |
2101 | get_search_arr (int *search_arr) |
2145 | get_search_arr (int *search_arr) |
2102 | { |
2146 | { |
2103 | int |
2147 | int i; |
2104 | i; |
|
|
2105 | |
2148 | |
2106 | for (i = 0; i < SIZEOFFREE; i++) |
2149 | for (i = 0; i < SIZEOFFREE; i++) |
2107 | { |
|
|
2108 | search_arr[i] = i; |
2150 | search_arr[i] = i; |
2109 | } |
|
|
2110 | |
2151 | |
2111 | permute (search_arr, 1, SIZEOFFREE1 + 1); |
2152 | permute (search_arr, 1, SIZEOFFREE1 + 1); |
2112 | permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); |
2153 | permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); |
2113 | permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); |
2154 | permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); |
2114 | } |
2155 | } |
… | |
… | |
2123 | * Perhaps incorrectly, but I'm making the assumption that exclude |
2164 | * Perhaps incorrectly, but I'm making the assumption that exclude |
2124 | * is actually want is going to try and move there. We need this info |
2165 | * is actually want is going to try and move there. We need this info |
2125 | * because we have to know what movement the thing looking to move |
2166 | * because we have to know what movement the thing looking to move |
2126 | * there is capable of. |
2167 | * there is capable of. |
2127 | */ |
2168 | */ |
2128 | |
|
|
2129 | int |
2169 | int |
2130 | find_dir (maptile *m, int x, int y, object *exclude) |
2170 | find_dir (maptile *m, int x, int y, object *exclude) |
2131 | { |
2171 | { |
2132 | int |
|
|
2133 | i, |
|
|
2134 | max = SIZEOFFREE, mflags; |
2172 | int max = SIZEOFFREE, mflags; |
2135 | |
|
|
2136 | sint16 nx, ny; |
|
|
2137 | object * |
|
|
2138 | tmp; |
|
|
2139 | maptile * |
|
|
2140 | mp; |
|
|
2141 | |
|
|
2142 | MoveType blocked, move_type; |
2173 | MoveType move_type; |
2143 | |
2174 | |
2144 | if (exclude && exclude->head) |
2175 | if (exclude && exclude->head_ () != exclude) |
2145 | { |
2176 | { |
2146 | exclude = exclude->head; |
2177 | exclude = exclude->head; |
2147 | move_type = exclude->move_type; |
2178 | move_type = exclude->move_type; |
2148 | } |
2179 | } |
2149 | else |
2180 | else |
2150 | { |
2181 | { |
2151 | /* If we don't have anything, presume it can use all movement types. */ |
2182 | /* If we don't have anything, presume it can use all movement types. */ |
2152 | move_type = MOVE_ALL; |
2183 | move_type = MOVE_ALL; |
2153 | } |
2184 | } |
2154 | |
2185 | |
2155 | for (i = 1; i < max; i++) |
2186 | for (int i = 1; i < max; i++) |
2156 | { |
2187 | { |
2157 | mp = m; |
2188 | mapxy pos (m, x, y); |
2158 | nx = x + freearr_x[i]; |
2189 | pos.move (i); |
2159 | ny = y + freearr_y[i]; |
|
|
2160 | |
2190 | |
2161 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
2191 | if (!pos.normalise ()) |
2162 | |
|
|
2163 | if (mflags & P_OUT_OF_MAP) |
|
|
2164 | max = maxfree[i]; |
2192 | max = maxfree[i]; |
2165 | else |
2193 | else |
2166 | { |
2194 | { |
2167 | blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); |
2195 | mapspace &ms = *pos; |
2168 | |
2196 | |
2169 | if ((move_type & blocked) == move_type) |
2197 | if ((move_type & ms.move_block) == move_type) |
2170 | max = maxfree[i]; |
2198 | max = maxfree [i]; |
2171 | else if (mflags & P_IS_ALIVE) |
2199 | else if (ms.flags () & P_IS_ALIVE) |
2172 | { |
2200 | { |
2173 | for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above) |
2201 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
2174 | if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) |
2202 | if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ()) |
2175 | break; |
2203 | && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) |
2176 | |
|
|
2177 | if (tmp) |
|
|
2178 | return freedir[i]; |
2204 | return freedir [i]; |
2179 | } |
2205 | } |
2180 | } |
2206 | } |
2181 | } |
2207 | } |
2182 | |
2208 | |
2183 | return 0; |
2209 | return 0; |
… | |
… | |
2185 | |
2211 | |
2186 | /* |
2212 | /* |
2187 | * distance(object 1, object 2) will return the square of the |
2213 | * distance(object 1, object 2) will return the square of the |
2188 | * distance between the two given objects. |
2214 | * distance between the two given objects. |
2189 | */ |
2215 | */ |
2190 | |
|
|
2191 | int |
2216 | int |
2192 | distance (const object *ob1, const object *ob2) |
2217 | distance (const object *ob1, const object *ob2) |
2193 | { |
2218 | { |
2194 | int i; |
|
|
2195 | |
|
|
2196 | i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2219 | return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2197 | return i; |
|
|
2198 | } |
2220 | } |
2199 | |
2221 | |
2200 | /* |
2222 | /* |
2201 | * find_dir_2(delta-x,delta-y) will return a direction in which |
2223 | * find_dir_2(delta-x,delta-y) will return a direction value |
2202 | * an object which has subtracted the x and y coordinates of another |
2224 | * for running into direct [dx, dy]. |
2203 | * object, needs to travel toward it. |
2225 | * (the opposite of crossfire's find_dir_2!) |
2204 | */ |
2226 | */ |
2205 | |
|
|
2206 | int |
2227 | int |
2207 | find_dir_2 (int x, int y) |
2228 | find_dir_2 (int x, int y) |
2208 | { |
2229 | { |
|
|
2230 | #if 1 // new algorithm |
|
|
2231 | // this works by putting x, y into 16 sectors, which |
|
|
2232 | // are not equal sized, but are a better approximation |
|
|
2233 | // then the old algorithm, and then using a mapping |
|
|
2234 | // table to map it into a direction value. |
|
|
2235 | |
|
|
2236 | static const uint8 dir[16] = { |
|
|
2237 | 4, 5, 4, 3, |
|
|
2238 | 2, 1, 2, 3, |
|
|
2239 | 6, 5, 6, 7, |
|
|
2240 | 8, 1, 8, 7, |
|
|
2241 | }; |
|
|
2242 | int sector = 0; |
|
|
2243 | |
|
|
2244 | // this is a bit ugly, but more likely to result in branchless code |
|
|
2245 | sector |= x < 0 ? 8 : 0; |
|
|
2246 | x = x < 0 ? -x : x; // abs |
|
|
2247 | |
|
|
2248 | sector |= y < 0 ? 4 : 0; |
|
|
2249 | y = y < 0 ? -y : y; // abs |
|
|
2250 | |
|
|
2251 | if (x > y) |
|
|
2252 | { |
|
|
2253 | sector |= 2; |
|
|
2254 | |
|
|
2255 | if (x > y * 2) |
|
|
2256 | sector |= 1; |
|
|
2257 | } |
|
|
2258 | else |
|
|
2259 | { |
|
|
2260 | if (y > x * 2) |
|
|
2261 | sector |= 1; |
|
|
2262 | else if (!y) |
|
|
2263 | return 0; // x == 0 here |
|
|
2264 | } |
|
|
2265 | |
|
|
2266 | return dir [sector]; |
|
|
2267 | #else // old algorithm |
2209 | int q; |
2268 | int q; |
2210 | |
2269 | |
2211 | if (y) |
2270 | if (y) |
2212 | q = x * 100 / y; |
2271 | q = 128 * x / y; |
2213 | else if (x) |
2272 | else if (x) |
2214 | q = -300 * x; |
2273 | q = -512 * x; // to make it > 309 |
2215 | else |
2274 | else |
2216 | return 0; |
2275 | return 0; |
2217 | |
2276 | |
2218 | if (y > 0) |
2277 | if (y > 0) |
2219 | { |
2278 | { |
2220 | if (q < -242) |
2279 | if (q < -309) return 7; |
|
|
2280 | if (q < -52) return 6; |
|
|
2281 | if (q < 52) return 5; |
|
|
2282 | if (q < 309) return 4; |
|
|
2283 | |
2221 | return 3; |
2284 | return 3; |
2222 | if (q < -41) |
2285 | } |
2223 | return 2; |
2286 | else |
2224 | if (q < 41) |
2287 | { |
2225 | return 1; |
2288 | if (q < -309) return 3; |
2226 | if (q < 242) |
2289 | if (q < -52) return 2; |
2227 | return 8; |
2290 | if (q < 52) return 1; |
|
|
2291 | if (q < 309) return 8; |
|
|
2292 | |
2228 | return 7; |
2293 | return 7; |
2229 | } |
2294 | } |
2230 | |
2295 | #endif |
2231 | if (q < -242) |
|
|
2232 | return 7; |
|
|
2233 | if (q < -41) |
|
|
2234 | return 6; |
|
|
2235 | if (q < 41) |
|
|
2236 | return 5; |
|
|
2237 | if (q < 242) |
|
|
2238 | return 4; |
|
|
2239 | |
|
|
2240 | return 3; |
|
|
2241 | } |
|
|
2242 | |
|
|
2243 | /* |
|
|
2244 | * absdir(int): Returns a number between 1 and 8, which represent |
|
|
2245 | * the "absolute" direction of a number (it actually takes care of |
|
|
2246 | * "overflow" in previous calculations of a direction). |
|
|
2247 | */ |
|
|
2248 | |
|
|
2249 | int |
|
|
2250 | absdir (int d) |
|
|
2251 | { |
|
|
2252 | while (d < 1) |
|
|
2253 | d += 8; |
|
|
2254 | while (d > 8) |
|
|
2255 | d -= 8; |
|
|
2256 | return d; |
|
|
2257 | } |
2296 | } |
2258 | |
2297 | |
2259 | /* |
2298 | /* |
2260 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
2299 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
2261 | * between two directions (which are expected to be absolute (see absdir()) |
2300 | * between two directions (which are expected to be absolute (see absdir()) |
2262 | */ |
2301 | */ |
2263 | |
|
|
2264 | int |
2302 | int |
2265 | dirdiff (int dir1, int dir2) |
2303 | dirdiff (int dir1, int dir2) |
2266 | { |
2304 | { |
2267 | int |
|
|
2268 | d; |
|
|
2269 | |
|
|
2270 | d = abs (dir1 - dir2); |
2305 | int d = abs (dir1 - dir2); |
2271 | if (d > 4) |
2306 | |
2272 | d = 8 - d; |
2307 | return d > 4 ? 8 - d : d; |
2273 | return d; |
|
|
2274 | } |
2308 | } |
2275 | |
2309 | |
2276 | /* peterm: |
2310 | /* peterm: |
2277 | * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. |
2311 | * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. |
2278 | * Basically, this is a table of directions, and what directions |
2312 | * Basically, this is a table of directions, and what directions |
… | |
… | |
2280 | * This basically means that if direction is 15, then it could either go |
2314 | * This basically means that if direction is 15, then it could either go |
2281 | * direction 4, 14, or 16 to get back to where we are. |
2315 | * direction 4, 14, or 16 to get back to where we are. |
2282 | * Moved from spell_util.c to object.c with the other related direction |
2316 | * Moved from spell_util.c to object.c with the other related direction |
2283 | * functions. |
2317 | * functions. |
2284 | */ |
2318 | */ |
2285 | |
|
|
2286 | int |
|
|
2287 | reduction_dir[SIZEOFFREE][3] = { |
2319 | static const int reduction_dir[SIZEOFFREE][3] = { |
2288 | {0, 0, 0}, /* 0 */ |
2320 | {0, 0, 0}, /* 0 */ |
2289 | {0, 0, 0}, /* 1 */ |
2321 | {0, 0, 0}, /* 1 */ |
2290 | {0, 0, 0}, /* 2 */ |
2322 | {0, 0, 0}, /* 2 */ |
2291 | {0, 0, 0}, /* 3 */ |
2323 | {0, 0, 0}, /* 3 */ |
2292 | {0, 0, 0}, /* 4 */ |
2324 | {0, 0, 0}, /* 4 */ |
… | |
… | |
2383 | * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause |
2415 | * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause |
2384 | * core dumps if they do. |
2416 | * core dumps if they do. |
2385 | * |
2417 | * |
2386 | * Add a check so we can't pick up invisible objects (0.93.8) |
2418 | * Add a check so we can't pick up invisible objects (0.93.8) |
2387 | */ |
2419 | */ |
2388 | |
|
|
2389 | int |
2420 | int |
2390 | can_pick (const object *who, const object *item) |
2421 | can_pick (const object *who, const object *item) |
2391 | { |
2422 | { |
2392 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2423 | return /*who->flag [FLAG_WIZ]|| */ |
2393 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2424 | (item->weight > 0 && !item->flag [FLAG_NO_PICK] && |
2394 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); |
2425 | !item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); |
2395 | } |
2426 | } |
2396 | |
2427 | |
2397 | /* |
2428 | /* |
2398 | * create clone from object to another |
2429 | * create clone from object to another |
2399 | */ |
2430 | */ |
2400 | object * |
2431 | object * |
2401 | object_create_clone (object *asrc) |
2432 | object::deep_clone () |
2402 | { |
2433 | { |
2403 | object *dst = 0, *tmp, *src, *part, *prev, *item; |
2434 | assert (("deep_clone called on non-head object", is_head ())); |
2404 | |
2435 | |
2405 | if (!asrc) |
2436 | object *dst = clone (); |
2406 | return 0; |
|
|
2407 | |
2437 | |
2408 | src = asrc; |
2438 | object *prev = dst; |
2409 | if (src->head) |
|
|
2410 | src = src->head; |
|
|
2411 | |
|
|
2412 | prev = 0; |
|
|
2413 | for (part = src; part; part = part->more) |
2439 | for (object *part = this->more; part; part = part->more) |
2414 | { |
2440 | { |
2415 | tmp = part->clone (); |
2441 | object *tmp = part->clone (); |
2416 | tmp->x -= src->x; |
|
|
2417 | tmp->y -= src->y; |
|
|
2418 | |
|
|
2419 | if (!part->head) |
|
|
2420 | { |
|
|
2421 | dst = tmp; |
|
|
2422 | tmp->head = 0; |
|
|
2423 | } |
|
|
2424 | else |
|
|
2425 | tmp->head = dst; |
2442 | tmp->head = dst; |
2426 | |
|
|
2427 | tmp->more = 0; |
|
|
2428 | |
|
|
2429 | if (prev) |
|
|
2430 | prev->more = tmp; |
2443 | prev->more = tmp; |
2431 | |
|
|
2432 | prev = tmp; |
2444 | prev = tmp; |
2433 | } |
2445 | } |
2434 | |
2446 | |
2435 | for (item = src->inv; item; item = item->below) |
2447 | for (object *item = inv; item; item = item->below) |
2436 | insert_ob_in_ob (object_create_clone (item), dst); |
2448 | insert_ob_in_ob (item->deep_clone (), dst); |
2437 | |
2449 | |
2438 | return dst; |
2450 | return dst; |
2439 | } |
|
|
2440 | |
|
|
2441 | /* GROS - Creates an object using a string representing its content. */ |
|
|
2442 | /* Basically, we save the content of the string to a temp file, then call */ |
|
|
2443 | /* load_object on it. I admit it is a highly inefficient way to make things, */ |
|
|
2444 | /* but it was simple to make and allows reusing the load_object function. */ |
|
|
2445 | /* Remember not to use load_object_str in a time-critical situation. */ |
|
|
2446 | /* Also remember that multiparts objects are not supported for now. */ |
|
|
2447 | |
|
|
2448 | object * |
|
|
2449 | load_object_str (const char *obstr) |
|
|
2450 | { |
|
|
2451 | object *op; |
|
|
2452 | char filename[MAX_BUF]; |
|
|
2453 | |
|
|
2454 | sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); |
|
|
2455 | |
|
|
2456 | FILE *tempfile = fopen (filename, "w"); |
|
|
2457 | |
|
|
2458 | if (tempfile == NULL) |
|
|
2459 | { |
|
|
2460 | LOG (llevError, "Error - Unable to access load object temp file\n"); |
|
|
2461 | return NULL; |
|
|
2462 | } |
|
|
2463 | |
|
|
2464 | fprintf (tempfile, obstr); |
|
|
2465 | fclose (tempfile); |
|
|
2466 | |
|
|
2467 | op = object::create (); |
|
|
2468 | |
|
|
2469 | object_thawer thawer (filename); |
|
|
2470 | |
|
|
2471 | if (thawer) |
|
|
2472 | load_object (thawer, op, 0); |
|
|
2473 | |
|
|
2474 | LOG (llevDebug, " load str completed, object=%s\n", &op->name); |
|
|
2475 | CLEAR_FLAG (op, FLAG_REMOVED); |
|
|
2476 | |
|
|
2477 | return op; |
|
|
2478 | } |
2451 | } |
2479 | |
2452 | |
2480 | /* This returns the first object in who's inventory that |
2453 | /* This returns the first object in who's inventory that |
2481 | * has the same type and subtype match. |
2454 | * has the same type and subtype match. |
2482 | * returns NULL if no match. |
2455 | * returns NULL if no match. |
2483 | */ |
2456 | */ |
2484 | object * |
2457 | object * |
2485 | find_obj_by_type_subtype (const object *who, int type, int subtype) |
2458 | find_obj_by_type_subtype (const object *who, int type, int subtype) |
2486 | { |
2459 | { |
2487 | object *tmp; |
|
|
2488 | |
|
|
2489 | for (tmp = who->inv; tmp; tmp = tmp->below) |
2460 | for (object *tmp = who->inv; tmp; tmp = tmp->below) |
2490 | if (tmp->type == type && tmp->subtype == subtype) |
2461 | if (tmp->type == type && tmp->subtype == subtype) |
2491 | return tmp; |
2462 | return tmp; |
2492 | |
2463 | |
2493 | return NULL; |
|
|
2494 | } |
|
|
2495 | |
|
|
2496 | /* If ob has a field named key, return the link from the list, |
|
|
2497 | * otherwise return NULL. |
|
|
2498 | * |
|
|
2499 | * key must be a passed in shared string - otherwise, this won't |
|
|
2500 | * do the desired thing. |
|
|
2501 | */ |
|
|
2502 | key_value * |
|
|
2503 | get_ob_key_link (const object *ob, const char *key) |
|
|
2504 | { |
|
|
2505 | key_value *link; |
|
|
2506 | |
|
|
2507 | for (link = ob->key_values; link != NULL; link = link->next) |
|
|
2508 | if (link->key == key) |
|
|
2509 | return link; |
|
|
2510 | |
|
|
2511 | return NULL; |
|
|
2512 | } |
|
|
2513 | |
|
|
2514 | /* |
|
|
2515 | * Returns the value of op has an extra_field for key, or NULL. |
|
|
2516 | * |
|
|
2517 | * The argument doesn't need to be a shared string. |
|
|
2518 | * |
|
|
2519 | * The returned string is shared. |
|
|
2520 | */ |
|
|
2521 | const char * |
|
|
2522 | get_ob_key_value (const object *op, const char *const key) |
|
|
2523 | { |
|
|
2524 | key_value *link; |
|
|
2525 | shstr_cmp canonical_key (key); |
|
|
2526 | |
|
|
2527 | if (!canonical_key) |
|
|
2528 | { |
|
|
2529 | /* 1. There being a field named key on any object |
|
|
2530 | * implies there'd be a shared string to find. |
|
|
2531 | * 2. Since there isn't, no object has this field. |
|
|
2532 | * 3. Therefore, *this* object doesn't have this field. |
|
|
2533 | */ |
|
|
2534 | return 0; |
|
|
2535 | } |
|
|
2536 | |
|
|
2537 | /* This is copied from get_ob_key_link() above - |
|
|
2538 | * only 4 lines, and saves the function call overhead. |
|
|
2539 | */ |
|
|
2540 | for (link = op->key_values; link; link = link->next) |
|
|
2541 | if (link->key == canonical_key) |
|
|
2542 | return link->value; |
|
|
2543 | |
|
|
2544 | return 0; |
2464 | return 0; |
2545 | } |
2465 | } |
2546 | |
2466 | |
2547 | |
2467 | shstr_tmp |
2548 | /* |
2468 | object::kv_get (shstr_tmp key) const |
2549 | * Updates the canonical_key in op to value. |
|
|
2550 | * |
|
|
2551 | * canonical_key is a shared string (value doesn't have to be). |
|
|
2552 | * |
|
|
2553 | * Unless add_key is TRUE, it won't add fields, only change the value of existing |
|
|
2554 | * keys. |
|
|
2555 | * |
|
|
2556 | * Returns TRUE on success. |
|
|
2557 | */ |
|
|
2558 | int |
|
|
2559 | set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) |
|
|
2560 | { |
2469 | { |
2561 | key_value * |
2470 | for (key_value *kv = key_values; kv; kv = kv->next) |
2562 | field = NULL, *last = NULL; |
2471 | if (kv->key == key) |
|
|
2472 | return kv->value; |
2563 | |
2473 | |
2564 | for (field = op->key_values; field != NULL; field = field->next) |
2474 | return shstr (); |
2565 | { |
2475 | } |
2566 | if (field->key != canonical_key) |
2476 | |
|
|
2477 | void |
|
|
2478 | object::kv_set (shstr_tmp key, shstr_tmp value) |
|
|
2479 | { |
|
|
2480 | for (key_value *kv = key_values; kv; kv = kv->next) |
|
|
2481 | if (kv->key == key) |
2567 | { |
2482 | { |
2568 | last = field; |
2483 | kv->value = value; |
2569 | continue; |
2484 | return; |
2570 | } |
2485 | } |
2571 | |
2486 | |
2572 | if (value) |
2487 | key_value *kv = new key_value; |
2573 | field->value = value; |
2488 | |
2574 | else |
2489 | kv->next = key_values; |
|
|
2490 | kv->key = key; |
|
|
2491 | kv->value = value; |
|
|
2492 | |
|
|
2493 | key_values = kv; |
|
|
2494 | } |
|
|
2495 | |
|
|
2496 | void |
|
|
2497 | object::kv_del (shstr_tmp key) |
|
|
2498 | { |
|
|
2499 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
|
|
2500 | if ((*kvp)->key == key) |
2575 | { |
2501 | { |
2576 | /* Basically, if the archetype has this key set, |
2502 | key_value *kv = *kvp; |
2577 | * we need to store the null value so when we save |
2503 | *kvp = (*kvp)->next; |
2578 | * it, we save the empty value so that when we load, |
2504 | delete kv; |
2579 | * we get this value back again. |
2505 | return; |
2580 | */ |
|
|
2581 | if (get_ob_key_link (&op->arch->clone, canonical_key)) |
|
|
2582 | field->value = 0; |
|
|
2583 | else |
|
|
2584 | { |
|
|
2585 | if (last) |
|
|
2586 | last->next = field->next; |
|
|
2587 | else |
|
|
2588 | op->key_values = field->next; |
|
|
2589 | |
|
|
2590 | delete field; |
|
|
2591 | } |
|
|
2592 | } |
2506 | } |
2593 | return TRUE; |
|
|
2594 | } |
|
|
2595 | /* IF we get here, key doesn't exist */ |
|
|
2596 | |
|
|
2597 | /* No field, we'll have to add it. */ |
|
|
2598 | |
|
|
2599 | if (!add_key) |
|
|
2600 | { |
|
|
2601 | return FALSE; |
|
|
2602 | } |
|
|
2603 | /* There isn't any good reason to store a null |
|
|
2604 | * value in the key/value list. If the archetype has |
|
|
2605 | * this key, then we should also have it, so shouldn't |
|
|
2606 | * be here. If user wants to store empty strings, |
|
|
2607 | * should pass in "" |
|
|
2608 | */ |
|
|
2609 | if (value == NULL) |
|
|
2610 | return TRUE; |
|
|
2611 | |
|
|
2612 | field = new key_value; |
|
|
2613 | |
|
|
2614 | field->key = canonical_key; |
|
|
2615 | field->value = value; |
|
|
2616 | /* Usual prepend-addition. */ |
|
|
2617 | field->next = op->key_values; |
|
|
2618 | op->key_values = field; |
|
|
2619 | |
|
|
2620 | return TRUE; |
|
|
2621 | } |
|
|
2622 | |
|
|
2623 | /* |
|
|
2624 | * Updates the key in op to value. |
|
|
2625 | * |
|
|
2626 | * If add_key is FALSE, this will only update existing keys, |
|
|
2627 | * and not add new ones. |
|
|
2628 | * In general, should be little reason FALSE is ever passed in for add_key |
|
|
2629 | * |
|
|
2630 | * Returns TRUE on success. |
|
|
2631 | */ |
|
|
2632 | int |
|
|
2633 | set_ob_key_value (object *op, const char *key, const char *value, int add_key) |
|
|
2634 | { |
|
|
2635 | shstr key_ (key); |
|
|
2636 | |
|
|
2637 | return set_ob_key_value_s (op, key_, value, add_key); |
|
|
2638 | } |
2507 | } |
2639 | |
2508 | |
2640 | object::depth_iterator::depth_iterator (object *container) |
2509 | object::depth_iterator::depth_iterator (object *container) |
2641 | : iterator_base (container) |
2510 | : iterator_base (container) |
2642 | { |
2511 | { |
… | |
… | |
2656 | } |
2525 | } |
2657 | else |
2526 | else |
2658 | item = item->env; |
2527 | item = item->env; |
2659 | } |
2528 | } |
2660 | |
2529 | |
|
|
2530 | const char * |
|
|
2531 | object::flag_desc (char *desc, int len) const |
|
|
2532 | { |
|
|
2533 | char *p = desc; |
|
|
2534 | bool first = true; |
|
|
2535 | |
|
|
2536 | *p = 0; |
|
|
2537 | |
|
|
2538 | for (int i = 0; i < NUM_FLAGS; i++) |
|
|
2539 | { |
|
|
2540 | if (len <= 10) // magic constant! |
|
|
2541 | { |
|
|
2542 | snprintf (p, len, ",..."); |
|
|
2543 | break; |
|
|
2544 | } |
|
|
2545 | |
|
|
2546 | if (flag [i]) |
|
|
2547 | { |
|
|
2548 | int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i); |
|
|
2549 | len -= cnt; |
|
|
2550 | p += cnt; |
|
|
2551 | first = false; |
|
|
2552 | } |
|
|
2553 | } |
|
|
2554 | |
|
|
2555 | return desc; |
|
|
2556 | } |
|
|
2557 | |
2661 | // return a suitable string describing an objetc in enough detail to find it |
2558 | // return a suitable string describing an object in enough detail to find it |
2662 | const char * |
2559 | const char * |
2663 | object::debug_desc (char *info) const |
2560 | object::debug_desc (char *info) const |
2664 | { |
2561 | { |
|
|
2562 | char flagdesc[512]; |
2665 | char info2[256 * 3]; |
2563 | char info2[256 * 4]; |
2666 | char *p = info; |
2564 | char *p = info; |
2667 | |
2565 | |
2668 | p += snprintf (p, 256, "%d=\"%s%s%s\"", |
2566 | p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}", |
2669 | count, |
2567 | count, |
|
|
2568 | uuid.c_str (), |
2670 | &name, |
2569 | &name, |
2671 | title ? " " : "", |
2570 | title ? ",title:\"" : "", |
2672 | title ? (const char *)title : ""); |
2571 | title ? (const char *)title : "", |
|
|
2572 | title ? "\"" : "", |
|
|
2573 | flag_desc (flagdesc, 512), type); |
2673 | |
2574 | |
2674 | if (env) |
2575 | if (!flag[FLAG_REMOVED] && env) |
2675 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2576 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2676 | |
2577 | |
2677 | if (map) |
2578 | if (map) |
2678 | p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); |
2579 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2679 | |
2580 | |
2680 | return info; |
2581 | return info; |
2681 | } |
2582 | } |
2682 | |
2583 | |
2683 | const char * |
2584 | const char * |
2684 | object::debug_desc () const |
2585 | object::debug_desc () const |
2685 | { |
2586 | { |
2686 | static char info[256 * 3]; |
2587 | static char info[3][256 * 4]; |
|
|
2588 | static int info_idx; |
|
|
2589 | |
2687 | return debug_desc (info); |
2590 | return debug_desc (info [++info_idx % 3]); |
2688 | } |
2591 | } |
2689 | |
2592 | |
|
|
2593 | struct region * |
|
|
2594 | object::region () const |
|
|
2595 | { |
|
|
2596 | return map ? map->region (x, y) |
|
|
2597 | : region::default_region (); |
|
|
2598 | } |
|
|
2599 | |
|
|
2600 | void |
|
|
2601 | object::open_container (object *new_container) |
|
|
2602 | { |
|
|
2603 | if (container == new_container) |
|
|
2604 | return; |
|
|
2605 | |
|
|
2606 | object *old_container = container; |
|
|
2607 | |
|
|
2608 | if (old_container) |
|
|
2609 | { |
|
|
2610 | if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) |
|
|
2611 | return; |
|
|
2612 | |
|
|
2613 | #if 0 |
|
|
2614 | // remove the "Close old_container" object. |
|
|
2615 | if (object *closer = old_container->inv) |
|
|
2616 | if (closer->type == CLOSE_CON) |
|
|
2617 | closer->destroy (); |
|
|
2618 | #endif |
|
|
2619 | |
|
|
2620 | // make sure the container is available |
|
|
2621 | esrv_send_item (this, old_container); |
|
|
2622 | |
|
|
2623 | old_container->flag [FLAG_APPLIED] = false; |
|
|
2624 | container = 0; |
|
|
2625 | |
|
|
2626 | // client needs item update to make it work, client bug requires this to be separate |
|
|
2627 | esrv_update_item (UPD_FLAGS, this, old_container); |
|
|
2628 | |
|
|
2629 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ()); |
|
|
2630 | play_sound (sound_find ("chest_close")); |
|
|
2631 | } |
|
|
2632 | |
|
|
2633 | if (new_container) |
|
|
2634 | { |
|
|
2635 | if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) |
|
|
2636 | return; |
|
|
2637 | |
|
|
2638 | // TODO: this does not seem to serve any purpose anymore? |
|
|
2639 | #if 0 |
|
|
2640 | // insert the "Close Container" object. |
|
|
2641 | if (archetype *closer = new_container->other_arch) |
|
|
2642 | { |
|
|
2643 | object *closer = new_container->other_arch->instance (); |
|
|
2644 | closer->flag [FLAG_NO_MAP_SAVE] = 1; |
|
|
2645 | new_container->insert (closer); |
|
|
2646 | } |
|
|
2647 | #endif |
|
|
2648 | |
|
|
2649 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ()); |
|
|
2650 | |
|
|
2651 | // make sure the container is available, client bug requires this to be separate |
|
|
2652 | esrv_send_item (this, new_container); |
|
|
2653 | |
|
|
2654 | new_container->flag [FLAG_APPLIED] = true; |
|
|
2655 | container = new_container; |
|
|
2656 | |
|
|
2657 | // client needs flag change |
|
|
2658 | esrv_update_item (UPD_FLAGS, this, new_container); |
|
|
2659 | esrv_send_inventory (this, new_container); |
|
|
2660 | play_sound (sound_find ("chest_open")); |
|
|
2661 | } |
|
|
2662 | // else if (!old_container->env && contr && contr->ns) |
|
|
2663 | // contr->ns->floorbox_reset (); |
|
|
2664 | } |
|
|
2665 | |
|
|
2666 | object * |
|
|
2667 | object::force_find (shstr_tmp name) |
|
|
2668 | { |
|
|
2669 | /* cycle through his inventory to look for the MARK we want to |
|
|
2670 | * place |
|
|
2671 | */ |
|
|
2672 | for (object *tmp = inv; tmp; tmp = tmp->below) |
|
|
2673 | if (tmp->type == FORCE && tmp->slaying == name) |
|
|
2674 | return splay (tmp); |
|
|
2675 | |
|
|
2676 | return 0; |
|
|
2677 | } |
|
|
2678 | |
|
|
2679 | //-GPL |
|
|
2680 | |
|
|
2681 | void |
|
|
2682 | object::force_set_timer (int duration) |
|
|
2683 | { |
|
|
2684 | this->duration = 1; |
|
|
2685 | this->speed_left = -1.f; |
|
|
2686 | |
|
|
2687 | this->set_speed (duration ? 1.f / duration : 0.f); |
|
|
2688 | } |
|
|
2689 | |
|
|
2690 | object * |
|
|
2691 | object::force_add (shstr_tmp name, int duration) |
|
|
2692 | { |
|
|
2693 | if (object *force = force_find (name)) |
|
|
2694 | force->destroy (); |
|
|
2695 | |
|
|
2696 | object *force = get_archetype (FORCE_NAME); |
|
|
2697 | |
|
|
2698 | force->slaying = name; |
|
|
2699 | force->force_set_timer (duration); |
|
|
2700 | force->flag [FLAG_APPLIED] = true; |
|
|
2701 | |
|
|
2702 | return insert (force); |
|
|
2703 | } |
|
|
2704 | |
|
|
2705 | void |
|
|
2706 | object::play_sound (faceidx sound) const |
|
|
2707 | { |
|
|
2708 | if (!sound) |
|
|
2709 | return; |
|
|
2710 | |
|
|
2711 | if (is_on_map ()) |
|
|
2712 | map->play_sound (sound, x, y); |
|
|
2713 | else if (object *pl = in_player ()) |
|
|
2714 | pl->contr->play_sound (sound); |
|
|
2715 | } |
|
|
2716 | |
|
|
2717 | void |
|
|
2718 | object::say_msg (const char *msg) const |
|
|
2719 | { |
|
|
2720 | if (is_on_map ()) |
|
|
2721 | map->say_msg (msg, x, y); |
|
|
2722 | else if (object *pl = in_player ()) |
|
|
2723 | pl->contr->play_sound (sound); |
|
|
2724 | } |
|
|
2725 | |
|
|
2726 | void |
|
|
2727 | object::make_noise () |
|
|
2728 | { |
|
|
2729 | // we do not model noise in the map, so instead put |
|
|
2730 | // a temporary light into the noise source |
|
|
2731 | // could use the map instead, but that's less reliable for our |
|
|
2732 | // goal, which is to make invisibility a bit harder to exploit |
|
|
2733 | |
|
|
2734 | // currently only works sensibly for players |
|
|
2735 | if (!is_player ()) |
|
|
2736 | return; |
|
|
2737 | |
|
|
2738 | // find old force, or create new one |
|
|
2739 | object *force = force_find (shstr_noise_force); |
|
|
2740 | |
|
|
2741 | if (force) |
|
|
2742 | force->speed_left = -1.f; // patch old speed up |
|
|
2743 | else |
|
|
2744 | { |
|
|
2745 | force = archetype::get (shstr_noise_force); |
|
|
2746 | |
|
|
2747 | force->slaying = shstr_noise_force; |
|
|
2748 | force->stats.food = 1; |
|
|
2749 | force->speed_left = -1.f; |
|
|
2750 | |
|
|
2751 | force->set_speed (1.f / 4.f); |
|
|
2752 | force->flag [FLAG_IS_USED_UP] = true; |
|
|
2753 | force->flag [FLAG_APPLIED] = true; |
|
|
2754 | |
|
|
2755 | insert (force); |
|
|
2756 | } |
|
|
2757 | } |
|
|
2758 | |
|
|
2759 | void object::change_move_type (MoveType mt) |
|
|
2760 | { |
|
|
2761 | if (move_type == mt) |
|
|
2762 | return; |
|
|
2763 | |
|
|
2764 | if (is_on_map ()) |
|
|
2765 | { |
|
|
2766 | // we are on the map, so handle move_on/off effects |
|
|
2767 | remove (); |
|
|
2768 | move_type = mt; |
|
|
2769 | map->insert (this, x, y, this); |
|
|
2770 | } |
|
|
2771 | else |
|
|
2772 | move_type = mt; |
|
|
2773 | } |
|
|
2774 | |
|
|
2775 | /* object should be a player. |
|
|
2776 | * we return the object the player has marked with the 'mark' command |
|
|
2777 | * below. If no match is found (or object has changed), we return |
|
|
2778 | * NULL. We leave it up to the calling function to print messages if |
|
|
2779 | * nothing is found. |
|
|
2780 | */ |
|
|
2781 | object * |
|
|
2782 | object::mark () const |
|
|
2783 | { |
|
|
2784 | if (contr && contr->mark && contr->mark->env == this) |
|
|
2785 | return contr->mark; |
|
|
2786 | else |
|
|
2787 | return 0; |
|
|
2788 | } |
|
|
2789 | |