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.34 by root, Sun Nov 15 19:13:01 2009 UTC vs.
Revision 1.46 by root, Mon Oct 29 23:55:55 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 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.
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 Affero GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * 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>
23 */ 23 */
24 24
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];
… …
103 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr))) 75 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
104 return 0; 76 return 0;
105 77
106 remove (); 78 remove ();
107 79
80 pos.m->activate ();
81
108 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (pos.m), ARG_INT (pos.x), ARG_INT (pos.y))) 82 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (pos.m), ARG_INT (pos.x), ARG_INT (pos.y)))
109 return 0; 83 return 0;
110 84
111 if (INVOKE_MAP (ENTER, pos.m, ARG_PLAYER (contr), ARG_INT (pos.x), ARG_INT (pos.y))) 85 if (INVOKE_MAP (ENTER, pos.m, ARG_PLAYER (contr), ARG_INT (pos.x), ARG_INT (pos.y)))
112 return 0; 86 return 0;
… …
132 106
133int 107int
134transfer_ob (object *op, int x, int y, int randomly, object *originator) 108transfer_ob (object *op, int x, int y, int randomly, object *originator)
135{ 109{
136 int i; 110 int i;
137 object *tmp;
138 111
139 if (randomly) 112 if (randomly)
140 i = find_free_spot (op, op->map, x, y, 0, SIZEOFFREE); 113 i = find_free_spot (op, op->map, x, y, 0, SIZEOFFREE);
141 else 114 else
142 i = find_first_free_spot (op, op->map, x, y); 115 i = find_first_free_spot (op, op->map, x, y);
… …
183 156
184 /* Find all other teleporters within range. This range 157 /* Find all other teleporters within range. This range
185 * should really be setable by some object attribute instead of 158 * should really be setable by some object attribute instead of
186 * using hard coded values. 159 * using hard coded values.
187 */ 160 */
188 unordered_mapwalk (teleporter, -5, -5, 5, 5) 161 unordered_mapwalk (mapwalk_buf, teleporter, -5, -5, 5, 5)
189 { 162 {
190 mapspace &ms = m->at (nx, ny); 163 mapspace &ms = m->at (nx, ny);
191 164
192 for (object *tmp = ms.top; tmp; tmp = tmp->below) 165 for (object *tmp = ms.top; tmp; tmp = tmp->below)
193 if (tmp->type == tele_type) 166 if (tmp->type == tele_type)
… …
204 LOG (llevError, "%s: no alternative teleporters around (user %s).\n", 177 LOG (llevError, "%s: no alternative teleporters around (user %s).\n",
205 teleporter->debug_desc (), user->debug_desc ()); 178 teleporter->debug_desc (), user->debug_desc ());
206 return 0; 179 return 0;
207 } 180 }
208 181
209 int k = find_free_spot (user, other_teleporter->map, other_teleporter->x, other_teleporter->y, 1, 9); 182 int k = find_free_spot (user, other_teleporter->map, other_teleporter->x, other_teleporter->y, 1, SIZEOFFREE1 + 1);
210 183
211 /* if k==-1, unable to find a free spot. If this is shop 184 /* if k==-1, unable to find a free spot. If this is shop
212 * mat that the player is using, find someplace to move 185 * mat that the player is using, find someplace to move
213 * the player - otherwise, player can get trapped in the shops 186 * the player - otherwise, player can get trapped in the shops
214 * that appear in random dungeons. We basically just make 187 * that appear in random dungeons. We basically just make
… …
280 for (tmp = GET_MAP_OB (m2, tx, ty); tmp; tmp = tmp->above) 253 for (tmp = GET_MAP_OB (m2, tx, ty); tmp; tmp = tmp->above)
281 { 254 {
282 if (tmp->head == op || tmp == op) 255 if (tmp->head == op || tmp == op)
283 continue; 256 continue;
284 257
285 if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->type != DOOR)) 258 if ((tmp->flag [FLAG_ALIVE] && tmp->type != DOOR))
286 return 1; 259 return 1;
287 260
288 if (OB_MOVE_BLOCK (op, tmp)) 261 if (OB_MOVE_BLOCK (op, tmp))
289 return 1; 262 return 1;
290 263
… …
310 op = op->head; 283 op = op->head;
311 284
312 x = op->x + freearr_x[dir]; 285 x = op->x + freearr_x[dir];
313 y = op->y + freearr_y[dir]; 286 y = op->y + freearr_y[dir];
314 287
315 if (!QUERY_FLAG (op, FLAG_CAN_ROLL) 288 if (!op->flag [FLAG_CAN_ROLL]
316 || (op->weight && random_roll (0, op->weight / 50000 - 1, pusher, PREFER_LOW) 289 || (op->weight && random_roll (0, op->weight / 50000 - 1, pusher, PREFER_LOW)
317 > pusher->stats.Str)) 290 > pusher->stats.Str))
318 return 0; 291 return 0;
319 292
320 m = op->map; 293 m = op->map;
… …
353 { 326 {
354 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You fail to push the %s.", query_name (op)); 327 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You fail to push the %s.", query_name (op));
355 return; 328 return;
356 } 329 }
357 330
358 move_ob (pusher, dir, pusher); 331 pusher->move (dir);
359 new_draw_info_format (NDI_BLACK, 0, pusher, "You move the %s.", query_name (op)); 332 new_draw_info_format (NDI_BLACK, 0, pusher, "You move the %s.", query_name (op));
360 return; 333 return;
361} 334}
362 335
363/* returns 1 if pushing invokes a attack, 0 when not */ 336/* returns 1 if pushing invokes a attack, 0 when not */
… …
370 if (who->head != NULL) 343 if (who->head != NULL)
371 who = who->head; 344 who = who->head;
372 owner = who->owner; 345 owner = who->owner;
373 346
374 /* Wake up sleeping monsters that may be pushed */ 347 /* Wake up sleeping monsters that may be pushed */
375 CLEAR_FLAG (who, FLAG_SLEEP); 348 who->clr_flag (FLAG_SLEEP);
376 349
377 /* player change place with his pets or summoned creature */ 350 /* player change place with his pets or summoned creature */
378 /* TODO: allow multi arch pushing. Can't be very difficult */ 351 /* TODO: allow multi arch pushing. Can't be very difficult */
379 if (who->more == NULL 352 if (who->more == NULL
380 && ((owner && owner->contr && pusher->contr && same_party (owner->contr->party, pusher->contr->party)) 353 && ((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 */ 380 /* 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 */ 381 /* In original we have here a unaggressive check only - that was the reason why */
409 /* we so often become an enemy of friendly monsters... */ 382 /* we so often become an enemy of friendly monsters... */
410 /* funny: was they set to unaggressive 0 (= not so nice) they don't attack */ 383 /* funny: was they set to unaggressive 0 (= not so nice) they don't attack */
411 if (owner != pusher && pusher->type == PLAYER && who->type != PLAYER && 384 if (owner != pusher && pusher->type == PLAYER && who->type != PLAYER &&
412 !QUERY_FLAG (who, FLAG_FRIENDLY) && !QUERY_FLAG (who, FLAG_NEUTRAL)) 385 !who->flag [FLAG_FRIENDLY] && !who->flag [FLAG_NEUTRAL])
413 { 386 {
414 if (pusher->contr->run_on) /* only when we run */ 387 if (pusher->contr->run_on) /* only when we run */
415 { 388 {
416 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You start to attack %s!!", &who->name); 389 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 */ 390 who->clr_flag (FLAG_UNAGGRESSIVE); /* the sucker don't like you anymore */
418 who->enemy = pusher; 391 who->enemy = pusher;
419 return 1; 392 return 1;
420 } 393 }
421 else 394 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); 395 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 } 396 }
424 397
425 /* now, let's test stand still. we NEVER can push stand_still monsters. */ 398 /* now, let's test stand still. we NEVER can push stand_still monsters. */
426 if (QUERY_FLAG (who, FLAG_STAND_STILL)) 399 if (who->flag [FLAG_STAND_STILL])
427 { 400 {
428 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You can't push %s. H<You simply can't.>", &who->name); 401 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You can't push %s. H<You simply can't.>", &who->name);
429 return 0; 402 return 0;
430 } 403 }
431 404
… …
436 * this pushes the other person away - its not a swap. 409 * this pushes the other person away - its not a swap.
437 */ 410 */
438 411
439 str1 = (who->stats.Str > 0 ? who->stats.Str : who->level); 412 str1 = (who->stats.Str > 0 ? who->stats.Str : who->level);
440 str2 = (pusher->stats.Str > 0 ? pusher->stats.Str : pusher->level); 413 str2 = (pusher->stats.Str > 0 ? pusher->stats.Str : pusher->level);
441 if (QUERY_FLAG (who, FLAG_WIZ) || 414 if (who->flag [FLAG_WIZ] ||
442 random_roll (str1, str1 * 5 / 2, who, PREFER_HIGH) >= 415 random_roll (str1, str1 * 5 / 2, who, PREFER_HIGH) >=
443 random_roll (str2, str2 * 5 / 2, pusher, PREFER_HIGH) || !move_object (who, dir)) 416 random_roll (str2, str2 * 5 / 2, pusher, PREFER_HIGH) || !who->move (dir))
444 { 417 {
445 if (who->type == PLAYER) 418 if (who->type == PLAYER)
446 new_draw_info_format (NDI_UNIQUE, 0, who, "%s tried to push you.", &pusher->name); 419 new_draw_info_format (NDI_UNIQUE, 0, who, "%s tried to push you.", &pusher->name);
447 420
448 return 0; 421 return 0;
… …
450 423
451 /* If we get here, the push succeeded. 424 /* If we get here, the push succeeded.
452 * Let everyone know the status. 425 * Let everyone know the status.
453 */ 426 */
454 if (who->type == PLAYER) 427 if (who->type == PLAYER)
455 {
456 new_draw_info_format (NDI_UNIQUE, 0, who, "%s pushed you.", &pusher->name); 428 new_draw_info_format (NDI_UNIQUE, 0, who, "%s pushed you.", &pusher->name);
457 } 429
458 if (pusher->type == PLAYER) 430 if (pusher->type == PLAYER)
459 {
460 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You pushed %s back.", &who->name); 431 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You pushed %s back.", &who->name);
461 }
462 432
463 return 1; 433 return 1;
464} 434}

Diff Legend

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