Mercurial > mm7

comparison Player.cpp @ 1691:1c880907575f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Player::_48DCF6 substituted unnecessary vars by their values
author Grumpy7
date Sun, 22 Sep 2013 08:37:41 +0200
parents 95118ff8cc22
children 92732b6fc196
comparison
equal deleted inserted replaced
1690:95118ff8cc22 1691:1c880907575f
2321 v48 = 0; 2321 v48 = 0;
2322 switch ( a2 ) 2322 switch ( a2 )
2323 { 2323 {
2324 case 1: 2324 case 1:
2325 v6 = GetActualWillpower(); 2325 v6 = GetActualWillpower();
2326 v7 = GetParameterBonus(v6); 2326 v11 = GetParameterBonus(v6);
2327 v11 = v7;
2328 break; 2327 break;
2329 case 2: 2328 case 2:
2330 case 3: 2329 case 3:
2331 case 4: 2330 case 4:
2332 case 9: 2331 case 9:
2333 case 10: 2332 case 10:
2334 case 11: 2333 case 11:
2335 case 13: 2334 case 13:
2336 case 21: 2335 case 21:
2337 v6 = GetActualEndurance(); 2336 v6 = GetActualEndurance();
2338 v7 = GetParameterBonus(v6); 2337 v11 = GetParameterBonus(v6);
2339 v11 = v7;
2340 break; 2338 break;
2341 case 5: 2339 case 5:
2342 case 12: 2340 case 12:
2343 case 23: 2341 case 23:
2344 v40 = (CHARACTER_ATTRIBUTE_TYPE)14; 2342 v40 = (CHARACTER_ATTRIBUTE_TYPE)14;
2345 v7 = GetActualResistance(v40); 2343 v11 = GetActualResistance(v40);
2346 v11 = v7;
2347 break; 2344 break;
2348 case 15: 2345 case 15:
2349 v40 = (CHARACTER_ATTRIBUTE_TYPE)13; 2346 v40 = (CHARACTER_ATTRIBUTE_TYPE)13;
2350 v7 = GetActualResistance(v40); 2347 v11 = GetActualResistance(v40);
2351 v11 = v7;
2352 break; 2348 break;
2353 case 6: 2349 case 6:
2354 case 7: 2350 case 7:
2355 case 8: 2351 case 8:
2356 case 14: 2352 case 14:
2357 case 16: 2353 case 16:
2358 v40 = (CHARACTER_ATTRIBUTE_TYPE)15; 2354 v40 = (CHARACTER_ATTRIBUTE_TYPE)15;
2359 v7 = GetActualResistance(v40); 2355 v11 = GetActualResistance(v40);
2360 v11 = v7;
2361 break; 2356 break;
2362 case 22: 2357 case 22:
2363 v8 = GetActualWillpower(); 2358 v8 = GetActualWillpower();
2364 v9 = GetParameterBonus(v8);
2365 v10 = GetActualIntelligence(); 2359 v10 = GetActualIntelligence();
2366 v11 = (GetParameterBonus(v10) + v9) >> 1; 2360 v11 = (GetParameterBonus(v10) + GetParameterBonus(v8)) / 2;
2367 break; 2361 break;
2368 case 17: 2362 case 17:
2369 v12 = 0; 2363 v12 = 0;
2370 v13 = this->pInventoryItemList; 2364 v13 = this->pInventoryItemList;
2371 do 2365 do
2440 while ( v19 < 126 ); 2434 while ( v19 < 126 );
2441 if ( !v4 ) 2435 if ( !v4 )
2442 return 0; 2436 return 0;
2443 v47 = (unsigned __int8)v46[rand() % v4]; 2437 v47 = (unsigned __int8)v46[rand() % v4];
2444 v6 = GetActualAccuracy(); 2438 v6 = GetActualAccuracy();
2445 v7 = GetParameterBonus(v6); 2439 v11 = GetParameterBonus(v6);
2446 v11 = v7;
2447 break; 2440 break;
2448 default: 2441 default:
2449 v11 = 0; 2442 v11 = 0;
2450 break; 2443 break;
2451 } 2444 }
2458 else 2451 else
2459 { 2452 {
2460 switch ( a2 ) 2453 switch ( a2 )
2461 { 2454 {
2462 case 1: 2455 case 1:
2463 v41 = 1; 2456 SetCondition(0, 1);
2464 v36 = 0; 2457 pAudioPlayer->PlaySound((SoundID)221, 0, 0, -1, 0, 0, 0, 0);
2465 SetCondition(v36, v41);
2466 v42 = 0;
2467 v37 = 0;
2468 v35 = 0;
2469 v34 = 0;
2470 v33 = -1;
2471 v32 = 0;
2472 v31 = 0;
2473 v30 = (SoundID)221;
2474 pAudioPlayer->PlaySound(v30, v31, v32, v33, v34, v35, v37, v42);
2475 do 2458 do
2476 { 2459 {
2477 if ( this == pPlayers[v3 + 1] ) 2460 if ( this == pPlayers[v3 + 1] )
2478 break; 2461 break;
2479 ++v3; 2462 ++v3;
2481 while ( v3 < 4 ); 2464 while ( v3 < 4 );
2482 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); 2465 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3);
2483 return 1; 2466 return 1;
2484 break; 2467 break;
2485 case 2: 2468 case 2:
2486 v41 = 1; 2469 SetCondition(1, 1);
2487 v36 = 1; 2470 pAudioPlayer->PlaySound((SoundID)221, 0, 0, -1, 0, 0, 0, 0);
2488 SetCondition(v36, v41);
2489 v42 = 0;
2490 v37 = 0;
2491 v35 = 0;
2492 v34 = 0;
2493 v33 = -1;
2494 v32 = 0;
2495 v31 = 0;
2496 v30 = (SoundID)221;
2497 pAudioPlayer->PlaySound(v30, v31, v32, v33, v34, v35, v37, v42);
2498 do 2471 do
2499 { 2472 {
2500 if ( this == pPlayers[v3 + 1] ) 2473 if ( this == pPlayers[v3 + 1] )
2501 break; 2474 break;
2502 ++v3; 2475 ++v3;
2504 while ( v3 < 4 ); 2477 while ( v3 < 4 );
2505 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); 2478 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3);
2506 return 1; 2479 return 1;
2507 break; 2480 break;
2508 case 3: 2481 case 3:
2509 v41 = 1; 2482 SetCondition(2, 1);
2510 v36 = 2; 2483 pAudioPlayer->PlaySound((SoundID)221, 0, 0, -1, 0, 0, 0, 0);
2511 SetCondition(v36, v41);
2512 v42 = 0;
2513 v37 = 0;
2514 v35 = 0;
2515 v34 = 0;
2516 v33 = -1;
2517 v32 = 0;
2518 v31 = 0;
2519 v30 = (SoundID)221;
2520 pAudioPlayer->PlaySound(v30, v31, v32, v33, v34, v35, v37, v42);
2521 do 2484 do
2522 { 2485 {
2523 if ( this == pPlayers[v3 + 1] ) 2486 if ( this == pPlayers[v3 + 1] )
2524 break; 2487 break;
2525 ++v3; 2488 ++v3;
2527 while ( v3 < 4 ); 2490 while ( v3 < 4 );
2528 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); 2491 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3);
2529 return 1; 2492 return 1;
2530 break; 2493 break;
2531 case 23: 2494 case 23:
2532 v41 = 1; 2495 SetCondition(3, 1);
2533 v36 = 3; 2496 pAudioPlayer->PlaySound((SoundID)221, 0, 0, -1, 0, 0, 0, 0);
2534 SetCondition(v36, v41);
2535 v42 = 0;
2536 v37 = 0;
2537 v35 = 0;
2538 v34 = 0;
2539 v33 = -1;
2540 v32 = 0;
2541 v31 = 0;
2542 v30 = (SoundID)221;
2543 pAudioPlayer->PlaySound(v30, v31, v32, v33, v34, v35, v37, v42);
2544 do 2497 do
2545 { 2498 {
2546 if ( this == pPlayers[v3 + 1] ) 2499 if ( this == pPlayers[v3 + 1] )
2547 break; 2500 break;
2548 ++v3; 2501 ++v3;
2550 while ( v3 < 4 ); 2503 while ( v3 < 4 );
2551 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); 2504 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3);
2552 return 1; 2505 return 1;
2553 break; 2506 break;
2554 case 4: 2507 case 4:
2555 v41 = 1; 2508 SetCondition(4, 1);
2556 v36 = 4; 2509 pAudioPlayer->PlaySound((SoundID)221, 0, 0, -1, 0, 0, 0, 0);
2557 SetCondition(v36, v41);
2558 v42 = 0;
2559 v37 = 0;
2560 v35 = 0;
2561 v34 = 0;
2562 v33 = -1;
2563 v32 = 0;
2564 v31 = 0;
2565 v30 = (SoundID)221;
2566 pAudioPlayer->PlaySound(v30, v31, v32, v33, v34, v35, v37, v42);
2567 do 2510 do
2568 { 2511 {
2569 if ( this == pPlayers[v3 + 1] ) 2512 if ( this == pPlayers[v3 + 1] )
2570 break; 2513 break;
2571 ++v3; 2514 ++v3;
2573 while ( v3 < 4 ); 2516 while ( v3 < 4 );
2574 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); 2517 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3);
2575 return 1; 2518 return 1;
2576 break; 2519 break;
2577 case 5: 2520 case 5:
2578 v43 = 1; 2521 SetCondition(5, 1);
2579 v38 = 5; 2522 pAudioPlayer->PlaySound((SoundID)224, 0, 0, -1, 0, 0, 0, 0);
2580 SetCondition(v38, v43);
2581 v42 = 0;
2582 v37 = 0;
2583 v35 = 0;
2584 v34 = 0;
2585 v33 = -1;
2586 v32 = 0;
2587 v31 = 0;
2588 v30 = (SoundID)224;
2589 pAudioPlayer->PlaySound(v30, v31, v32, v33, v34, v35, v37, v42);
2590 do 2523 do
2591 { 2524 {
2592 if ( this == pPlayers[v3 + 1] ) 2525 if ( this == pPlayers[v3 + 1] )
2593 break; 2526 break;
2594 ++v3; 2527 ++v3;
2596 while ( v3 < 4 ); 2529 while ( v3 < 4 );
2597 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); 2530 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3);
2598 return 1; 2531 return 1;
2599 break; 2532 break;
2600 case 6: 2533 case 6:
2534 SetCondition(6, 1);
2535 pAudioPlayer->PlaySound((SoundID)222, 0, 0, -1, 0, 0, 0, 0);
2536 do
2537 {
2538 if ( this == pPlayers[v3 + 1] )
2539 break;
2540 ++v3;
2541 }
2542 while ( v3 < 4 );
2543 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3);
2544 return 1;
2545 break;
2601 case 7: 2546 case 7:
2547 SetCondition(8, 1);
2548 pAudioPlayer->PlaySound((SoundID)222, 0, 0, -1, 0, 0, 0, 0);
2549 do
2550 {
2551 if ( this == pPlayers[v3 + 1] )
2552 break;
2553 ++v3;
2554 }
2555 while ( v3 < 4 );
2556 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3);
2557 return 1;
2558 break;
2602 case 8: 2559 case 8:
2603 if ( a2 == 6 ) 2560 SetCondition(10, 1);
2604 { 2561 pAudioPlayer->PlaySound((SoundID)222, 0, 0, -1, 0, 0, 0, 0);
2605 v44 = 6;
2606 v24 = v44;
2607 SetCondition(v24, 1);
2608 v42 = 0;
2609 v37 = 0;
2610 v35 = 0;
2611 v34 = 0;
2612 v33 = -1;
2613 v32 = 0;
2614 v31 = 0;
2615 v30 = (SoundID)222;
2616 pAudioPlayer->PlaySound(v30, v31, v32, v33, v34, v35, v37, v42);
2617 do
2618 {
2619 if ( this == pPlayers[v3 + 1] )
2620 break;
2621 ++v3;
2622 }
2623 while ( v3 < 4 );
2624 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3);
2625 return 1;
2626 break;
2627 }
2628 v25 = 2 * (a2 != 8) + 8;
2629 v24 = v25;
2630 SetCondition(v24, 1);
2631 v42 = 0;
2632 v37 = 0;
2633 v35 = 0;
2634 v34 = 0;
2635 v33 = -1;
2636 v32 = 0;
2637 v31 = 0;
2638 v30 = (SoundID)222;
2639 pAudioPlayer->PlaySound(v30, v31, v32, v33, v34, v35, v37, v42);
2640 do 2562 do
2641 { 2563 {
2642 if ( this == pPlayers[v3 + 1] ) 2564 if ( this == pPlayers[v3 + 1] )
2643 break; 2565 break;
2644 ++v3; 2566 ++v3;
2646 while ( v3 < 4 ); 2568 while ( v3 < 4 );
2647 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); 2569 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3);
2648 return 1; 2570 return 1;
2649 break; 2571 break;
2650 case 9: 2572 case 9:
2651 if ( a2 == 6 ) 2573 SetCondition(11, 1);
2652 { 2574 pAudioPlayer->PlaySound((SoundID)222, 0, 0, -1, 0, 0, 0, 0);
2653 v44 = 7;
2654 v24 = v44;
2655 }
2656 else
2657 {
2658 v25 = 2 * (a2 != 8) + 9;
2659 v24 = v25;
2660 }
2661 SetCondition(v24, 1);
2662 v42 = 0;
2663 v37 = 0;
2664 v35 = 0;
2665 v34 = 0;
2666 v33 = -1;
2667 v32 = 0;
2668 v31 = 0;
2669 v30 = (SoundID)222;
2670 pAudioPlayer->PlaySound(v30, v31, v32, v33, v34, v35, v37, v42);
2671 do 2575 do
2672 { 2576 {
2673 if ( this == pPlayers[v3 + 1] ) 2577 if ( this == pPlayers[v3 + 1] )
2674 break; 2578 break;
2675 ++v3; 2579 ++v3;
2677 while ( v3 < 4 ); 2581 while ( v3 < 4 );
2678 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); 2582 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3);
2679 return 1; 2583 return 1;
2680 break; 2584 break;
2681 case 12: 2585 case 12:
2682 v43 = 1; 2586 SetCondition(12, 1);
2683 v38 = 12; 2587 pAudioPlayer->PlaySound((SoundID)224, 0, 0, -1, 0, 0, 0, 0);
2684 SetCondition(v38, v43);
2685 v42 = 0;
2686 v37 = 0;
2687 v35 = 0;
2688 v34 = 0;
2689 v33 = -1;
2690 v32 = 0;
2691 v31 = 0;
2692 v30 = (SoundID)224;
2693 pAudioPlayer->PlaySound(v30, v31, v32, v33, v34, v35, v37, v42);
2694 do 2588 do
2695 { 2589 {
2696 if ( this == pPlayers[v3 + 1] ) 2590 if ( this == pPlayers[v3 + 1] )
2697 break; 2591 break;
2698 ++v3; 2592 ++v3;
2700 while ( v3 < 4 ); 2594 while ( v3 < 4 );
2701 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); 2595 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3);
2702 return 1; 2596 return 1;
2703 break; 2597 break;
2704 case 15: 2598 case 15:
2705 v45 = 1; 2599 SetCondition(15, 1);
2706 v39 = 15; 2600 pAudioPlayer->PlaySound((SoundID)225, 0, 0, -1, 0, 0, 0, 0);
2707 SetCondition(v39, v45);
2708 v42 = 0;
2709 v37 = 0;
2710 v35 = 0;
2711 v34 = 0;
2712 v33 = -1;
2713 v32 = 0;
2714 v31 = 0;
2715 v30 = (SoundID)225;
2716 pAudioPlayer->PlaySound(v30, v31, v32, v33, v34, v35, v37, v42);
2717 do 2601 do
2718 { 2602 {
2719 if ( this == pPlayers[v3 + 1] ) 2603 if ( this == pPlayers[v3 + 1] )
2720 break; 2604 break;
2721 ++v3; 2605 ++v3;
2723 while ( v3 < 4 ); 2607 while ( v3 < 4 );
2724 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); 2608 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3);
2725 return 1; 2609 return 1;
2726 break; 2610 break;
2727 case 13: 2611 case 13:
2728 v43 = 1; 2612 SetCondition(13, 1);
2729 v38 = 13; 2613 pAudioPlayer->PlaySound((SoundID)224, 0, 0, -1, 0, 0, 0, 0);
2730 SetCondition(v38, v43);
2731 v42 = 0;
2732 v37 = 0;
2733 v35 = 0;
2734 v34 = 0;
2735 v33 = -1;
2736 v32 = 0;
2737 v31 = 0;
2738 v30 = (SoundID)224;
2739 pAudioPlayer->PlaySound(v30, v31, v32, v33, v34, v35, v37, v42);
2740 do 2614 do
2741 { 2615 {
2742 if ( this == pPlayers[v3 + 1] ) 2616 if ( this == pPlayers[v3 + 1] )
2743 break; 2617 break;
2744 ++v3; 2618 ++v3;
2746 while ( v3 < 4 ); 2620 while ( v3 < 4 );
2747 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); 2621 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3);
2748 return 1; 2622 return 1;
2749 break; 2623 break;
2750 case 14: 2624 case 14:
2751 v45 = 1; 2625 SetCondition(14, 1);
2752 v39 = 14; 2626 pAudioPlayer->PlaySound((SoundID)225, 0, 0, -1, 0, 0, 0, 0);
2753 SetCondition(v39, v45);
2754 v42 = 0;
2755 v37 = 0;
2756 v35 = 0;
2757 v34 = 0;
2758 v33 = -1;
2759 v32 = 0;
2760 v31 = 0;
2761 v30 = (SoundID)225;
2762 pAudioPlayer->PlaySound(v30, v31, v32, v33, v34, v35, v37, v42);
2763 do 2627 do
2764 { 2628 {
2765 if ( this == pPlayers[v3 + 1] ) 2629 if ( this == pPlayers[v3 + 1] )
2766 break; 2630 break;
2767 ++v3; 2631 ++v3;
2769 while ( v3 < 4 ); 2633 while ( v3 < 4 );
2770 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); 2634 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3);
2771 return 1; 2635 return 1;
2772 break; 2636 break;
2773 case 16: 2637 case 16:
2774 v45 = 1; 2638 SetCondition(16, 1);
2775 v39 = 16; 2639 pAudioPlayer->PlaySound((SoundID)225, 0, 0, -1, 0, 0, 0, 0);
2776 SetCondition(v39, v45);
2777 v42 = 0;
2778 v37 = 0;
2779 v35 = 0;
2780 v34 = 0;
2781 v33 = -1;
2782 v32 = 0;
2783 v31 = 0;
2784 v30 = (SoundID)225;
2785 pAudioPlayer->PlaySound(v30, v31, v32, v33, v34, v35, v37, v42);
2786 do 2640 do
2787 { 2641 {
2788 if ( this == pPlayers[v3 + 1] ) 2642 if ( this == pPlayers[v3 + 1] )
2789 break; 2643 break;
2790 ++v3; 2644 ++v3;
2794 return 1; 2648 return 1;
2795 break; 2649 break;
2796 case 17: 2650 case 17:
2797 case 18: 2651 case 18:
2798 case 19: 2652 case 19:
2799 v26 = v48;
2800 if ( *(char *)(v48 + 21) & 2 ) 2653 if ( *(char *)(v48 + 21) & 2 )
2801 { 2654 {
2802 do 2655 do
2803 { 2656 {
2804 if ( this == pPlayers[v3 + 1] ) 2657 if ( this == pPlayers[v3 + 1] )
2808 while ( v3 < 4 ); 2661 while ( v3 < 4 );
2809 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); 2662 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3);
2810 return 1; 2663 return 1;
2811 } 2664 }
2812 PlaySound(SPEECH_40, 0); 2665 PlaySound(SPEECH_40, 0);
2813 *(int *)(v26 + 20) |= 2u; 2666 *(int *)(v48 + 20) |= 2u;
2814 v42 = 0; 2667 pAudioPlayer->PlaySound((SoundID)47, 0, 0, -1, 0, 0, 0, 0);
2815 v37 = 0;
2816 v35 = 0;
2817 v34 = 0;
2818 v33 = -1;
2819 v32 = 0;
2820 v31 = 0;
2821 v30 = (SoundID)47;
2822 pAudioPlayer->PlaySound(v30, v31, v32, v33, v34, v35, v37, v42);
2823 do 2668 do
2824 { 2669 {
2825 if ( this == pPlayers[v3 + 1] ) 2670 if ( this == pPlayers[v3 + 1] )
2826 break; 2671 break;
2827 ++v3; 2672 ++v3;
2847 while ( v3 < 4 ); 2692 while ( v3 < 4 );
2848 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3); 2693 pGame->pStru6Instance->SetPlayerBuffAnim(0x99u, v3);
2849 return 1; 2694 return 1;
2850 } 2695 }
2851 } 2696 }
2852 v28 = v47;
2853 memcpy(v27, &this->pInventoryItemList[this->pInventoryMatrix[v47]-1], 0x24u); 2697 memcpy(v27, &this->pInventoryItemList[this->pInventoryMatrix[v47]-1], 0x24u);
2854 RemoveItemAtInventoryIndex(v28); 2698 RemoveItemAtInventoryIndex(v47);
2855 v42 = 0; 2699 pAudioPlayer->PlaySound((SoundID)47, 0, 0, -1, 0, 0, 0, 0);
2856 v37 = 0;
2857 v35 = 0;
2858 v34 = 0;
2859 v33 = -1;
2860 v32 = 0;
2861 v31 = 0;
2862 v30 = (SoundID)47;
2863 pAudioPlayer->PlaySound(v30, v31, v32, v33, v34, v35, v37, v42);
2864 do 2700 do
2865 { 2701 {
2866 if ( this == pPlayers[v3 + 1] ) 2702 if ( this == pPlayers[v3 + 1] )
2867 break; 2703 break;
2868 ++v3; 2704 ++v3;
2872 return 1; 2708 return 1;
2873 break; 2709 break;
2874 case 21: 2710 case 21:
2875 PlaySound(SPEECH_42, 0); 2711 PlaySound(SPEECH_42, 0);
2876 ++this->sAgeModifier; 2712 ++this->sAgeModifier;
2877 v42 = 0; 2713 pAudioPlayer->PlaySound((SoundID)226, 0, 0, -1, 0, 0, 0, 0);
2878 v37 = 0;
2879 v35 = 0;
2880 v34 = 0;
2881 v33 = -1;
2882 v32 = 0;
2883 v31 = 0;
2884 v30 = (SoundID)226;
2885 pAudioPlayer->PlaySound(v30, v31, v32, v33, v34, v35, v37, v42);
2886 do 2714 do
2887 { 2715 {
2888 if ( this == pPlayers[v3 + 1] ) 2716 if ( this == pPlayers[v3 + 1] )
2889 break; 2717 break;
2890 ++v3; 2718 ++v3;
2894 return 1; 2722 return 1;
2895 break; 2723 break;
2896 case 22: 2724 case 22:
2897 PlaySound(SPEECH_41, 0); 2725 PlaySound(SPEECH_41, 0);
2898 this->sMana = 0; 2726 this->sMana = 0;
2899 v42 = 0; 2727 pAudioPlayer->PlaySound((SoundID)226, 0, 0, -1, 0, 0, 0, 0);
2900 v37 = 0;
2901 v35 = 0;
2902 v34 = 0;
2903 v33 = -1;
2904 v32 = 0;
2905 v31 = 0;
2906 v30 = (SoundID)226;
2907 pAudioPlayer->PlaySound(v30, v31, v32, v33, v34, v35, v37, v42);
2908 do 2728 do
2909 { 2729 {
2910 if ( this == pPlayers[v3 + 1] ) 2730 if ( this == pPlayers[v3 + 1] )
2911 break; 2731 break;
2912 ++v3; 2732 ++v3;