ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/button.C
(Generate patch)

Comparing deliantra/server/common/button.C (file contents):
Revision 1.16 by elmex, Tue Dec 19 15:30:01 2006 UTC vs.
Revision 1.65 by root, Fri Mar 26 01:04:43 2010 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
8 it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
9 the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
10 (at your option) any later version. 11 * option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
18 along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22*/ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <funcpoint.h>
26 26
27/* 27/*
28 * This code is no longer highly inefficient 8) 28 * This code is no longer highly inefficient 8)
29 */ 29 */
30 30
31/* 31/*
32 * elmex: 32 * elmex:
33 * This function takes a objectlink list with all the objects are going to be activated. 33 * This function takes a objectlink list with all the objects are going to be activated.
34 * state is a true/false flag that will actiavte objects that have FLAG_ACTIVATE_ON_PUSH/RELEASE set. 34 * state is a true/false flag that will actiavte objects that have FLAG_ACTIVATE_ON_PUSH/RELEASE set.
35 * The source argument can be 0 or the source object for this activation. 35 * The activator argument can be 0 or the source object for this activation.
36 * the originator is the player or monster who did something.
36 */ 37 */
37void 38static void
38activate_connection_link (objectlink * ol, bool state, object *source = 0) 39activate_connection_link (objectlink *ol, int state, object *activator, object *originator)
39{ 40{
40 object *tmp = 0;
41
42 for (; ol; ol = ol->next) 41 for (; ol; ol = ol->next)
43 { 42 {
44 if (!ol->ob) 43 if (!ol->ob)
45 { 44 {
46 LOG (llevError, "Internal error in activate_connection_link.\n"); 45 LOG (llevError, "Internal error in activate_connection_link.\n");
55 * re-loaded. As such, just exit this function if that is the case. 54 * re-loaded. As such, just exit this function if that is the case.
56 */ 55 */
57 56
58 if (QUERY_FLAG (ol->ob, FLAG_FREED)) 57 if (QUERY_FLAG (ol->ob, FLAG_FREED))
59 return; 58 return;
59
60 tmp = ol->ob; 60 object *tmp = ol->ob;
61 61
62 /* if the criteria isn't appropriate, don't do anything */ 62 /* if the criteria isn't appropriate, don't do anything */
63 if (state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_PUSH)) 63 if (state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_PUSH))
64 continue; 64 continue;
65
65 if (!state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_RELEASE)) 66 if (!state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_RELEASE))
66 continue; 67 continue;
67 68
68 switch (tmp->type) 69 switch (tmp->type)
69 { 70 {
70 case GATE: 71 case GATE:
71 case HOLE: 72 case HOLE:
73 if (!tmp->active)
74 tmp->play_sound (tmp->sound
75 ? tmp->sound
76 : sound_find (tmp->type == GATE ? "trigger_gate" : "trigger_hole"));
72 tmp->value = tmp->stats.maxsp ? !state : state; 77 tmp->value = tmp->stats.maxsp ? !state : state;
73 tmp->speed = 0.5; 78 tmp->set_speed (0.5);
74 update_ob_speed (tmp);
75 break; 79 break;
76 80
77 case CF_HANDLE: 81 case T_HANDLE:
78 SET_ANIMATION (tmp, (tmp->value = tmp->stats.maxsp ? !state : state)); 82 SET_ANIMATION (tmp, (tmp->value = tmp->stats.maxsp ? !state : state));
79 update_object (tmp, UP_OBJ_FACE); 83 update_object (tmp, UP_OBJ_FACE);
80 break; 84 break;
81 85
82 case SIGN: 86 case SIGN:
83 if (!tmp->stats.food || tmp->last_eat < tmp->stats.food) 87 if (!tmp->stats.food || tmp->last_eat < tmp->stats.food)
84 { 88 {
89 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("msg_voice"));
90
91 if (originator && originator->contr)
92 originator->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n%s", &tmp->name, &tmp->msg));
93
85 new_info_map (NDI_UNIQUE | NDI_NAVY, tmp->map, tmp->msg); 94 new_info_map_except (NDI_UNIQUE | NDI_NAVY, tmp->map, originator, tmp->msg);
95
86 if (tmp->stats.food) 96 if (tmp->stats.food)
87 tmp->last_eat++; 97 tmp->last_eat++;
88 } 98 }
89 break; 99 break;
90 100
91 case ALTAR: 101 case ALTAR:
102 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_altar"));
92 tmp->value = 1; 103 tmp->value = 1;
93 SET_ANIMATION (tmp, tmp->value); 104 SET_ANIMATION (tmp, tmp->value);
94 update_object (tmp, UP_OBJ_FACE); 105 update_object (tmp, UP_OBJ_FACE);
95 break; 106 break;
96 107
97 case BUTTON: 108 case BUTTON:
98 case PEDESTAL: 109 case PEDESTAL:
110 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_button"));
99 tmp->value = state; 111 tmp->value = state;
100 SET_ANIMATION (tmp, tmp->value); 112 SET_ANIMATION (tmp, tmp->value);
101 update_object (tmp, UP_OBJ_FACE); 113 update_object (tmp, UP_OBJ_FACE);
102 break; 114 break;
103 115
104 case MOOD_FLOOR: 116 case MOOD_FLOOR:
105 do_mood_floor (tmp, source); 117 do_mood_floor (tmp, activator);
106 break; 118 break;
107 119
108 case TIMED_GATE: 120 case TIMED_GATE:
121 if (!tmp->active)
122 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_gate"));
123
109 tmp->speed = tmp->arch->clone.speed; 124 tmp->set_speed (tmp->arch->speed);
110 update_ob_speed (tmp); /* original values */
111 tmp->value = tmp->arch->clone.value; 125 tmp->value = tmp->arch->value;
112 tmp->stats.sp = 1; 126 tmp->stats.sp = 1;
113 tmp->stats.hp = tmp->stats.maxhp; 127 tmp->stats.hp = tmp->stats.maxhp;
114 /* Handle multipart gates. We copy the value for the other parts 128 /* Handle multipart gates. We copy the value for the other parts
115 * from the head - this ensures that the data will consistent 129 * from the head - this ensures that the data will consistent
116 */ 130 */
117 for (tmp = tmp->more; tmp != NULL; tmp = tmp->more) 131 for (object *part = tmp->more; part; part = part->more)
118 { 132 {
119 tmp->speed = tmp->head->speed; 133 part->value = tmp->value;
120 tmp->value = tmp->head->value; 134 part->stats.sp = tmp->stats.sp;
121 tmp->stats.sp = tmp->head->stats.sp; 135 part->stats.hp = tmp->stats.hp;
122 tmp->stats.hp = tmp->head->stats.hp;
123 update_ob_speed (tmp); 136 part->set_speed (tmp->speed);
124 } 137 }
125 break; 138 break;
126 139
127 case DIRECTOR: 140 case DIRECTOR:
128 case FIREWALL: 141 case FIREWALL:
129 if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL) 142 if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL)
130 move_firewall (tmp); 143 move_firewall (tmp);
131 else 144 else
132 { 145 {
133 if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */ 146 tmp->stats.sp = absdir (tmp->stats.sp + tmp->stats.maxsp); /* next direction */
134 tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1;
135 animate_turning (tmp); 147 animate_turning (tmp);
136 } 148 }
137 break; 149 break;
138 150
139 case TELEPORTER: 151 case TELEPORTER:
140 move_teleporter (tmp); 152 move_teleporter (tmp);
141 break; 153 break;
142 154
143 case CREATOR: 155 case CREATOR:
144 move_creator (tmp); 156 move_creator (tmp);
145 break; 157 break;
146 158
147 case TRIGGER_MARKER: 159 case TRIGGER_MARKER:
160 //tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_marker"));
148 move_marker (tmp); 161 move_marker (tmp);
149 break; 162 break;
150 163
151 case DUPLICATOR: 164 case DUPLICATOR:
152 move_duplicator (tmp); 165 move_duplicator (tmp);
153 break; 166 break;
167
168 case MAPSCRIPT:
169 cfperl_mapscript_activate (tmp, state, activator, originator);
170 break;
154 } 171 }
155 } 172 }
156} 173}
157 174
158/* 175/*
166 * Changed the routine to loop through _all_ objects. 183 * Changed the routine to loop through _all_ objects.
167 * Better hurry with that linked list... 184 * Better hurry with that linked list...
168 * 185 *
169 */ 186 */
170void 187void
171push_button (object *op) 188push_button (object *op, object *originator)
172{ 189{
173 oblinkpt *obp = get_button_links (op); 190 if (oblinkpt *obp = op->find_link ())
174 191 {
175 if (!obp) 192 if (INVOKE_MAP (TRIGGER, op->map, ARG_STRING (&obp->id), ARG_INT (op->value), ARG_OBJECT (op), ARG_OBJECT (originator)))
176 return; 193 return;
177 194
178 if (INVOKE_MAP (TRIGGER, op->map, ARG_INT64 (obp->value), ARG_INT (op->value)))
179 return;
180
181 activate_connection_link (obp->link, op->value, op); 195 activate_connection_link (obp->link, op->value, op, originator);
196 }
182} 197}
183 198
184/* 199/*
185 * elmex: 200 * elmex:
186 * This activates a connection, similar to push_button (object *op) but it takes 201 * This activates a connection, similar to push_button (object *op) but it takes
188 * the connection was 'state' or 'released'. So that you can activate objects 203 * the connection was 'state' or 'released'. So that you can activate objects
189 * who have FLAG_ACTIVATE_ON_PUSH/RELEASE set properly. 204 * who have FLAG_ACTIVATE_ON_PUSH/RELEASE set properly.
190 * 205 *
191 */ 206 */
192void 207void
193activate_connection (maptile *map, long connection, bool state) 208maptile::trigger (shstr_tmp id, int state, object *activator, object *originator)
194{ 209{
195 if (INVOKE_MAP (TRIGGER, map, ARG_INT64 (connection), ARG_INT (state))) 210 if (INVOKE_MAP (TRIGGER, this, ARG_STRING (&id), ARG_INT (state), ARG_OBJECT (originator)))
196 return; 211 return;
197 212
198 oblinkpt *obp = get_connection_links (map, connection); 213 if (oblinkpt *obp = find_link (id))
199
200 if (obp)
201 activate_connection_link (obp->link, state); 214 activate_connection_link (obp->link, state, activator, originator);
202} 215}
203 216
204/* 217/*
205 * Updates everything connected with the button op. 218 * Updates everything connected with the button op.
206 * After changing the state of a button, this function must be called 219 * After changing the state of a button, this function must be called
207 * to make sure that all gates and other buttons connected to the 220 * to make sure that all gates and other buttons connected to the
208 * button reacts to the (eventual) change of state. 221 * button reacts to the (eventual) change of state.
209 */ 222 */
210
211void 223void
212update_button (object *op) 224update_button (object *op, object *originator)
213{ 225{
214 object *ab, *tmp, *head;
215 int tot, any_down = 0, old_value = op->value; 226 int any_down = 0, old_value = op->value;
216 oblinkpt *obp = 0;
217 objectlink *ol;
218 227
219 obp = get_button_links (op); 228 if (oblinkpt *obp = op->find_link ())
220 /* LOG(llevDebug, "update_button: %s (%d)\n", op->name, op->count); */
221 if (obp)
222 for (ol = obp->link; ol; ol = ol->next) 229 for (objectlink *ol = obp->link; ol; ol = ol->next)
223 { 230 {
224 if (!ol->ob) 231 if (!ol->ob)
225 { 232 {
226 LOG (llevDebug, "Internal error in update_button (%s).\n", &op->name); 233 LOG (llevDebug, "Internal error in update_button (%s).\n", &op->name);
227 continue; 234 continue;
228 } 235 }
229 236
230 tmp = ol->ob; 237 object *tmp = ol->ob;
238
231 if (tmp->type == BUTTON) 239 if (tmp->type == BUTTON)
232 { 240 {
241 sint32 total = 0;
242
233 for (ab = tmp->above, tot = 0; ab != NULL; ab = ab->above) 243 for (object *ab = tmp->above; ab; ab = ab->above)
234 /* Bug? The pedestal code below looks for the head of
235 * the object, this bit doesn't. I'd think we should check
236 * for head here also. Maybe it also makese sense to
237 * make the for ab=tmp->above loop common, and alter
238 * behaviour based on object within that loop?
239 */
240
241 /* Basically, if the move_type matches that on what the 244 /* Basically, if the move_type matches that on what the
242 * button wants, we count it. The second check is so that 245 * button wants, we count it. The second check is so that
243 * objects don't move (swords, etc) will count. Note that 246 * objects who don't move (swords, etc) will count. Note that
244 * this means that more work is needed to make buttons 247 * this means that more work is needed to make buttons
245 * that are only triggered by flying objects. 248 * that are only triggered by flying objects.
246 */ 249 */
247 if ((ab->move_type & tmp->move_on) || ab->move_type == 0) 250 if ((ab->move_type & tmp->move_on) || ab->move_type == 0)
248 tot += ab->weight * (ab->nrof ? ab->nrof : 1) + ab->carrying; 251 total += ab->head_ ()->total_weight ();
249 252
250 tmp->value = (tot >= tmp->weight) ? 1 : 0; 253 tmp->value = total >= tmp->weight;
251 if (tmp->value) 254
252 any_down = 1; 255 any_down = any_down || tmp->value;
253 } 256 }
254 else if (tmp->type == PEDESTAL) 257 else if (tmp->type == PEDESTAL)
255 { 258 {
259 bool is_match = is_match_expr (tmp->slaying);
256 tmp->value = 0; 260 tmp->value = 0;
261
257 for (ab = tmp->above; ab != NULL; ab = ab->above) 262 for (object *ab = tmp->above; ab; ab = ab->above)
258 { 263 {
259 head = ab->head ? ab->head : ab; 264 object *head = ab->head_ ();
265
260 /* Same note regarding move_type for buttons above apply here. */ 266 /* Same note regarding move_type for buttons above apply here. */
261 if (((head->move_type & tmp->move_on) || ab->move_type == 0) && 267 if (((ab->move_type & tmp->move_on) || ab->move_type == 0))
268 if (is_match
269 ? match (tmp->slaying, head, tmp, originator)
262 (head->race == tmp->slaying || 270 : (head->race == tmp->slaying
263 ((head->type == SPECIAL_KEY) && (head->slaying == tmp->slaying)) || 271 || (head->type == SPECIAL_KEY && head->slaying == tmp->slaying)
264 (!strcmp (tmp->slaying, "player") && head->type == PLAYER))) 272 || (tmp->slaying == shstr_player && head->type == PLAYER)))
273 {
265 tmp->value = 1; 274 tmp->value = 1;
275 break;
276 }
277 }
278
279 any_down = any_down || tmp->value;
280 }
281 else if (tmp->type == T_MATCH)
282 {
283 tmp->value = 0;
284
285 for (object *ab = tmp->above; ab; ab = ab->above)
266 } 286 {
267 if (tmp->value) 287 object *head = ab->head_ ();
268 any_down = 1; 288
289 /* Same note regarding move_type for buttons above apply here. */
290 if (((ab->move_type & tmp->move_on) || ab->move_type == 0))
291 if (match (tmp->slaying, head, tmp, originator))
292 {
293 tmp->value = 1;
294 break;
295 }
296 }
297
298 any_down = any_down || tmp->value;
269 } 299 }
270 } 300 }
301
271 if (any_down) /* If any other buttons were down, force this to remain down */ 302 if (any_down) /* If any other buttons were down, force this to remain down */
272 op->value = 1; 303 op->value = 1;
273 304
305 //LOG(llevDebug, "update_button: %s (%d, %d=%d)\n", &op->name, op->count, op->value, old_value);
306
274 /* If this button hasn't changed, don't do anything */ 307 /* If this button hasn't changed, don't do anything */
275 if (op->value != old_value) 308 if (op->value != old_value)
276 { 309 {
277 SET_ANIMATION (op, op->value); 310 SET_ANIMATION (op, op->value);
278 update_object (op, UP_OBJ_FACE); 311 update_object (op, UP_OBJ_FACE);
279 push_button (op); /* Make all other buttons the same */ 312 push_button (op, originator); /* Make all other buttons the same */
280 } 313 }
281} 314}
282
283/*
284 * Updates every button on the map (by calling update_button() for them).
285 */
286 315
287void 316void
288update_buttons (maptile *m) 317use_trigger (object *op, object *originator)
289{ 318{
290 objectlink *ol;
291 oblinkpt *obp;
292
293 for (obp = m->buttons; obp; obp = obp->next)
294 for (ol = obp->link; ol; ol = ol->next)
295 {
296 if (!ol->ob)
297 {
298 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
299 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
300 continue;
301 }
302
303 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
304 {
305 update_button (ol->ob);
306 break;
307 }
308 }
309}
310
311void
312use_trigger (object *op)
313{
314
315 /* Toggle value */ 319 /* Toggle value */
316 op->value = !op->value; 320 op->value = !op->value;
321
317 push_button (op); 322 push_button (op, originator);
318} 323}
319 324
320/* 325/*
321 * Note: animate_object should be used instead of this, 326 * Note: animate_object should be used instead of this,
322 * but it can't handle animations in the 8 directions 327 * but it can't handle animations in the 8 directions
323 */ 328 */
324
325void 329void
326animate_turning (object *op) /* only one part objects */ 330animate_turning (object *op) /* only one part objects */
327{ 331{
328 if (++op->state >= NUM_ANIMATIONS (op) / 8) 332 if (++op->state >= NUM_ANIMATIONS (op) / 8)
329 op->state = 0; 333 op->state = 0;
342 * 346 *
343 * 0.93.4: Linked objects (ie, objects that are connected) can not be 347 * 0.93.4: Linked objects (ie, objects that are connected) can not be
344 * sacrificed. This fixes a bug of trying to put multiple altars/related 348 * sacrificed. This fixes a bug of trying to put multiple altars/related
345 * objects on the same space that take the same sacrifice. 349 * objects on the same space that take the same sacrifice.
346 */ 350 */
347
348int 351int
349check_altar_sacrifice (const object *altar, const object *sacrifice) 352check_altar_sacrifice (object *altar, object *sacrifice, object *originator)
350{ 353{
351 if (!QUERY_FLAG (sacrifice, FLAG_ALIVE) && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED) && sacrifice->type != PLAYER) 354 if (sacrifice->flag [FLAG_UNPAID])
355 return 0;
356
357 if (is_match_expr (ARCH_SACRIFICE (altar)))
358 return match (ARCH_SACRIFICE (altar), altar, originator);
359
360 if (!QUERY_FLAG (sacrifice, FLAG_ALIVE)
361 && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED)
362 && sacrifice->type != PLAYER)
352 { 363 {
353 if ((ARCH_SACRIFICE (altar) == sacrifice->arch->name || 364 if (ARCH_SACRIFICE (altar) == shstr_money
354 ARCH_SACRIFICE (altar) == sacrifice->name || 365 && sacrifice->type == MONEY
355 ARCH_SACRIFICE (altar) == sacrifice->slaying || 366 && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar))
356 (!strcmp (ARCH_SACRIFICE (altar), query_base_name (sacrifice, 0))))
357 && NROF_SACRIFICE (altar) <= (sacrifice->nrof ? sacrifice->nrof : 1))
358 return 1; 367 return 1;
359 if (strcmp (ARCH_SACRIFICE (altar), "money") == 0 368
360 && sacrifice->type == MONEY && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar)) 369 if ((ARCH_SACRIFICE (altar) == sacrifice->arch->archname
370 || ARCH_SACRIFICE (altar) == sacrifice->name
371 || ARCH_SACRIFICE (altar) == sacrifice->slaying
372 || strstr (query_base_name (sacrifice, 0), ARCH_SACRIFICE (altar)))
373 && NROF_SACRIFICE (altar) <= sacrifice->number_of ())
361 return 1; 374 return 1;
362 } 375 }
376
363 return 0; 377 return 0;
364} 378}
365 379
366/* 380/*
367 * operate_altar checks if sacrifice was accepted and removes sacrificed 381 * operate_altar checks if sacrifice was accepted and removes sacrificed
371 * 385 *
372 * If this function returns 1, '*sacrifice' is modified to point to the 386 * If this function returns 1, '*sacrifice' is modified to point to the
373 * remaining sacrifice, or is set to NULL if the sacrifice was used up. 387 * remaining sacrifice, or is set to NULL if the sacrifice was used up.
374 */ 388 */
375int 389int
376operate_altar (object *altar, object **sacrifice) 390operate_altar (object *altar, object **sacrifice, object *originator)
377{ 391{
378 if (!altar->map) 392 if (!altar->map)
379 { 393 {
380 LOG (llevError, "BUG: operate_altar(): altar has no map\n"); 394 LOG (llevError, "BUG: operate_altar(): altar has no map\n");
381 return 0; 395 return 0;
382 } 396 }
383 397
384 if (!altar->slaying || altar->value) 398 if (!altar->slaying || altar->value)
385 return 0; 399 return 0;
386 400
387 if (!check_altar_sacrifice (altar, *sacrifice)) 401 if (!check_altar_sacrifice (altar, *sacrifice, originator))
388 return 0; 402 return 0;
389 403
390 /* check_altar_sacrifice should have already verified that enough money 404 /* check_altar_sacrifice should have already verified that enough money
391 * has been dropped. 405 * has been dropped.
392 */ 406 */
393 if (!strcmp (ARCH_SACRIFICE (altar), "money")) 407 if (ARCH_SACRIFICE (altar) == shstr_money)
394 { 408 {
395 int number = NROF_SACRIFICE (altar) / (*sacrifice)->value; 409 int number = NROF_SACRIFICE (altar) / (*sacrifice)->value;
396 410
397 /* Round up any sacrifices. Altars don't make change either */ 411 /* Round up any sacrifices. Altars don't make change either */
398 if (NROF_SACRIFICE (altar) % (*sacrifice)->value) 412 if (NROF_SACRIFICE (altar) % (*sacrifice)->value)
399 number++; 413 number++;
400 414
401 *sacrifice = decrease_ob_nr (*sacrifice, number); 415 if (!(*sacrifice)->decrease (number))
416 *sacrifice = 0;
402 } 417 }
403 else 418 else
404 *sacrifice = decrease_ob_nr (*sacrifice, NROF_SACRIFICE (altar)); 419 if (!(*sacrifice)->decrease (NROF_SACRIFICE (altar)))
420 *sacrifice = 0;
405 421
406 if (altar->msg) 422 if (altar->msg)
407 new_info_map (NDI_BLACK, altar->map, altar->msg); 423 new_info_map (NDI_BLACK, altar->map, altar->msg);
408 424
409 return 1; 425 return 1;
410} 426}
411 427
412void 428static void
413trigger_move (object *op, int state) /* 1 down and 0 up */ 429trigger_move (object *op, int state, object *originator) /* 1 down and 0 up */
414{ 430{
415 op->stats.wc = state; 431 op->stats.wc = state;
432
416 if (state) 433 if (state)
417 { 434 {
418 use_trigger (op); 435 use_trigger (op, originator);
419 if (op->stats.exp > 0) /* check sanity */ 436 op->set_speed (op->stats.exp > 0 ? 1. / op->stats.exp : 1.);
420 op->speed = 1.0 / op->stats.exp;
421 else
422 op->speed = 1.0;
423 update_ob_speed (op);
424 op->speed_left = -1; 437 op->speed_left = -1;
425 } 438 }
426 else 439 else
427 { 440 {
428 use_trigger (op); 441 use_trigger (op, originator);
429 op->speed = 0; 442 op->set_speed (0);
430 update_ob_speed (op);
431 } 443 }
432} 444}
433 445
434 446
435/* 447/*
443 * TRIGGER: Returns 1 if handle could be moved, 0 if not. 455 * TRIGGER: Returns 1 if handle could be moved, 0 if not.
444 * 456 *
445 * TRIGGER_BUTTON, TRIGGER_PEDESTAL: Returns 0. 457 * TRIGGER_BUTTON, TRIGGER_PEDESTAL: Returns 0.
446 */ 458 */
447int 459int
448check_trigger (object *op, object *cause) 460check_trigger (object *op, object *cause, object *originator)
449{ 461{
450 object *tmp; 462 object *tmp;
451 int push = 0, tot = 0; 463 int push = 0, tot = 0;
452 int in_movement = op->stats.wc || op->speed; 464 int in_movement = op->stats.wc || op->has_active_speed ();
453 465
454 switch (op->type) 466 switch (op->type)
455 { 467 {
456 case TRIGGER_BUTTON: 468 case TRIGGER_BUTTON:
457 if (op->weight > 0) 469 if (op->weight > 0)
458 { 470 {
459 if (cause) 471 if (cause)
460 { 472 {
461 for (tmp = op->above; tmp; tmp = tmp->above) 473 for (tmp = op->above; tmp; tmp = tmp->above)
462 /* Comment reproduced from update_buttons(): */ 474 /* Comment reproduced from update_buttons(): */
463 /* Basically, if the move_type matches that on what the 475 /* Basically, if the move_type matches that on what the
464 * button wants, we count it. The second check is so that 476 * button wants, we count it. The second check is so that
465 * objects that don't move (swords, etc) will count. Note that 477 * objects that don't move (swords, etc) will count. Note that
466 * this means that more work is needed to make buttons 478 * this means that more work is needed to make buttons
467 * that are only triggered by flying objects. 479 * that are only triggered by flying objects.
480 */
481 if ((tmp->move_type & op->move_on) || tmp->move_type == 0)
482 tot += tmp->head_ ()->total_weight ();
483
484 if (tot >= op->weight)
485 push = 1;
486
487 if (op->stats.ac == push)
488 return 0;
489
490 op->stats.ac = push;
491 if (NUM_ANIMATIONS (op) > 1)
492 {
493 SET_ANIMATION (op, push);
494 update_object (op, UP_OBJ_FACE);
495 }
496
497 if (in_movement || !push)
498 return 0;
499 }
500
501 trigger_move (op, push, cause);
502 }
503
504 return 0;
505
506 case TRIGGER_PEDESTAL:
507 if (cause)
508 {
509 for (tmp = op->above; tmp; tmp = tmp->above)
510 {
511 object *head = tmp->head_ ();
512
513 /* See comment in TRIGGER_BUTTON about move_types */
514 if (((head->move_type & op->move_on) || head->move_type == 0)
515 && (head->race == op->slaying || (op->slaying == shstr_player && head->type == PLAYER)))
516 {
517 push = 1;
518 break;
519 }
520 }
521
522 if (op->stats.ac == push)
523 return 0;
524
525 op->stats.ac = push;
526
527 if (NUM_ANIMATIONS (op) > 1)
528 {
529 SET_ANIMATION (op, push);
530 update_object (op, UP_OBJ_FACE);
531 }
532
533 update_object (op, UP_OBJ_FACE);
534
535 if (in_movement || !push)
536 return 0;
537 }
538
539 trigger_move (op, push, cause);
540 return 0;
541
542 case TRIGGER_ALTAR:
543 if (cause)
544 {
545 if (in_movement)
546 return 0;
547
548 if (operate_altar (op, &cause)) /* TODO: originator? */
549 {
550 if (NUM_ANIMATIONS (op) > 1)
551 {
552 SET_ANIMATION (op, 1);
553 update_object (op, UP_OBJ_FACE);
554 }
555
556 if (op->last_sp >= 0)
557 {
558 trigger_move (op, 1, cause);
559
560 if (op->last_sp > 0)
561 op->last_sp = -op->last_sp;
562 }
563 else
564 {
565 /* for trigger altar with last_sp, the ON/OFF
566 * status (-> +/- value) is "simulated":
468 */ 567 */
469 568 op->value = !op->value;
470 if ((tmp->move_type & op->move_on) || tmp->move_type == 0) 569 trigger_move (op, 1, cause);
471 { 570 op->last_sp = -op->last_sp;
472 tot += tmp->weight * (tmp->nrof ? tmp->nrof : 1) + tmp->carrying; 571 op->value = !op->value;
473 }
474 if (tot >= op->weight)
475 push = 1;
476 if (op->stats.ac == push)
477 return 0;
478 op->stats.ac = push;
479 if (NUM_ANIMATIONS (op) > 1)
480 {
481 SET_ANIMATION (op, push);
482 update_object (op, UP_OBJ_FACE);
483 } 572 }
484 if (in_movement || !push) 573
485 return 0; 574 return cause == NULL;
486 } 575 }
487 trigger_move (op, push);
488 } 576 else
489 return 0;
490
491 case TRIGGER_PEDESTAL:
492 if (cause)
493 {
494 for (tmp = op->above; tmp; tmp = tmp->above)
495 {
496 object *head = tmp->head ? tmp->head : tmp;
497
498 /* See comment in TRIGGER_BUTTON about move_types */
499 if (((head->move_type & op->move_on) || head->move_type == 0)
500 && (head->race == op->slaying || (!strcmp (op->slaying, "player") && head->type == PLAYER)))
501 {
502 push = 1;
503 break;
504 }
505 }
506 if (op->stats.ac == push)
507 return 0; 577 return 0;
508 op->stats.ac = push; 578 }
579 else
580 {
509 if (NUM_ANIMATIONS (op) > 1) 581 if (NUM_ANIMATIONS (op) > 1)
510 { 582 {
511 SET_ANIMATION (op, push); 583 SET_ANIMATION (op, 0);
512 update_object (op, UP_OBJ_FACE); 584 update_object (op, UP_OBJ_FACE);
513 } 585 }
514 update_object (op, UP_OBJ_FACE);
515 if (in_movement || !push)
516 return 0;
517 }
518 trigger_move (op, push);
519 return 0;
520 586
521 case TRIGGER_ALTAR:
522 if (cause)
523 {
524 if (in_movement)
525 return 0;
526 if (operate_altar (op, &cause))
527 {
528 if (NUM_ANIMATIONS (op) > 1)
529 {
530 SET_ANIMATION (op, 1);
531 update_object (op, UP_OBJ_FACE);
532 }
533 if (op->last_sp >= 0)
534 {
535 trigger_move (op, 1);
536 if (op->last_sp > 0)
537 op->last_sp = -op->last_sp;
538 }
539 else
540 {
541 /* for trigger altar with last_sp, the ON/OFF
542 * status (-> +/- value) is "simulated":
543 */
544 op->value = !op->value;
545 trigger_move (op, 1);
546 op->last_sp = -op->last_sp;
547 op->value = !op->value;
548 }
549 return cause == NULL;
550 }
551 else
552 {
553 return 0;
554 }
555 }
556 else
557 {
558 if (NUM_ANIMATIONS (op) > 1)
559 {
560 SET_ANIMATION (op, 0);
561 update_object (op, UP_OBJ_FACE);
562 }
563
564 /* If trigger_altar has "last_sp > 0" set on the map, 587 /* If trigger_altar has "last_sp > 0" set on the map,
565 * it will push the connected value only once per sacrifice. 588 * it will push the connected value only once per sacrifice.
566 * Otherwise (default), the connected value will be 589 * Otherwise (default), the connected value will be
567 * pushed twice: First by sacrifice, second by reset! -AV 590 * pushed twice: First by sacrifice, second by reset! -AV
568 */ 591 */
569 if (!op->last_sp) 592 if (!op->last_sp)
570 trigger_move (op, 0); 593 trigger_move (op, 0, cause);
571 else 594 else
572 { 595 {
573 op->stats.wc = 0; 596 op->stats.wc = 0;
574 op->value = !op->value; 597 op->value = !op->value;
575 op->speed = 0; 598 op->set_speed (0);
576 update_ob_speed (op);
577 } 599 }
578 } 600 }
579 return 0; 601 return 0;
580 602
581 case TRIGGER: 603 case TRIGGER:
582 if (cause) 604 if (cause)
583 { 605 {
584 if (in_movement) 606 if (in_movement)
585 return 0; 607 return 0;
608
586 push = 1; 609 push = 1;
587 } 610 }
611
588 if (NUM_ANIMATIONS (op) > 1) 612 if (NUM_ANIMATIONS (op) > 1)
589 { 613 {
590 SET_ANIMATION (op, push); 614 SET_ANIMATION (op, push);
591 update_object (op, UP_OBJ_FACE); 615 update_object (op, UP_OBJ_FACE);
592 } 616 }
617
593 trigger_move (op, push); 618 trigger_move (op, push, cause);
594 return 1; 619 return 1;
595 620
596 default: 621 default:
597 LOG (llevDebug, "Unknown trigger type: %s (%d)\n", &op->name, op->type); 622 LOG (llevDebug, "Unknown trigger type: %s (%d)\n", &op->name, op->type);
598 return 0; 623 return 0;
599 } 624 }
600} 625}
601 626
602void 627void
603add_button_link (object *button, maptile *map, int connected) 628object::add_link (maptile *map, shstr_tmp id)
604{ 629{
605 oblinkpt *obp;
606 objectlink *ol = get_objectlink ();
607
608 if (!map) 630 if (!map)
609 { 631 {
610 LOG (llevError, "Tried to add button-link without map.\n"); 632 LOG (llevError, "Tried to add button-link without map.\n");
611 return; 633 return;
612 } 634 }
613 if (!editor)
614 button->path_attuned = connected; /* peterm: I need this so I can rebuild
615 a connected map from a template map. */
616 635
617/* LOG(llevDebug,"adding button %s (%d)\n", button->name, connected);*/ 636 flag [FLAG_IS_LINKED] = true;
618 637
619 SET_FLAG (button, FLAG_IS_LINKED); 638 objectlink *ol = get_objectlink ();
620
621 ol->ob = button; 639 ol->ob = this;
622 640
623 for (obp = map->buttons; obp && obp->value != connected; obp = obp->next); 641 for (oblinkpt *obp = map->buttons; obp; obp = obp->next)
624 642 if (obp->id == id)
625 if (obp)
626 { 643 {
627 ol->next = obp->link; 644 ol->next = obp->link;
628 obp->link = ol; 645 obp->link = ol;
646 return;
629 } 647 }
630 else 648
631 {
632 obp = get_objectlinkpt (); 649 oblinkpt *obp = get_objectlinkpt ();
633 obp->value = connected; 650 obp->id = id;
634 651
635 obp->next = map->buttons; 652 obp->next = map->buttons;
636 map->buttons = obp; 653 map->buttons = obp;
637 obp->link = ol; 654 obp->link = ol;
638 }
639} 655}
640 656
641/* 657/*
642 * Remove the object from the linked lists of buttons in the map. 658 * Remove the object from the linked lists of buttons in the map.
643 * This is only needed by editors. 659 * This is only needed by editors.
644 */ 660 */
645
646void 661void
647remove_button_link (object *op) 662object::remove_link ()
648{ 663{
649 oblinkpt *obp; 664 if (!map)
650 objectlink **olp, *ol;
651
652 if (op->map == NULL)
653 { 665 {
654 LOG (llevError, "remove_button_link() in object without map.\n"); 666 LOG (llevError, "remove_button_link() in object without map.\n");
655 return; 667 return;
656 } 668 }
657 669
658 if (!QUERY_FLAG (op, FLAG_IS_LINKED)) 670 if (!flag [FLAG_IS_LINKED])
659 { 671 {
660 LOG (llevError, "remove_button_linked() in unlinked object.\n"); 672 LOG (llevError, "remove_button_linked() in unlinked object.\n");
661 return; 673 return;
662 } 674 }
663 675
676 flag [FLAG_IS_LINKED] = false;
677
664 for (obp = op->map->buttons; obp; obp = obp->next) 678 for (oblinkpt *obp = map->buttons; obp; obp = obp->next)
665 for (olp = &obp->link; (ol = *olp); olp = &ol->next) 679 for (objectlink **olp = &obp->link; *olp; olp = &(*olp)->next)
666 if (ol->ob == op) 680 if ((*olp)->ob == this)
667 { 681 {
668 682 objectlink *ol = *olp;
669/* LOG(llevDebug, "Removed link %d in button %s and map %s.\n",
670 obp->value, op->name, op->map->path);
671*/
672 *olp = ol->next; 683 *olp = ol->next;
673 delete ol; 684 delete ol;
674 return; 685 return;
675 } 686 }
676 687
677 LOG (llevError, "remove_button_linked(): couldn't find object.\n"); 688 LOG (llevError, "remove_button_linked(): couldn't find object.\n");
678 CLEAR_FLAG (op, FLAG_IS_LINKED); 689}
690
691/*
692 * Updates every button on the map (by calling update_button() for them).
693 */
694void
695maptile::update_buttons ()
696{
697 for (oblinkpt *obp = buttons; obp; obp = obp->next)
698 for (objectlink *ol = obp->link; ol; ol = ol->next)
699 {
700 if (!ol->ob)
701 {
702 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
703 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, &obp->id);
704 continue;
705 }
706
707 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
708 {
709 update_button (ol->ob, 0);
710 break;
711 }
712 }
679} 713}
680 714
681/* 715/*
682 * Gets the objectlink for this connection from the map. 716 * Gets the objectlink for this connection from the map.
683 */ 717 */
684oblinkpt * 718oblinkpt *
685get_connection_links (maptile *map, long connection) 719maptile::find_link (shstr_tmp id)
686{ 720{
687 for (oblinkpt * obp = map->buttons; obp; obp = obp->next) 721 for (oblinkpt *obp = buttons; obp; obp = obp->next)
688 if (obp->value == connection) 722 if (obp->id == id)
689 return obp; 723 return obp;
690 724
691 return 0; 725 return 0;
692} 726}
693 727
694/* 728/*
695 * Return the first objectlink in the objects linked to this one 729 * Return the first objectlink in the objects linked to this one
696 */ 730 */
697
698oblinkpt * 731oblinkpt *
699get_button_links (const object *button) 732object::find_link () const
700{ 733{
701 oblinkpt *obp; 734 if (map)
702 objectlink *ol;
703
704 if (!button->map)
705 return NULL;
706
707 for (obp = button->map->buttons; obp; obp = obp->next) 735 for (oblinkpt *obp = map->buttons; obp; obp = obp->next)
708 for (ol = obp->link; ol; ol = ol->next) 736 for (objectlink *ol = obp->link; ol; ol = ol->next)
709 if (ol->ob == button) 737 if (ol->ob == this)
710 return obp; 738 return obp;
711 739
712 return NULL;
713}
714
715/*
716 * Made as a separate function to increase efficiency
717 */
718
719int
720get_button_value (const object *button)
721{
722 oblinkpt *obp;
723 objectlink *ol;
724
725 if (!button->map)
726 return 0;
727 for (obp = button->map->buttons; obp; obp = obp->next)
728 for (ol = obp->link; ol; ol = ol->next)
729 if (ol->ob == button)
730 return obp->value;
731 return 0; 740 return 0;
732} 741}
733 742
734/* This routine makes monsters who are 743/* This routine makes monsters who are
735 * standing on the 'mood floor' change their 744 * standing on the 'mood floor' change their
737 * If floor is to be triggered must have 746 * If floor is to be triggered must have
738 * a speed of zero (default is 1 for all 747 * a speed of zero (default is 1 for all
739 * but the charm floor type). 748 * but the charm floor type).
740 * by b.t. thomas@nomad.astro.psu.edu 749 * by b.t. thomas@nomad.astro.psu.edu
741 */ 750 */
742
743void 751void
744do_mood_floor (object *op, object *source) 752do_mood_floor (object *op, object *source)
745{ 753{
746 object *tmp;
747 object *tmp2;
748
749 if (!source) 754 if (!source)
750 source = op; 755 source = op;
751 756
752 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above) 757 mapspace &ms = op->ms ();
758
759 if (!(ms.flags () & P_IS_ALIVE))
760 return;
761
762 object *tmp;
763
764 for (tmp = ms.top; tmp; tmp = tmp->below)
753 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 765 if (QUERY_FLAG (tmp, FLAG_MONSTER))
754 break; 766 break;
755 767
756 /* doesn't effect players, and if there is a player on this space, won't also 768 /* doesn't effect players, and if there is a player on this space, won't also
757 * be a monster here. 769 * be a monster here.
758 */ 770 */
771 //TODO: have players really FLAG_MONSTER? kept it for safety
759 if (!tmp || tmp->type == PLAYER) 772 if (!tmp || tmp->type == PLAYER)
760 return; 773 return;
761 774
762 switch (op->last_sp) 775 switch (op->last_sp)
763 { 776 {
764 case 0: /* furious--make all monsters mad */ 777 case 0: /* furious--make all monsters mad */
765 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) 778 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
766 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); 779 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);
780
767 if (QUERY_FLAG (tmp, FLAG_FRIENDLY)) 781 if (QUERY_FLAG (tmp, FLAG_FRIENDLY))
768 { 782 {
769 CLEAR_FLAG (tmp, FLAG_FRIENDLY);
770 remove_friendly_object (tmp);
771 tmp->attack_movement = 0; 783 tmp->attack_movement = 0;
772 /* lots of checks here, but want to make sure we don't 784 /* lots of checks here, but want to make sure we don't
773 * dereference a null value 785 * dereference a null value
774 */ 786 */
775 if (tmp->type == GOLEM && tmp->owner && tmp->owner->type == PLAYER && tmp->owner->contr->ranges[range_golem] == tmp) 787 if (tmp->type == GOLEM
788 && tmp->owner
789 && tmp->owner->type == PLAYER
790 && tmp->owner->contr->golem == tmp)
776 tmp->owner->contr->ranges[range_golem] = 0; 791 tmp->owner->contr->golem = 0;
777 792
778 tmp->owner = 0; 793 tmp->owner = 0;
794
795 remove_friendly_object (tmp);
779 } 796 }
780 break; 797 break;
798
781 case 1: /* angry -- get neutral monsters mad */ 799 case 1: /* angry -- get neutral monsters mad */
782 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY)) 800 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY))
783 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); 801 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);
784 break; 802 break;
803
785 case 2: /* calm -- pacify unfriendly monsters */ 804 case 2: /* calm -- pacify unfriendly monsters */
786 if (!QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
787 SET_FLAG (tmp, FLAG_UNAGGRESSIVE); 805 SET_FLAG (tmp, FLAG_UNAGGRESSIVE);
788 break; 806 break;
807
789 case 3: /* make all monsters fall asleep */ 808 case 3: /* make all monsters fall asleep */
790 if (!QUERY_FLAG (tmp, FLAG_SLEEP))
791 SET_FLAG (tmp, FLAG_SLEEP); 809 SET_FLAG (tmp, FLAG_SLEEP);
792 break; 810 break;
811
793 case 4: /* charm all monsters */ 812 case 4: /* charm all monsters */
794 if (op == source) 813 if (op == source)
795 break; /* only if 'connected' */ 814 break; /* only if 'connected' */
796 815
797 for (tmp2 = get_map_ob (source->map, source->x, source->y); /* finding an owner */ 816 if (object *pl = source->ms ().player ())
798 tmp2->type != PLAYER; tmp2 = tmp2->above) 817 {
799 if (tmp2->above == NULL) 818 tmp->set_owner (pl);
819 SET_FLAG (tmp, FLAG_MONSTER);
820
821 tmp->stats.exp = 0;
822
823 add_friendly_object (tmp);
824 tmp->attack_movement = PETMOVE;
825 }
800 break; 826 break;
801 827
802 if (tmp2->type != PLAYER) 828 case 6: // kill monsters
829 if (!QUERY_FLAG (tmp, FLAG_FRIENDLY))
803 break; 830 break;
804 tmp->set_owner (tmp2); 831
805 SET_FLAG (tmp, FLAG_MONSTER); 832 // FALL THROUGH
806 tmp->stats.exp = 0; 833 case 5: // kill all alives
807 SET_FLAG (tmp, FLAG_FRIENDLY); 834 if (!tmp->flag [FLAG_PRECIOUS])
808 add_friendly_object (tmp); 835 {
809 tmp->attack_movement = PETMOVE; 836 archetype::get (shstr_burnout)->insert_at (tmp, source);
837 tmp->destroy ();
838 }
810 break; 839 break;
811 840
812 default: 841 default:
813 break; 842 break;
814 } 843 }
818 * It will descend through containers to find the object. 847 * It will descend through containers to find the object.
819 * slaying = match object slaying flag 848 * slaying = match object slaying flag
820 * race = match object archetype name flag 849 * race = match object archetype name flag
821 * hp = match object type (excpt type '0'== PLAYER) 850 * hp = match object type (excpt type '0'== PLAYER)
822 */ 851 */
823
824object * 852object *
825check_inv_recursive (object *op, const object *trig) 853check_inv_recursive (object *op, const object *trig)
826{ 854{
827 object *tmp, *ret = NULL; 855 object *tmp, *ret = NULL;
828 856
829 /* First check the object itself. */ 857 /* First check the object itself. */
830 if ((trig->stats.hp && (op->type == trig->stats.hp)) 858 if ((trig->stats.hp && (op->type == trig->stats.hp))
831 || (trig->slaying && (op->slaying == trig->slaying)) 859 || (trig->slaying && (op->slaying == trig->slaying))
832 || (trig->race && (op->arch->name == trig->race))) 860 || (trig->race && (op->arch->archname == trig->race)))
833 return op; 861 return op;
834 862
835 for (tmp = op->inv; tmp; tmp = tmp->below) 863 for (tmp = op->inv; tmp; tmp = tmp->below)
836 { 864 {
837 if (tmp->inv) 865 if (tmp->inv)
840 if (ret) 868 if (ret)
841 return ret; 869 return ret;
842 } 870 }
843 else if ((trig->stats.hp && (tmp->type == trig->stats.hp)) 871 else if ((trig->stats.hp && (tmp->type == trig->stats.hp))
844 || (trig->slaying && (tmp->slaying == trig->slaying)) 872 || (trig->slaying && (tmp->slaying == trig->slaying))
845 || (trig->race && (tmp->arch->name == trig->race))) 873 || (trig->race && (tmp->arch->archname == trig->race)))
846 return tmp; 874 return tmp;
847 } 875 }
848 return NULL; 876 return NULL;
849} 877}
850 878
863 * and has a matching item. Imagine what happens if someone steps on the inventory 891 * and has a matching item. Imagine what happens if someone steps on the inventory
864 * checker with a matching item, has it, activates the connection, throws the item 892 * checker with a matching item, has it, activates the connection, throws the item
865 * away, and then leaves the inventory checker. That would've caused an always-enabled 893 * away, and then leaves the inventory checker. That would've caused an always-enabled
866 * state in the inventory checker. This won't happen anymore now. 894 * state in the inventory checker. This won't happen anymore now.
867 * 895 *
896 * Wed Jan 10 11:34:26 CET 2007 elmex: fixed this function, we now check
897 * whether op is on this mapspace or not, because the value (1|0) depends
898 * on this information. also make sure to only push_button if op has
899 * a matching item (because when we do a push_button with value=0 timed gates
900 * will still open)! (i hope i got the semantics right this time)
868 */ 901 *
869 902 */
870void 903void
871check_inv (object *op, object *trig) 904check_inv (object *op, object *trig)
872{ 905{
873 object *match = 0;
874
875 trig->value = 0; // deactivate if none of the following conditions apply 906 trig->value = 0; // deactivate if none of the following conditions apply
876 907
877 for (object *tmp = trig->above; tmp; tmp = tmp->above) 908 object *pl = trig->ms ().player ();
878 if (tmp->type == PLAYER)
879 {
880 object *match = check_inv_recursive (tmp, trig); 909 object *match = check_inv_recursive (op, trig);
881 910
911 // elmex: a note about (pl == op):
912 // if pl == 0 then the player has left this space
913 // if pl != 0 then a player is on this mapspace, but then
914 // we still have to check whether it's the player that triggered
915 // this inv-checker, because if not, then the op left this inv-checker
916 // and we have to set the value to 0
917
882 if (match && trig->last_sp) // match == having 918 if (match && trig->last_sp) // match == having
883 { 919 {
884 if (trig->last_heal) 920 if (trig->last_heal)
885 decrease_ob (match); 921 match->decrease ();
886 922
887 trig->value = 1; 923 trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left
888 } 924 push_button (trig, op);
925 }
889 else if (!match && !trig->last_sp) // match == not having 926 else if (!match && !trig->last_sp) // match == not having
890 trig->value = 1; 927 {
891 928 trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left
892 break;
893 }
894
895 push_button (trig); 929 push_button (trig, op);
930 }
896} 931}
897 932

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines