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

Comparing deliantra/server/server/time.C (file contents):
Revision 1.51 by root, Fri May 18 20:45:37 2007 UTC vs.
Revision 1.52 by root, Tue May 22 10:50:01 2007 UTC

954 return; 954 return;
955 teleport (head, TELEPORTER, tmp); 955 teleport (head, TELEPORTER, tmp);
956 } 956 }
957} 957}
958 958
959
960/* This object will teleport someone to a different map 959/* This object will teleport someone to a different map
961 and will also apply changes to the player from its inventory. 960 and will also apply changes to the player from its inventory.
962 This was invented for giving classes, but there's no reason it 961 This was invented for giving classes, but there's no reason it
963 can't be generalized. 962 can't be generalized.
964*/ 963*/
1094 * is cleared, otherwise the player will get stuck in 1093 * is cleared, otherwise the player will get stuck in
1095 * place. This can happen if the player used a spell to 1094 * place. This can happen if the player used a spell to
1096 * get to this space. 1095 * get to this space.
1097 */ 1096 */
1098 victim->contr->fire_on = 0; 1097 victim->contr->fire_on = 0;
1099 victim->speed_left = 0.f; 1098 victim->speed_left = 1.f;
1100 move_player (victim, dir); 1099 move_player (victim, dir);
1101 } 1100 }
1102 else 1101 else
1103 return; 1102 return;
1104 } 1103 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines