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.85 by elmex, Mon Jan 12 00:17:23 2009 UTC vs.
Revision 1.103 by root, Fri Mar 26 00:53:26 2010 UTC

… …
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * 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 Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/* 25/*
… …
49 } 50 }
50 } 51 }
51 52
52 if (op->other_arch) 53 if (op->other_arch)
53 { 54 {
54 object *tmp = arch_to_object (op->other_arch); 55 object *tmp = op->other_arch->instance ();
55 tmp->x = op->x; 56 tmp->x = op->x;
56 tmp->y = op->y; 57 tmp->y = op->y;
57 tmp->map = op->map; 58 tmp->map = op->map;
58 tmp->level = op->level; 59 tmp->level = op->level;
59 insert_ob_in_map (tmp, op->map, op, 0); 60 insert_ob_in_map (tmp, op->map, op, 0);
… …
78 } 79 }
79 } 80 }
80 81
81 if (op->other_arch) 82 if (op->other_arch)
82 { 83 {
83 tmp = arch_to_object (op->other_arch); 84 tmp = op->other_arch->instance ();
84 tmp->x = op->x; 85 tmp->x = op->x;
85 tmp->y = op->y; 86 tmp->y = op->y;
86 tmp->map = op->map; 87 tmp->map = op->map;
87 tmp->level = op->level; 88 tmp->level = op->level;
88 insert_ob_in_map (tmp, op->map, op, 0); 89 insert_ob_in_map (tmp, op->map, op, 0);
89 } 90 }
90 91
91 op->drop_and_destroy (); 92 op->drop_and_destroy ();
92} 93}
93 94
94void 95static void
95generate_monster (object *gen) 96generate_monster (object *gen)
96{ 97{
97 if (!gen->map) 98 if (!gen->map)
98 return; 99 return;
99 100
… …
134 // ...or use other_arch 135 // ...or use other_arch
135 dir = find_free_spot (gen->other_arch, gen->map, gen->x, gen->y, 1, SIZEOFFREE1 + 1); 136 dir = find_free_spot (gen->other_arch, gen->map, gen->x, gen->y, 1, SIZEOFFREE1 + 1);
136 if (dir < 0) 137 if (dir < 0)
137 return; 138 return;
138 139
139 op = arch_to_object (gen->other_arch); 140 op = gen->other_arch->instance ();
140 } 141 }
141 else 142 else
142 return; 143 return;
143 144
144 op->expand_tail (); 145 op->expand_tail ();
… …
157 } 158 }
158 159
159 op->destroy (); 160 op->destroy ();
160} 161}
161 162
162void 163static void
163remove_force (object *op) 164remove_force (object *op)
164{ 165{
165 if (--op->duration > 0) 166 if (--op->duration > 0)
166 return; 167 return;
167 168
… …
179 } 180 }
180 181
181 op->destroy (); 182 op->destroy ();
182} 183}
183 184
184void 185static void
185remove_blindness (object *op) 186remove_blindness (object *op)
186{ 187{
187 if (--op->stats.food > 0) 188 if (--op->stats.food > 0)
188 return; 189 return;
189 190
… …
196 } 197 }
197 198
198 op->destroy (); 199 op->destroy ();
199} 200}
200 201
201void 202static void
202poison_more (object *op) 203poison_more (object *op)
203{ 204{
204 if (op->env == NULL || !QUERY_FLAG (op->env, FLAG_ALIVE) || op->env->stats.hp < 0) 205 if (op->env == NULL || !QUERY_FLAG (op->env, FLAG_ALIVE) || op->env->stats.hp < 0)
205 { 206 {
206 op->destroy (); 207 op->destroy ();
… …
231 232
232 hit_player (op->env, op->stats.dam, op, AT_INTERNAL, 1); 233 hit_player (op->env, op->stats.dam, op, AT_INTERNAL, 1);
233} 234}
234 235
235 236
236void 237static void
237move_gate (object *op) 238move_gate (object *op)
238{ /* 1 = going down, 0 = going up */ 239{ /* 1 = going down, 0 = going up */
239 object *tmp; 240 object *tmp;
240 241
241 if (op->stats.wc < 0 || (int) op->stats.wc >= NUM_ANIMATIONS (op)) 242 if (op->stats.wc < 0 || (int) op->stats.wc >= NUM_ANIMATIONS (op))
… …
248 if (op->value) 249 if (op->value)
249 { 250 {
250 if (--op->stats.wc <= 0) 251 if (--op->stats.wc <= 0)
251 { /* Reached bottom, let's stop */ 252 { /* Reached bottom, let's stop */
252 op->stats.wc = 0; 253 op->stats.wc = 0;
253 if (op->arch->speed) 254 if (op->arch->has_active_speed ())
254 op->value = 0; 255 op->value = 0;
255 else 256 else
256 op->set_speed (0); 257 op->set_speed (0);
257 } 258 }
258 259
… …
284 if (!QUERY_FLAG (tmp, FLAG_NO_PICK) || QUERY_FLAG (tmp, FLAG_CAN_ROLL) || QUERY_FLAG (tmp, FLAG_ALIVE)) 285 if (!QUERY_FLAG (tmp, FLAG_NO_PICK) || QUERY_FLAG (tmp, FLAG_CAN_ROLL) || QUERY_FLAG (tmp, FLAG_ALIVE))
285 break; 286 break;
286 287
287 if (!tmp) 288 if (!tmp)
288 { 289 {
289 if (op->arch->speed) 290 if (op->arch->has_active_speed ())
290 op->value = 1; 291 op->value = 1;
291 else 292 else
292 op->set_speed (0); 293 op->set_speed (0);
293 294
294 return; 295 return;
… …
375 376
376/* hp : how long door is open/closed 377/* hp : how long door is open/closed
377 * maxhp : initial value for hp 378 * maxhp : initial value for hp
378 * sp : 1 = open, 0 = close 379 * sp : 1 = open, 0 = close
379 */ 380 */
380void 381static void
381move_timed_gate (object *op) 382move_timed_gate (object *op)
382{ 383{
383 int v = op->value; 384 int v = op->value;
384 385
385 if (op->stats.sp) 386 if (op->stats.sp)
… …
404 * speed: frequency of 'glances' 405 * speed: frequency of 'glances'
405 * connected: connected value of detector 406 * connected: connected value of detector
406 * sp: 1 if detection sets buttons 407 * sp: 1 if detection sets buttons
407 * -1 if detection unsets buttons 408 * -1 if detection unsets buttons
408 */ 409 */
409 410static void
410void
411move_detector (object *op) 411move_detector (object *op)
412{ 412{
413 object *tmp; 413 object *tmp;
414 int last = op->value; 414 int last = op->value;
415 int detected; 415 int detected;
… …
482 SET_ANIMATION (op, op->stats.wc); 482 SET_ANIMATION (op, op->stats.wc);
483 update_object (op, UP_OBJ_FACE); 483 update_object (op, UP_OBJ_FACE);
484 } 484 }
485} 485}
486 486
487void 487static void
488move_hole (object *op) 488move_hole (object *op)
489{ /* 1 = opening, 0 = closing */ 489{ /* 1 = opening, 0 = closing */
490 if (op->value) 490 if (op->value)
491 { /* We're opening */ 491 { /* We're opening */
492 if (--op->stats.wc <= 0) 492 if (--op->stats.wc <= 0)
… …
599 599
600 // restore original wc, dam, attacktype and slaying 600 // restore original wc, dam, attacktype and slaying
601 op->stats.wc = op->stats.sp; 601 op->stats.wc = op->stats.sp;
602 op->stats.dam = op->stats.hp; 602 op->stats.dam = op->stats.hp;
603 op->attacktype = op->stats.grace; 603 op->attacktype = op->stats.grace;
604 op->slaying = op->custom_name;
604 605
605 if (op->spellarg)
606 {
607 op->slaying = op->spellarg;
608 free (op->spellarg);
609 op->spellarg = 0;
610 }
611 else
612 op->slaying = 0;
613
614 /* Reset these to zero, so that object::can_merge will work properly */ 606 /* Reset these to defaults, so that object::can_merge will work properly */
615 op->spellarg = NULL; 607 op->custom_name = 0;
616 op->stats.sp = 0; 608 op->stats.sp = 0;
617 op->stats.hp = 0; 609 op->stats.hp = 0;
618 op->stats.grace = 0; 610 op->stats.grace = 0;
619 op->level = 0; 611 op->level = 0;
620 op->face = op->arch->face; 612 op->face = op->arch->face;
621 op->owner = NULL; /* So that stopped arrows will be saved */ 613 op->owner = 0;
614
622 update_object (op, UP_OBJ_CHANGE); 615 update_object (op, UP_OBJ_CHANGE);
616
623 return op; 617 return op;
624} 618}
625 619
626/* stop_arrow() - what to do when a non-living flying object 620/* stop_arrow() - what to do when a non-living flying object
627 * has to stop. Sept 96 - I added in thrown object code in 621 * has to stop. Sept 96 - I added in thrown object code in
… …
816 return; 810 return;
817 } 811 }
818 812
819 /* update object image for new facing */ 813 /* update object image for new facing */
820 /* many thrown objects *don't* have more than one face */ 814 /* many thrown objects *don't* have more than one face */
821 if (GET_ANIM_ID (op)) 815 if (op->has_anim ())
822 SET_ANIMATION (op, op->direction); 816 op->set_anim_frame (op->direction);
823 } /* object is reflected */ 817 } /* object is reflected */
824 } /* object ran into a wall */ 818 } /* object ran into a wall */
825 819
826 /* decrease the speed as it flies. 0.05 means a standard bow will shoot 820 /* decrease the speed as it flies. 0.05 means a standard bow will shoot
827 * about 17 squares. Tune as needed. 821 * about 17 squares. Tune as needed.
… …
830 824
831 /* Move the arrow. */ 825 /* Move the arrow. */
832 op->move_to (pos); 826 op->move_to (pos);
833} 827}
834 828
835void 829static void
836change_object (object *op) 830change_object (object *op)
837{ /* Doesn`t handle linked objs yet */ 831{ /* Doesn`t handle linked objs yet */
838 int i, j;
839
840 if (!op->other_arch) 832 if (!op->other_arch)
841 { 833 {
842 LOG (llevError, "Change object (%s) without other_arch error.\n", op->debug_desc ()); 834 LOG (llevError, "Change object (%s) without other_arch error.\n", op->debug_desc ());
843 return; 835 return;
844 } 836 }
… …
853 } 845 }
854 846
855 object *env = op->env; 847 object *env = op->env;
856 848
857 op->remove (); 849 op->remove ();
858 for (i = 0; i < op->stats.food; i++) 850 for (int i = 0; i < op->stats.food; i++)
859 { 851 {
860 object *tmp = arch_to_object (op->other_arch); 852 object *tmp = op->other_arch->instance ();
861 853
862 tmp->stats.hp = op->stats.hp; /* The only variable it keeps. */ 854 tmp->stats.hp = op->stats.hp; /* The only variable it keeps. */
863 855
864 if (env) 856 if (env)
865 env->insert (tmp); 857 env->insert (tmp);
866 else 858 else
867 { 859 {
868 j = find_first_free_spot (tmp, op->map, op->x, op->y); 860 int j = find_first_free_spot (tmp, op->map, op->x, op->y);
861
869 if (j < 0) /* No free spot */ 862 if (j < 0) /* No free spot */
870 tmp->destroy (); 863 tmp->destroy ();
871 else 864 else
872 { 865 {
873 mapxy pos (op); pos.move (j); 866 mapxy pos (op); pos.move (j);
… …
947/* This object will teleport someone to a different map 940/* This object will teleport someone to a different map
948 and will also apply changes to the player from its inventory. 941 and will also apply changes to the player from its inventory.
949 This was invented for giving classes, but there's no reason it 942 This was invented for giving classes, but there's no reason it
950 can't be generalized. 943 can't be generalized.
951*/ 944*/
952void 945static void
953move_player_changer (object *op) 946move_player_changer (object *op)
954{ 947{
955 object *player;
956 object *walk;
957
958 if (!op->above || !EXIT_PATH (op)) 948 if (!op->above || !EXIT_PATH (op))
959 return; 949 return;
960 950
961 /* This isn't all that great - means that the player_mover 951 /* This isn't all that great - means that the player_mover
962 * needs to be on top. 952 * needs to be on top.
963 */ 953 */
964 if (op->above->type == PLAYER) 954 if (op->above->type == PLAYER)
965 { 955 {
956 object *player = op->above;
957
966 if (INVOKE_OBJECT (TRIGGER, op, ARG_OBJECT (player))) 958 if (INVOKE_OBJECT (TRIGGER, op, ARG_OBJECT (player)))
967 return; 959 return;
968 960
969 player = op->above;
970
971 for (walk = op->inv; walk; walk = walk->below) 961 for (object *walk = op->inv; walk; walk = walk->below)
972 apply_changes_to_player (player, walk); 962 apply_changes_to_player (player, walk);
973 963
974 player->update_stats (); 964 player->update_stats ();
975 965
976 esrv_send_inventory (op->above, op->above); 966 esrv_send_inventory (op->above, op->above);
… …
1023 * moves them in the op->stats.sp direction. speed is how often it'll move. 1013 * moves them in the op->stats.sp direction. speed is how often it'll move.
1024 * If attacktype is nonzero it will paralyze the player. If lifesave is set, 1014 * If attacktype is nonzero it will paralyze the player. If lifesave is set,
1025 * it'll dissapear after hp+1 moves. If hp is set and attacktype is set, 1015 * it'll dissapear after hp+1 moves. If hp is set and attacktype is set,
1026 * it'll paralyze the victim for hp*his speed/op->speed 1016 * it'll paralyze the victim for hp*his speed/op->speed
1027 */ 1017 */
1028void 1018static void
1029move_player_mover (object *op) 1019move_player_mover (object *op)
1030{ 1020{
1031 int dir = op->stats.sp; 1021 int dir = op->stats.sp;
1032 sint16 nx, ny; 1022 sint16 nx, ny;
1033 maptile *m; 1023 maptile *m;
… …
1077 /* only level >=1 movers move people */ 1067 /* only level >=1 movers move people */
1078 if (op->level) 1068 if (op->level)
1079 { 1069 {
1080 /* Following is a bit of hack. We need to make sure it 1070 /* Following is a bit of hack. We need to make sure it
1081 * is cleared, otherwise the player will get stuck in 1071 * is cleared, otherwise the player will get stuck in
1082 * place. This can happen if the player used a spell to 1072 * place. This can happen if the player used a spell to
1083 * get to this space. 1073 * get to this space.
1084 */ 1074 */
1085 victim->contr->fire_on = 0; 1075 victim->contr->fire_on = 0;
1086 victim->speed_left = 1.f; 1076 victim->speed_left = 1.f;
1087 move_player (victim, dir); 1077 move_player (victim, dir);
1088 } 1078 }
1089 else 1079 else
1090 return; 1080 return;
1091 } 1081 }
1092 else 1082 else
1093 move_object (victim, dir); 1083 victim->move (dir);
1094 1084
1095 if (!op->stats.maxsp && op->attacktype) 1085 if (!op->stats.maxsp && op->attacktype)
1096 op->stats.maxsp = 2; 1086 op->stats.maxsp = 2;
1097 1087
1098 if (op->attacktype) 1088 if (op->attacktype)
1099 { /* flag to paralyze the player */ 1089 { /* flag to paralyze the player */
1100 victim->speed_left = max (-5.f, -FABS (op->stats.maxsp * victim->speed / op->speed)); 1090 victim->speed_left = max (-5.f, -op->stats.maxsp * victim->speed / op->speed);
1101 } 1091 }
1102 } 1092 }
1103 } 1093 }
1104} 1094}
1105 1095
… …
1235 { 1225 {
1236 /* remove an old force with a slaying field == op->name */ 1226 /* remove an old force with a slaying field == op->name */
1237 if (object *force = tmp->force_find (op->name)) 1227 if (object *force = tmp->force_find (op->name))
1238 force->destroy (); 1228 force->destroy ();
1239 1229
1240 if (!tmp->force_find (op->slaying)) 1230 if (op->slaying && !tmp->force_find (op->slaying))
1241 { 1231 {
1242 tmp->force_add (op->slaying, op->stats.food); 1232 tmp->force_add (op->slaying, op->stats.food);
1243 1233
1244 if (op->msg) 1234 if (op->msg)
1245 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, tmp, op->msg); 1235 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, tmp, op->msg);
… …
1259 } 1249 }
1260} 1250}
1261 1251
1262// mapscript objects activate themselves (only) then their timer fires 1252// mapscript objects activate themselves (only) then their timer fires
1263// TODO: maybe they should simply trigger the link like any other object? 1253// TODO: maybe they should simply trigger the link like any other object?
1264void 1254static void
1265move_mapscript (object *op) 1255move_mapscript (object *op)
1266{ 1256{
1267 op->set_speed (0); 1257 op->set_speed (0);
1268 cfperl_mapscript_activate (op, true, op, 0); 1258 cfperl_mapscript_activate (op, true, op, 0);
1269} 1259}
1270 1260
1261static void
1271void move_lamp (object *op) 1262move_lamp (object *op)
1272{ 1263{
1273 // if the lamp/torch is off, we should disable it. 1264 // if the lamp/torch is off, we should disable it.
1274 if (!op->glow_radius) 1265 if (!op->glow_radius)
1275 { 1266 {
1276 op->set_speed (0); 1267 op->set_speed (0);
1277 return; 1268 return;
1278 } 1269 }
1270 else
1271 {
1272 // check whether the face might need to be updated
1273 // (currently this is needed to have already switched on torches
1274 // on maps, as they just set the glow_radius in the archetype)
1275 if (op->other_arch
1276 && (
1277 (op->flag [FLAG_ANIMATE] != op->other_arch->flag [FLAG_ANIMATE])
1278 || (op->flag [FLAG_ANIMATE]
1279 ? (op->animation_id != op->other_arch->animation_id)
1280 : (op->face != op->other_arch->face))
1281 ))
1282 get_animation_from_arch (op, op->other_arch);
1283 }
1279 1284
1280 // lamps and torches auf maps don't use up their fuel 1285 // lamps and torches on maps don't use up their fuel
1281 if (op->is_on_map ()) 1286 if (op->is_on_map ())
1282 return; 1287 return;
1283 1288
1284 if (op->stats.food > 0) 1289 if (op->stats.food > 0)
1285 { 1290 {

Diff Legend

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