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.38 by root, Fri Mar 26 00:59:22 2010 UTC vs.
Revision 1.44 by root, Tue Jan 3 11:25:36 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 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 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
… …
75 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr))) 75 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
76 return 0; 76 return 0;
77 77
78 remove (); 78 remove ();
79 79
80 pos.m->activate ();
81
80 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)))
81 return 0; 83 return 0;
82 84
83 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)))
84 return 0; 86 return 0;
… …
176 LOG (llevError, "%s: no alternative teleporters around (user %s).\n", 178 LOG (llevError, "%s: no alternative teleporters around (user %s).\n",
177 teleporter->debug_desc (), user->debug_desc ()); 179 teleporter->debug_desc (), user->debug_desc ());
178 return 0; 180 return 0;
179 } 181 }
180 182
181 int k = find_free_spot (user, other_teleporter->map, other_teleporter->x, other_teleporter->y, 1, 9); 183 int k = find_free_spot (user, other_teleporter->map, other_teleporter->x, other_teleporter->y, 1, SIZEOFFREE1 + 1);
182 184
183 /* if k==-1, unable to find a free spot. If this is shop 185 /* if k==-1, unable to find a free spot. If this is shop
184 * mat that the player is using, find someplace to move 186 * mat that the player is using, find someplace to move
185 * the player - otherwise, player can get trapped in the shops 187 * the player - otherwise, player can get trapped in the shops
186 * that appear in random dungeons. We basically just make 188 * that appear in random dungeons. We basically just make
… …
252 for (tmp = GET_MAP_OB (m2, tx, ty); tmp; tmp = tmp->above) 254 for (tmp = GET_MAP_OB (m2, tx, ty); tmp; tmp = tmp->above)
253 { 255 {
254 if (tmp->head == op || tmp == op) 256 if (tmp->head == op || tmp == op)
255 continue; 257 continue;
256 258
257 if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->type != DOOR)) 259 if ((tmp->flag [FLAG_ALIVE] && tmp->type != DOOR))
258 return 1; 260 return 1;
259 261
260 if (OB_MOVE_BLOCK (op, tmp)) 262 if (OB_MOVE_BLOCK (op, tmp))
261 return 1; 263 return 1;
262 264
… …
282 op = op->head; 284 op = op->head;
283 285
284 x = op->x + freearr_x[dir]; 286 x = op->x + freearr_x[dir];
285 y = op->y + freearr_y[dir]; 287 y = op->y + freearr_y[dir];
286 288
287 if (!QUERY_FLAG (op, FLAG_CAN_ROLL) 289 if (!op->flag [FLAG_CAN_ROLL]
288 || (op->weight && random_roll (0, op->weight / 50000 - 1, pusher, PREFER_LOW) 290 || (op->weight && random_roll (0, op->weight / 50000 - 1, pusher, PREFER_LOW)
289 > pusher->stats.Str)) 291 > pusher->stats.Str))
290 return 0; 292 return 0;
291 293
292 m = op->map; 294 m = op->map;
… …
342 if (who->head != NULL) 344 if (who->head != NULL)
343 who = who->head; 345 who = who->head;
344 owner = who->owner; 346 owner = who->owner;
345 347
346 /* Wake up sleeping monsters that may be pushed */ 348 /* Wake up sleeping monsters that may be pushed */
347 CLEAR_FLAG (who, FLAG_SLEEP); 349 who->clr_flag (FLAG_SLEEP);
348 350
349 /* player change place with his pets or summoned creature */ 351 /* player change place with his pets or summoned creature */
350 /* TODO: allow multi arch pushing. Can't be very difficult */ 352 /* TODO: allow multi arch pushing. Can't be very difficult */
351 if (who->more == NULL 353 if (who->more == NULL
352 && ((owner && owner->contr && pusher->contr && same_party (owner->contr->party, pusher->contr->party)) 354 && ((owner && owner->contr && pusher->contr && same_party (owner->contr->party, pusher->contr->party))
… …
379 /* We want ONLY become enemy of evil, unaggressive monster. We must RUN in them */ 381 /* We want ONLY become enemy of evil, unaggressive monster. We must RUN in them */
380 /* In original we have here a unaggressive check only - that was the reason why */ 382 /* In original we have here a unaggressive check only - that was the reason why */
381 /* we so often become an enemy of friendly monsters... */ 383 /* we so often become an enemy of friendly monsters... */
382 /* funny: was they set to unaggressive 0 (= not so nice) they don't attack */ 384 /* funny: was they set to unaggressive 0 (= not so nice) they don't attack */
383 if (owner != pusher && pusher->type == PLAYER && who->type != PLAYER && 385 if (owner != pusher && pusher->type == PLAYER && who->type != PLAYER &&
384 !QUERY_FLAG (who, FLAG_FRIENDLY) && !QUERY_FLAG (who, FLAG_NEUTRAL)) 386 !who->flag [FLAG_FRIENDLY] && !who->flag [FLAG_NEUTRAL])
385 { 387 {
386 if (pusher->contr->run_on) /* only when we run */ 388 if (pusher->contr->run_on) /* only when we run */
387 { 389 {
388 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You start to attack %s!!", &who->name); 390 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You start to attack %s!!", &who->name);
389 CLEAR_FLAG (who, FLAG_UNAGGRESSIVE); /* the sucker don't like you anymore */ 391 who->clr_flag (FLAG_UNAGGRESSIVE); /* the sucker don't like you anymore */
390 who->enemy = pusher; 392 who->enemy = pusher;
391 return 1; 393 return 1;
392 } 394 }
393 else 395 else
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); 396 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 } 397 }
396 398
397 /* now, let's test stand still. we NEVER can push stand_still monsters. */ 399 /* now, let's test stand still. we NEVER can push stand_still monsters. */
398 if (QUERY_FLAG (who, FLAG_STAND_STILL)) 400 if (who->flag [FLAG_STAND_STILL])
399 { 401 {
400 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You can't push %s. H<You simply can't.>", &who->name); 402 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You can't push %s. H<You simply can't.>", &who->name);
401 return 0; 403 return 0;
402 } 404 }
403 405
… …
408 * this pushes the other person away - its not a swap. 410 * this pushes the other person away - its not a swap.
409 */ 411 */
410 412
411 str1 = (who->stats.Str > 0 ? who->stats.Str : who->level); 413 str1 = (who->stats.Str > 0 ? who->stats.Str : who->level);
412 str2 = (pusher->stats.Str > 0 ? pusher->stats.Str : pusher->level); 414 str2 = (pusher->stats.Str > 0 ? pusher->stats.Str : pusher->level);
413 if (QUERY_FLAG (who, FLAG_WIZ) || 415 if (who->flag [FLAG_WIZ] ||
414 random_roll (str1, str1 * 5 / 2, who, PREFER_HIGH) >= 416 random_roll (str1, str1 * 5 / 2, who, PREFER_HIGH) >=
415 random_roll (str2, str2 * 5 / 2, pusher, PREFER_HIGH) || !who->move (dir)) 417 random_roll (str2, str2 * 5 / 2, pusher, PREFER_HIGH) || !who->move (dir))
416 { 418 {
417 if (who->type == PLAYER) 419 if (who->type == PLAYER)
418 new_draw_info_format (NDI_UNIQUE, 0, who, "%s tried to push you.", &pusher->name); 420 new_draw_info_format (NDI_UNIQUE, 0, who, "%s tried to push you.", &pusher->name);

Diff Legend

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