[ViewVC] Diff of: cvs/deliantra/server/server/time.C

Comparing deliantra/server/server/time.C (file contents):
Revision 1.84 by root, Thu Jan 8 04:35:05 2009 UTC vs.
Revision 1.118 by root, Fri Jan 27 22:00:40 2012 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* 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
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* 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,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* 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
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	/*	25	/*
49	}	50	}
50	}	51	}
51		52
52	if (op->other_arch)	53	if (op->other_arch)
53	{	54	{
54	object *tmp = arch_to_object (op->other_arch);	55	object *tmp = op->other_arch->instance ();
55	tmp->x = op->x;	56	tmp->x = op->x;
56	tmp->y = op->y;	57	tmp->y = op->y;
57	tmp->map = op->map;	58	tmp->map = op->map;
58	tmp->level = op->level;	59	tmp->level = op->level;
59	insert_ob_in_map (tmp, op->map, op, 0);	60	insert_ob_in_map (tmp, op->map, op, 0);
…		…
78	}	79	}
79	}	80	}
80		81
81	if (op->other_arch)	82	if (op->other_arch)
82	{	83	{
83	tmp = arch_to_object (op->other_arch);	84	tmp = op->other_arch->instance ();
84	tmp->x = op->x;	85	tmp->x = op->x;
85	tmp->y = op->y;	86	tmp->y = op->y;
86	tmp->map = op->map;	87	tmp->map = op->map;
87	tmp->level = op->level;	88	tmp->level = op->level;
88	insert_ob_in_map (tmp, op->map, op, 0);	89	insert_ob_in_map (tmp, op->map, op, 0);
89	}	90	}
90		91
91	op->drop_and_destroy ();	92	op->drop_and_destroy ();
92	}	93	}
93		94
94	void	95	static void
95	generate_monster (object *gen)	96	generate_monster (object *gen)
96	{	97	{
97	if (!gen->map)	98	if (!gen->map)
98	return;	99	return;
99		100
…		…
106	return;	107	return;
107		108
108	object *op;	109	object *op;
109	int dir;	110	int dir;
110		111
111	if (QUERY_FLAG (gen, FLAG_CONTENT_ON_GEN))	112	if (gen->flag [FLAG_CONTENT_ON_GEN])
112	{	113	{
113	// either copy one item from the inventory...	114	// either copy one item from the inventory...
114	if (!gen->inv)	115	if (!gen->inv)
115	return;	116	return;
116		117
…		…
124	if (dir < 0)	125	if (dir < 0)
125	return;	126	return;
126		127
127	op = op->deep_clone ();	128	op = op->deep_clone ();
128		129
129	CLEAR_FLAG (op, FLAG_IS_A_TEMPLATE);	130	op->clr_flag (FLAG_IS_A_TEMPLATE);
130	unflag_inv (op, FLAG_IS_A_TEMPLATE);	131	unflag_inv (op, FLAG_IS_A_TEMPLATE);
131	}	132	}
132	else if (gen->other_arch)	133	else if (gen->other_arch)
133	{	134	{
134	// ...or use other_arch	135	// ...or use other_arch
135	dir = find_free_spot (gen->other_arch, gen->map, gen->x, gen->y, 1, SIZEOFFREE1 + 1);	136	dir = find_free_spot (gen->other_arch, gen->map, gen->x, gen->y, 1, SIZEOFFREE1 + 1);
136	if (dir < 0)	137	if (dir < 0)
137	return;	138	return;
138		139
139	op = arch_to_object (gen->other_arch);	140	op = gen->other_arch->instance ();
140	}	141	}
141	else	142	else
142	return;	143	return;
143		144
144	op->expand_tail ();	145	op->expand_tail ();
…		…
157	}	158	}
158		159
159	op->destroy ();	160	op->destroy ();
160	}	161	}
161		162
162	void	163	static void
163	remove_force (object *op)	164	remove_force (object *op)
164	{	165	{
165	if (--op->duration > 0)	166	if (--op->duration > 0)
166	return;	167	return;
167		168
168	if (op->env)	169	if (op->env)
169	switch (op->subtype)	170	switch (op->subtype)
170	{	171	{
171	case FORCE_CONFUSION:	172	case FORCE_CONFUSION:
172	CLEAR_FLAG (op->env, FLAG_CONFUSED);	173	op->env->clr_flag (FLAG_CONFUSED);
173	new_draw_info (NDI_UNIQUE, 0, op->env, "You regain your senses.\n");	174	new_draw_info (NDI_UNIQUE, 0, op->env, "You regain your senses.\n");
174		175
175	default:	176	default:
176	CLEAR_FLAG (op, FLAG_APPLIED);	177	op->clr_flag (FLAG_APPLIED);
177	change_abil (op->env, op);	178	change_abil (op->env, op);
178	op->env->update_stats ();	179	op->env->update_stats ();
179	}	180	}
180		181
181	op->destroy ();	182	op->destroy ();
182	}	183	}
183		184
184	void	185	static void
185	remove_blindness (object *op)	186	remove_blindness (object *op)
186	{	187	{
187	if (--op->stats.food > 0)	188	if (--op->stats.food > 0)
188	return;	189	return;
189		190
190	CLEAR_FLAG (op, FLAG_APPLIED);	191	op->clr_flag (FLAG_APPLIED);
191		192
192	if (op->env)	193	if (op->env)
193	{	194	{
194	change_abil (op->env, op);	195	change_abil (op->env, op);
195	op->env->update_stats ();	196	op->env->update_stats ();
196	}	197	}
197		198
198	op->destroy ();	199	op->destroy ();
199	}	200	}
200		201
201	void	202	static void
202	poison_more (object *op)	203	poison_more (object *op)
203	{	204	{
204	if (op->env == NULL \|\| !QUERY_FLAG (op->env, FLAG_ALIVE) \|\| op->env->stats.hp < 0)	205	if (op->env == NULL \|\| !op->env->flag [FLAG_ALIVE] \|\| op->env->stats.hp < 0)
205	{	206	{
206	op->destroy ();	207	op->destroy ();
207	return;	208	return;
208	}	209	}
209		210
…		…
212	/* need to unapply the object before update_stats is called, else fix_player	213	/* need to unapply the object before update_stats is called, else fix_player
213	* will not do anything.	214	* will not do anything.
214	*/	215	*/
215	if (op->env->type == PLAYER)	216	if (op->env->type == PLAYER)
216	{	217	{
217	CLEAR_FLAG (op, FLAG_APPLIED);	218	op->clr_flag (FLAG_APPLIED);
218	op->env->update_stats ();	219	op->env->update_stats ();
219	new_draw_info (NDI_UNIQUE, 0, op->env, "You feel much better now.");	220	new_draw_info (NDI_UNIQUE, 0, op->env, "You feel much better now.");
220	}	221	}
221		222
222	op->destroy ();	223	op->destroy ();
…		…
231		232
232	hit_player (op->env, op->stats.dam, op, AT_INTERNAL, 1);	233	hit_player (op->env, op->stats.dam, op, AT_INTERNAL, 1);
233	}	234	}
234		235
235		236
236	void	237	static void
237	move_gate (object *op)	238	move_gate (object *op)
238	{ /* 1 = going down, 0 = going up */	239	{ /* 1 = going down, 0 = going up */
239	object *tmp;	240	object *tmp;
240		241
241	if (op->stats.wc < 0 \|\| (int) op->stats.wc >= NUM_ANIMATIONS (op))	242	if (op->stats.wc < 0 \|\| (int) op->stats.wc >= NUM_ANIMATIONS (op))
242	{	243	{
243	LOG (llevError, "Gate error: animation was %d, max=%d\n", op->stats.wc, NUM_ANIMATIONS (op));	244	LOG (llevError, "%s: gate error: animation was %d, max=%d\n", op->debug_desc (), op->stats.wc, NUM_ANIMATIONS (op));
244	op->stats.wc = 0;	245	op->stats.wc = 0;
245	}	246	}
246		247
247	/* We're going down */	248	/* We're going down */
248	if (op->value)	249	if (op->value)
249	{	250	{
250	if (--op->stats.wc <= 0)	251	if (--op->stats.wc <= 0)
251	{ /* Reached bottom, let's stop */	252	{ /* Reached bottom, let's stop */
252	op->stats.wc = 0;	253	op->stats.wc = 0;
253	if (op->arch->speed)	254	if (op->arch->has_active_speed ())
254	op->value = 0;	255	op->value = 0;
255	else	256	else
256	op->set_speed (0);	257	op->set_speed (0);
257	}	258	}
258		259
259	if ((int) op->stats.wc < (NUM_ANIMATIONS (op) / 2 + 1))	260	if ((int) op->stats.wc < (NUM_ANIMATIONS (op) / 2 + 1))
260	{	261	{
261	op->move_block = 0;	262	op->move_block = 0;
262	CLEAR_FLAG (op, FLAG_BLOCKSVIEW);	263	op->clr_flag (FLAG_BLOCKSVIEW);
263	update_all_los (op->map, op->x, op->y);	264	update_all_los (op->map, op->x, op->y);
264	}	265	}
265		266
266	SET_ANIMATION (op, op->stats.wc);	267	SET_ANIMATION (op, op->stats.wc);
267	update_object (op, UP_OBJ_CHANGE);	268	update_object (op, UP_OBJ_CHANGE);
…		…
271	/* We're going up */	272	/* We're going up */
272		273
273	/* First, lets see if we are already at the top */	274	/* First, lets see if we are already at the top */
274	if ((unsigned char) op->stats.wc == (NUM_ANIMATIONS (op) - 1))	275	if ((unsigned char) op->stats.wc == (NUM_ANIMATIONS (op) - 1))
275	{	276	{
276
277	/* Check to make sure that only non pickable and non rollable	277	/* Check to make sure that only non pickable and non rollable
278	* objects are above the gate. If so, we finish closing the gate,	278	* objects are above the gate. If so, we finish closing the gate,
279	* otherwise, we fall through to the code below which should lower	279	* otherwise, we fall through to the code below which should lower
280	* the gate slightly.	280	* the gate slightly.
281	*/	281	*/
282		282
283	for (tmp = op->above; tmp; tmp = tmp->above)	283	for (tmp = op->above; tmp; tmp = tmp->above)
284	if (!QUERY_FLAG (tmp, FLAG_NO_PICK) \|\| QUERY_FLAG (tmp, FLAG_CAN_ROLL) \|\| QUERY_FLAG (tmp, FLAG_ALIVE))	284	if (!tmp->flag [FLAG_NO_PICK] \|\| tmp->flag [FLAG_CAN_ROLL] \|\| tmp->flag [FLAG_ALIVE])
285	break;	285	break;
286		286
287	if (!tmp)	287	if (!tmp)
288	{	288	{
289	if (op->arch->speed)	289	if (op->arch->has_active_speed ())
290	op->value = 1;	290	op->value = 1;
291	else	291	else
292	op->set_speed (0);	292	op->set_speed (0);
293		293
294	return;	294	return;
…		…
320	for (tmp = op->above; tmp && tmp->above; tmp = tmp->above)	320	for (tmp = op->above; tmp && tmp->above; tmp = tmp->above)
321	;	321	;
322		322
323	if (tmp)	323	if (tmp)
324	{	324	{
325	if (QUERY_FLAG (tmp, FLAG_ALIVE))	325	if (tmp->flag [FLAG_ALIVE])
326	{	326	{
327	hit_player (tmp, random_roll (0, op->stats.dam, tmp, PREFER_LOW), op, AT_PHYSICAL, 1);	327	hit_player (tmp, random_roll (0, op->stats.dam, tmp, PREFER_LOW), op, AT_PHYSICAL, 1);
328	op->play_sound (sound_find ("blocked_gate"));	328	op->play_sound (sound_find ("blocked_gate"));
329		329
330	if (tmp->type == PLAYER)	330	if (tmp->type == PLAYER)
…		…
332	}	332	}
333	/* If the object is not alive, and the object either can	333	/* If the object is not alive, and the object either can
334	* be picked up or the object rolls, move the object	334	* be picked up or the object rolls, move the object
335	* off the gate.	335	* off the gate.
336	*/	336	*/
337	else if (!QUERY_FLAG (tmp, FLAG_ALIVE) && (!QUERY_FLAG (tmp, FLAG_NO_PICK) \|\| QUERY_FLAG (tmp, FLAG_CAN_ROLL)))	337	else if (!tmp->flag [FLAG_ALIVE] && (!tmp->flag [FLAG_NO_PICK] \|\| tmp->flag [FLAG_CAN_ROLL]))
338	{	338	{
339	/* If it has speed, it should move itself, otherwise: */	339	/* If it has speed, it should move itself, otherwise: */
340	int i = find_free_spot (tmp, op->map, op->x, op->y, 1, SIZEOFFREE1 + 1);	340	int i = find_free_spot (tmp, op->map, op->x, op->y, 1, SIZEOFFREE1 + 1);
341		341
342	/* If there is a free spot, move the object someplace */	342	/* If there is a free spot, move the object someplace */
…		…
350	}	350	}
351	}	351	}
352		352
353	/* See if there is still anything blocking the gate */	353	/* See if there is still anything blocking the gate */
354	for (tmp = op->above; tmp; tmp = tmp->above)	354	for (tmp = op->above; tmp; tmp = tmp->above)
355	if (!QUERY_FLAG (tmp, FLAG_NO_PICK) \|\| QUERY_FLAG (tmp, FLAG_CAN_ROLL) \|\| QUERY_FLAG (tmp, FLAG_ALIVE))	355	if (!tmp->flag [FLAG_NO_PICK] \|\| tmp->flag [FLAG_CAN_ROLL] \|\| tmp->flag [FLAG_ALIVE])
356	break;	356	break;
357		357
358	/* IF there is, start putting the gate down */	358	/* IF there is, start putting the gate down */
359	if (tmp)	359	if (tmp)
360	op->stats.food = 1;	360	op->stats.food = 1;
361	else	361	else
362	{	362	{
363	op->move_block = MOVE_ALL;	363	op->move_block = MOVE_ALL;
364		364
365	if (!op->arch->stats.ac)	365	if (!op->arch->stats.ac)
366	SET_FLAG (op, FLAG_BLOCKSVIEW);	366	op->set_flag (FLAG_BLOCKSVIEW);
367	update_all_los (op->map, op->x, op->y);	367	update_all_los (op->map, op->x, op->y);
368	}	368	}
369	} /* gate is halfway up */	369	} /* gate is halfway up */
370		370
371	SET_ANIMATION (op, op->stats.wc);	371	SET_ANIMATION (op, op->stats.wc);
…		…
375		375
376	/* hp : how long door is open/closed	376	/* hp : how long door is open/closed
377	* maxhp : initial value for hp	377	* maxhp : initial value for hp
378	* sp : 1 = open, 0 = close	378	* sp : 1 = open, 0 = close
379	*/	379	*/
380	void	380	static void
381	move_timed_gate (object *op)	381	move_timed_gate (object *op)
382	{	382	{
383	int v = op->value;	383	int v = op->value;
384		384
385	if (op->stats.sp)	385	if (op->stats.sp)
…		…
404	* speed: frequency of 'glances'	404	* speed: frequency of 'glances'
405	* connected: connected value of detector	405	* connected: connected value of detector
406	* sp: 1 if detection sets buttons	406	* sp: 1 if detection sets buttons
407	* -1 if detection unsets buttons	407	* -1 if detection unsets buttons
408	*/	408	*/
409		409	static void
410	void
411	move_detector (object *op)	410	move_detector (object *op)
412	{	411	{
413	object *tmp;	412	object *tmp;
414	int last = op->value;	413	int last = op->value;
415	int detected;	414	int detected;
…		…
482	SET_ANIMATION (op, op->stats.wc);	481	SET_ANIMATION (op, op->stats.wc);
483	update_object (op, UP_OBJ_FACE);	482	update_object (op, UP_OBJ_FACE);
484	}	483	}
485	}	484	}
486		485
487	void	486	static void
488	move_hole (object *op)	487	move_hole (object *op)
489	{ /* 1 = opening, 0 = closing */	488	{ /* 1 = opening, 0 = closing */
490	if (op->value)	489	if (op->value)
491	{ /* We're opening */	490	{ /* We're opening */
492	if (--op->stats.wc <= 0)	491	if (--op->stats.wc <= 0)
…		…
502	move_apply (op, tmp, tmp);	501	move_apply (op, tmp, tmp);
503	}	502	}
504	}	503	}
505		504
506	SET_ANIMATION (op, op->stats.wc);	505	SET_ANIMATION (op, op->stats.wc);
507	update_object (op, UP_OBJ_FACE);	506	update_object (op, UP_OBJ_CHANGE);
508	return;	507	return;
509	}	508	}
510		509
511	/* We're closing */	510	/* We're closing */
512	op->move_on = 0;	511	op->move_on = 0;
513		512
514	op->stats.wc++;	513	op->stats.wc++;
515	if ((int) op->stats.wc >= NUM_ANIMATIONS (op))	514	if (op->stats.wc >= NUM_ANIMATIONS (op))
516	op->stats.wc = NUM_ANIMATIONS (op) - 1;	515	op->stats.wc = NUM_ANIMATIONS (op) - 1;
517		516
518	SET_ANIMATION (op, op->stats.wc);	517	SET_ANIMATION (op, op->stats.wc);
519	update_object (op, UP_OBJ_FACE);	518	update_object (op, UP_OBJ_CHANGE);
520	if ((unsigned char) op->stats.wc == (NUM_ANIMATIONS (op) - 1))	519	if (op->stats.wc == (NUM_ANIMATIONS (op) - 1))
521	op->set_speed (0); /* closed, let's stop */	520	op->set_speed (0); /* closed, let's stop */
522	}	521	}
523		522
524		523
525	/* stop_item() returns a pointer to the stopped object. The stopped object	524	/* stop_item() returns a pointer to the stopped object. The stopped object
…		…
573	fix_stopped_item (object op, maptile map, object *originator)	572	fix_stopped_item (object op, maptile map, object *originator)
574	{	573	{
575	if (map == NULL)	574	if (map == NULL)
576	return;	575	return;
577		576
578	if (QUERY_FLAG (op, FLAG_REMOVED))	577	if (op->flag [FLAG_REMOVED])
579	insert_ob_in_map (op, map, originator, 0);	578	insert_ob_in_map (op, map, originator, 0);
580	else if (op->type == ARROW)	579	else if (op->type == ARROW)
581	merge_ob (op, NULL); /* only some arrows actually need this */	580	merge_ob (op, NULL); /* only some arrows actually need this */
582	}	581	}
583		582
…		…
599		598
600	// restore original wc, dam, attacktype and slaying	599	// restore original wc, dam, attacktype and slaying
601	op->stats.wc = op->stats.sp;	600	op->stats.wc = op->stats.sp;
602	op->stats.dam = op->stats.hp;	601	op->stats.dam = op->stats.hp;
603	op->attacktype = op->stats.grace;	602	op->attacktype = op->stats.grace;
		603	op->slaying = op->custom_name;
