Mercurial > mm7

comparison mm7_5.cpp @ 1014:a704435d3285

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
comtinue player cleaning
author Gloval
date Sun, 19 May 2013 20:38:49 +0400
parents 9e823ad5eaa6
children 9ac94d00012e 32ec62bbaa2c
comparison
equal deleted inserted replaced
1012:9e823ad5eaa6 1014:a704435d3285
3398 pAudioPlayer->PlaySound(SOUND_Button, 0, 0, -1, 0, 0, 0, 0); 3398 pAudioPlayer->PlaySound(SOUND_Button, 0, 0, -1, 0, 0, 0, 0);
3399 player->PlaySound(SPEECH_PickMe, 0); 3399 player->PlaySound(SPEECH_PickMe, 0);
3400 break; 3400 break;
3401 case UIMSG_PlayerCreation_FacePrev: 3401 case UIMSG_PlayerCreation_FacePrev:
3402 pPlayer = &pParty->pPlayers[pParam]; 3402 pPlayer = &pParty->pPlayers[pParam];
3403 if (!pPlayer->uFace) 3403 if (!pPlayer->uCurrentFace)
3404 pPlayer->uFace = 19; 3404 pPlayer->uCurrentFace = 19;
3405 else 3405 else
3406 pPlayer->uFace -= 1; 3406 pPlayer->uCurrentFace -= 1;
3407 pPlayer->uVoiceID = pPlayer->uFace; 3407 pPlayer->uVoiceID = pPlayer->uCurrentFace;
3408 pPlayer->SetInitialStats(); 3408 pPlayer->SetInitialStats();
3409 pPlayer->SetSexByVoice(); 3409 pPlayer->SetSexByVoice();
3410 pPlayer->RandomizeName(); 3410 pPlayer->RandomizeName();
3411 v25 = pParam; 3411 v25 = pParam;
3412 pGUIWindow_CurrentMenu->pCurrentPosActiveItem = (pGUIWindow_CurrentMenu->pCurrentPosActiveItem - pGUIWindow_CurrentMenu->pStartingPosActiveItem) 3412 pGUIWindow_CurrentMenu->pCurrentPosActiveItem = (pGUIWindow_CurrentMenu->pCurrentPosActiveItem - pGUIWindow_CurrentMenu->pStartingPosActiveItem)
3416 pAudioPlayer->PlaySound(SOUND_Button, 0, 0, -1, 0, 0, 0.0, 0); 3416 pAudioPlayer->PlaySound(SOUND_Button, 0, 0, -1, 0, 0, 0.0, 0);
3417 pPlayer->PlaySound(SPEECH_PickMe, 0); 3417 pPlayer->PlaySound(SPEECH_PickMe, 0);
3418 break; 3418 break;
3419 case UIMSG_PlayerCreation_FaceNext: 3419 case UIMSG_PlayerCreation_FaceNext:
3420 pPlayer = &pParty->pPlayers[pParam]; 3420 pPlayer = &pParty->pPlayers[pParam];
3421 v20 = (char)((int)pPlayer->uFace + 1) % 20; 3421 v20 = (char)((int)pPlayer->uCurrentFace + 1) % 20;
3422 pPlayer->uFace = v20; 3422 pPlayer->uCurrentFace = v20;
3423 pPlayer->uVoiceID = v20; 3423 pPlayer->uVoiceID = v20;
3424 pPlayer->SetInitialStats(); 3424 pPlayer->SetInitialStats();
3425 pPlayer->SetSexByVoice(); 3425 pPlayer->SetSexByVoice();
3426 pPlayer->RandomizeName(); 3426 pPlayer->RandomizeName();
3427 v21 = pParam; 3427 v21 = pParam;
6058 papredoll_drhs[v1] = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE); 6058 papredoll_drhs[v1] = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE);
6059 wsprintfA(pContainer, "pc23v%dlh", v9); 6059 wsprintfA(pContainer, "pc23v%dlh", v9);
6060 papredoll_dlhs[v1] = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE); 6060 papredoll_dlhs[v1] = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE);
6061 wsprintfA(pContainer, "pc23v%dlhu", v9); 6061 wsprintfA(pContainer, "pc23v%dlhu", v9);
6062 papredoll_dlhus[v1] = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE); 6062 papredoll_dlhus[v1] = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE);
6063 v6 = pPlayers[v1 + 1]->uFace; 6063 v6 = pPlayers[v1 + 1]->uCurrentFace;
6064 if ( v6 == 12 || v6 == 13 ) 6064 if ( v6 == 12 || v6 == 13 )
6065 papredoll_dbrds[pPlayers[v8]->uFace] = 0; 6065 papredoll_dbrds[pPlayers[v8]->uCurrentFace] = 0;
6066 papredoll_flying_feet[pPlayers[v8]->uFace] = 0; 6066 papredoll_flying_feet[pPlayers[v8]->uCurrentFace] = 0;
6067 IsPlayerWearingWatersuit[v8] = 1; 6067 IsPlayerWearingWatersuit[v8] = 1;
6068 } 6068 }
6069 } 6069 }
6070 6070
6071 //----- (0043F0BD) -------------------------------------------------------- 6071 //----- (0043F0BD) --------------------------------------------------------
6083 v7 = uPlayerID; 6083 v7 = uPlayerID;
6084 if ( ((uPlayerID - 1) & 0x80000000u) == 0 ) 6084 if ( ((uPlayerID - 1) & 0x80000000u) == 0 )
6085 { 6085 {
6086 v2 = &pPlayers[uPlayerID]; 6086 v2 = &pPlayers[uPlayerID];
6087 v3 = uPlayerID - 1; 6087 v3 = uPlayerID - 1;
6088 papredoll_dbods[v3] = pIcons_LOD->LoadTexture(dbod_texnames_by_face[(*v2)->uFace], TEXTURE_16BIT_PALETTE); 6088 papredoll_dbods[v3] = pIcons_LOD->LoadTexture(dbod_texnames_by_face[(*v2)->uCurrentFace], TEXTURE_16BIT_PALETTE);
6089 papredoll_dlads[v3] = pIcons_LOD->LoadTexture(dlad_texnames_by_face[(*v2)->uFace], TEXTURE_16BIT_PALETTE); 6089 papredoll_dlads[v3] = pIcons_LOD->LoadTexture(dlad_texnames_by_face[(*v2)->uCurrentFace], TEXTURE_16BIT_PALETTE);
6090 papredoll_dlaus[v3] = pIcons_LOD->LoadTexture(dlau_texnames_by_face[(*v2)->uFace], TEXTURE_16BIT_PALETTE); 6090 papredoll_dlaus[v3] = pIcons_LOD->LoadTexture(dlau_texnames_by_face[(*v2)->uCurrentFace], TEXTURE_16BIT_PALETTE);
6091 papredoll_drhs[v3] = pIcons_LOD->LoadTexture(drh_texnames_by_face[(*v2)->uFace], TEXTURE_16BIT_PALETTE); 6091 papredoll_drhs[v3] = pIcons_LOD->LoadTexture(drh_texnames_by_face[(*v2)->uCurrentFace], TEXTURE_16BIT_PALETTE);
6092 papredoll_dlhs[v3] = pIcons_LOD->LoadTexture(dlh_texnames_by_face[(*v2)->uFace], TEXTURE_16BIT_PALETTE); 6092 papredoll_dlhs[v3] = pIcons_LOD->LoadTexture(dlh_texnames_by_face[(*v2)->uCurrentFace], TEXTURE_16BIT_PALETTE);
6093 papredoll_dlhus[v3] = pIcons_LOD->LoadTexture(dlhu_texnames_by_face[(*v2)->uFace], TEXTURE_16BIT_PALETTE); 6093 papredoll_dlhus[v3] = pIcons_LOD->LoadTexture(dlhu_texnames_by_face[(*v2)->uCurrentFace], TEXTURE_16BIT_PALETTE);
6094 v4 = (int)&(*v2)->uFace; 6094 v4 = (int)&(*v2)->uCurrentFace;
6095 v5 = *(char *)v4; 6095 v5 = *(char *)v4;
6096 if ( *(char *)v4 == 12 || v5 == 13 ) 6096 if ( *(char *)v4 == 12 || v5 == 13 )
6097 { 6097 {
6098 wsprintfA(pContainer, "pc%02dbrd", v5 + 1); 6098 wsprintfA(pContainer, "pc%02dbrd", v5 + 1);
6099 v4 = (int)&(*v2)->uFace; 6099 v4 = (int)&(*v2)->uCurrentFace;
6100 papredoll_dbrds[*(char *)v4] = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE); 6100 papredoll_dbrds[*(char *)v4] = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE);
6101 } 6101 }
6102 wsprintfA(pContainer, "item281pc%02d", *(char *)v4 + 1); 6102 wsprintfA(pContainer, "item281pc%02d", *(char *)v4 + 1);
6103 papredoll_flying_feet[(*v2)->uFace] = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE); 6103 papredoll_flying_feet[(*v2)->uCurrentFace] = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE);
6104 result = v7; 6104 result = v7;
6105 IsPlayerWearingWatersuit[v7] = 0; 6105 IsPlayerWearingWatersuit[v7] = 0;
6106 } 6106 }
6107 return result; 6107 return result;
6108 } 6108 }
10858 { 10858 {
10859 if ( v51 != 4 ) 10859 if ( v51 != 4 )
10860 { 10860 {
10861 if ( v51 != 5 ) 10861 if ( v51 != 5 )
10862 { 10862 {
10863 v19 = v0->AddItem(0xFFFFFFFFu, 0xDCu); 10863 v19 = v0->AddItem(-1, 0xDCu);
10864 if ( v19 ) 10864 if ( v19 )
10865 *(int *)&v0->field_1F5[36 * v19 + 15] = 1; 10865 *(int *)&v0->field_1F5[36 * v19 + 15] = 1;
10866 v20 = v47 + 50 * v15; 10866 v20 = v47 + 50 * v15;
10867 v0->pInventoryItems[pOut.z].uItemID = v51; 10867 v0->pInventoryItems[pOut.z].uItemID = v51;
10868 v0->pInventoryItems[pOut.z].uEnchantmentType = (pParty->pPickedItem.uEnchantmentType 10868 v0->pInventoryItems[pOut.z].uEnchantmentType = (pParty->pPickedItem.uEnchantmentType
10882 { 10882 {
10883 if ( *(int *)(a2.y + 532) == 221 ) 10883 if ( *(int *)(a2.y + 532) == 221 )
10884 *(int *)(a2.y + 532) = pParty->pPickedItem.uItemID; 10884 *(int *)(a2.y + 532) = pParty->pPickedItem.uItemID;
10885 else 10885 else
10886 *(int *)(a2.y + 536) = pParty->pPickedItem.uEnchantmentType; 10886 *(int *)(a2.y + 536) = pParty->pPickedItem.uEnchantmentType;
10887 v21 = v0->AddItem(0xFFFFFFFFu, 0xDCu); 10887 v21 = v0->AddItem(-1, 0xDCu);
10888 if ( v21 ) 10888 if ( v21 )
10889 *(int *)&v0->field_1F5[36 * v21 + 15] = 1; 10889 *(int *)&v0->field_1F5[36 * v21 + 15] = 1;
10890 goto LABEL_74; 10890 goto LABEL_74;
10891 } 10891 }
10892 goto LABEL_115; 10892 goto LABEL_115;