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.55 by root, Mon Jun 4 12:19:09 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software; you can redistribute it and/or modify it
9 * it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
10 * the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
11 * (at your option) any later version. 11 * 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, but
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16 * GNU General Public License for more details. 16 * for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License along
19 * along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 23 */
24 24
25/* 25/*
26 * Routines that is executed from objects based on their speed have been 26 * Routines that is executed from objects based on their speed have been
27 * collected in this file. 27 * collected in this file.
… …
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 }
… …
1137 if (op->above == NULL) 1136 if (op->above == NULL)
1138 return; 1137 return;
1139 1138
1140 for (tmp = op->above; tmp; tmp = tmp->above) 1139 for (tmp = op->above; tmp; tmp = tmp->above)
1141 { 1140 {
1142 if (op->other_arch->name == tmp->arch->name) 1141 if (op->other_arch->archname == tmp->arch->archname)
1143 { 1142 {
1144 if (op->level <= 0) 1143 if (op->level <= 0)
1145 tmp->destroy (); 1144 tmp->destroy ();
1146 else 1145 else
1147 { 1146 {
… …
1300} 1299}
1301 1300
1302void 1301void
1303process_object (object *op) 1302process_object (object *op)
1304{ 1303{
1305 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 1304 if (expect_false (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)))
1306 return; 1305 return;
1307 1306
1308 if (INVOKE_OBJECT (TICK, op)) 1307 if (expect_false (INVOKE_OBJECT (TICK, op)))
1309 return; 1308 return;
1310 1309
1311 if (QUERY_FLAG (op, FLAG_MONSTER)) 1310 if (QUERY_FLAG (op, FLAG_MONSTER))
1312 if (move_monster (op) || QUERY_FLAG (op, FLAG_FREED)) 1311 if (move_monster (op) || QUERY_FLAG (op, FLAG_FREED))
1313 return; 1312 return;
… …
1318 1317
1319 if (QUERY_FLAG (op, FLAG_SEE_ANYWHERE)) 1318 if (QUERY_FLAG (op, FLAG_SEE_ANYWHERE))
1320 make_sure_seen (op); 1319 make_sure_seen (op);
1321 } 1320 }
1322 1321
1322 if (expect_false (
1323 if (op->flag [FLAG_GENERATOR] 1323 op->flag [FLAG_GENERATOR]
1324 || op->flag [FLAG_CHANGING] 1324 || op->flag [FLAG_CHANGING]
1325 || op->flag [FLAG_IS_USED_UP]) 1325 || op->flag [FLAG_IS_USED_UP]
1326 ))
1326 { 1327 {
1327 if (QUERY_FLAG (op, FLAG_CHANGING) && !op->state) 1328 if (QUERY_FLAG (op, FLAG_CHANGING) && !op->state)
1328 { 1329 {
1329 change_object (op); 1330 change_object (op);
1330 return; 1331 return;

Diff Legend

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