604		604
605	if (op->spellarg)
606	{
607	op->slaying = op->spellarg;
608	free (op->spellarg);
609	op->spellarg = 0;
610	}
611	else
612	op->slaying = 0;
613
614	/* Reset these to zero, so that object::can_merge will work properly */	605	/* Reset these to defaults, so that object::can_merge will work properly */
615	op->spellarg = NULL;	606	op->custom_name = 0;
616	op->stats.sp = 0;	607	op->stats.sp = 0;
617	op->stats.hp = 0;	608	op->stats.hp = 0;
618	op->stats.grace = 0;	609	op->stats.grace = 0;
619	op->level = 0;	610	op->level = 0;
620	op->face = op->arch->face;	611	op->face = op->arch->face;
621	op->owner = NULL; /* So that stopped arrows will be saved */	612	op->owner = 0;
		613
622	update_object (op, UP_OBJ_CHANGE);	614	update_object (op, UP_OBJ_CHANGE);
		615
623	return op;	616	return op;
624	}	617	}
625		618
626	/* stop_arrow() - what to do when a non-living flying object	619	/* stop_arrow() - what to do when a non-living flying object
627	* has to stop. Sept 96 - I added in thrown object code in	620	* has to stop. Sept 96 - I added in thrown object code in
…		…
652	if (op)	645	if (op)
653	merge_ob (op, 0);	646	merge_ob (op, 0);
654	}	647	}
655	}	648	}
656		649
657	/* Move an arrow along its course. op is the arrow or thrown object.	650	/* Move an arrow or throwen_obj along its course. op is the arrow or thrown object.
658	*/	651	*/
659	void	652	void
660	move_arrow (object *op)	653	move_arrow (object *op)
661	{	654	{
662	int was_reflected;	655	int was_reflected;
663		656
664	if (!op->map)	657	if (!op->map)
665	{	658	{
666	LOG (llevError, "BUG: Arrow had no map.\n");	659	LOG (llevError \| logBacktrace, "BUG: Arrow %s had no map.\n", op->debug_desc ());
667	op->destroy ();	660	op->destroy ();
668	return;	661	return;
669	}	662	}
670		663
671	/* we need to stop thrown objects at some point. Like here. */	664	/* we need to stop thrown objects at some point. Like here. */
…		…
690	stop_arrow (op);	683	stop_arrow (op);
691	return;	684	return;
692	}	685	}
693	}	686	}
694		687
		688	/* decrease the speed as it flies. 0.05 means a standard bow will shoot
		689	* about 17 squares. Tune as needed.
		690	*/
		691	op->set_speed (op->speed - 0.05);
		692
