Mercurial > mm7
diff mm7_5.cpp @ 1091:9c7eb4037567
data moving
author | Gloval |
---|---|
date | Sun, 26 May 2013 14:13:22 +0400 |
parents | b79139c3b5c8 |
children | 3e5d70cfe20e |
line wrap: on
line diff
--- a/mm7_5.cpp Sun May 26 00:03:16 2013 +0400 +++ b/mm7_5.cpp Sun May 26 14:13:22 2013 +0400 @@ -5938,89 +5938,6 @@ } // A750D8: using guessed type __int64 qword_A750D8; -//----- (0043EF2B) -------------------------------------------------------- -void __fastcall WetsuitOn(unsigned int uPlayerID) -{ - unsigned int v1; // ebx@1 - Player **v2; // esi@2 - enum CHARACTER_RACE v3; // edi@2 - signed int v4; // eax@2 - int v5; // ecx@5 - unsigned __int8 v6; // al@7 - char pContainer[20]; // [sp+4h] [bp-1Ch]@7 - unsigned int v8; // [sp+18h] [bp-8h]@1 - int v9; // [sp+1Ch] [bp-4h]@7 - - v1 = uPlayerID - 1; - v8 = uPlayerID; - if ( (uPlayerID - 1) >= 0 ) - { - v2 = &pPlayers[uPlayerID]; - v3 = (*v2)->GetRace(); - v4 = (*v2)->GetSexByVoice(); - if ( v3 && v3 != 1 && v3 != 2 ) - v5 = (v4 != 0) + 3; - else - v5 = (v4 != 0) + 1; - v9 = v5; - wsprintfA(pContainer, "pc23v%dBod", v5); - papredoll_dbods[v1] = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE); - wsprintfA(pContainer, "pc23v%dlad", v9); - papredoll_dlads[v1] = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE); - wsprintfA(pContainer, "pc23v%dlau", v9); - papredoll_dlaus[v1] = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE); - wsprintfA(pContainer, "pc23v%drh", v9); - papredoll_drhs[v1] = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE); - wsprintfA(pContainer, "pc23v%dlh", v9); - papredoll_dlhs[v1] = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE); - wsprintfA(pContainer, "pc23v%dlhu", v9); - papredoll_dlhus[v1] = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE); - v6 = pPlayers[v1 + 1]->uCurrentFace; - if ( v6 == 12 || v6 == 13 ) - papredoll_dbrds[pPlayers[v8]->uCurrentFace] = 0; - papredoll_flying_feet[pPlayers[v8]->uCurrentFace] = 0; - IsPlayerWearingWatersuit[v8] = 1; - } -} - -//----- (0043F0BD) -------------------------------------------------------- -unsigned int __fastcall WetsuitOff(unsigned int uPlayerID) -{ - unsigned int result; // eax@1 - Player **v2; // edi@2 - unsigned int v3; // ebx@2 - int v4; // ebx@2 - char v5; // al@2 - char pContainer[20]; // [sp+0h] [bp-18h]@4 - unsigned int v7; // [sp+14h] [bp-4h]@1 - - result = uPlayerID - 1; - v7 = uPlayerID; - if ( ((uPlayerID - 1) & 0x80000000u) == 0 ) - { - v2 = &pPlayers[uPlayerID]; - v3 = uPlayerID - 1; - papredoll_dbods[v3] = pIcons_LOD->LoadTexture(dbod_texnames_by_face[(*v2)->uCurrentFace], TEXTURE_16BIT_PALETTE); - papredoll_dlads[v3] = pIcons_LOD->LoadTexture(dlad_texnames_by_face[(*v2)->uCurrentFace], TEXTURE_16BIT_PALETTE); - papredoll_dlaus[v3] = pIcons_LOD->LoadTexture(dlau_texnames_by_face[(*v2)->uCurrentFace], TEXTURE_16BIT_PALETTE); - papredoll_drhs[v3] = pIcons_LOD->LoadTexture(drh_texnames_by_face[(*v2)->uCurrentFace], TEXTURE_16BIT_PALETTE); - papredoll_dlhs[v3] = pIcons_LOD->LoadTexture(dlh_texnames_by_face[(*v2)->uCurrentFace], TEXTURE_16BIT_PALETTE); - papredoll_dlhus[v3] = pIcons_LOD->LoadTexture(dlhu_texnames_by_face[(*v2)->uCurrentFace], TEXTURE_16BIT_PALETTE); - v4 = (int)&(*v2)->uCurrentFace; - v5 = *(char *)v4; - if ( *(char *)v4 == 12 || v5 == 13 ) - { - wsprintfA(pContainer, "pc%02dbrd", v5 + 1); - v4 = (int)&(*v2)->uCurrentFace; - papredoll_dbrds[*(char *)v4] = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE); - } - wsprintfA(pContainer, "item281pc%02d", *(char *)v4 + 1); - papredoll_flying_feet[(*v2)->uCurrentFace] = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE); - result = v7; - IsPlayerWearingWatersuit[v7] = 0; - } - return result; -} //----- (0043F333) -------------------------------------------------------- void BspRenderer::MakeVisibleSectorList() @@ -11044,10 +10961,10 @@ { if ( i->msg == UIMSG_InventoryLeftClick ) { - dword_50698C = i->uX; - dword_506988 = i->uY; - dword_506984 = i->uZ; - dword_506980 = i->uW; + dword_50698C_uX = i->uX; + dword_506988_uY = i->uY; + dword_506984_uZ = i->uZ; + dword_506980_uW = i->uW; i->uW = 0; i->uZ = 0; i->uY = 0; @@ -11089,10 +11006,10 @@ { if ( pButton->msg == UIMSG_InventoryLeftClick ) { - pButton->uX = dword_50698C; - pButton->uY = dword_506988; - pButton->uZ = dword_506984; - pButton->uW = dword_506980; + pButton->uX = dword_50698C_uX; + pButton->uY = dword_506988_uY; + pButton->uZ = dword_506984_uZ; + pButton->uW = dword_506980_uW; pGUIWindow_CurrentMenu->_41D08F_set_keyboard_control_group(1, 0, 0, 0); } }