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

Comparing deliantra/server/server/move.C (file contents):
Revision 1.1 by elmex, Sun Aug 13 17:16:04 2006 UTC vs.
Revision 1.29 by root, Sun Dec 28 06:59:27 2008 UTC

…		…
1	/*	1	/*
2	* static char *rcsid_move_c =	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	* "$Id: move.C,v 1.1 2006/08/13 17:16:04 elmex Exp $";	3	*
		4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
		5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
		6	* Copyright (©) 1992,2007 Frank Tore Johansen
		7	*
		8	* Deliantra is free software: you can redistribute it and/or modify
		9	* it under the terms of the GNU General Public License as published by
		10	* the Free Software Foundation, either version 3 of the License, or
		11	* (at your option) any later version.
		12	*
		13	* This program is distributed in the hope that it will be useful,
		14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
		15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		16	* GNU General Public License for more details.
		17	*
		18	* You should have received a copy of the GNU General Public License
		19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
		20	*
		21	* The authors can be reached via e-mail to <support@deliantra.net>
4	*/	22	*/
5
6	/*
7	CrossFire, A Multiplayer game for X-windows
8
9	Copyright (C) 2002 Mark Wedel & Crossfire Development Team
10	Copyright (C) 1992 Frank Tore Johansen
11
12	This program is free software; you can redistribute it and/or modify
13	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
15	(at your option) any later version.
16
17	This program is distributed in the hope that it will be useful,
18	but WITHOUT ANY WARRANTY; without even the implied warranty of
19	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20	GNU General Public License for more details.
21
22	You should have received a copy of the GNU General Public License
23	along with this program; if not, write to the Free Software
24	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
25
26	The author can be reached via e-mail to crossfire-devel@real-time.com
27	*/
28		23
29	#include <global.h>	24	#include <global.h>
30	#ifndef __CEXTRACT__	25	#ifndef __CEXTRACT__
31	#include <sproto.h>	26	# include <sproto.h>
32	#endif
33
34	#ifdef COZY_SERVER
35	// use a ptotoype
36	extern int same_party (partylist a, partylist b);
37	#endif	27	#endif
38		28
39	/*	29	/*
40	* move_object() tries to move object op in the direction "dir".	30	* move_object() tries to move object op in the direction "dir".
41	* If it fails (something blocks the passage), it returns 0,	31	* If it fails (something blocks the passage), it returns 0,
42	* otherwise 1.	32	* otherwise 1.
43	* This is an improvement from the previous move_ob(), which	33	* This is an improvement from the previous move_ob(), which
44	* removed and inserted objects even if they were unable to move.	34	* removed and inserted objects even if they were unable to move.
45	*/	35	*/
46		36
		37	int
47	int move_object(object *op, int dir) {	38	move_object (object *op, int dir)
48	return move_ob(op, dir, op);	39	{
		40	return op->move (dir);
49	}	41	}
50
51		42
52	/* object op is trying to move in direction dir.	43	/* object op is trying to move in direction dir.
53	* originator is typically the same as op, but	44	* originator is typically the same as op, but
54	* can be different if originator is causing op to	45	* can be different if originator is causing op to
55	* move (originator is pushing op)	46	* move (originator is pushing op)
56	* returns 0 if the object is not able to move to the	47	* returns 0 if the object is not able to move to the
57	* desired space, 1 otherwise (in which case we also	48	* desired space, 1 otherwise (in which case we also
58	* move the object accordingly. This function is	49	* move the object accordingly. This function is
59	* very similiar to move_object.	50	* very similiar to move_object.
60	*/	51	*/
		52	int
61	int move_ob (object op, int dir, object originator)	53	move_ob (object op, int dir, object originator)
62	{	54	{
		55	return op->move (dir, originator);
		56	}
		57
		58	int
		59	object::move (int dir, object *originator)
		60	{
63	sint16 newx = op->x+freearr_x[dir];	61	sint16 newx = x + freearr_x[dir];
64	sint16 newy = op->y+freearr_y[dir];	62	sint16 newy = y + freearr_y[dir];
65	object *tmp;	63	object *tmp;
66	mapstruct *m;	64	maptile *m;
67	int mflags;	65	int mflags;
68		66
69	if(op==NULL) {
70	LOG(llevError,"Trying to move NULL.\n");
71	return 0;
72	}
73
74	m = op->map;	67	m = map;
75	mflags = get_map_flags(m, &m, newx, newy, &newx, &newy);	68	mflags = get_map_flags (m, &m, newx, newy, &newx, &newy);
76		69
77	/* If the space the player is trying to is out of the map,	70	/* If the space the player is trying to is out of the map,
78	* bail now - we know it can't work.	71	* bail now - we know it can't work.
79	*/	72	*/
80	if (mflags & P_OUT_OF_MAP) return 0;	73	if (mflags & P_OUT_OF_MAP)
		74	return 0;
81		75
82
83	/* Is this space blocked? Players with wizpass are immune to	76	/* Is this space blocked? Players with wizpass are immune to
84	* this condition.	77	* this condition.
85	*/	78	*/
86	if(blocked_link(op, m, newx, newy) &&	79	if (blocked_link (this, m, newx, newy) && !flag [FLAG_WIZPASS])
87	!QUERY_FLAG(op, FLAG_WIZPASS))
88	return 0;	80	return 0;
89		81
90	/* 0.94.2 - we need to set the direction for the new animation code.	82	/* 0.94.2 - we need to set the direction for the new animation code.
91	* it uses it to figure out face to use - I can't see it	83	* it uses it to figure out face to use - I can't see it
92	* breaking anything, but it might.	84	* breaking anything, but it might.
93	*/	85	*/
94	if(op->more != NULL && !move_ob(op->more, dir, op->more->head))	86	if (more && !more->move (dir, more->head))
95	return 0;	87	return 0;
96		88
97	op->direction = dir;	89	direction = dir;
98		90
99	if(op->will_apply&4)	91	if (will_apply & 4)
100	check_earthwalls(op,m, newx,newy);	92	check_earthwalls (this, m, newx, newy);
		93
101	if(op->will_apply&8)	94	if (will_apply & 8)
102	check_doors(op,m, newx,newy);	95	check_doors (this, m, newx, newy);
103		96
104	/* 0.94.1 - I got a stack trace that showed it crash with remove_ob trying	97	/* 0.94.1 - I got a stack trace that showed it crash with remove_ob trying
105	* to remove a removed object, and this function was the culprit. A possible	98	* to remove a removed object, and this function was the culprit. A possible
106	* guess I have is that check_doors above ran into a trap, killing the	99	* guess I have is that check_doors above ran into a trap, killing the
107	* monster.	100	* monster.
108	*	101	*
109	* Unfortunately, it doesn't appear that the calling functions of move_object	102	* Unfortunately, it doesn't appear that the calling functions of move_object
110	* deal very well with op being killed, so all this might do is just	103	* deal very well with op being killed, so all this might do is just
111	* migrate the problem someplace else.	104	* migrate the problem someplace else.
112	*/	105	*/
113		106	if (flag [FLAG_REMOVED])//D remove or fix?
114	if (QUERY_FLAG(op, FLAG_REMOVED)) {	107	{
115	LOG(llevDebug,"move_object: monster has been removed - will not process further\n");	108	LOG (llevDebug, "move_object: monster has been removed - will not process further\n");
116	/* Was not successful, but don't want to try and move again */	109	/* Was not successful, but don't want to try and move again */
117	return 1;	110	return 1;
118	}	111	}
119		112
120	/* If this is a tail portion, just want to tell caller that move is	113	/* If this is a tail portion, just want to tell caller that move is
121	* ok - the caller will deal with actual object removal/insertion	114	* ok - the caller will deal with actual object removal/insertion
122	*/	115	*/
123	if(op->head)	116	if (head)
124	return 1;	117	return 1;
125		118
		119	if (m != map && contr)
		120	{
		121	if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
		122	return 0;
		123
		124	remove ();
		125
		126	if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (m), ARG_INT (newx), ARG_INT (newy)))
		127	return 0;
		128
		129	if (INVOKE_MAP (ENTER, m, ARG_PLAYER (contr), ARG_INT (newx), ARG_INT (newy)))
		130	return 0;
		131	}
		132	else
126	remove_ob(op);	133	remove ();
127		134
128	/* we already have newx, newy, and m, so lets use them.
129	* In addition, this fixes potential crashes, because multipart object was
130	* on edge of map, +=x, +=y doesn't make correct coordinates.
131	*/
132	for(tmp = op; tmp != NULL; tmp = tmp->more) {	135	for (tmp = this; tmp; tmp = tmp->more)
		136	{
133	tmp->x += freearr_x[dir];	137	tmp->x += freearr_x[dir];
134	tmp->y += freearr_y[dir];	138	tmp->y += freearr_y[dir];
135	tmp->map = get_map_from_coord(tmp->map, &tmp->x, &tmp->y);	139	xy_normalise (tmp->map, tmp->x, tmp->y);
136	}	140	}
137		141
138	/* insert_ob_in_map will deal with any tiling issues */	142	/* insert_ob_in_map will deal with any tiling issues */
139	insert_ob_in_map(op, m, originator,0);	143	insert_ob_in_map (this, map, originator, 0);
140		144
141	/* Hmmm. Should be possible for multispace players now */	145	return 1;
142	if (op->type==PLAYER) {
143	esrv_map_scroll(&op->contr->socket, freearr_x[dir],freearr_y[dir]);
144	op->contr->socket.update_look=1;
145	op->contr->socket.look_position=0;
146	}
147	else if (op->type == TRANSPORT) {
148	object *pl;
149
150	for (pl=op->inv; pl; pl=pl->below) {
151	if (pl->type == PLAYER) {
152	pl->contr->do_los=1;
153	pl->map = op->map;
154	pl->x = op->x;
155	pl->y = op->y;
156	esrv_map_scroll(&pl->contr->socket, freearr_x[dir],freearr_y[dir]);
157	pl->contr->socket.update_look=1;
158	pl->contr->socket.look_position=0;
159	}
160	}
161	}
162
163	return 1; /* this shouldn't be reached */
164	}	146	}
165		147
166		148
167	/*	149	/*
168	* transfer_ob(): Move an object (even linked objects) to another spot	150	* transfer_ob(): Move an object (even linked objects) to another spot
174	* use find_first_free_spot().	156	* use find_first_free_spot().
175	*	157	*
176	* Return value: 1 if object was destroyed, 0 otherwise.	158	* Return value: 1 if object was destroyed, 0 otherwise.
177	*/	159	*/
178		160
		161	int
179	int transfer_ob (object op, int x, int y, int randomly, object originator)	162	transfer_ob (object op, int x, int y, int randomly, object originator)
180	{	163	{
181	int i;	164	int i;
182	object *tmp;	165	object *tmp;
183		166
184	if (randomly)	167	if (randomly)
185	i = find_free_spot (op,op->map,x,y,0,SIZEOFFREE);	168	i = find_free_spot (op, op->map, x, y, 0, SIZEOFFREE);
186	else	169	else
187	i = find_first_free_spot(op,op->map,x,y);	170	i = find_first_free_spot (op, op->map, x, y);
188		171
189	if (i==-1)	172	if (i == -1)
190	return 0; /* No free spot */	173	return 0; /* No free spot */
191		174
192	if(op->head!=NULL)	175	op = op->head_ ();
193	op=op->head;	176	op->remove ();
194	remove_ob(op);	177
195	for(tmp=op;tmp!=NULL;tmp=tmp->more)	178	for (object *tmp = op; tmp; tmp = tmp->more)
		179	{
196	tmp->x=x+freearr_x[i]+(tmp->arch==NULL?0:tmp->arch->clone.x),	180	tmp->x = x + freearr_x[i] + (!tmp->arch ? 0 : tmp->arch->x);
197	tmp->y=y+freearr_y[i]+(tmp->arch==NULL?0:tmp->arch->clone.y);	181	tmp->y = y + freearr_y[i] + (!tmp->arch ? 0 : tmp->arch->y);
		182	}
198		183
199	tmp = insert_ob_in_map(op,op->map,originator,0);	184	op = insert_ob_in_map (op, op->map, originator, 0);
200	if (op && op->type == PLAYER) MapNewmapCmd(op->contr);	185
201	if (tmp) return 0;	186	return !op;
202	else return 1;
203	}	187	}
204		188
205	/*	189	/*
206	* Return value: 1 if object was destroyed, 0 otherwise.	190	* Return value: 1 if object was destroyed, 0 otherwise.
207	* Modified so that instead of passing the 'originator' that had no	191	* Modified so that instead of passing the 'originator' that had no
…		…
212	* currently, this is either set to SHOP_MAT or TELEPORTER.	196	* currently, this is either set to SHOP_MAT or TELEPORTER.
213	* It is basically used so that shop_mats and normal teleporters can	197	* It is basically used so that shop_mats and normal teleporters can
214	* be used close to each other and not have the player put to the	198	* be used close to each other and not have the player put to the
215	* one of another type.	199	* one of another type.
216	*/	200	*/
		201	int
217	int teleport (object teleporter, uint8 tele_type, object user)	202	teleport (object teleporter, uint8 tele_type, object user)
218	{	203	{
219	object *altern;	204	object *altern;
220	int i,j,k,nrofalt=0;	205	int i, j, k, nrofalt = 0;
221	object other_teleporter, tmp;	206	object other_teleporter, tmp;
222	mapstruct *m;	207	maptile *m;
223	sint16 sx, sy;	208	sint16 sx, sy;
224		209
225	if(user==NULL) return 0;	210	if (user == NULL)
		211	return 0;
226	if(user->head!=NULL)	212	if (user->head != NULL)
227	user=user->head;	213	user = user->head;
228		214
229	/* Find all other teleporters within range. This range	215	/* Find all other teleporters within range. This range
230	* should really be setable by some object attribute instead of	216	* should really be setable by some object attribute instead of
231	* using hard coded values.	217	* using hard coded values.
232	*/	218	*/
233	for(i= -5;i<6;i++)	219	for (i = -5; i < 6; i++)
234	for(j= -5;j<6;j++) {	220	for (j = -5; j < 6; j++)
		221	{
235	if(i==0&&j==0)	222	if (i == 0 && j == 0)
236	continue;	223	continue;
		224
237	/* Perhaps this should be extended to support tiled maps */	225	/* Perhaps this should be extended to support tiled maps */
238	if(OUT_OF_REAL_MAP(teleporter->map,teleporter->x+i,teleporter->y+j))	226	if (OUT_OF_REAL_MAP (teleporter->map, teleporter->x + i, teleporter->y + j))
239	continue;	227	continue;
240	other_teleporter=get_map_ob(teleporter->map,
241	teleporter->x+i,teleporter->y+j);
242		228
		229	other_teleporter = GET_MAP_OB (teleporter->map, teleporter->x + i, teleporter->y + j);
		230
243	while (other_teleporter) {	231	while (other_teleporter)
		232	{
244	if (other_teleporter->type == tele_type) break;	233	if (other_teleporter->type == tele_type)
		234	break;
245	other_teleporter = other_teleporter->above;	235	other_teleporter = other_teleporter->above;
		236	}
		237
		238	if (other_teleporter && !rndm (++nrofalt))
		239	altern = other_teleporter;
		240	}
		241
		242	if (!nrofalt)
		243	{
		244	LOG (llevError, "%s: no alternative teleporters around (user %s).\n",
		245	teleporter->debug_desc (), user->debug_desc ());
		246	return 0;
246	}	247	}
247	if (other_teleporter && !(RANDOM() % ++nrofalt))
248	altern = other_teleporter;
249	}
250		248
251	if(!nrofalt) {
252	LOG(llevError,"No alternative teleporters around!\n");
253	return 0;
254	}
255
256	other_teleporter=altern;	249	other_teleporter = altern;
257	k=find_free_spot(user,other_teleporter->map,	250	k = find_free_spot (user, other_teleporter->map, other_teleporter->x, other_teleporter->y, 1, 9);
258	other_teleporter->x,other_teleporter->y,1,9);
259		251
260	/* if k==-1, unable to find a free spot. If this is shop	252	/* if k==-1, unable to find a free spot. If this is shop
261	* mat that the player is using, find someplace to move	253	* mat that the player is using, find someplace to move
262	* the player - otherwise, player can get trapped in the shops	254	* the player - otherwise, player can get trapped in the shops
263	* that appear in random dungeons. We basically just make	255	* that appear in random dungeons. We basically just make
264	* sure the space isn't no pass (eg wall), and don't care	256	* sure the space isn't no pass (eg wall), and don't care
265	* about is alive.	257	* about is alive.
266	*/	258	*/
267	if (k==-1) {	259	if (k == -1)
		260	{
268	if (tele_type == SHOP_MAT && user->type == PLAYER) {	261	if (tele_type == SHOP_MAT && user->type == PLAYER)
		262	{
269	for (k=1; k<9; k++) {	263	for (k = 1; k < 9; k++)
		264	{
270	if (get_map_flags(other_teleporter->map, &m,	265	if (get_map_flags (other_teleporter->map, &m,
271	other_teleporter->x + freearr_x[k],	266	other_teleporter->x + freearr_x[k], other_teleporter->y + freearr_y[k], &sx, &sy) & P_OUT_OF_MAP)
272	other_teleporter->y + freearr_y[k], &sx,&sy) &	267	continue;
273	P_OUT_OF_MAP) continue;
274		268
275	if (!OB_TYPE_MOVE_BLOCK(user, GET_MAP_MOVE_BLOCK(m, sx, sy))) break;	269	if (!OB_TYPE_MOVE_BLOCK (user, GET_MAP_MOVE_BLOCK (m, sx, sy)))
		270	break;
276		271
		272	}
		273	if (k == 9)
		274	{
		275	LOG (llevError, "Shop mat %s (%d, %d) is in solid rock?\n",
		276	&other_teleporter->name, other_teleporter->x, other_teleporter->y);
		277	return 0;
		278	}
		279	}
		280	else
		281	return 0;
277	}	282	}
278	if (k==9) {
279	LOG(llevError,"Shop mat %s (%d, %d) is in solid rock?\n",
280	other_teleporter->name, other_teleporter->x, other_teleporter->y);
281	return 0;
282	}
283	}
284	else return 0;
285	}
286		283
287	remove_ob(user);	284	user->remove ();
288		285
289	/* Update location for the object */	286	/* Update location for the object */
290	for(tmp=user;tmp!=NULL;tmp=tmp->more) {	287	for (tmp = user; tmp; tmp = tmp->more)
291	tmp->x=other_teleporter->x+freearr_x[k]+
292	(tmp->arch==NULL?0:tmp->arch->clone.x);
293	tmp->y=other_teleporter->y+freearr_y[k]+
294	(tmp->arch==NULL?0:tmp->arch->clone.y);
295	}	288	{
		289	tmp->x = other_teleporter->x + freearr_x[k] + (tmp->arch ? tmp->arch->x : 0);
		290	tmp->y = other_teleporter->y + freearr_y[k] + (tmp->arch ? tmp->arch->y : 0);
		291	}
		292
296	tmp = insert_ob_in_map(user,other_teleporter->map,NULL,0);	293	tmp = insert_ob_in_map (user, other_teleporter->map, NULL, 0);
297	if (tmp && tmp->type == PLAYER) MapNewmapCmd(tmp->contr);	294	return !tmp;
298	return (tmp == NULL);
299	}	295	}
300		296
		297	void
