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