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.60 by root, Thu Jul 5 08:10:30 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
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your 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 GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 22 */
24 23
25/* 24/*
26 * Routines that is executed from objects based on their speed have been 25 * Routines that is executed from objects based on their speed have been
27 * collected in this file. 26 * collected in this file.
… …
100 99
101 object *op; 100 object *op;
102 101
103 if (QUERY_FLAG (gen, FLAG_CONTENT_ON_GEN)) 102 if (QUERY_FLAG (gen, FLAG_CONTENT_ON_GEN))
104 { 103 {
105 // either copy one item form the inventory... 104 // either copy one item from the inventory...
106 if (!gen->inv) 105 if (!gen->inv)
107 return; 106 return;
108 107
109 // first select one item from the inventory 108 // first select one item from the inventory
110 int index = 0; 109 int index = 0;
… …
115 op = object_create_clone (op); 114 op = object_create_clone (op);
116 115
117 CLEAR_FLAG (op, FLAG_IS_A_TEMPLATE); 116 CLEAR_FLAG (op, FLAG_IS_A_TEMPLATE);
118 unflag_inv (op, FLAG_IS_A_TEMPLATE); 117 unflag_inv (op, FLAG_IS_A_TEMPLATE);
119 } 118 }
119 else if (gen->other_arch)
120 {
121 // ...or use other_arch
122 op = arch_to_object (gen->other_arch);
123 }
120 else 124 else
121 {
122 // ...or use other_arch
123 if (archetype *at = gen->other_arch)
124 op = arch_to_object (at);
125 else
126 return; 125 return;
127 }
128 126
129 op->expand_tail (); 127 op->expand_tail ();
130 128
131 int i = find_free_spot (op, gen->map, gen->x, gen->y, 1, 9); 129 int i = find_free_spot (op, gen->map, gen->x, gen->y, 1, 9);
132 if (i >= 0) 130 if (i >= 0)
… …
147} 145}
148 146
149void 147void
150remove_force (object *op) 148remove_force (object *op)
151{ 149{
150 fprintf (stderr, "duration %s %d\n", &op->name, op->duration);//D
152 if (--op->duration > 0) 151 if (--op->duration > 0)
153 return; 152 return;
154 153
155 if (op->env) 154 if (op->env)
156 switch (op->subtype) 155 switch (op->subtype)
… …
235 if (op->value) 234 if (op->value)
236 { 235 {
237 if (--op->stats.wc <= 0) 236 if (--op->stats.wc <= 0)
238 { /* Reached bottom, let's stop */ 237 { /* Reached bottom, let's stop */
239 op->stats.wc = 0; 238 op->stats.wc = 0;
240 if (op->arch->clone.speed) 239 if (op->arch->speed)
241 op->value = 0; 240 op->value = 0;
242 else 241 else
243 op->set_speed (0); 242 op->set_speed (0);
244 } 243 }
245 244
… …
271 if (!QUERY_FLAG (tmp, FLAG_NO_PICK) || QUERY_FLAG (tmp, FLAG_CAN_ROLL) || QUERY_FLAG (tmp, FLAG_ALIVE)) 270 if (!QUERY_FLAG (tmp, FLAG_NO_PICK) || QUERY_FLAG (tmp, FLAG_CAN_ROLL) || QUERY_FLAG (tmp, FLAG_ALIVE))
272 break; 271 break;
273 272
274 if (tmp == NULL) 273 if (tmp == NULL)
275 { 274 {
276 if (op->arch->clone.speed) 275 if (op->arch->speed)
277 op->value = 1; 276 op->value = 1;
278 else 277 else
279 op->set_speed (0); 278 op->set_speed (0);
280 279
281 return; 280 return;
… …
347 op->stats.food = 1; 346 op->stats.food = 1;
348 } 347 }
349 else 348 else
350 { 349 {
351 op->move_block = MOVE_ALL; 350 op->move_block = MOVE_ALL;
352 if (!op->arch->clone.stats.ac) 351 if (!op->arch->stats.ac)
353 SET_FLAG (op, FLAG_BLOCKSVIEW); 352 SET_FLAG (op, FLAG_BLOCKSVIEW);
354 update_all_los (op->map, op->x, op->y); 353 update_all_los (op->map, op->x, op->y);
355 } 354 }
356 } /* gate is halfway up */ 355 } /* gate is halfway up */
357 356
… …
598 op->spellarg = NULL; 597 op->spellarg = NULL;
599 op->stats.sp = 0; 598 op->stats.sp = 0;
600 op->stats.hp = 0; 599 op->stats.hp = 0;
601 op->stats.grace = 0; 600 op->stats.grace = 0;
602 op->level = 0; 601 op->level = 0;
603 op->face = op->arch->clone.face; 602 op->face = op->arch->face;
604 op->owner = NULL; /* So that stopped arrows will be saved */ 603 op->owner = NULL; /* So that stopped arrows will be saved */
605 update_object (op, UP_OBJ_CHANGE); 604 update_object (op, UP_OBJ_CHANGE);
606 return op; 605 return op;
607} 606}
608 607
… …
910 move_teleporter (op->more); 909 move_teleporter (op->more);
911 910
912 if (op->head) 911 if (op->head)
913 head = op->head; 912 head = op->head;
914 913
915 for (tmp = op->above; tmp != NULL; tmp = tmp->above) 914 for (tmp = op->above; tmp; tmp = tmp->above)
916 if (!QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 915 if (!QUERY_FLAG (tmp, FLAG_IS_FLOOR))
917 break; 916 break;
918 917
919 /* If nothing above us to move, nothing to do */ 918 /* If nothing above us to move, nothing to do */
920 if (!tmp || QUERY_FLAG (tmp, FLAG_WIZPASS)) 919 if (!tmp || QUERY_FLAG (tmp, FLAG_WIZPASS))
… …
953 if (INVOKE_OBJECT (TRIGGER, op, ARG_OBJECT (tmp))) 952 if (INVOKE_OBJECT (TRIGGER, op, ARG_OBJECT (tmp)))
954 return; 953 return;
955 teleport (head, TELEPORTER, tmp); 954 teleport (head, TELEPORTER, tmp);
956 } 955 }
957} 956}
958
959 957
960/* This object will teleport someone to a different map 958/* This object will teleport someone to a different map
961 and will also apply changes to the player from its inventory. 959 and will also apply changes to the player from its inventory.
962 This was invented for giving classes, but there's no reason it 960 This was invented for giving classes, but there's no reason it
963 can't be generalized. 961 can't be generalized.
… …
1016 return; /* dm has created a firewall in his inventory */ 1014 return; /* dm has created a firewall in his inventory */
1017 1015
1018 spell = op->inv; 1016 spell = op->inv;
1019 1017
1020 if (!spell || spell->type != SPELL) 1018 if (!spell || spell->type != SPELL)
1021 spell = &op->other_arch->clone; 1019 spell = op->other_arch;
1022 1020
1023 if (!spell) 1021 if (!spell)
1024 { 1022 {
1025 LOG (llevError, "move_firewall: no spell specified (%s, %s, %d, %d)\n", &op->name, &op->map->name, op->x, op->y); 1023 LOG (llevError, "move_firewall: no spell specified (%s, %s, %d, %d)\n", &op->name, &op->map->name, op->x, op->y);
1026 return; 1024 return;
… …
1094 * is cleared, otherwise the player will get stuck in 1092 * is cleared, otherwise the player will get stuck in
1095 * place. This can happen if the player used a spell to 1093 * place. This can happen if the player used a spell to
1096 * get to this space. 1094 * get to this space.
1097 */ 1095 */
1098 victim->contr->fire_on = 0; 1096 victim->contr->fire_on = 0;
1099 victim->speed_left = 0.f; 1097 victim->speed_left = 1.f;
1100 move_player (victim, dir); 1098 move_player (victim, dir);
1101 } 1099 }
1102 else 1100 else
1103 return; 1101 return;
1104 } 1102 }
… …
1137 if (op->above == NULL) 1135 if (op->above == NULL)
1138 return; 1136 return;
1139 1137
1140 for (tmp = op->above; tmp; tmp = tmp->above) 1138 for (tmp = op->above; tmp; tmp = tmp->above)
1141 { 1139 {
1142 if (op->other_arch->name == tmp->arch->name) 1140 if (op->other_arch->archname == tmp->arch->archname)
1143 { 1141 {
1144 if (op->level <= 0) 1142 if (op->level <= 0)
1145 tmp->destroy (); 1143 tmp->destroy ();
1146 else 1144 else
1147 { 1145 {
… …
1243void 1241void
1244move_marker (object *op) 1242move_marker (object *op)
1245{ 1243{
1246 if (object *tmp = op->ms ().player ()) 1244 if (object *tmp = op->ms ().player ())
1247 { 1245 {
1248 object *tmp2;
1249
1250 /* remove an old force with a slaying field == op->name */ 1246 /* remove an old force with a slaying field == op->name */
1251 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below) 1247 if (object *force = tmp->force_find (op->name))
1252 if (tmp2->type == FORCE && tmp2->slaying && tmp2->slaying == op->name) 1248 force->destroy ();
1249
1250 if (!tmp->force_find (op->slaying))
1253 { 1251 {
1254 tmp2->destroy (); 1252 tmp->force_add (op->slaying, op->stats.food);
1255 break;
1256 }
1257 1253
1258 /* cycle through his inventory to look for the MARK we want to
1259 * place
1260 */
1261 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
1262 if (tmp2->type == FORCE && tmp2->slaying && tmp2->slaying == op->slaying)
1263 break;
1264
1265 /* if we didn't find our own MARK */
1266 if (!tmp2)
1267 {
1268 object *force = get_archetype (FORCE_NAME);
1269
1270 if (op->stats.food)
1271 {
1272 force->set_speed (0.01);
1273 force->speed_left = -op->stats.food;
1274 }
1275 else
1276 force->set_speed (0);
1277
1278 /* put in the lock code */
1279 force->slaying = op->slaying;
1280
1281 if (op->lore)
1282 force->lore = op->lore;
1283
1284 insert_ob_in_ob (force, tmp);
1285 if (op->msg) 1254 if (op->msg)
1286 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, tmp, op->msg); 1255 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, tmp, op->msg);
1287 1256
1288 if (op->stats.hp > 0) 1257 if (op->stats.hp > 0)
1289 { 1258 {
1290 op->stats.hp--; 1259 op->stats.hp--;
1260
1291 if (op->stats.hp == 0) 1261 if (op->stats.hp == 0)
1292 { 1262 {
1293 /* marker expires--granted mark number limit */ 1263 /* marker expires--granted mark number limit */
1294 op->destroy (); 1264 op->destroy ();
1295 return; 1265 return;
… …
1300} 1270}
1301 1271
1302void 1272void
1303process_object (object *op) 1273process_object (object *op)
1304{ 1274{
1305 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 1275 if (expect_false (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)))
1306 return; 1276 return;
1307 1277
1308 if (INVOKE_OBJECT (TICK, op)) 1278 if (expect_false (INVOKE_OBJECT (TICK, op)))
1309 return; 1279 return;
1310 1280
1311 if (QUERY_FLAG (op, FLAG_MONSTER)) 1281 if (QUERY_FLAG (op, FLAG_MONSTER))
1312 if (move_monster (op) || QUERY_FLAG (op, FLAG_FREED)) 1282 if (move_monster (op) || QUERY_FLAG (op, FLAG_FREED))
1313 return; 1283 return;
… …
1318 1288
1319 if (QUERY_FLAG (op, FLAG_SEE_ANYWHERE)) 1289 if (QUERY_FLAG (op, FLAG_SEE_ANYWHERE))
1320 make_sure_seen (op); 1290 make_sure_seen (op);
1321 } 1291 }
1322 1292
1293 if (expect_false (
1323 if (op->flag [FLAG_GENERATOR] 1294 op->flag [FLAG_GENERATOR]
1324 || op->flag [FLAG_CHANGING] 1295 || op->flag [FLAG_CHANGING]
1325 || op->flag [FLAG_IS_USED_UP]) 1296 || op->flag [FLAG_IS_USED_UP]
1297 ))
1326 { 1298 {
1327 if (QUERY_FLAG (op, FLAG_CHANGING) && !op->state) 1299 if (QUERY_FLAG (op, FLAG_CHANGING) && !op->state)
1328 { 1300 {
1329 change_object (op); 1301 change_object (op);
1330 return; 1302 return;

Diff Legend

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