301	void recursive_roll(object op,int dir,object pusher) {	298	recursive_roll (object op, int dir, object pusher)
		299	{
302	if(!roll_ob(op,dir,pusher)) {	300	if (!roll_ob (op, dir, pusher))
303	new_draw_info_format(NDI_UNIQUE, 0, pusher,	301	{
304	"You fail to push the %s.",query_name(op));	302	new_draw_info_format (NDI_UNIQUE, 0, pusher, "You fail to push the %s.", query_name (op));
305	return;	303	return;
306	}	304	}
307	(void) move_ob(pusher,dir,pusher);	305	(void) move_ob (pusher, dir, pusher);
308	new_draw_info_format(NDI_BLACK, 0, pusher,	306	new_draw_info_format (NDI_BLACK, 0, pusher, "You move the %s.", query_name (op));
309	"You move the %s.",query_name(op));
310	return;	307	return;
311	}	308	}
312		309
313	/*	310	/*
314	* This is a new version of blocked, this one handles objects	311	* This is a new version of blocked, this one handles objects
…		…
317	* very new version handles also multipart objects	314	* very new version handles also multipart objects
318	* This is currently only used for the boulder roll code.	315	* This is currently only used for the boulder roll code.
319	* Returns 1 if object does not fit, 0 if it does.	316	* Returns 1 if object does not fit, 0 if it does.
320	*/	317	*/
321		318
		319	int
