mm7: mm7_6.cpp comparison

comparison mm7_6.cpp @ 319:5a66be213cff

Actor::Die

author	Nomad
date	Wed, 20 Feb 2013 02:53:37 +0200
parents	2a09e1d6fc8f
children	d720a13e2273

comparison

equal deleted inserted replaced

-:e41fe9cf3613
+:5a66be213cff
 result = 0;
 return result;
 }
 //----- (0042777D) --------------------------------------------------------
-bool __fastcall _42777D_CastSpell_UseWand_ShootArrow(int a1, unsigned int uPlayerID, unsigned int a4, __int16 a5, int a6)
+void _42777D_CastSpell_UseWand_ShootArrow(int a1, unsigned int uPlayerID, unsigned int a4, __int16 a5, int a6)
 {
 bool result; // eax@2
 __int16 v6; // bx@4
 Player *v7; // eax@4
 char v8; // zf@12
 if ( result != -1 )
 {
 if ( v6 & 2 )
 {
 if ( pGUIWindow_Settings )
-return result;
+return;
 pGUIWindow_Settings = GUIWindow::Create(0, 0, 640, 480, (WindowType)(WINDOW_HouseInterior|0x2), (int)&pStru277[result], 0);
 pGUIWindow_Settings->CreateButton(0x34u, 0x1A6u, 0x23u, 0, 2, 0, 0x45u, 0, 0x31u, "", 0);
 pGUIWindow_Settings->CreateButton(0xA5u, 0x1A6u, 0x23u, 0, 2, 0, 0x45u, 1u, 0x32u, "", 0);
 pGUIWindow_Settings->CreateButton(0x118u, 0x1A6u, 0x23u, 0, 2, 0, 0x45u, 2u, 0x33u, "", 0);
 pGUIWindow_Settings->CreateButton(0x186u, 0x1A6u, 0x23u, 0, 2, 0, 0x45u, 3u, 0x34u, "", 0);
-return sub_421B2C_PlaceInInventory_or_DropPickedItem();
+sub_421B2C_PlaceInInventory_or_DropPickedItem();
+return;
 }
 if ( v6 & 8 )
 {
 if ( pGUIWindow_Settings )
-return result;
+return;
 v17 = GUIWindow::Create(0, 0, 640, 480, (WindowType)(WINDOW_HouseInterior|0x2), (int)&pStru277[result], 0);
 v29 = 0;
 v28 = "";
 v27 = 0;
 v26 = 0;
 v19 = 8;
 pGUIWindow_Settings = v17;
 v18 = v17;
 LABEL_56:
 v18->CreateButton(v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29);
-return sub_421B2C_PlaceInInventory_or_DropPickedItem();
+sub_421B2C_PlaceInInventory_or_DropPickedItem();
+return;
 }
 if ( v6 & 0x40 )
 {
 if ( pGUIWindow_Settings )
-return result;
+return;
 v17 = GUIWindow::Create(0, 0, 640, 480, (WindowType)(WINDOW_HouseInterior|0x2), (int)&pStru277[result], 0);
 v29 = 0;
 v28 = "";
 v27 = 0;
 v26 = 0;
 goto LABEL_44;
 }
 if ( (char)v6 < 0 )
 {
 if ( pGUIWindow_Settings )
-return result;
+return;
 ++pIcons_LOD->uTexturePacksCount;
 if ( !pIcons_LOD->uNumPrevLoadedFiles )
 pIcons_LOD->uNumPrevLoadedFiles = pIcons_LOD->uNumLoadedFiles;
 pGUIWindow_Settings = pStru277[result].sub_4219BE();
 unk_50C9A0 = 1;
 some_active_character = uActiveCharacter;
-return sub_421B2C_PlaceInInventory_or_DropPickedItem();
+sub_421B2C_PlaceInInventory_or_DropPickedItem();
+return;
 }
 if ( HIBYTE(v6) & 1 )
 {
 if ( pGUIWindow_Settings )
-return result;
+return;
-pGUIWindow_Settings = GUIWindow::Create(0, 0, 640, 480, (WindowType)(WINDOW_HouseInterior|0x2), 20 * result + 5292232, 0);
+pGUIWindow_Settings = GUIWindow::Create(0, 0, 640, 480, (WindowType)(WINDOW_HouseInterior|0x2), (int)&pStru277[result], 0);
 pGUIWindow_Settings->CreateButton(0x34u, 0x1A6u, 0x23u, 0, 2, 0, 0x8Du, 0, 0x31u, "", 0);
 pGUIWindow_Settings->CreateButton(0xA5u, 0x1A6u, 0x23u, 0, 2, 0, 0x8Du, 1u, 0x32u, "", 0);
 pGUIWindow_Settings->CreateButton(0x118u, 0x1A6u, 0x23u, 0, 2, 0, 0x8Du, 2u, 0x33u, "", 0);
 pGUIWindow_Settings->CreateButton(0x186u, 0x1A6u, 0x23u, 0, 2, 0, 0x8Du, 3u, 0x34u, "", 0);
 v29 = 0;
 v18 = pGUIWindow_Settings;
 goto LABEL_56;
 }
 if ( HIBYTE(v6) & 2 && !pGUIWindow_Settings )
 {
-pGUIWindow_Settings = GUIWindow::Create(0, 0, 640, 480, (WindowType)(WINDOW_HouseInterior|0x2), 20 * result + 5292232, 0);
+pGUIWindow_Settings = GUIWindow::Create(0, 0, 640, 480, (WindowType)(WINDOW_HouseInterior|0x2), (int)&pStru277[result], 0);
 pBtn_NPCLeft = pGUIWindow_Settings->CreateButton(
 0x1D5u,
 0xB2u,
-(uTextureID_507990 != -1 ? pIcons_LOD->pTextures[uTextureID_507990].uTextureWidth : 24),
+(uTextureID_Btn_NPCLeft != -1 ? pIcons_LOD->pTextures[uTextureID_Btn_NPCLeft].uTextureWidth : 24),
-(uTextureID_507990 != -1 ? pIcons_LOD->pTextures[uTextureID_507990].uTextureHeight : 26),
+(uTextureID_Btn_NPCLeft != -1 ? pIcons_LOD->pTextures[uTextureID_Btn_NPCLeft].uTextureHeight : 26),
 1,
 0,
 0xBCu,
 0,
 0,
 "",
-(Texture *)(uTextureID_507990 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_507990] : 0),
+(Texture *)(uTextureID_Btn_NPCLeft != -1 ? &pIcons_LOD->pTextures[uTextureID_Btn_NPCLeft] : 0),
 0);
 pBtn_NPCRight = pGUIWindow_Settings->CreateButton(
 0x272u,
 0xB2u,
-(uTextureID_50798C != -1 ? pIcons_LOD->pTextures[uTextureID_50798C].uTextureWidth : 24),
+(uTextureID_Btn_NPCRight != -1 ? pIcons_LOD->pTextures[uTextureID_Btn_NPCRight].uTextureWidth : 24),
-(uTextureID_50798C != -1 ? pIcons_LOD->pTextures[uTextureID_50798C].uTextureHeight : 26),
+(uTextureID_Btn_NPCRight != -1 ? pIcons_LOD->pTextures[uTextureID_Btn_NPCRight].uTextureHeight : 26),
 1,
 0,
 0xBCu,
 1u,
 0,
 "",
-(Texture *)(uTextureID_50798C != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_50798C] : 0),
+(Texture *)(uTextureID_Btn_NPCRight != -1 ? &pIcons_LOD->pTextures[uTextureID_Btn_NPCRight] : 0),
 0);
 pGUIWindow_Settings->CreateButton(0x1EBu, 0x95u, 0x40u, 0x4Au, 1, 0, 0x8Fu, 4u, 0x35u, "", 0);
-result = (bool)pGUIWindow_Settings->CreateButton(
+pGUIWindow_Settings->CreateButton(0x231u, 0x95u, 0x40u, 0x4Au, 1, 0, 0x8Fu, 5u, 0x36u, "", 0);
-0x231u,
-0x95u,
-0x40u,
-0x4Au,
-1,
-0,
-0x8Fu,
-5u,
-0x36u,
-"",
-0);
 }
 }
 }
-return result;
 }
 //----- (00427D48) --------------------------------------------------------

Mercurial > mm7

comparison mm7_6.cpp @ 319:5a66be213cff