ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/move.C
(Generate patch)

Comparing deliantra/server/server/move.C (file contents):
Revision 1.36 by root, Sun Feb 7 04:22:33 2010 UTC vs.
Revision 1.42 by root, Sat Apr 23 04:56:56 2011 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 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 it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
… …
25#include <global.h> 25#include <global.h>
26#ifndef __CEXTRACT__ 26#ifndef __CEXTRACT__
27# include <sproto.h> 27# include <sproto.h>
28#endif 28#endif
29 29
30/*
31 * move_object() tries to move object op in the direction "dir".
32 * If it fails (something blocks the passage), it returns 0,
33 * otherwise 1.
34 * This is an improvement from the previous move_ob(), which
35 * removed and inserted objects even if they were unable to move.
36 */
37int
38move_object (object *op, int dir)
39{
40 return op->move (dir);
41}
42
43/* object op is trying to move in direction dir.
44 * originator is typically the same as op, but
45 * can be different if originator is causing op to
46 * move (originator is pushing op)
47 * returns 0 if the object is not able to move to the
48 * desired space, 1 otherwise (in which case we also
49 * move the object accordingly. This function is
50 * very similiar to move_object.
51 */
52int
53move_ob (object *op, int dir, object *originator)
54{
55 return op->move (dir, originator);
56}
57
58int 30int
59object::move (int dir, object *originator) 31object::move (int dir, object *originator)
60{ 32{
61 sint16 newx = x + freearr_x[dir]; 33 sint16 newx = x + freearr_x[dir];
62 sint16 newy = y + freearr_y[dir]; 34 sint16 newy = y + freearr_y[dir];
… …
204 LOG (llevError, "%s: no alternative teleporters around (user %s).\n", 176 LOG (llevError, "%s: no alternative teleporters around (user %s).\n",
205 teleporter->debug_desc (), user->debug_desc ()); 177 teleporter->debug_desc (), user->debug_desc ());
206 return 0; 178 return 0;
207 } 179 }
208 180
209 int k = find_free_spot (user, other_teleporter->map, other_teleporter->x, other_teleporter->y, 1, 9); 181 int k = find_free_spot (user, other_teleporter->map, other_teleporter->x, other_teleporter->y, 1, SIZEOFFREE1 + 1);
210 182
211 /* if k==-1, unable to find a free spot. If this is shop 183 /* if k==-1, unable to find a free spot. If this is shop
212 * mat that the player is using, find someplace to move 184 * mat that the player is using, find someplace to move
213 * the player - otherwise, player can get trapped in the shops 185 * the player - otherwise, player can get trapped in the shops
214 * that appear in random dungeons. We basically just make 186 * that appear in random dungeons. We basically just make
… …
280 for (tmp = GET_MAP_OB (m2, tx, ty); tmp; tmp = tmp->above) 252 for (tmp = GET_MAP_OB (m2, tx, ty); tmp; tmp = tmp->above)
281 { 253 {
282 if (tmp->head == op || tmp == op) 254 if (tmp->head == op || tmp == op)
283 continue; 255 continue;
284 256
285 if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->type != DOOR)) 257 if ((tmp->flag [FLAG_ALIVE] && tmp->type != DOOR))
286 return 1; 258 return 1;
287 259
288 if (OB_MOVE_BLOCK (op, tmp)) 260 if (OB_MOVE_BLOCK (op, tmp))
289 return 1; 261 return 1;
290 262
… …
310 op = op->head; 282 op = op->head;
311 283
312 x = op->x + freearr_x[dir]; 284 x = op->x + freearr_x[dir];
313 y = op->y + freearr_y[dir]; 285 y = op->y + freearr_y[dir];
314 286
315 if (!QUERY_FLAG (op, FLAG_CAN_ROLL) 287 if (!op->flag [FLAG_CAN_ROLL]
316 || (op->weight && random_roll (0, op->weight / 50000 - 1, pusher, PREFER_LOW) 288 || (op->weight && random_roll (0, op->weight / 50000 - 1, pusher, PREFER_LOW)
317 > pusher->stats.Str)) 289 > pusher->stats.Str))
318 return 0; 290 return 0;
319 291
320 m = op->map; 292 m = op->map;
… …
353 { 325 {
354 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You fail to push the %s.", query_name (op)); 326 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You fail to push the %s.", query_name (op));
355 return; 327 return;
356 } 328 }
357 329
358 move_ob (pusher, dir, pusher); 330 pusher->move (dir);
359 new_draw_info_format (NDI_BLACK, 0, pusher, "You move the %s.", query_name (op)); 331 new_draw_info_format (NDI_BLACK, 0, pusher, "You move the %s.", query_name (op));
360 return; 332 return;
361} 333}
362 334
363/* returns 1 if pushing invokes a attack, 0 when not */ 335/* returns 1 if pushing invokes a attack, 0 when not */
… …
370 if (who->head != NULL) 342 if (who->head != NULL)
371 who = who->head; 343 who = who->head;
372 owner = who->owner; 344 owner = who->owner;
373 345
374 /* Wake up sleeping monsters that may be pushed */ 346 /* Wake up sleeping monsters that may be pushed */
375 CLEAR_FLAG (who, FLAG_SLEEP); 347 who->clr_flag (FLAG_SLEEP);
376 348
377 /* player change place with his pets or summoned creature */ 349 /* player change place with his pets or summoned creature */
378 /* TODO: allow multi arch pushing. Can't be very difficult */ 350 /* TODO: allow multi arch pushing. Can't be very difficult */
379 if (who->more == NULL 351 if (who->more == NULL
380 && ((owner && owner->contr && pusher->contr && same_party (owner->contr->party, pusher->contr->party)) 352 && ((owner && owner->contr && pusher->contr && same_party (owner->contr->party, pusher->contr->party))
… …
407 /* We want ONLY become enemy of evil, unaggressive monster. We must RUN in them */ 379 /* We want ONLY become enemy of evil, unaggressive monster. We must RUN in them */
408 /* In original we have here a unaggressive check only - that was the reason why */ 380 /* In original we have here a unaggressive check only - that was the reason why */
409 /* we so often become an enemy of friendly monsters... */ 381 /* we so often become an enemy of friendly monsters... */
410 /* funny: was they set to unaggressive 0 (= not so nice) they don't attack */ 382 /* funny: was they set to unaggressive 0 (= not so nice) they don't attack */
411 if (owner != pusher && pusher->type == PLAYER && who->type != PLAYER && 383 if (owner != pusher && pusher->type == PLAYER && who->type != PLAYER &&
412 !QUERY_FLAG (who, FLAG_FRIENDLY) && !QUERY_FLAG (who, FLAG_NEUTRAL)) 384 !who->flag [FLAG_FRIENDLY] && !who->flag [FLAG_NEUTRAL])
413 { 385 {
414 if (pusher->contr->run_on) /* only when we run */ 386 if (pusher->contr->run_on) /* only when we run */
415 { 387 {
416 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You start to attack %s!!", &who->name); 388 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You start to attack %s!!", &who->name);
417 CLEAR_FLAG (who, FLAG_UNAGGRESSIVE); /* the sucker don't like you anymore */ 389 who->clr_flag (FLAG_UNAGGRESSIVE); /* the sucker don't like you anymore */
418 who->enemy = pusher; 390 who->enemy = pusher;
419 return 1; 391 return 1;
420 } 392 }
421 else 393 else
422 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You avoid attacking %s. H<You have to run if you wish to attack unnagressive NPCs.>", &who->name); 394 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You avoid attacking %s. H<You have to run if you wish to attack unnagressive NPCs.>", &who->name);
423 } 395 }
424 396
425 /* now, let's test stand still. we NEVER can push stand_still monsters. */ 397 /* now, let's test stand still. we NEVER can push stand_still monsters. */
426 if (QUERY_FLAG (who, FLAG_STAND_STILL)) 398 if (who->flag [FLAG_STAND_STILL])
427 { 399 {
428 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You can't push %s. H<You simply can't.>", &who->name); 400 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You can't push %s. H<You simply can't.>", &who->name);
429 return 0; 401 return 0;
430 } 402 }
431 403
… …
436 * this pushes the other person away - its not a swap. 408 * this pushes the other person away - its not a swap.
437 */ 409 */
438 410
439 str1 = (who->stats.Str > 0 ? who->stats.Str : who->level); 411 str1 = (who->stats.Str > 0 ? who->stats.Str : who->level);
440 str2 = (pusher->stats.Str > 0 ? pusher->stats.Str : pusher->level); 412 str2 = (pusher->stats.Str > 0 ? pusher->stats.Str : pusher->level);
441 if (QUERY_FLAG (who, FLAG_WIZ) || 413 if (who->flag [FLAG_WIZ] ||
442 random_roll (str1, str1 * 5 / 2, who, PREFER_HIGH) >= 414 random_roll (str1, str1 * 5 / 2, who, PREFER_HIGH) >=
443 random_roll (str2, str2 * 5 / 2, pusher, PREFER_HIGH) || !move_object (who, dir)) 415 random_roll (str2, str2 * 5 / 2, pusher, PREFER_HIGH) || !who->move (dir))
444 { 416 {
445 if (who->type == PLAYER) 417 if (who->type == PLAYER)
446 new_draw_info_format (NDI_UNIQUE, 0, who, "%s tried to push you.", &pusher->name); 418 new_draw_info_format (NDI_UNIQUE, 0, who, "%s tried to push you.", &pusher->name);
447 419
448 return 0; 420 return 0;

Diff Legend

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