322	int try_fit (object op, mapstruct m, int x, int y)	320	try_fit (object op, maptile m, int x, int y)
323	{	321	{
324	object tmp, more;	322	object tmp, more;
325	sint16 tx, ty;	323	sint16 tx, ty;
326	int mflags;	324	int mflags;
327	mapstruct *m2;	325	maptile *m2;
328		326
329	if (op->head)	327	if (op->head)
330	op = op->head;	328	op = op->head;
331		329
332	for (more = op; more ; more = more->more) {	330	for (more = op; more; more = more->more)
		331	{
333	tx = x + more->x - op->x;	332	tx = x + more->x - op->x;
334	ty = y + more->y - op->y;	333	ty = y + more->y - op->y;
335		334
336	mflags = get_map_flags(m, &m2, tx, ty, &tx, &ty);	335	mflags = get_map_flags (m, &m2, tx, ty, &tx, &ty);
337		336
338	if (mflags & P_OUT_OF_MAP)	337	if (mflags & P_OUT_OF_MAP)
339	return 1;	338	return 1;
340		339
341	for (tmp = get_map_ob (m2, tx, ty); tmp; tmp=tmp->above) {	340	for (tmp = GET_MAP_OB (m2, tx, ty); tmp; tmp = tmp->above)
		341	{
342	if (tmp->head == op \|\| tmp == op)	342	if (tmp->head == op \|\| tmp == op)
343	continue;	343	continue;
344		344
345	if ((QUERY_FLAG(tmp,FLAG_ALIVE) && tmp->type!=DOOR))	345	if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->type != DOOR))
346	return 1;	346	return 1;
347		347
348	if (OB_MOVE_BLOCK(op, tmp)) return 1;	348	if (OB_MOVE_BLOCK (op, tmp))
		349	return 1;
349		350
350	}	351	}
351	}	352	}
352	return 0;	353	return 0;
353	}	354	}
354		355
355	/*	356	/*
356	* this is not perfect yet.	357	* this is not perfect yet.
357	* it does not roll objects behind multipart objects properly.	358	* it does not roll objects behind multipart objects properly.
358	* Support for rolling multipart objects is questionable.	359	* Support for rolling multipart objects is questionable.
359	*/	360	*/
360		361
		362	int
361	int roll_ob(object op,int dir, object pusher) {	363	roll_ob (object op, int dir, object pusher)
		364	{
362	object *tmp;	365	object *tmp;
363	sint16 x, y;	366	sint16 x, y;
364	int flags;	367	int flags;
365	mapstruct *m;	368	maptile *m;
366	MoveType move_block;	369	MoveType move_block;
367		370
368	if (op->head)	371	if (op->head)
369	op = op->head;	372	op = op->head;
370		373
371	x=op->x+freearr_x[dir];	374	x = op->x + freearr_x[dir];
372	y=op->y+freearr_y[dir];	375	y = op->y + freearr_y[dir];
373		376
374	if(!QUERY_FLAG(op,FLAG_CAN_ROLL) \|\|	377	if (!QUERY_FLAG (op, FLAG_CAN_ROLL)
375	(op->weight &&	378	\|\| (op->weight && random_roll (0, op->weight / 50000 - 1, pusher, PREFER_LOW)
376	random_roll(0, op->weight/50000-1, pusher, PREFER_LOW) > pusher->stats.Str))	379	> pusher->stats.Str))
377	return 0;	380	return 0;
378		381
379	m = op->map;	382	m = op->map;
380	flags = get_map_flags(m, &m, x, y, &x, &y);	383	flags = get_map_flags (m, &m, x, y, &x, &y);
381		384
382	if (flags & (P_OUT_OF_MAP \| P_IS_ALIVE))	385	if (flags & (P_OUT_OF_MAP \| P_IS_ALIVE))
383	return 0;	386	return 0;
384		387
385	move_block = GET_MAP_MOVE_BLOCK(m, x, y);	388	move_block = GET_MAP_MOVE_BLOCK (m, x, y);
386		389
387	/* If the target space is not blocked, no need to look at the objects on it */	390	/* If the target space is not blocked, no need to look at the objects on it */
388	if ((op->move_type & move_block) == op->move_type) {	391	if ((op->move_type & move_block) == op->move_type)
		392	{
389	for (tmp=get_map_ob(m, x, y); tmp!=NULL; tmp=tmp->above) {	393	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
		394	{
390	if (tmp->head == op)	395	if (tmp->head == op)
391	continue;	396	continue;
392	if (OB_MOVE_BLOCK(op, tmp) && !roll_ob(tmp,dir,pusher))	397	if (OB_MOVE_BLOCK (op, tmp) && !roll_ob (tmp, dir, pusher))
393	return 0;	398	return 0;
394	}	399	}
395	}	400	}
396	if (try_fit (op, m, x, y))	401	if (try_fit (op, m, x, y))
397	return 0;	402	return 0;
398		403
399	remove_ob(op);	404	op->remove ();
400	for(tmp=op; tmp!=NULL; tmp=tmp->more)	405	for (tmp = op; tmp != NULL; tmp = tmp->more)
401	tmp->x+=freearr_x[dir],tmp->y+=freearr_y[dir];	406	tmp->x += freearr_x[dir], tmp->y += freearr_y[dir];
402	insert_ob_in_map(op,op->map,pusher,0);	407	insert_ob_in_map (op, op->map, pusher, 0);
403	return 1;	408	return 1;
404	}	409	}
405		410
406	/* returns 1 if pushing invokes a attack, 0 when not */	411	/* returns 1 if pushing invokes a attack, 0 when not */
		412	int
407	int push_ob(object who, int dir, object pusher) {	413	push_ob (object who, int dir, object pusher)
		414	{
408	int str1, str2;	415	int str1, str2;
409	object *owner;	416	object *owner;
410		417
411	if (who->head != NULL)	418	if (who->head != NULL)
412	who = who->head;	419	who = who->head;
413	owner = get_owner(who);	420	owner = who->owner;
414		421
415	/* Wake up sleeping monsters that may be pushed */	422	/* Wake up sleeping monsters that may be pushed */
416	CLEAR_FLAG(who,FLAG_SLEEP);	423	CLEAR_FLAG (who, FLAG_SLEEP);
417		424
418	/* player change place with his pets or summoned creature */	425	/* player change place with his pets or summoned creature */
419	/* TODO: allow multi arch pushing. Can't be very difficult */	426	/* TODO: allow multi arch pushing. Can't be very difficult */
420	if (who->more == NULL	427	if (who->more == NULL
421	#ifdef COZY_SERVER	428	&& ((owner && owner->contr && pusher->contr && same_party (owner->contr->party, pusher->contr->party))
422	&&
423	(
424	(owner && owner->contr && pusher->contr
425	&& same_party (owner->contr->party, pusher->contr->party))
426	\|\| owner == pusher	429	\|\| owner == pusher)
427	)	430	)
428	#else	431	{
429	&& owner == pusher	432	int temp;
430	#endif	433	maptile *m;
431	) {
432	int temp;
433	mapstruct *m;
434		434
435	remove_ob(who);	435	who->remove ();
436	remove_ob(pusher);	436	pusher->remove ();
437	temp = pusher->x;	437	temp = pusher->x;
438	pusher->x = who->x;	438	pusher->x = who->x;
439	who->x = temp;	439	who->x = temp;
440		440
441	temp = pusher->y;	441	temp = pusher->y;
442	pusher->y = who->y;	442	pusher->y = who->y;
443	who->y = temp;	443	who->y = temp;
444		444
445	m = pusher->map;	445	m = pusher->map;
446	pusher->map = who->map;	446	pusher->map = who->map;
447	who->map = m;	447	who->map = m;
448		448
449	insert_ob_in_map (who,who->map,pusher,0);	449	insert_ob_in_map (who, who->map, pusher, 0);
450	insert_ob_in_map (pusher,pusher->map,pusher,0);	450	insert_ob_in_map (pusher, pusher->map, pusher, 0);
451		451	return 0;
452	/* we presume that if the player is pushing his put, he moved in
453	* direction 'dir'. I can' think of any case where this would not be
454	* the case. Putting the map_scroll should also improve performance some.
455	*/
456	if (pusher->type == PLAYER ) {
457	esrv_map_scroll(&pusher->contr->socket, freearr_x[dir],freearr_y[dir]);
458	pusher->contr->socket.update_look=1;
459	pusher->contr->socket.look_position=0;
460	}
461	return 0;
462	}	452	}
463		453
464
465	/* We want ONLY become enemy of evil, unaggressive monster. We must RUN in them */	454	/* We want ONLY become enemy of evil, unaggressive monster. We must RUN in them */
466	/* In original we have here a unaggressive check only - that was the reason why */	455	/* In original we have here a unaggressive check only - that was the reason why */
467	/* we so often become an enemy of friendly monsters... */	456	/* we so often become an enemy of friendly monsters... */
468	/* funny: was they set to unaggressive 0 (= not so nice) they don't attack */	457	/* funny: was they set to unaggressive 0 (= not so nice) they don't attack */
469
470	if(owner != pusher && pusher->type == PLAYER && who->type != PLAYER &&	458	if (owner != pusher && pusher->type == PLAYER && who->type != PLAYER &&
471	!QUERY_FLAG(who,FLAG_FRIENDLY)&& !QUERY_FLAG(who,FLAG_NEUTRAL)) {	459	!QUERY_FLAG (who, FLAG_FRIENDLY) && !QUERY_FLAG (who, FLAG_NEUTRAL))
		460	{
472	if(pusher->contr->run_on) /* only when we run */ {	461	if (pusher->contr->run_on) /* only when we run */
473	new_draw_info_format(NDI_UNIQUE, 0, pusher,	462	{
474	"You start to attack %s !!",who->name);	463	new_draw_info_format (NDI_UNIQUE, 0, pusher, "You start to attack %s!!", &who->name);
475	CLEAR_FLAG(who,FLAG_UNAGGRESSIVE); /* the sucker don't like you anymore */	464	CLEAR_FLAG (who, FLAG_UNAGGRESSIVE); /* the sucker don't like you anymore */
476	who->enemy = pusher;	465	who->enemy = pusher;
477	return 1;	466	return 1;
478	}	467	}
479	else	468	else
480	{	469	new_draw_info_format (NDI_UNIQUE, 0, pusher, "You avoid attacking %s.", &who->name);
481	new_draw_info_format(NDI_UNIQUE, 0, pusher,
482	"You avoid attacking %s .",who->name);
483	}
484	}	470	}
485		471
486	/* now, lets test stand still. we NEVER can push stand_still monsters. */	472	/* now, lets test stand still. we NEVER can push stand_still monsters. */
487	if(QUERY_FLAG(who,FLAG_STAND_STILL))	473	if (QUERY_FLAG (who, FLAG_STAND_STILL))
488	{
489	new_draw_info_format(NDI_UNIQUE, 0, pusher,
490	"You can't push %s.",who->name);
491	return 0;
492	}	474	{
493		475	new_draw_info_format (NDI_UNIQUE, 0, pusher, "You can't push %s.", &who->name);
		476	return 0;
		477	}
		478