695	/* if the arrow is moving too slow.. stop it. 0.5 was chosen as lower	693	/* if the arrow is moving too slow.. stop it. 0.5 was chosen as lower
696	values look rediculous. */	694	values look rediculous. */
697	if (op->speed < 0.5 && op->type == ARROW)	695	if (op->speed < (op->type == ARROW ? 0.5 : MIN_ACTIVE_SPEED))
698	{	696	{
699	stop_arrow (op);	697	stop_arrow (op);
700	return;	698	return;
701	}	699	}
702		700
…		…
715	if (pos->flags () & P_IS_ALIVE)	713	if (pos->flags () & P_IS_ALIVE)
716	{	714	{
717	object *tmp;	715	object *tmp;
718		716
719	for (tmp = pos->bot; tmp; tmp = tmp->above)	717	for (tmp = pos->bot; tmp; tmp = tmp->above)
720	if (QUERY_FLAG (tmp, FLAG_ALIVE))	718	if (tmp->flag [FLAG_ALIVE])
721	break;	719	break;
722		720
723	/* Not really fair, but don't let monsters hit themselves with	721	/* Not really fair, but don't let monsters hit themselves with
724	* their own arrow - this can be because they fire it then	722	* their own arrow - this can be because they fire it then
725	* move into it.	723	* move into it.
…		…
728	{	726	{
729	/* Found living object, but it is reflecting the missile. Update	727	/* Found living object, but it is reflecting the missile. Update
730	* as below. (Note that for living creatures there is a small	728	* as below. (Note that for living creatures there is a small
731	* chance that reflect_missile fails.)	729	* chance that reflect_missile fails.)
732	*/	730	*/
733	if (QUERY_FLAG (tmp, FLAG_REFL_MISSILE) && (rndm (0, 99)) < (90 - op->level / 10))	731	if (tmp->flag [FLAG_REFL_MISSILE] && (rndm (0, 99)) < (90 - op->level / 10))
734	{	732	{
735	int number = op->face;
736
737	op->direction = absdir (op->direction + 4);	733	op->direction = absdir (op->direction + 4);
738	update_turn_face (op);	734	update_turn_face (op);
739	was_reflected = 1; /* skip normal movement calculations */	735	was_reflected = 1; /* skip normal movement calculations */
740	}	736	}
741	else	737	else
…		…
757	* note that this code will now catch cases where a monster is	753	* note that this code will now catch cases where a monster is
758	* on a wall but has reflecting - the arrow won't reflect.	754	* on a wall but has reflecting - the arrow won't reflect.
759	* Mapmakers shouldn't put monsters on top of wall in the first	755	* Mapmakers shouldn't put monsters on top of wall in the first
760	* place, so I don't consider that a problem.	756	* place, so I don't consider that a problem.
761	*/	757	*/
762	if (!QUERY_FLAG (op, FLAG_REFLECTING) \|\| !(rndm (0, 19)))	758	if (!op->flag [FLAG_REFLECTING] \|\| !rndm (0, 19))
763	{	759	{
764	stop_arrow (op);	760	stop_arrow (op);
765	return;	761	return;
766	}	762	}
767	else	763	else
…		…
816	return;	812	return;
817	}	813	}
818		814
819	/* update object image for new facing */	815	/* update object image for new facing */
820	/* many thrown objects don't have more than one face */	816	/* many thrown objects don't have more than one face */
821	if (GET_ANIM_ID (op))	817	if (op->has_anim ())
822	SET_ANIMATION (op, op->direction);	818	op->set_anim_frame (op->direction);
823	} /* object is reflected */	819	} /* object is reflected */
824	} /* object ran into a wall */	820	} /* object ran into a wall */
825		821
826	/* decrease the speed as it flies. 0.05 means a standard bow will shoot
827	* about 17 squares. Tune as needed.
828	*/
829	op->speed -= 0.05;
830
831	/* Move the arrow. */	822	/* Move the arrow. */
832	op->move_to (pos);	823	op->move_to (pos);
833	}	824	}
834		825
835	void	826	static void
836	change_object (object *op)	827	change_object (object *op)
837	{ /* Doesn`t handle linked objs yet */	828	{ /* Doesn`t handle linked objs yet */
838	int i, j;
839
840	if (!op->other_arch)	829	if (!op->other_arch)
841	{	830	{
842	LOG (llevError, "Change object (%s) without other_arch error.\n", op->debug_desc ());	831	LOG (llevError, "Change object (%s) without other_arch error.\n", op->debug_desc ());
843	return;	832	return;
844	}	833	}
845		834
846	/* In non-living items only change when food value is 0 */	835	/* In non-living items only change when food value is 0 */
847	if (!QUERY_FLAG (op, FLAG_ALIVE))	836	if (!op->flag [FLAG_ALIVE])
848	{	837	{
849	if (op->stats.food-- > 0)	838	if (op->stats.food-- > 0)
850	return;	839	return;
851		840
852	op->stats.food = 1; /* so 1 other_arch is made */	841	op->stats.food = 1; /* so 1 other_arch is made */
853	}	842	}
854		843
855	object *env = op->env;	844	object *env = op->env;
856		845
857	op->remove ();	846	op->remove ();
858	for (i = 0; i < op->stats.food; i++)	847	for (int i = 0; i < op->stats.food; i++)
859	{	848	{
860	object *tmp = arch_to_object (op->other_arch);	849	object *tmp = op->other_arch->instance ();
861
862	if (op->type == LAMP)
863	tmp->stats.food = op->stats.food - 1;
864		850
865	tmp->stats.hp = op->stats.hp; /* The only variable it keeps. */	851	tmp->stats.hp = op->stats.hp; /* The only variable it keeps. */
866		852
867	if (env)	853	if (env)
868	env->insert (tmp);	854	env->insert (tmp);
869	else	855	else
870	{	856	{
871	j = find_first_free_spot (tmp, op->map, op->x, op->y);	857	int j = find_first_free_spot (tmp, op->map, op->x, op->y);
		858
872	if (j < 0) /* No free spot */	859	if (j < 0) /* No free spot */
873	tmp->destroy ();	860	tmp->destroy ();
874	else	861	else
875	{	862	{
876	mapxy pos (op); pos.move (j);	863	mapxy pos (op); pos.move (j);
…		…
901		888
902	if (op->head)	889	if (op->head)
903	head = op->head;	890	head = op->head;
904		891
905	for (tmp = op->above; tmp; tmp = tmp->above)	892	for (tmp = op->above; tmp; tmp = tmp->above)
906	if (!QUERY_FLAG (tmp, FLAG_IS_FLOOR))	893	if (!tmp->flag [FLAG_IS_FLOOR])
907	break;	894	break;
908		895
909	/* If nothing above us to move, nothing to do */	896	/* If nothing above us to move, nothing to do */
910	if (!tmp \|\| QUERY_FLAG (tmp, FLAG_WIZPASS))	897	if (!tmp \|\| tmp->flag [FLAG_WIZPASS])
911	return;	898	return;
912		899
913	if (EXIT_PATH (head))	900	if (EXIT_PATH (head))
914	{	901	{
915	if (tmp->type == PLAYER)	902	if (tmp->type == PLAYER)
…		…
950	/* This object will teleport someone to a different map	937	/* This object will teleport someone to a different map
951	and will also apply changes to the player from its inventory.	938	and will also apply changes to the player from its inventory.
952	This was invented for giving classes, but there's no reason it	939	This was invented for giving classes, but there's no reason it
953	can't be generalized.	940	can't be generalized.
954	*/	941	*/
955	void	942	static void
956	move_player_changer (object *op)	943	move_player_changer (object *op)
957	{	944	{
958	object *player;
959	object *walk;
960
961	if (!op->above \|\| !EXIT_PATH (op))	945	if (!op->above \|\| !EXIT_PATH (op))
962	return;	946	return;
963		947
964	/* This isn't all that great - means that the player_mover	948	/* This isn't all that great - means that the player_mover
965	* needs to be on top.	949	* needs to be on top.
966	*/	950	*/
967	if (op->above->type == PLAYER)	951	if (op->above->type == PLAYER)
968	{	952	{
		953	object *player = op->above;
		954
969	if (INVOKE_OBJECT (TRIGGER, op, ARG_OBJECT (player)))	955	if (INVOKE_OBJECT (TRIGGER, op, ARG_OBJECT (player)))
970	return;	956	return;
971		957
972	player = op->above;
973
974	for (walk = op->inv; walk; walk = walk->below)	958	for (object *walk = op->inv; walk; walk = walk->below)
975	apply_changes_to_player (player, walk);	959	apply_changes_to_player (player, walk);
976		960
977	player->update_stats ();	961	player->update_stats ();
978		962
979	esrv_send_inventory (op->above, op->above);	963	esrv_send_inventory (op->above, op->above);
…		…
1017	}	1001	}
1018		1002
1019	cast_spell (op, op, op->stats.sp ? op->stats.sp : rndm (1, 8), spell, NULL);	1003	cast_spell (op, op, op->stats.sp ? op->stats.sp : rndm (1, 8), spell, NULL);
1020	}	1004	}
1021		1005
1022	/* move_player_mover: this function takes a "player mover" as an	1006	/* move_player_mover: this function takes a "player mover" as an
1023	* argument, and performs the function of a player mover, which is:	1007	* argument, and performs the function of a player mover, which is:
1024	*	1008	*
1025	* a player mover finds any players that are sitting on it. It	1009	* a player mover finds any players that are sitting on it. It
1026	* moves them in the op->stats.sp direction. speed is how often it'll move.	1010	* moves them in the op->stats.sp direction. speed is how often it'll move.
1027	* If attacktype is nonzero it will paralyze the player. If lifesave is set,	1011	* If attacktype is nonzero it will paralyze the player. If lifesave is set,
1028	* it'll dissapear after hp+1 moves. If hp is set and attacktype is set,	1012	* it'll dissapear after hp+1 moves. If hp is set and attacktype is set,
1029	* it'll paralyze the victim for hp*his speed/op->speed	1013	* it'll paralyze the victim for hp*his speed/op->speed
1030	*/	1014	*/
1031	void	1015	static void
1032	move_player_mover (object *op)	1016	move_player_mover (object *op)
1033	{	1017	{
1034	int dir = op->stats.sp;	1018	int dir = 0;
1035	sint16 nx, ny;
1036	maptile *m;
1037
1038	/* Determine direction now for random movers so we do the right thing */
1039	if (!dir)
1040	dir = rndm (1, 8);
1041		1019
1042	for (object *victim = op->ms ().bot; victim; victim = victim->above)	1020	for (object *victim = op->ms ().bot; victim; victim = victim->above)
1043	{	1021	{
1044	if (QUERY_FLAG (victim, FLAG_ALIVE) && !QUERY_FLAG (victim, FLAG_WIZPASS) &&	1022	if (victim->flag [FLAG_ALIVE]
		1023	&& !victim->flag [FLAG_WIZPASS]
1045	(victim->move_type & op->move_type \|\| !victim->move_type))	1024	&& (victim->move_type & op->move_type \|\| !victim->move_type))
		1025	{
		1026	if (op->flag [FLAG_LIFESAVE] && op->stats.hp-- < 0)
1046	{	1027	{
		1028	op->destroy ();
		1029	return;
		1030	}
		1031
		1032	/* Determine direction only once so we do the right thing */
		1033	// why is it the right thing, though?
		1034	if (!dir)
		1035	dir = op->stats.sp ? op->stats.sp : rndm (1, 8);
		1036
		1037	sint16 nx = op->x + freearr_x[dir];
		1038	sint16 ny = op->y + freearr_y[dir];
		1039	maptile *m = op->map;
		1040	if (get_map_flags (m, &m, nx, ny, &nx, &ny) & P_OUT_OF_MAP)
		1041	{
		1042	LOG (llevError, "move_player_mover: Trying to push player off the map! map=%s (%d, %d)\n", &m->path, op->x, op->y);
		1043	return;
		1044	}
1047		1045
1048	if (victim->head)	1046	if (victim->head)
1049	victim = victim->head;	1047	victim = victim->head;
1050		1048
1051	if (QUERY_FLAG (op, FLAG_LIFESAVE) && op->stats.hp-- < 0)
1052	{
1053	op->remove ();
1054	return;
1055	}
1056
1057	nx = op->x + freearr_x[dir];
1058	ny = op->y + freearr_y[dir];
1059	m = op->map;
1060	if (get_map_flags (m, &m, nx, ny, &nx, &ny) & P_OUT_OF_MAP)
1061	{
1062	LOG (llevError, "move_player_mover: Trying to push player off the map! map=%s (%d, %d)\n", &m->path, op->x, op->y);
1063	return;
1064	}
1065
1066	if (should_director_abort (op, victim))	1049	if (should_director_abort (op, victim))
1067	return;	1050	return;
1068		1051
1069	for (object *nextmover = m->at (nx, ny).bot; nextmover; nextmover = nextmover->above)	1052	for (object *nextmover = m->at (nx, ny).bot; nextmover; nextmover = nextmover->above)
1070	{	1053	{
1071	if (nextmover->type == PLAYERMOVER)	1054	if (nextmover->type == PLAYERMOVER)
1072	nextmover->speed_left = -.99f;	1055	nextmover->speed_left = -.99f;
1073		1056
1074	if (QUERY_FLAG (nextmover, FLAG_ALIVE))	1057	if (nextmover->flag [FLAG_ALIVE])
1075	op->speed_left = -1.1f; /* wait until the next thing gets out of the way */	1058	op->speed_left = -1.1f; /* wait until the next thing gets out of the way */
1076	}	1059	}
1077		1060
1078	if (victim->type == PLAYER)	1061	if (victim->type == PLAYER)
1079	{	1062	{
1080	/* only level >=1 movers move people */	1063	/* only level >=1 movers move people */
1081	if (op->level)	1064	if (op->level)
1082	{	1065	{
1083	/* Following is a bit of hack. We need to make sure it	1066	/* Following is a bit of hack. We need to make sure it
1084	* is cleared, otherwise the player will get stuck in	1067	* is cleared, otherwise the player will get stuck in
1085	* place. This can happen if the player used a spell to	1068	* place. This can happen if the player used a spell to
1086	* get to this space.	1069	* get to this space.
1087	*/	1070	*/
1088	victim->contr->fire_on = 0;	1071	victim->contr->fire_on = 0;
1089	victim->speed_left = 1.f;	1072	victim->speed_left = 1.f;
1090	move_player (victim, dir);	1073	move_player (victim, dir);
1091	}	1074	}
1092	else	1075	else
1093	return;	1076	return;
1094	}	1077	}
1095	else	1078	else
1096	move_object (victim, dir);	1079	victim->move (dir);
1097		1080
1098	if (!op->stats.maxsp && op->attacktype)	1081	if (!op->stats.maxsp && op->attacktype)
1099	op->stats.maxsp = 2;	1082	op->stats.maxsp = 2;
1100		1083
1101	if (op->attacktype)	1084	if (op->attacktype)
1102	{ /* flag to paralyze the player */	1085	{ /* flag to paralyze the player */
1103	victim->speed_left = max (-5.f, -FABS (op->stats.maxsp * victim->speed / op->speed));	1086	victim->speed_left = max (-5.f, -op->stats.maxsp * victim->speed / op->speed);
1104	}	1087	}
1105	}	1088	}
1106	}	1089	}
1107	}	1090	}
1108		1091
…		…
1164	void	1147	void
1165	move_creator (object *creator)	1148	move_creator (object *creator)
1166	{	1149	{
1167	object *new_ob;	1150	object *new_ob;
1168		1151
1169	if (!QUERY_FLAG (creator, FLAG_LIFESAVE) && --creator->stats.hp < 0)	1152	if (!creator->flag [FLAG_LIFESAVE] && --creator->stats.hp < 0)
1170	{	1153	{
1171	creator->stats.hp = -1;	1154	creator->stats.hp = -1;
1172	return;	1155	return;
1173	}	1156	}
1174		1157
…		…
1178	int i;	1161	int i;
1179	object *ob_to_copy;	1162	object *ob_to_copy;
1180		1163
1181	/* select random object from inventory to copy */	1164	/* select random object from inventory to copy */
1182	ob_to_copy = creator->inv;	1165	ob_to_copy = creator->inv;
1183	for (ob = creator->inv->below, i = 1; ob != NULL; ob = ob->below, i++)	1166	for (ob = creator->inv->below, i = 1; ob; ob = ob->below, i++)
1184	{	1167	{
1185	if (rndm (0, i) == 0)	1168	if (rndm (0, i) == 0)
1186	{	1169	{
1187	ob_to_copy = ob;	1170	ob_to_copy = ob;
1188	}	1171	}
1189	}	1172	}
		1173
1190	new_ob = ob_to_copy->deep_clone ();	1174	new_ob = ob_to_copy->deep_clone ();
1191	CLEAR_FLAG (new_ob, FLAG_IS_A_TEMPLATE);	1175	new_ob->clr_flag (FLAG_IS_A_TEMPLATE);
1192	unflag_inv (new_ob, FLAG_IS_A_TEMPLATE);	1176	unflag_inv (new_ob, FLAG_IS_A_TEMPLATE);
1193	}	1177	}
1194	else	1178	else
1195	{	1179	{
1196	if (!creator->other_arch)	1180	if (!creator->other_arch)
…		…
1211	return;	1195	return;
1212	}	1196	}
1213		1197
1214	// for now lets try to identify everything generated here, it mostly	1198	// for now lets try to identify everything generated here, it mostly
1215	// happens automated, so this will at least fix many identify-experience holes	1199	// happens automated, so this will at least fix many identify-experience holes
1216	SET_FLAG (new_ob, FLAG_IDENTIFIED);	1200	if (new_ob->need_identify ())
		1201	new_ob->set_flag (FLAG_IDENTIFIED);
1217		1202
1218	insert_ob_in_map_at (new_ob, creator->map, creator, 0, creator->x, creator->y);	1203	insert_ob_in_map_at (new_ob, creator->map, creator, 0, creator->x, creator->y);
1219	if (QUERY_FLAG (new_ob, FLAG_FREED))	1204	if (new_ob->flag [FLAG_FREED])
1220	return;	1205	return;
1221		1206
1222	if (creator->slaying)	1207	if (creator->slaying)
1223	new_ob->name = new_ob->title = creator->slaying;	1208	new_ob->name = new_ob->title = creator->slaying;
1224	}	1209	}
…		…
1238	{	1223	{
1239	/* remove an old force with a slaying field == op->name */	1224	/* remove an old force with a slaying field == op->name */
1240	if (object *force = tmp->force_find (op->name))	1225	if (object *force = tmp->force_find (op->name))
1241	force->destroy ();	1226	force->destroy ();
1242		1227
1243	if (!tmp->force_find (op->slaying))	1228	if (op->slaying && !tmp->force_find (op->slaying))
1244	{	1229	{
1245	tmp->force_add (op->slaying, op->stats.food);	1230	tmp->force_add (op->slaying, op->stats.food);
1246		1231
1247	if (op->msg)	1232	if (op->msg)
1248	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, tmp, op->msg);	1233	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, tmp, op->msg);
…		…
1262	}	1247	}
1263	}	1248	}
1264		1249
1265	// mapscript objects activate themselves (only) then their timer fires	1250	// mapscript objects activate themselves (only) then their timer fires
1266	// TODO: maybe they should simply trigger the link like any other object?	1251	// TODO: maybe they should simply trigger the link like any other object?
1267	void	1252	static void
1268	move_mapscript (object *op)	1253	move_mapscript (object *op)
1269	{	1254	{
1270	op->set_speed (0);	1255	op->set_speed (0);
1271	cfperl_mapscript_activate (op, true, op, 0);	1256	cfperl_mapscript_activate (op, true, op, 0);
1272	}	1257	}
1273		1258
		1259	static void
		1260	move_lamp (object *op)
		1261	{
		1262	// if the lamp/torch is off, we should disable it.
		1263	if (!op->glow_radius)
		1264	{
		1265	op->set_speed (0);
		1266	return;
		1267	}
		1268	else
		1269	{
		1270	// check whether the face might need to be updated
		1271	// (currently this is needed to have already switched on torches
		1272	// on maps, as they just set the glow_radius in the archetype)
		1273	if (op->other_arch
		1274	&& (
		1275	(op->flag [FLAG_ANIMATE] != op->other_arch->flag [FLAG_ANIMATE])
		1276	\|\| (op->flag [FLAG_ANIMATE]
		1277	? (op->animation_id != op->other_arch->animation_id)
		1278	: (op->face != op->other_arch->face))
		1279	))
		1280	get_animation_from_arch (op, op->other_arch);
		1281	}
		1282
		1283	// lamps and torches on maps don't use up their fuel
		1284	if (op->is_on_map ())
		1285	return;
		1286
		1287	if (op->stats.food > 0)
		1288	{
		1289	op->stats.food--;
		1290	return;
		1291	}
		1292
		1293	apply_lamp (op, false);
		1294	}
		1295
1274	void	1296	void
1275	process_object (object *op)	1297	process_object (object *op)
1276	{	1298	{
1277	if (expect_false (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)))	1299	if (expect_false (op->flag [FLAG_IS_A_TEMPLATE]))
1278	return;	1300	return;
1279		1301
1280	if (expect_false (INVOKE_OBJECT (TICK, op)))	1302	if (expect_false (INVOKE_OBJECT (TICK, op)))
1281	return;	1303	return;
1282		1304
1283	if (QUERY_FLAG (op, FLAG_MONSTER))	1305	if (op->flag [FLAG_MONSTER])
1284	if (move_monster (op) \|\| QUERY_FLAG (op, FLAG_FREED))	1306	if (move_monster (op) \|\| op->flag [FLAG_FREED])
1285	return;	1307	return;
1286		1308
1287	if (QUERY_FLAG (op, FLAG_ANIMATE) && op->anim_speed == 0)	1309	if (op->flag [FLAG_ANIMATE] && op->anim_speed == 0)
1288	{	1310	{
1289	animate_object (op, op->contr ? op->facing : op->direction);	1311	animate_object (op, op->contr ? op->facing : op->direction);
1290		1312
1291	if (QUERY_FLAG (op, FLAG_SEE_ANYWHERE))	1313	if (op->flag [FLAG_SEE_ANYWHERE])
1292	make_sure_seen (op);	1314	make_sure_seen (op);
1293	}	1315	}
1294		1316
1295	if (expect_false (	1317	if (expect_false (
1296	op->flag [FLAG_GENERATOR]	1318	op->flag [FLAG_GENERATOR]
1297	\|\| op->flag [FLAG_CHANGING]	1319	\|\| op->flag [FLAG_CHANGING]
1298	\|\| op->flag [FLAG_IS_USED_UP]	1320	\|\| op->flag [FLAG_IS_USED_UP]
1299	))	1321	))
1300	{	1322	{
1301	if (QUERY_FLAG (op, FLAG_CHANGING) && !op->state)	1323	if (op->flag [FLAG_CHANGING] && !op->state)
1302	{	1324	{
1303	change_object (op);	1325	change_object (op);
1304	return;	1326	return;
1305	}	1327	}
1306		1328
1307	if (QUERY_FLAG (op, FLAG_GENERATOR) && !QUERY_FLAG (op, FLAG_FRIENDLY))	1329	if (op->flag [FLAG_GENERATOR] && !op->flag [FLAG_FRIENDLY])
1308	generate_monster (op);	1330	generate_monster (op);
1309		1331
1310	if (QUERY_FLAG (op, FLAG_IS_USED_UP) && --op->stats.food <= 0)	1332	if (op->flag [FLAG_IS_USED_UP] && --op->stats.food <= 0)
1311	{	1333	{
1312	if (QUERY_FLAG (op, FLAG_APPLIED))	1334	if (op->flag [FLAG_APPLIED])
1313	remove_force (op);	1335	remove_force (op);
1314	else	1336	else
1315	{	1337	{
1316	op->remove (); // TODO: really necessary?	1338	op->remove (); // TODO: really necessary?
1317		1339
1318	if (QUERY_FLAG (op, FLAG_SEE_ANYWHERE))	1340	if (op->flag [FLAG_SEE_ANYWHERE])
1319	make_sure_not_seen (op);	1341	make_sure_not_seen (op);
1320		1342
1321	op->drop_and_destroy ();	1343	op->drop_and_destroy ();
1322	}	1344	}
1323		1345
…		…
1454	break;	1476	break;
1455		1477
1456	case MAPSCRIPT:	1478	case MAPSCRIPT:
1457	move_mapscript (op);	1479	move_mapscript (op);
1458	break;	1480	break;
1459	}
1460	}
1461		1481
		1482	case LAMP:
		1483	case TORCH:
		1484	move_lamp (op);
		1485	break;
		1486
		1487	case PHYSICS: // hmm, bad naming
		1488	move_physics (op);
		1489	break;
		1490	}
		1491	}
		1492

Diff Legend

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

Comparing deliantra/server/server/time.C (file contents): Revision 1.84 by root, Thu Jan 8 04:35:05 2009 UTC vs. Revision 1.118 by root, Fri Jan 27 22:00:40 2012 UTC

Diff Legend

Comparing deliantra/server/server/time.C (file contents):
Revision 1.84 by root, Thu Jan 8 04:35:05 2009 UTC vs.
Revision 1.118 by root, Fri Jan 27 22:00:40 2012 UTC