Mercurial > mm7

comparison Outdoor.cpp @ 2495:7b076fe64f23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
GetItemTextureFilename fix
author Ritor1
date Wed, 17 Sep 2014 17:35:13 +0600
parents de8c5c223e9c
children
comparison
equal deleted inserted replaced
2494:de8c5c223e9c 2495:7b076fe64f23
1765 } 1765 }
1766 //LABEL_69: 1766 //LABEL_69:
1767 if (pBModels[i].pFaces[j].sCogTriggeredID) 1767 if (pBModels[i].pFaces[j].sCogTriggeredID)
1768 { 1768 {
1769 if (pBModels[i].pFaces[j].HasEventHint()) 1769 if (pBModels[i].pFaces[j].HasEventHint())
1770 pBModels[i].pFaces[j].uAttributes |= FACE_UNKNOW; 1770 pBModels[i].pFaces[j].uAttributes |= FACE_HAS_EVENT;
1771 else 1771 else
1772 pBModels[i].pFaces[j].uAttributes &= ~FACE_UNKNOW; 1772 pBModels[i].pFaces[j].uAttributes &= ~FACE_HAS_EVENT;
1773 } 1773 }
1774 //++v144; 1774 //++v144;
1775 //v60 = pBModels; 1775 //v60 = pBModels;
1776 //v149 = (char *)v149 + 308; 1776 //v149 = (char *)v149 + 308;
1777 //Str2 += 10; 1777 //Str2 += 10;
2017 { 2017 {
2018 ODMFace face = model.pFaces[j]; 2018 ODMFace face = model.pFaces[j];
2019 if (face.sCogTriggeredID) 2019 if (face.sCogTriggeredID)
2020 { 2020 {
2021 if (face.HasEventHint()) 2021 if (face.HasEventHint())
2022 face.uAttributes |= FACE_HAS_EVENT; 2022 face.uAttributes |= FACE_HAS_EVENT_HINT;
2023 else 2023 else
2024 face.uAttributes &= 0xFFFFEFFFu; 2024 face.uAttributes &= ~FACE_HAS_EVENT_HINT;//~0x00001000
2025 } 2025 }
2026 } 2026 }
2027 } 2027 }
2028 2028
2029 pGameLoadingUI_ProgressBar->Progress(); 2029 pGameLoadingUI_ProgressBar->Progress();
2465 pActors[i].PrepareSprites(0); 2465 pActors[i].PrepareSprites(0);
2466 } 2466 }
2467 else 2467 else
2468 { 2468 {
2469 pActors[i].uAIState = AIState::Disabled; 2469 pActors[i].uAIState = AIState::Disabled;
2470 pActors[i].uAttributes = pActors[i].uAttributes | 0x10000; 2470 pActors[i].uAttributes |= ACTOR_UNKNOW11;
2471 } 2471 }
2472 } 2472 }
2473 else if ( a1 == 0 ) 2473 else if ( a1 == 0 )
2474 { 2474 {
2475 pActors[i].uAIState = AIState::Disabled; 2475 pActors[i].uAIState = AIState::Disabled;
2476 pActors[i].uAttributes = pActors[i].uAttributes | 0x10000; 2476 pActors[i].uAttributes |= ACTOR_UNKNOW11;
2477 } 2477 }
2478 else if ( alert_status != 0 ) 2478 else if ( alert_status != 0 )
2479 { 2479 {
2480 pActors[i].uCurrentActionTime = 0; 2480 pActors[i].uCurrentActionTime = 0;
2481 pActors[i].uCurrentActionLength = 0; 2481 pActors[i].uCurrentActionLength = 0;
2482 if ( pActors[i].uAttributes & 0x10000 ) 2482 if ( pActors[i].uAttributes & ACTOR_UNKNOW11 )
2483 pActors[i].uAIState = AIState::Disabled; 2483 pActors[i].uAIState = AIState::Disabled;
2484 if ( pActors[i].uAIState != AIState::Removed && pActors[i].uAIState != AIState::Disabled && 2484 if ( pActors[i].uAIState != AIState::Removed && pActors[i].uAIState != AIState::Disabled &&
2485 (pActors[i].sCurrentHP == 0 || pActors[i].pMonsterInfo.uHP == 0) ) 2485 (pActors[i].sCurrentHP == 0 || pActors[i].pMonsterInfo.uHP == 0) )
2486 pActors[i].uAIState = AIState::Dead; 2486 pActors[i].uAIState = AIState::Dead;
2487 pActors[i].vVelocity.x = 0; 2487 pActors[i].vVelocity.x = 0;
2492 pActors[i].PrepareSprites(0); 2492 pActors[i].PrepareSprites(0);
2493 } 2493 }
2494 else 2494 else
2495 { 2495 {
2496 pActors[i].uAIState = AIState::Disabled; 2496 pActors[i].uAIState = AIState::Disabled;
2497 pActors[i].uAttributes = pActors[i].uAttributes | 0x10000; 2497 pActors[i].uAttributes |= ACTOR_UNKNOW11;
2498 alert_status = GetAlertStatus(); 2498 alert_status = GetAlertStatus();
2499 } 2499 }
2500 } 2500 }
2501 2501
2502 pGameLoadingUI_ProgressBar->Progress(); 2502 pGameLoadingUI_ProgressBar->Progress();
2530 unsigned int result; // eax@1 2530 unsigned int result; // eax@1
2531 int z; // esi@5 2531 int z; // esi@5
2532 float v4; // ST48_4@8 2532 float v4; // ST48_4@8
2533 unsigned int v8; // eax@11 2533 unsigned int v8; // eax@11
2534 int v9; // edx@11 2534 int v9; // edx@11
2535 //__int16 v10; // dx@11
2536 //unsigned int v11; // eax@13
2537 signed int v12; // eax@16 2535 signed int v12; // eax@16
2538 //__int16 v13; // cx@21
2539 SpriteFrame *v14; // eax@24 2536 SpriteFrame *v14; // eax@24
2540 SpriteFrame *v15; // ebx@25 2537 SpriteFrame *v15; // ebx@25
2541 //int *v16; // eax@25
2542 int v17; // eax@35 2538 int v17; // eax@35
2543 int v18; // ST78_4@36 2539 int v18; // ST78_4@36
2544 int v19; // eax@36 2540 int v19; // eax@36
2545 int v20; // ecx@38 2541 int v20; // ecx@38
2546 int v21; // eax@38 2542 int v21; // eax@38
2548 int v23; // ST5C_4@43 2544 int v23; // ST5C_4@43
2549 int v24; // esi@44 2545 int v24; // esi@44
2550 signed __int64 v25; // qtt@45 2546 signed __int64 v25; // qtt@45
2551 int v26; // ST54_4@45 2547 int v26; // ST54_4@45
2552 int v27; // ecx@45 2548 int v27; // ecx@45
2553 //RenderBillboard *v28; // esi@45
2554 //__int16 v29; // ax@46
2555 // unsigned __int8 v30; // zf@46
2556 // unsigned __int8 v31; // sf@46
2557 // signed __int16 v32; // ax@49
2558 // signed int v33; // ecx@50
2559 int v34; // ecx@54 2549 int v34; // ecx@54
2560 //MonsterDesc *v35; // edx@54
2561 //int v36; // ecx@54
2562 //unsigned __int8 v37; // zf@54
2563 //unsigned __int8 v38; // sf@54
2564 //unsigned int v39; // [sp-8h] [bp-68h]@23
2565 //unsigned int v40; // [sp-4h] [bp-64h]@23
2566 int v41; // [sp+24h] [bp-3Ch]@11 2550 int v41; // [sp+24h] [bp-3Ch]@11
2567 int v42; // [sp+28h] [bp-38h]@38 2551 int v42; // [sp+28h] [bp-38h]@38
2568 int v43; // [sp+28h] [bp-38h]@45 2552 int v43; // [sp+28h] [bp-38h]@45
2569 int v44; // [sp+2Ch] [bp-34h]@36 2553 int v44; // [sp+2Ch] [bp-34h]@36
2570 int v45; // [sp+2Ch] [bp-34h]@44 2554 int v45; // [sp+2Ch] [bp-34h]@44
2572 int v47; // [sp+30h] [bp-30h]@36 2556 int v47; // [sp+30h] [bp-30h]@36
2573 int v48; // [sp+30h] [bp-30h]@41 2557 int v48; // [sp+30h] [bp-30h]@41
2574 signed int v49; // [sp+34h] [bp-2Ch]@5 2558 signed int v49; // [sp+34h] [bp-2Ch]@5
2575 int v50; // [sp+34h] [bp-2Ch]@36 2559 int v50; // [sp+34h] [bp-2Ch]@36
2576 int v51; // [sp+34h] [bp-2Ch]@41 2560 int v51; // [sp+34h] [bp-2Ch]@41
2577 // int v52; // [sp+34h] [bp-2Ch]@50
2578 int v53; // [sp+38h] [bp-28h]@36 2561 int v53; // [sp+38h] [bp-28h]@36
2579 //int v54; // [sp+3Ch] [bp-24h]@2
2580 int y; // [sp+40h] [bp-20h]@5 2562 int y; // [sp+40h] [bp-20h]@5
2581 int x; // [sp+44h] [bp-1Ch]@5 2563 int x; // [sp+44h] [bp-1Ch]@5
2582 int v57; // [sp+48h] [bp-18h]@45 2564 int v57; // [sp+48h] [bp-18h]@45
2583 int v58; // [sp+4Ch] [bp-14h]@45 2565 int v58; // [sp+4Ch] [bp-14h]@45
2584 //signed int v59; // [sp+50h] [bp-10h]@1
2585 int X; // [sp+54h] [bp-Ch]@36 2566 int X; // [sp+54h] [bp-Ch]@36
2586 //__int16 v61; // [sp+58h] [bp-8h]@5
2587 signed __int16 v62; // [sp+5Ch] [bp-4h]@25 2567 signed __int16 v62; // [sp+5Ch] [bp-4h]@25
2588 2568
2589 //result = 0; 2569 //result = 0;
2590 //v59 = 0; 2570 //v59 = 0;
2591 for (int i = 0; i < uNumActors; ++i) 2571 for (int i = 0; i < uNumActors; ++i)