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.4 by elmex, Wed Aug 30 12:42:56 2006 UTC vs.
Revision 1.38 by elmex, Tue Jul 31 18:28:46 2007 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines