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

Comparing deliantra/server/server/time.C (file contents):
Revision 1.83 by elmex, Thu Jan 1 15:48:57 2009 UTC vs.
Revision 1.105 by root, Fri Mar 26 01:04:45 2010 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 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
…		…
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
…		…
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
…		…
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 \|\| !QUERY_FLAG (op->env, FLAG_ALIVE) \|\| op->env->stats.hp < 0)
205	{	206	{
206	op->destroy ();	207	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))
…		…
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
…		…
284	if (!QUERY_FLAG (tmp, FLAG_NO_PICK) \|\| QUERY_FLAG (tmp, FLAG_CAN_ROLL) \|\| QUERY_FLAG (tmp, FLAG_ALIVE))	285	if (!QUERY_FLAG (tmp, FLAG_NO_PICK) \|\| QUERY_FLAG (tmp, FLAG_CAN_ROLL) \|\| QUERY_FLAG (tmp, FLAG_ALIVE))
285	break;	286	break;
286		287
287	if (!tmp)	288	if (!tmp)
288	{	289	{
289	if (op->arch->speed)	290	if (op->arch->has_active_speed ())
290	op->value = 1;	291	op->value = 1;
291	else	292	else
292	op->set_speed (0);	293	op->set_speed (0);
293		294
294	return;	295	return;
…		…
375		376
376	/* hp : how long door is open/closed	377	/* hp : how long door is open/closed
377	* maxhp : initial value for hp	378	* maxhp : initial value for hp
378	* sp : 1 = open, 0 = close	379	* sp : 1 = open, 0 = close
379	*/	380	*/
380	void	381	static void
381	move_timed_gate (object *op)	382	move_timed_gate (object *op)
382	{	383	{
383	int v = op->value;	384	int v = op->value;
384		385
385	if (op->stats.sp)	386	if (op->stats.sp)
…		…
404	* speed: frequency of 'glances'	405	* speed: frequency of 'glances'
405	* connected: connected value of detector	406	* connected: connected value of detector
406	* sp: 1 if detection sets buttons	407	* sp: 1 if detection sets buttons
407	* -1 if detection unsets buttons	408	* -1 if detection unsets buttons
408	*/	409	*/
409		410	static void
410	void
411	move_detector (object *op)	411	move_detector (object *op)
412	{	412	{
413	object *tmp;	413	object *tmp;
414	int last = op->value;	414	int last = op->value;
415	int detected;	415	int detected;
…		…
442	if (op->stats.sp == 1)	442	if (op->stats.sp == 1)
443	{	443	{
444	if (detected && last == 0)	444	if (detected && last == 0)
445	{	445	{
446	op->value = 1;	446	op->value = 1;
447	push_button (op);	447	push_button (op, tmp);
448	}	448	}
449		449
450	if (!detected && last == 1)	450	if (!detected && last == 1)
451	{	451	{
452	op->value = 0;	452	op->value = 0;
453	push_button (op);	453	push_button (op, tmp);
454	}	454	}
455	}	455	}
456	else	456	else
457	{ /* in this case, we unset buttons */	457	{ /* in this case, we unset buttons */
458	if (detected && last == 1)	458	if (detected && last == 1)
459	{	459	{
460	op->value = 0;	460	op->value = 0;
461	push_button (op);	461	push_button (op, tmp);
462	}	462	}
463		463
464	if (!detected && last == 0)	464	if (!detected && last == 0)
465	{	465	{
466	op->value = 1;	466	op->value = 1;
467	push_button (op);	467	push_button (op, tmp);
468	}	468	}
469	}	469	}
470	}	470	}
471		471
472	void	472	void
…		…
482	SET_ANIMATION (op, op->stats.wc);	482	SET_ANIMATION (op, op->stats.wc);
483	update_object (op, UP_OBJ_FACE);	483	update_object (op, UP_OBJ_FACE);
484	}	484	}
485	}	485	}
486		486
487	void	487	static void
488	move_hole (object *op)	488	move_hole (object *op)
489	{ /* 1 = opening, 0 = closing */	489	{ /* 1 = opening, 0 = closing */
490	if (op->value)	490	if (op->value)
491	{ /* We're opening */	491	{ /* We're opening */
492	if (--op->stats.wc <= 0)	492	if (--op->stats.wc <= 0)
…		…
599		599
600	// restore original wc, dam, attacktype and slaying	600	// restore original wc, dam, attacktype and slaying
601	op->stats.wc = op->stats.sp;	601	op->stats.wc = op->stats.sp;
602	op->stats.dam = op->stats.hp;	602	op->stats.dam = op->stats.hp;
603	op->attacktype = op->stats.grace;	603	op->attacktype = op->stats.grace;
		604	op->slaying = op->custom_name;
604		605
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 */	606	/* Reset these to defaults, so that object::can_merge will work properly */
615	op->spellarg = NULL;	607	op->custom_name = 0;
616	op->stats.sp = 0;	608	op->stats.sp = 0;
617	op->stats.hp = 0;	609	op->stats.hp = 0;
618	op->stats.grace = 0;	610	op->stats.grace = 0;
619	op->level = 0;	611	op->level = 0;
620	op->face = op->arch->face;	612	op->face = op->arch->face;
621	op->owner = NULL; /* So that stopped arrows will be saved */	613	op->owner = 0;
		614
622	update_object (op, UP_OBJ_CHANGE);	615	update_object (op, UP_OBJ_CHANGE);
		616
623	return op;	617	return op;
624	}	618	}
625		619
626	/* stop_arrow() - what to do when a non-living flying object	620	/* stop_arrow() - what to do when a non-living flying object
627	* has to stop. Sept 96 - I added in thrown object code in	621	* has to stop. Sept 96 - I added in thrown object code in
…		…
816	return;	810	return;
817	}	811	}
818		812
819	/* update object image for new facing */	813	/* update object image for new facing */
820	/* many thrown objects don't have more than one face */	814	/* many thrown objects don't have more than one face */
821	if (GET_ANIM_ID (op))	815	if (op->has_anim ())
822	SET_ANIMATION (op, op->direction);	816	op->set_anim_frame (op->direction);
823	} /* object is reflected */	817	} /* object is reflected */
824	} /* object ran into a wall */	818	} /* object ran into a wall */
825		819
826	/* decrease the speed as it flies. 0.05 means a standard bow will shoot	820	/* decrease the speed as it flies. 0.05 means a standard bow will shoot
827	* about 17 squares. Tune as needed.	821	* about 17 squares. Tune as needed.
…		…
830		824
831	/* Move the arrow. */	825	/* Move the arrow. */
832	op->move_to (pos);	826	op->move_to (pos);
833	}	827	}
834		828
835	void	829	static void
836	change_object (object *op)	830	change_object (object *op)
837	{ /* Doesn`t handle linked objs yet */	831	{ /* Doesn`t handle linked objs yet */
838	int i, j;
839
840	if (!op->other_arch)	832	if (!op->other_arch)
841	{	833	{
842	LOG (llevError, "Change object (%s) without other_arch error.\n", op->debug_desc ());	834	LOG (llevError, "Change object (%s) without other_arch error.\n", op->debug_desc ());
843	return;	835	return;
844	}	836	}
…		…
853	}	845	}
854		846
855	object *env = op->env;	847	object *env = op->env;
856		848
857	op->remove ();	849	op->remove ();
858	for (i = 0; i < op->stats.food; i++)	850	for (int i = 0; i < op->stats.food; i++)
859	{	851	{
860	object *tmp = arch_to_object (op->other_arch);	852	object *tmp = op->other_arch->instance ();
861
862	if (op->type == LAMP)
863	tmp->stats.food = op->stats.food - 1;
864		853
865	tmp->stats.hp = op->stats.hp; /* The only variable it keeps. */	854	tmp->stats.hp = op->stats.hp; /* The only variable it keeps. */
866		855
867	if (env)	856	if (env)
868	env->insert (tmp);	857	env->insert (tmp);
869	else	858	else
870	{	859	{
871	j = find_first_free_spot (tmp, op->map, op->x, op->y);	860	int j = find_first_free_spot (tmp, op->map, op->x, op->y);
		861
872	if (j < 0) /* No free spot */	862	if (j < 0) /* No free spot */
873	tmp->destroy ();	863	tmp->destroy ();
874	else	864	else
875	{	865	{
876	mapxy pos (op); pos.move (j);	866	mapxy pos (op); pos.move (j);
…		…
950	/* This object will teleport someone to a different map	940	/* This object will teleport someone to a different map
951	and will also apply changes to the player from its inventory.	941	and will also apply changes to the player from its inventory.
952	This was invented for giving classes, but there's no reason it	942	This was invented for giving classes, but there's no reason it
953	can't be generalized.	943	can't be generalized.
954	*/	944	*/
955	void	945	static void
956	move_player_changer (object *op)	946	move_player_changer (object *op)
957	{	947	{
958	object *player;
959	object *walk;
960
961	if (!op->above \|\| !EXIT_PATH (op))	948	if (!op->above \|\| !EXIT_PATH (op))
962	return;	949	return;
963		950
964	/* This isn't all that great - means that the player_mover	951	/* This isn't all that great - means that the player_mover
965	* needs to be on top.	952	* needs to be on top.
966	*/	953	*/
967	if (op->above->type == PLAYER)	954	if (op->above->type == PLAYER)
968	{	955	{
		956	object *player = op->above;
		957
969	if (INVOKE_OBJECT (TRIGGER, op, ARG_OBJECT (player)))	958	if (INVOKE_OBJECT (TRIGGER, op, ARG_OBJECT (player)))
970	return;	959	return;
971		960
972	player = op->above;
973
974	for (walk = op->inv; walk; walk = walk->below)	961	for (object *walk = op->inv; walk; walk = walk->below)
975	apply_changes_to_player (player, walk);	962	apply_changes_to_player (player, walk);
976		963
977	player->update_stats ();	964	player->update_stats ();
978		965
979	esrv_send_inventory (op->above, op->above);	966	esrv_send_inventory (op->above, op->above);
…		…
1026	* moves them in the op->stats.sp direction. speed is how often it'll move.	1013	* 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,	1014	* 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,	1015	* 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	1016	* it'll paralyze the victim for hp*his speed/op->speed
1030	*/	1017	*/
1031	void	1018	static void
1032	move_player_mover (object *op)	1019	move_player_mover (object *op)
1033	{	1020	{
1034	int dir = op->stats.sp;	1021	int dir = op->stats.sp;
1035	sint16 nx, ny;	1022	sint16 nx, ny;
1036	maptile *m;	1023	maptile *m;
…		…
1080	/* only level >=1 movers move people */	1067	/* only level >=1 movers move people */
1081	if (op->level)	1068	if (op->level)
1082	{	1069	{
1083	/* Following is a bit of hack. We need to make sure it	1070	/* Following is a bit of hack. We need to make sure it
1084	* is cleared, otherwise the player will get stuck in	1071	* is cleared, otherwise the player will get stuck in
1085	* place. This can happen if the player used a spell to	1072	* place. This can happen if the player used a spell to
1086	* get to this space.	1073	* get to this space.
1087	*/	1074	*/
1088	victim->contr->fire_on = 0;	1075	victim->contr->fire_on = 0;
1089	victim->speed_left = 1.f;	1076	victim->speed_left = 1.f;
1090	move_player (victim, dir);	1077	move_player (victim, dir);
1091	}	1078	}
1092	else	1079	else
1093	return;	1080	return;
1094	}	1081	}
1095	else	1082	else
1096	move_object (victim, dir);	1083	victim->move (dir);
1097		1084
1098	if (!op->stats.maxsp && op->attacktype)	1085	if (!op->stats.maxsp && op->attacktype)
1099	op->stats.maxsp = 2;	1086	op->stats.maxsp = 2;
1100		1087
1101	if (op->attacktype)	1088	if (op->attacktype)
1102	{ /* flag to paralyze the player */	1089	{ /* flag to paralyze the player */
1103	victim->speed_left = max (-5.f, -FABS (op->stats.maxsp * victim->speed / op->speed));	1090	victim->speed_left = max (-5.f, -op->stats.maxsp * victim->speed / op->speed);
1104	}	1091	}
1105	}	1092	}
1106	}	1093	}
1107	}	1094	}
1108		1095
…		…
1238	{	1225	{
1239	/* remove an old force with a slaying field == op->name */	1226	/* remove an old force with a slaying field == op->name */
1240	if (object *force = tmp->force_find (op->name))	1227	if (object *force = tmp->force_find (op->name))
1241	force->destroy ();	1228	force->destroy ();
1242		1229
1243	if (!tmp->force_find (op->slaying))	1230	if (op->slaying && !tmp->force_find (op->slaying))
1244	{	1231	{
1245	tmp->force_add (op->slaying, op->stats.food);	1232	tmp->force_add (op->slaying, op->stats.food);
1246		1233
1247	if (op->msg)	1234	if (op->msg)
1248	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, tmp, op->msg);	1235	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, tmp, op->msg);
…		…
1260	}	1247	}
1261	}	1248	}
1262	}	1249	}
1263	}	1250	}
1264		1251
		1252	// mapscript objects activate themselves (only) then their timer fires
		1253	// TODO: maybe they should simply trigger the link like any other object?
		1254	static void
		1255	move_mapscript (object *op)
		1256	{
		1257	op->set_speed (0);
		1258	cfperl_mapscript_activate (op, true, op, 0);
		1259	}
		1260
		1261	static void
		1262	move_lamp (object *op)
		1263	{
		1264	// if the lamp/torch is off, we should disable it.
		1265	if (!op->glow_radius)
		1266	{
		1267	op->set_speed (0);
		1268	return;
		1269	}
		1270	else
		1271	{
		1272	// check whether the face might need to be updated
		1273	// (currently this is needed to have already switched on torches
		1274	// on maps, as they just set the glow_radius in the archetype)
		1275	if (op->other_arch
		1276	&& (
		1277	(op->flag [FLAG_ANIMATE] != op->other_arch->flag [FLAG_ANIMATE])
		1278	\|\| (op->flag [FLAG_ANIMATE]
		1279	? (op->animation_id != op->other_arch->animation_id)
		1280	: (op->face != op->other_arch->face))
		1281	))
		1282	get_animation_from_arch (op, op->other_arch);
		1283	}
		1284
		1285	// lamps and torches on maps don't use up their fuel
		1286	if (op->is_on_map ())
		1287	return;
		1288
		1289	if (op->stats.food > 0)
		1290	{
		1291	op->stats.food--;
		1292	return;
		1293	}
		1294
		1295	apply_lamp (op, false);
		1296	}
		1297
