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.45 by root, Sun Apr 22 13:06:45 2007 UTC vs.
Revision 1.52 by root, Tue May 22 10:50:01 2007 UTC

… …
41 object *tmp; 41 object *tmp;
42 42
43 for (i = 1; i < 9; i += 2) 43 for (i = 1; i < 9; i += 2)
44 if ((tmp = present (DOOR, op->map, op->x + freearr_x[i], op->y + freearr_y[i])) != NULL) 44 if ((tmp = present (DOOR, op->map, op->x + freearr_x[i], op->y + freearr_y[i])) != NULL)
45 { 45 {
46 tmp->set_speed (0.1); 46 tmp->set_speed (0.1f);
47 tmp->speed_left = -0.2; 47 tmp->speed_left = -0.2f;
48 } 48 }
49 49
50 if (op->other_arch) 50 if (op->other_arch)
51 { 51 {
52 tmp = arch_to_object (op->other_arch); 52 tmp = arch_to_object (op->other_arch);
… …
69 for (i = 1; i < 9; i += 2) 69 for (i = 1; i < 9; i += 2)
70 { 70 {
71 tmp = present (LOCKED_DOOR, op->map, op->x + freearr_x[i], op->y + freearr_y[i]); 71 tmp = present (LOCKED_DOOR, op->map, op->x + freearr_x[i], op->y + freearr_y[i]);
72 if (tmp && tmp->slaying == op->slaying) 72 if (tmp && tmp->slaying == op->slaying)
73 { /* same key both doors */ 73 { /* same key both doors */
74 tmp->set_speed (0.1); 74 tmp->set_speed (0.1f);
75 tmp->speed_left = -0.2; 75 tmp->speed_left = -0.2f;
76 } 76 }
77 } 77 }
78 78
79 if (op->other_arch) 79 if (op->other_arch)
80 { 80 {
… …
220} 220}
221 221
222 222
223void 223void
224move_gate (object *op) 224move_gate (object *op)
225{ /* 1 = going down, 0 = goind up */ 225{ /* 1 = going down, 0 = going up */
226 object *tmp; 226 object *tmp;
227 227
228 if (op->stats.wc < 0 || (int) op->stats.wc >= NUM_ANIMATIONS (op)) 228 if (op->stats.wc < 0 || (int) op->stats.wc >= NUM_ANIMATIONS (op))
229 { 229 {
230 LOG (llevError, "Gate error: animation was %d, max=%d\n", op->stats.wc, NUM_ANIMATIONS (op)); 230 LOG (llevError, "Gate error: animation was %d, max=%d\n", op->stats.wc, NUM_ANIMATIONS (op));
… …
302 */ 302 */
303 if ((int) op->stats.wc >= NUM_ANIMATIONS (op) / 2) 303 if ((int) op->stats.wc >= NUM_ANIMATIONS (op) / 2)
304 { 304 {
305 /* Halfway or further, check blocks */ 305 /* Halfway or further, check blocks */
306 /* First, get the top object on the square. */ 306 /* First, get the top object on the square. */
307 for (tmp = op->above; tmp != NULL && tmp->above != NULL; tmp = tmp->above); 307 for (tmp = op->above; tmp && tmp->above; tmp = tmp->above)
308 ;
308 309
309 if (tmp != NULL) 310 if (tmp)
310 { 311 {
311 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 312 if (QUERY_FLAG (tmp, FLAG_ALIVE))
312 { 313 {
313 hit_player (tmp, random_roll (1, op->stats.dam, tmp, PREFER_LOW), op, AT_PHYSICAL, 1); 314 hit_player (tmp, random_roll (0, op->stats.dam, tmp, PREFER_LOW), op, AT_PHYSICAL, 1);
315
314 if (tmp->type == PLAYER) 316 if (tmp->type == PLAYER)
315 new_draw_info_format (NDI_UNIQUE, 0, tmp, "You are crushed by the %s!", &op->name); 317 new_draw_info_format (NDI_UNIQUE, 0, tmp, "You are crushed by the %s!", &op->name);
316 } 318 }
317 else 319 else
318 /* If the object is not alive, and the object either can 320 /* If the object is not alive, and the object either can
… …
572 return NULL; 574 return NULL;
573 } 575 }
574 576
575 op->set_speed (0); 577 op->set_speed (0);
576 op->direction = 0; 578 op->direction = 0;
577 op->move_on = 0; 579 op->move_on = 0;
578 op->move_type = 0; 580 op->move_type = 0;
581 op->skill = 0; // really?
582
583 // restore original wc, dam, attacktype and slaying
579 op->stats.wc = op->stats.sp; 584 op->stats.wc = op->stats.sp;
580 op->stats.dam = op->stats.hp; 585 op->stats.dam = op->stats.hp;
581 op->attacktype = op->stats.grace; 586 op->attacktype = op->stats.grace;
582 op->slaying = 0;
583 op->skill = 0;
584 587
585 if (op->spellarg != NULL) 588 if (op->spellarg)
586 { 589 {
587 op->slaying = op->spellarg; 590 op->slaying = op->spellarg;
588 free (op->spellarg); 591 free (op->spellarg);
589 op->spellarg = NULL; 592 op->spellarg = 0;
590 } 593 }
591 else 594 else
592 op->slaying = NULL; 595 op->slaying = 0;
593 596
594 /* Reset these to zero, so that object::can_merge will work properly */ 597 /* Reset these to zero, so that object::can_merge will work properly */
595 op->spellarg = NULL; 598 op->spellarg = NULL;
596 op->stats.sp = 0; 599 op->stats.sp = 0;
597 op->stats.hp = 0; 600 op->stats.hp = 0;
… …
626 op->destroy (); 629 op->destroy ();
627 } 630 }
628 else 631 else
629 { 632 {
630 op = fix_stopped_arrow (op); 633 op = fix_stopped_arrow (op);
634
631 if (op) 635 if (op)
632 merge_ob (op, NULL); 636 merge_ob (op, 0);
633 } 637 }
634} 638}
635 639
636/* Move an arrow along its course. op is the arrow or thrown object. 640/* Move an arrow along its course. op is the arrow or thrown object.
637 */ 641 */
… …
950 return; 954 return;
951 teleport (head, TELEPORTER, tmp); 955 teleport (head, TELEPORTER, tmp);
952 } 956 }
953} 957}
954 958
955
956/* This object will teleport someone to a different map 959/* This object will teleport someone to a different map
957 and will also apply changes to the player from its inventory. 960 and will also apply changes to the player from its inventory.
958 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
959 can't be generalized. 962 can't be generalized.
960*/ 963*/
… …
1035 * it'll paralyze the victim for hp*his speed/op->speed 1038 * it'll paralyze the victim for hp*his speed/op->speed
1036 */ 1039 */
1037void 1040void
1038move_player_mover (object *op) 1041move_player_mover (object *op)
1039{ 1042{
1040 object *victim, *nextmover;
1041 int dir = op->stats.sp; 1043 int dir = op->stats.sp;
1042 sint16 nx, ny; 1044 sint16 nx, ny;
1043 maptile *m; 1045 maptile *m;
1044 1046
1045 /* Determine direction now for random movers so we do the right thing */ 1047 /* Determine direction now for random movers so we do the right thing */
1046 if (!dir) 1048 if (!dir)
1047 dir = rndm (1, 8); 1049 dir = rndm (1, 8);
1048 1050
1049 for (victim = GET_MAP_OB (op->map, op->x, op->y); victim != NULL; victim = victim->above) 1051 for (object *victim = op->ms ().bot; victim; victim = victim->above)
1050 { 1052 {
1051 if (QUERY_FLAG (victim, FLAG_ALIVE) && !QUERY_FLAG (victim, FLAG_WIZPASS) && 1053 if (QUERY_FLAG (victim, FLAG_ALIVE) && !QUERY_FLAG (victim, FLAG_WIZPASS) &&
1052 (victim->move_type & op->move_type || !victim->move_type)) 1054 (victim->move_type & op->move_type || !victim->move_type))
1053 { 1055 {
1054 1056
… …
1071 } 1073 }
1072 1074
1073 if (should_director_abort (op, victim)) 1075 if (should_director_abort (op, victim))
1074 return; 1076 return;
1075 1077
1076 for (nextmover = GET_MAP_OB (m, nx, ny); nextmover != NULL; nextmover = nextmover->above) 1078 for (object *nextmover = m->at (nx, ny).bot; nextmover; nextmover = nextmover->above)
1077 { 1079 {
1078 if (nextmover->type == PLAYERMOVER) 1080 if (nextmover->type == PLAYERMOVER)
1079 nextmover->speed_left = -.99; 1081 nextmover->speed_left = -.99f;
1082
1080 if (QUERY_FLAG (nextmover, FLAG_ALIVE)) 1083 if (QUERY_FLAG (nextmover, FLAG_ALIVE))
1081 {
1082 op->speed_left = -1.1; /* wait until the next thing gets out of the way */ 1084 op->speed_left = -1.1f; /* wait until the next thing gets out of the way */
1083 }
1084 } 1085 }
1085 1086
1086 if (victim->type == PLAYER) 1087 if (victim->type == PLAYER)
1087 { 1088 {
1088 /* only level >=1 movers move people */ 1089 /* only level >=1 movers move people */
… …
1092 * is cleared, otherwise the player will get stuck in 1093 * is cleared, otherwise the player will get stuck in
1093 * place. This can happen if the player used a spell to 1094 * place. This can happen if the player used a spell to
1094 * get to this space. 1095 * get to this space.
1095 */ 1096 */
1096 victim->contr->fire_on = 0; 1097 victim->contr->fire_on = 0;
1097 victim->speed_left = -FABS (victim->speed); 1098 victim->speed_left = 1.f;
1098 move_player (victim, dir); 1099 move_player (victim, dir);
1099 } 1100 }
1100 else 1101 else
1101 return; 1102 return;
1102 } 1103 }
… …
1106 if (!op->stats.maxsp && op->attacktype) 1107 if (!op->stats.maxsp && op->attacktype)
1107 op->stats.maxsp = 2; 1108 op->stats.maxsp = 2;
1108 1109
1109 if (op->attacktype) 1110 if (op->attacktype)
1110 { /* flag to paralyze the player */ 1111 { /* flag to paralyze the player */
1111
1112 victim->speed_left = -FABS (op->stats.maxsp * victim->speed / op->speed); 1112 victim->speed_left = max (-5.f, -FABS (op->stats.maxsp * victim->speed / op->speed));
1113 /* Not sure why, but for some chars on metalforge, they
1114 * would sometimes get -inf speed_left, and from the
1115 * description, it could only happen here, so just put
1116 * a lower sanity limit. My only guess is that the
1117 * mover has 0 speed.
1118 */
1119 if (victim->speed_left < -5.0)
1120 victim->speed_left = -5.0;
1121 } 1113 }
1122 } 1114 }
1123 } 1115 }
1124} 1116}
1125 1117
… …
1304 } 1296 }
1305 } 1297 }
1306 } 1298 }
1307} 1299}
1308 1300
1309int 1301void
1310process_object (object *op) 1302process_object (object *op)
1311{ 1303{
1312 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 1304 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1313 return 0; 1305 return;
1314 1306
1315 if (INVOKE_OBJECT (TICK, op)) 1307 if (INVOKE_OBJECT (TICK, op))
1316 return 0; 1308 return;
1317 1309
1318 if (QUERY_FLAG (op, FLAG_MONSTER)) 1310 if (QUERY_FLAG (op, FLAG_MONSTER))
1319 if (move_monster (op) || QUERY_FLAG (op, FLAG_FREED)) 1311 if (move_monster (op) || QUERY_FLAG (op, FLAG_FREED))
1320 return 1; 1312 return;
1321 1313
1322 if (QUERY_FLAG (op, FLAG_ANIMATE) && op->anim_speed == 0) 1314 if (QUERY_FLAG (op, FLAG_ANIMATE) && op->anim_speed == 0)
1323 { 1315 {
1324 if (op->type == PLAYER)
1325 animate_object (op, op->facing);
1326 else
1327 animate_object (op, op->direction); 1316 animate_object (op, op->contr ? op->facing : op->direction);
1328 1317
1329 if (QUERY_FLAG (op, FLAG_SEE_ANYWHERE)) 1318 if (QUERY_FLAG (op, FLAG_SEE_ANYWHERE))
1330 make_sure_seen (op); 1319 make_sure_seen (op);
1331 } 1320 }
1332 1321
1322 if (op->flag [FLAG_GENERATOR]
1323 || op->flag [FLAG_CHANGING]
1324 || op->flag [FLAG_IS_USED_UP])
1325 {
1333 if (QUERY_FLAG (op, FLAG_CHANGING) && !op->state) 1326 if (QUERY_FLAG (op, FLAG_CHANGING) && !op->state)
1334 { 1327 {
1335 change_object (op); 1328 change_object (op);
1336 return 1; 1329 return;
1337 } 1330 }
1338 1331
1339 if (QUERY_FLAG (op, FLAG_GENERATOR) && !QUERY_FLAG (op, FLAG_FRIENDLY)) 1332 if (QUERY_FLAG (op, FLAG_GENERATOR) && !QUERY_FLAG (op, FLAG_FRIENDLY))
1340 generate_monster (op); 1333 generate_monster (op);
1341 1334
1342 if (QUERY_FLAG (op, FLAG_IS_USED_UP) && --op->stats.food <= 0) 1335 if (QUERY_FLAG (op, FLAG_IS_USED_UP) && --op->stats.food <= 0)
1343 { 1336 {
1344 if (QUERY_FLAG (op, FLAG_APPLIED)) 1337 if (QUERY_FLAG (op, FLAG_APPLIED))
1345 remove_force (op); 1338 remove_force (op);
1346 else 1339 else
1347 { 1340 {
1348 /* IF necessary, delete the item from the players inventory */ 1341 /* If necessary, delete the item from the players inventory */
1349 object *pl = op->in_player (); 1342 object *pl = op->in_player ();
1350 1343
1351 if (pl) 1344 if (pl)
1352 esrv_del_item (pl->contr, op->count); 1345 esrv_del_item (pl->contr, op->count);
1353 1346
1354 op->remove (); 1347 op->remove ();
1355 1348
1356 if (QUERY_FLAG (op, FLAG_SEE_ANYWHERE)) 1349 if (QUERY_FLAG (op, FLAG_SEE_ANYWHERE))
1357 make_sure_not_seen (op); 1350 make_sure_not_seen (op);
1358 1351
1359 op->destroy (); 1352 op->destroy ();
1360 } 1353 }
1361 1354
1362 return 1; 1355 return;
1356 }
1363 } 1357 }
1364 1358
1365 switch (op->type) 1359 switch (op->type)
1366 { 1360 {
1367 case SPELL_EFFECT: 1361 case SPELL_EFFECT:
1368 move_spell_effect (op); 1362 move_spell_effect (op);
1369 return 1; 1363 break;
1370 1364
1371 case ROD: 1365 case ROD:
1372 case HORN: 1366 case HORN:
1373 regenerate_rod (op); 1367 regenerate_rod (op);
1374 return 1; 1368 break;
1375 1369
1376 case FORCE: 1370 case FORCE:
1377 case POTION_EFFECT: 1371 case POTION_EFFECT:
1378 remove_force (op); 1372 remove_force (op);
1379 return 1; 1373 break;
1380 1374
1381 case BLINDNESS: 1375 case BLINDNESS:
1382 remove_blindness (op); 1376 remove_blindness (op);
1383 return 0; 1377 break;
1384 1378
1385 case POISONING: 1379 case POISONING:
1386 poison_more (op); 1380 poison_more (op);
1387 return 0; 1381 break;
1388 1382
1389 case DISEASE: 1383 case DISEASE:
1390 move_disease (op); 1384 move_disease (op);
1391 return 0; 1385 break;
1392 1386
1393 case SYMPTOM: 1387 case SYMPTOM:
1394 move_symptom (op); 1388 move_symptom (op);
1395 return 0; 1389 break;
1396 1390
1397 case THROWN_OBJ: 1391 case THROWN_OBJ:
1398 case ARROW: 1392 case ARROW:
1399 move_arrow (op); 1393 move_arrow (op);
1400 return 0; 1394 break;
1401 1395
1402 case DOOR: 1396 case DOOR:
1403 remove_door (op); 1397 remove_door (op);
1404 return 0; 1398 break;
1405 1399
1406 case LOCKED_DOOR: 1400 case LOCKED_DOOR:
1407 remove_door2 (op); 1401 remove_door2 (op);
1408 return 0; 1402 break;
1409 1403
1410 case TELEPORTER: 1404 case TELEPORTER:
1411 move_teleporter (op); 1405 move_teleporter (op);
1412 return 0; 1406 break;
1413 1407
1414 case GOLEM: 1408 case GOLEM:
1415 move_golem (op); 1409 move_golem (op);
1416 return 0; 1410 break;
1417 1411
1418 case EARTHWALL: 1412 case EARTHWALL:
1419 hit_player (op, 2, op, AT_PHYSICAL, 1); 1413 hit_player (op, 2, op, AT_PHYSICAL, 1);
1420 return 0; 1414 break;
1421 1415
1422 case FIREWALL: 1416 case FIREWALL:
1423 move_firewall (op); 1417 move_firewall (op);
1424 if (op->stats.maxsp) 1418 if (op->stats.maxsp)
1425 animate_turning (op); 1419 animate_turning (op);
1426 return 0; 1420 break;
1427 1421
1428 case MOOD_FLOOR: 1422 case MOOD_FLOOR:
1429 do_mood_floor (op); 1423 do_mood_floor (op);
1430 return 0; 1424 break;
1431 1425
1432 case GATE: 1426 case GATE:
1433 move_gate (op); 1427 move_gate (op);
1434 return 0; 1428 break;
1435 1429
1436 case TIMED_GATE: 1430 case TIMED_GATE:
1437 move_timed_gate (op); 1431 move_timed_gate (op);
1438 return 0; 1432 break;
1439 1433
1440 case TRIGGER: 1434 case TRIGGER:
1441 case TRIGGER_BUTTON: 1435 case TRIGGER_BUTTON:
1442 case TRIGGER_PEDESTAL: 1436 case TRIGGER_PEDESTAL:
1443 case TRIGGER_ALTAR: 1437 case TRIGGER_ALTAR:
1444 animate_trigger (op); 1438 animate_trigger (op);
1445 return 0; 1439 break;
1446 1440
1447 case DETECTOR: 1441 case DETECTOR:
1448 move_detector (op); 1442 move_detector (op);
1449 1443
1450 case DIRECTOR: 1444 case DIRECTOR:
1451 if (op->stats.maxsp) 1445 if (op->stats.maxsp)
1452 animate_turning (op); 1446 animate_turning (op);
1453 return 0; 1447 break;
1454 1448
1455 case HOLE: 1449 case HOLE:
1456 move_hole (op); 1450 move_hole (op);
1457 return 0; 1451 break;
1458 1452
1459 case DEEP_SWAMP: 1453 case DEEP_SWAMP:
1460 move_deep_swamp (op); 1454 move_deep_swamp (op);
1461 return 0; 1455 break;
1462 1456
1463 case RUNE: 1457 case RUNE:
1464 case TRAP: 1458 case TRAP:
1465 move_rune (op); 1459 move_rune (op);
1466 return 0; 1460 break;
1467 1461
1468 case PLAYERMOVER: 1462 case PLAYERMOVER:
1469 move_player_mover (op); 1463 move_player_mover (op);
1470 return 0; 1464 break;
1471 1465
1472 case CREATOR: 1466 case CREATOR:
1473 move_creator (op); 1467 move_creator (op);
1474 return 0; 1468 break;
1475 1469
1476 case MARKER: 1470 case MARKER:
1477 move_marker (op); 1471 move_marker (op);
1478 return 0; 1472 break;
1479 1473
1480 case PLAYER_CHANGER: 1474 case PLAYER_CHANGER:
1481 move_player_changer (op); 1475 move_player_changer (op);
1482 return 0; 1476 break;
1483 1477
1484 case PEACEMAKER: 1478 case PEACEMAKER:
1485 move_peacemaker (op); 1479 move_peacemaker (op);
1486 return 0; 1480 break;
1487 }
1488 1481
1489 return 0; 1482 case PLAYER:
1483 // players have their own speed-management, so undo the --speed_left
1484 ++op->speed_left;
1485 break;
1486 }
1490} 1487}
1488

Diff Legend

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