494	/* This block is basically if you are pushing friendly but	479	/* This block is basically if you are pushing friendly but
495	* non pet creaturs.	480	* non pet creaturs.
496	* It basically does a random strength comparision to	481	* It basically does a random strength comparision to
497	* determine if you can push someone around. Note that	482	* determine if you can push someone around. Note that
498	* this pushes the other person away - its not a swap.	483	* this pushes the other person away - its not a swap.
499	*/	484	*/
500		485
501	str1 = (who->stats.Str>0?who->stats.Str:who->level);	486	str1 = (who->stats.Str > 0 ? who->stats.Str : who->level);
502	str2 = (pusher->stats.Str>0?pusher->stats.Str:pusher->level);	487	str2 = (pusher->stats.Str > 0 ? pusher->stats.Str : pusher->level);
503	if(QUERY_FLAG(who,FLAG_WIZ) \|\|	488	if (QUERY_FLAG (who, FLAG_WIZ) \|\|
504	random_roll(str1, str1/2+str1*2, who, PREFER_HIGH) >=	489	random_roll (str1, str1 * 5 / 2, who, PREFER_HIGH) >=
505	random_roll(str2, str2/2+str2*2, pusher, PREFER_HIGH) \|\|	490	random_roll (str2, str2 * 5 / 2, pusher, PREFER_HIGH) \|\| !move_object (who, dir))
506	!move_object(who,dir))
507	{	491	{
508	if (who ->type == PLAYER) {	492	if (who->type == PLAYER)
509	new_draw_info_format(NDI_UNIQUE, 0, who,	493	new_draw_info_format (NDI_UNIQUE, 0, who, "%s tried to push you.", &pusher->name);
510	"%s tried to push you.",pusher->name);
511	}
512	return 0;
513	}
514		494
		495	return 0;
		496	}
		497
515	/* If we get here, the push succeeded.	498	/* If we get here, the push succeeded.
516	* Let everyone know the status.	499	* Let everyone know the status.
517	*/	500	*/
518	if (who->type == PLAYER) {	501	if (who->type == PLAYER)
519	new_draw_info_format(NDI_UNIQUE, 0, who,
520	"%s pushed you.",pusher->name);
521	}	502	{
		503	new_draw_info_format (NDI_UNIQUE, 0, who, "%s pushed you.", &pusher->name);
		504	}
522	if (pusher->type == PLAYER) {	505	if (pusher->type == PLAYER)
523	new_draw_info_format(NDI_UNIQUE, 0, pusher,
524	"You pushed %s back.", who->name);
525	}	506	{
526		507	new_draw_info_format (NDI_UNIQUE, 0, pusher, "You pushed %s back.", &who->name);
		508	}
		509
527	return 1;	510	return 1;
528	}	511	}

Diff Legend

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

Comparing deliantra/server/server/move.C (file contents): Revision 1.1 by elmex, Sun Aug 13 17:16:04 2006 UTC vs. Revision 1.29 by root, Sun Dec 28 06:59:27 2008 UTC

Diff Legend

Comparing deliantra/server/server/move.C (file contents):
Revision 1.1 by elmex, Sun Aug 13 17:16:04 2006 UTC vs.
Revision 1.29 by root, Sun Dec 28 06:59:27 2008 UTC