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.40 by root, Sun Apr 11 00:34:06 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,2009,2010 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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines