mm7: Mouse.cpp comparison

comparison Mouse.cpp @ 2216:3f375342de12

window->GetWidth() continue

author	Ritor1
date	Sat, 15 Feb 2014 16:00:19 +0600
parents	e9625ad08541
children	744ed51880ed

comparison

equal deleted inserted replaced

-:e9625ad08541
+:3f375342de12
 if ( !this->bInitialized || !pName )
 return;
 if ( _stricmp("MICON2", pName) )
 pGame->uFlags2 &= 0xFFFFFFEFu;
 else
-pGame->uFlags2 |= 0x10u;
+pGame->uFlags2 |= 0x10;
 if ( _stricmp(this->pCurrentCursorName, pName) )
 strcpy(this->pCurrentCursorName, pName);
 ClearCursor();
 if ( _strnicmp(pName, "MICON1", 5) )
 {
 // 506128: using guessed type int areWeLoadingTexture;
 //----- (00469AE4) --------------------------------------------------------
 LONG Mouse::_469AE4()
 {
-Mouse *v1; // esi@1
 LONG v2; // ecx@2
 LONG result; // eax@2
 struct tagPOINT Point; // [sp+Ch] [bp-8h]@2
-v1 = this;
 this->field_8 = 1;
 /*if (pAsyncMouse)
 {
 v2 = *((int *)pAsyncMouse + 6);
 Point.x = *((int *)pAsyncMouse + 6);
 //if ( pRenderer->bWindowMode )
 ScreenToClient(window->GetApiHandle(), &Point);
 result = Point.y;
 v2 = Point.x;
 //}
-v1->uMouseClickX = v2;
+this->uMouseClickX = v2;
-v1->uMouseClickY = result;
+this->uMouseClickY = result;
 if ( true/*pRenderer->bWindowMode*/)
 goto LABEL_16;
 //if (pAsyncMouse)
 //  goto LABEL_24;
 if ( v2 < 0 )
 v2 = 0;
 if ( result < 0 )
 result = 0;
-if ( v2 > 639 )
+if ( v2 > window->GetWidth() - 1 )
-v2 = 639;
+v2 = window->GetWidth() - 1;
-if ( result > 479 )
+if ( result > window->GetHeight() - 1 )
 {
-result = 479;
+result = window->GetHeight() - 1;
 LABEL_16:
 //if (pAsyncMouse)
 //  goto LABEL_24;
-if (true/*pRenderer->bWindowMode*/ && (v2 < 0 || result < 0 || v2 > 639 || result > 479) )
+if (true/*pRenderer->bWindowMode*/ && (v2 < 0 || result < 0 || v2 > window->GetWidth() -1 || result > window->GetHeight() - 1) )
 goto LABEL_23;
 }
-if ( v1->field_C )
+if ( this->field_C )
 LABEL_23:
-v1->bActive = 0;
+this->bActive = 0;
 LABEL_24:
-v1->field_8 = 0;
+this->field_8 = 0;
 return result;
 }
 //----- (00469BA3) --------------------------------------------------------
 void Mouse::ClearCursor()
 void Mouse::Initialize(OSWindow *window)
 {
 this->window = window;
 this->bActive = false;
 this->bInitialized = true;
+//this->field_8 = 0;//Ritor1: result incorrect uMouseClickX, this->uMouseClickY in _469AE4()
+this->uCursorBitmapPitch = 0;//Ritor1: it's include
+for ( uint i = 0; i < 13; i++ )
+this->field_5C[i] = 0;
 this->pCursorBitmapPos.x = 0;
 this->pCursorBitmapPos.y = 0;
 this->uMouseClickX = 0;
 this->uMouseClickY = 0;
 this->pCursorBitmap_sysmem = 0;
 unsigned int v9; // eax@31
 if ( this->bInitialized )
 {
 if ( !this->field_8 && this->bActive && !this->field_C )
-pMouse->_469AE4();
+pMouse->_469AE4();//Ritor1: ��������, ���������� �������
 this->field_F4 = 1;
 if ( this->field_C )
 {
 this->field_F4 = 0;
 return;
 this->uMouseClickX = 639;
 if ( this->uMouseClickY > 479 )
 this->uMouseClickY = 479;
 }*/
 this->pCursorBitmapRect.x = this->uMouseClickX;
-this->pCursorBitmapRect.w = this->uMouseClickY + this->field_5C[0];//I think this error
+this->pCursorBitmapRect.w = this->uMouseClickY + this->field_5C[0]; //Ritor1: Maybe this->field_5C[0] - cursor width
 this->pCursorBitmapRect.y = this->uMouseClickY;
-this->pCursorBitmapRect.z = this->uMouseClickX + this->uCursorBitmapPitch;//and this error
+this->pCursorBitmapRect.z = this->uMouseClickX + this->uCursorBitmapPitch; //Ritor1: Maybe this->uCursorBitmapPitch - cursor height
 if ( this->uMouseClickX < 0 )
 this->pCursorBitmapRect.x = 0;
 if ( this->uMouseClickY < 0 )
 this->pCursorBitmapRect.y = 0;
 if ( this->pCursorBitmapRect.z > window->GetWidth() )
 }
 }
 }
 //----- (00469E1C) --------------------------------------------------------
-void Mouse::_469E1C()
+void Mouse::Activate()
 {
 bActive = true;
 }
 //----- (00469E24) --------------------------------------------------------
 {
 if (!pCursorBitmap3_sysmembits_16bit)
 return;
 ushort* pSrc = pCursorBitmap3_sysmembits_16bit;
-for (uint y = field_44; y < field_4C; ++y)
+for (uint y = uCursorWithItemY; y < uCursorWithItemZ; ++y)
-for (uint x = field_40; x < field_48; ++x)
+for (uint x = uCursorWithItemX; x < uCursorWithItemW; ++x)
 //pRenderer->pTargetSurface[y * pRenderer->uTargetSurfacePitch + x] = *pSrc++;
 pRenderer->WritePixel16(x, y, *pSrc++);
 }
 //----- (00469EA4) --------------------------------------------------------
-void Mouse::_469EA4()
+void Mouse::ReadCursorWithItem()
 {
-//Mouse *v1; // esi@1
 unsigned int pTextureID; // eax@2
 Texture *pTexture; // edi@2
-unsigned int v4; // ecx@3
-unsigned int v5; // eax@3
-unsigned int v6; // ebx@5
-int v7; // ecx@15
 int v8; // ecx@25
 int v9; // ebx@26
 unsigned int v10; // eax@26
 int v11; // edx@27
-//unsigned __int16 *v12; // edx@29
+int pTextureHeight; // [sp+20h] [bp-8h]@15
-//unsigned __int16 *v13; // ebx@29
-unsigned int a2; // [sp+Ch] [bp-1Ch]@5
-unsigned int v15; // [sp+10h] [bp-18h]@5
-//unsigned int v16; // [sp+14h] [bp-14h]@25
-//unsigned __int16 *v17; // [sp+18h] [bp-10h]@25
-//int v18; // [sp+1Ch] [bp-Ch]@27
-int v19; // [sp+20h] [bp-8h]@15
 unsigned __int16 *v20; // [sp+20h] [bp-8h]@28
 int pTextureWidth; // [sp+24h] [bp-4h]@12
 unsigned __int16 *v22; // [sp+24h] [bp-4h]@25
-//v1 = this;
 if ( pParty->pPickedItem.uItemID )
 {
 pTextureID = pIcons_LOD->LoadTexture(pParty->pPickedItem.GetIconName(), TEXTURE_16BIT_PALETTE);
 pTexture = (Texture *)(pTextureID != -1 ? (int)&pIcons_LOD->pTextures[pTextureID] : 0);
-v4 = pMouse->uMouseClickX;
+if ( (signed int)pMouse->uMouseClickX <= window->GetWidth() - 1 && (signed int)pMouse->uMouseClickY <= window->GetHeight() - 1 )
-v5 = pMouse->uMouseClickY;
+{
+/*if ( (v4 & 0x80000000u) != 0 )
-v6 = v5;
-a2 = v4;
-v15 = v5;
-if ( (signed int)v4 <= window->GetWidth() - 1 && (signed int)v5 <= window->GetHeight() - 1 )
-{
-if ( (v4 & 0x80000000u) != 0 )
 a2 = 0;
 if ( (v5 & 0x80000000u) != 0 )
 {
-v6 = 0;
+//v6 = 0;
 v15 = 0;
-}
+}	*/
-if ( (signed int)(pTexture->uTextureWidth + a2) <= window->GetWidth() )
+if ( (signed int)(pTexture->uTextureWidth + pMouse->uMouseClickX) <= window->GetWidth() )
 pTextureWidth = pTexture->uTextureWidth;
 else
-pTextureWidth = window->GetWidth() - a2;
+pTextureWidth = window->GetWidth() - pMouse->uMouseClickX;
-if ( (signed int)(pTexture->uTextureHeight + v6) <= window->GetHeight() )
+if ( (signed int)(pTexture->uTextureHeight + pMouse->uMouseClickY) <= window->GetHeight() )
-{
+pTextureHeight = pTexture->uTextureHeight;
-v19 = pTexture->uTextureHeight;
-v7 = pTexture->uTextureHeight;
-}
 else
-{
+pTextureHeight = window->GetHeight() - pMouse->uMouseClickY;
-v7 = window->GetHeight() - v6;
-v19 = window->GetHeight() - v6;
-}
 if ( !this->pCursorBitmap3_sysmembits_16bit
-|| a2 != this->field_40
+|| pMouse->uMouseClickX != this->uCursorWithItemX
-|| v6 != this->field_44
+|| pMouse->uMouseClickY != this->uCursorWithItemY
-|| a2 + pTextureWidth != this->field_48
+|| pMouse->uMouseClickX + pTextureWidth != this->uCursorWithItemW
-|| v6 + v7 != this->field_4C )
+|| pMouse->uMouseClickY + pTextureHeight != this->uCursorWithItemZ )
 {
 if ( this->pCursorBitmap3_sysmembits_16bit )
 free(this->pCursorBitmap3_sysmembits_16bit);
 this->pCursorBitmap3_sysmembits_16bit = (unsigned __int16 *)malloc(2 * pTexture->uTextureHeight * pTexture->uTextureWidth);
-this->field_40 = a2;
+this->uCursorWithItemX = pMouse->uMouseClickX;
-this->field_48 = a2 + pTextureWidth;
+this->uCursorWithItemW = pMouse->uMouseClickX + pTextureWidth;
-this->field_44 = v6;
+this->uCursorWithItemY = pMouse->uMouseClickY;
-this->field_4C = v6 + v19;
+this->uCursorWithItemZ = pMouse->uMouseClickY + pTextureHeight;
 }
-v8 = this->field_44;
 v22 = this->pCursorBitmap3_sysmembits_16bit;
-//v17 = pRenderer->pTargetSurface;
-//v16 = pRenderer->uTargetSurfacePitch;
+for (int y = this->uCursorWithItemY; y < this->uCursorWithItemZ; ++y)
+{
-v10 = pRenderer->uTargetSurfacePitch * v8;
+for (int x = this->uCursorWithItemX; x < this->uCursorWithItemW; ++x)
-v11 = this->field_40;
+{
-for (int y = this->field_44; y < this->field_4C; ++y)
+*v22++ = pRenderer->ReadPixel16(x, y);
-{
-//v20 = &v17[v10 + v11];
-for (int x = this->field_40; x < this->field_48; ++x)
-{
-//++v18;
-*v22++ = pRenderer->ReadPixel16(x, y);
 }
 }
 /*if ( v8 < this->field_4C )
 {
 v9 = this->field_48;
 }
 while ( v8 < this->field_4C );
 v6 = v15;
 }*/
-v6 = v15;
 if (pParty->pPickedItem.IsBroken())
-pRenderer->DrawTransparentRedShade(a2, v6, pTexture);
+pRenderer->DrawTransparentRedShade(pMouse->uMouseClickX, pMouse->uMouseClickY, pTexture);
 else if (!pParty->pPickedItem.IsIdentified())
-pRenderer->DrawTransparentGreenShade(a2, v6, pTexture);
+pRenderer->DrawTransparentGreenShade(pMouse->uMouseClickX, pMouse->uMouseClickY, pTexture);
 else
-pRenderer->DrawTextureTransparent(a2, v6, pTexture);
+pRenderer->DrawTextureTransparent(pMouse->uMouseClickX, pMouse->uMouseClickY, pTexture);
 }
 }
 else
 {
 if ( this->pCursorBitmap3_sysmembits_16bit )
 }
 }
 }
 //----- (0046A080) --------------------------------------------------------
-void Mouse::Activate(int bActive)
+void Mouse::ChangeActivation(int a1)
 {
-bActive = bActive;
+this->bActive = a1;
 }
 //----- (0046A08A) --------------------------------------------------------
 void Mouse::SetMouseClick(int x, int y)
 {
 }
 }
 break;
 }
 default:
-{
 break;
 }
 }
 }
-}

Mercurial > mm7

comparison Mouse.cpp @ 2216:3f375342de12