1265	void	1298	void
1266	process_object (object *op)	1299	process_object (object *op)
1267	{	1300	{
1268	if (expect_false (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)))	1301	if (expect_false (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)))
1269	return;	1302	return;
…		…
1441		1474
1442	case PLAYER:	1475	case PLAYER:
1443	// players have their own speed-management, so undo the --speed_left	1476	// players have their own speed-management, so undo the --speed_left
1444	++op->speed_left;	1477	++op->speed_left;
1445	break;	1478	break;
1446	}
1447	}
1448		1479
		1480	case MAPSCRIPT:
		1481	move_mapscript (op);
		1482	break;
		1483
		1484	case LAMP:
		1485	case TORCH:
		1486	move_lamp (op);
		1487	break;
		1488	}
		1489	}
		1490

Diff Legend

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

Comparing deliantra/server/server/time.C (file contents): Revision 1.83 by elmex, Thu Jan 1 15:48:57 2009 UTC vs. Revision 1.105 by root, Fri Mar 26 01:04:45 2010 UTC

Diff Legend

Comparing deliantra/server/server/time.C (file contents):
Revision 1.83 by elmex, Thu Jan 1 15:48:57 2009 UTC vs.
Revision 1.105 by root, Fri Mar 26 01:04:45 2010 UTC