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

Diff Legend

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