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.3 by elmex, Tue Aug 29 17:29:27 2006 UTC vs.
Revision 1.58 by root, Thu Oct 15 21:40:42 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines