[C++]Check Moving Item minor bug fix

[MrLibya]

Hello

Most of u will ignore it ( even ymir did ) but there's somepeoples who love to keep it all clean , even the small non effect bug

Before fix the bug :


After :


#UPDATE
I've fix also fix this bug :

and another bug related to inventory


To fix it :
Client Source / EterPythonLib/PythonGridSlotWindow.cpp
Serach for fucntion :

BOOL CGridSlotWindow::CheckMoving(DWORD dwSlotNumber, DWORD dwItemIndex, const std::list<TSlot*> & c_rSlotList)

replace with this :

BOOL CGridSlotWindow::CheckMoving(DWORD dwSlotNumber, DWORD dwItemIndex, const std::list<TSlot*> & c_rSlotList)
{
	if (m_dwSlotStyle != SLOT_STYLE_PICK_UP)
		return TRUE;

	for (std::list<TSlot*>::const_iterator itor = c_rSlotList.begin(); itor != c_rSlotList.end(); ++itor)
	{
		TSlot * pSlot = *itor;
		
		if (0 != pSlot->dwItemIndex || pSlot->dwCenterSlotNumber != pSlot->dwSlotNumber) // 아이템이 있고
		{
			if (dwItemIndex != pSlot->dwItemIndex || c_rSlotList.size() != 1) // 다른 아이템이면 못 옮김
				return false;
		}
	}

	return true;
}

Now Save and compile

[MaxChri]

Esthetic fix on a high level. I like these kind of attention.

[EULOG1SON]

Do you have any solution when you trying to move the item on the 1x slot at the top?
try with a 2 hand or 3 hand weapon and put it on the second slot and try to move it up, you can see the white slot but the weapon aren't able to move 1x slot up. (remove your fix first).

[MrLibya]

Originally Posted by EULOG1SON

Do you have any solution when you trying to move the item on the 1x slot at the top?
try with a 2 hand or 3 hand weapon and put it on the second slot and try to move it up, you can see the white slot but the weapon aren't able to move 1x slot up. (remove your fix first).

I've fix it and update the topic , i also fix another bug related inventory

[MrLibya]

Topic Updated

[xP3NG3Rx]

Hello,

Here is an update for this fix, because it isnt' complete. If you are moving an item which size is > 1 onto the same item that makes false value.
Rubinum:

 pseudo of GF

signed int __fastcall CGridSlotWindow::CheckMoving(int a1, int a2, unsigned int a3, int a4, int a5, int a6)
{
  int v6; // edx@1
  signed int v7; // ecx@1
  unsigned int v8; // eax@2
  int v10; // ebx@8
  int *v11; // edi@8
  int v12; // esi@9
  int v13; // eax@14
  int v14; // eax@17
  int v15; // edx@18
  int v16; // ecx@19
  char v17; // zf@21
  int v18; // eax@29
  int v19; // [sp+0h] [bp-4h]@1

  v6 = a1;
  v19 = a1;
  v7 = 1;
  while ( 1 )
  {
    v8 = 45 * (4 - v7);
    if ( a3 >= v8 )
      break;
    if ( (unsigned int)++v7 >= 4 )
      goto LABEL_6;
  }
  a3 -= v8;
LABEL_6:
  if ( *(_DWORD *)(v6 + 168) != 1 )
    return 1;
  v10 = **(_DWORD **)(a5 + 20);
  v11 = *(int **)a5;
  while ( 1 )
  {
    v12 = *(_DWORD *)(a5 + 20);
    if ( !v11 || v11 != *(int **)a5 )
      sub_6FE8F6();
    if ( v10 == v12 )
      return 1;
    if ( v11 )
    {
      v13 = *v11;
    }
    else
    {
      sub_6FE8F6();
      v13 = 0;
    }
    if ( v10 == *(_DWORD *)(v13 + 20) )
      sub_6FE8F6();
    v14 = *(_DWORD *)(v10 + 8);
    if ( a6 == *(_DWORD *)(v19 + 164) )
    {
      v15 = *(_DWORD *)(v14 + 8);
      if ( a3 == v15 )
        goto LABEL_28;
      v16 = *(_DWORD *)(v14 + 12);
      if ( !v16 && v15 == *(_DWORD *)(v14 + 4) )
      {
        v17 = (*(_BYTE *)v14 & 1) == 0;
        goto LABEL_27;
      }
    }
    else
    {
      v16 = *(_DWORD *)(v14 + 12);
      if ( !v16 && *(_DWORD *)(v14 + 8) == *(_DWORD *)(v14 + 4) )
      {
        v17 = (*(_BYTE *)v14 & 1) == 0;
        goto LABEL_27;
      }
    }
    v17 = a4 == v16;
LABEL_27:
    if ( !v17 )
      return 0;
LABEL_28:
    if ( v11 )
    {
      v18 = *v11;
    }
    else
    {
      sub_6FE8F6();
      v18 = 0;
    }
    if ( v10 == *(_DWORD *)(v18 + 20) )
      sub_6FE8F6();
    v10 = *(_DWORD *)v10;
  }
}

Gallery 1

 Fixed code

BOOL CGridSlotWindow::CheckMoving(DWORD dwSlotNumber, DWORD dwItemIndex, const std::list<TSlot*> & c_rSlotList)
{
	if (m_dwSlotStyle != SLOT_STYLE_PICK_UP)
		return TRUE;

	WORD wCellMaxPerPage = m_SlotVector.size();
	while (dwSlotNumber >= wCellMaxPerPage)
		dwSlotNumber -= wCellMaxPerPage;

	for (std::list<TSlot*>::const_iterator itor = c_rSlotList.begin(); itor != c_rSlotList.end(); ++itor)
	{
		TSlot* pSlot = *itor;
		if (dwSlotNumber == pSlot->dwSlotNumber && itor == c_rSlotList.begin())
			return TRUE;

		if (dwSlotNumber != pSlot->dwCenterSlotNumber)
		{
			if (c_rSlotList.size() == 2)
			{
				std::list<TSlot*>::const_iterator it = c_rSlotList.begin();
				std::advance(it, 1);
				if (0 != pSlot->dwItemIndex && 0 != (*it)->dwItemIndex)
					return FALSE;
			}
			if (c_rSlotList.size() == 3)
			{
				std::list<TSlot*>::const_iterator it = c_rSlotList.begin();
				std::advance(it, 1);
				if (0 != pSlot->dwItemIndex && 0 != (*it)->dwItemIndex)
					return FALSE;
				else
				{
					std::advance(it, 1);
					if (0 != pSlot->dwItemIndex && 0 != (*it)->dwItemIndex)
						return FALSE;
				}
			}

			if (0 != pSlot->dwItemIndex || pSlot->dwCenterSlotNumber != pSlot->dwSlotNumber)
				if (dwItemIndex != pSlot->dwItemIndex)
					return FALSE;
		}
	}

	return TRUE;
}

I didn't find any bugs, but if you will, feel free to explain how did you find it.

[.T4Ump]

Originally Posted by xP3NG3Rx

Hello,

Here is an update for this fix, because it isnt' complete. If you are moving an item which size is > 1 onto the same item that makes false value.
Rubinum:

 pseudo of GF

signed int __fastcall CGridSlotWindow::CheckMoving(int a1, int a2, unsigned int a3, int a4, int a5, int a6)
{
  int v6; // edx@1
  signed int v7; // ecx@1
  unsigned int v8; // eax@2
  int v10; // ebx@8
  int *v11; // edi@8
  int v12; // esi@9
  int v13; // eax@14
  int v14; // eax@17
  int v15; // edx@18
  int v16; // ecx@19
  char v17; // zf@21
  int v18; // eax@29
  int v19; // [sp+0h] [bp-4h]@1

  v6 = a1;
  v19 = a1;
  v7 = 1;
  while ( 1 )
  {
    v8 = 45 * (4 - v7);
    if ( a3 >= v8 )
      break;
    if ( (unsigned int)++v7 >= 4 )
      goto LABEL_6;
  }
  a3 -= v8;
LABEL_6:
  if ( *(_DWORD *)(v6 + 168) != 1 )
    return 1;
  v10 = **(_DWORD **)(a5 + 20);
  v11 = *(int **)a5;
  while ( 1 )
  {
    v12 = *(_DWORD *)(a5 + 20);
    if ( !v11 || v11 != *(int **)a5 )
      sub_6FE8F6();
    if ( v10 == v12 )
      return 1;
    if ( v11 )
    {
      v13 = *v11;
    }
    else
    {
      sub_6FE8F6();
      v13 = 0;
    }
    if ( v10 == *(_DWORD *)(v13 + 20) )
      sub_6FE8F6();
    v14 = *(_DWORD *)(v10 + 8);
    if ( a6 == *(_DWORD *)(v19 + 164) )
    {
      v15 = *(_DWORD *)(v14 + 8);
      if ( a3 == v15 )
        goto LABEL_28;
      v16 = *(_DWORD *)(v14 + 12);
      if ( !v16 && v15 == *(_DWORD *)(v14 + 4) )
      {
        v17 = (*(_BYTE *)v14 & 1) == 0;
        goto LABEL_27;
      }
    }
    else
    {
      v16 = *(_DWORD *)(v14 + 12);
      if ( !v16 && *(_DWORD *)(v14 + 8) == *(_DWORD *)(v14 + 4) )
      {
        v17 = (*(_BYTE *)v14 & 1) == 0;
        goto LABEL_27;
      }
    }
    v17 = a4 == v16;
LABEL_27:
    if ( !v17 )
      return 0;
LABEL_28:
    if ( v11 )
    {
      v18 = *v11;
    }
    else
    {
      sub_6FE8F6();
      v18 = 0;
    }
    if ( v10 == *(_DWORD *)(v18 + 20) )
      sub_6FE8F6();
    v10 = *(_DWORD *)v10;
  }
}

 Fixed code

BOOL CGridSlotWindow::CheckMoving(DWORD dwSlotNumber, DWORD dwItemIndex, const std::list<TSlot*> & c_rSlotList)
{
	if (m_dwSlotStyle != SLOT_STYLE_PICK_UP)
		return TRUE;

	WORD wCellMaxPerPage = m_SlotVector.size();
	while (dwSlotNumber >= wCellMaxPerPage)
		dwSlotNumber -= wCellMaxPerPage;

	for (std::list<TSlot*>::const_iterator itor = c_rSlotList.begin(); itor != c_rSlotList.end(); ++itor)
	{
		TSlot* pSlot = *itor;
		if (dwSlotNumber == pSlot->dwSlotNumber && itor == c_rSlotList.begin())
			return TRUE;

		if (dwSlotNumber != pSlot->dwCenterSlotNumber)
		{
			if (c_rSlotList.size() == 2)
			{
				std::list<TSlot*>::const_iterator it = c_rSlotList.begin();
				std::advance(it, 1);
				if (0 != pSlot->dwItemIndex && 0 != (*it)->dwItemIndex)
					return FALSE;
			}
			if (c_rSlotList.size() == 3)
			{
				std::list<TSlot*>::const_iterator it = c_rSlotList.begin();
				std::advance(it, 1);
				if (0 != pSlot->dwItemIndex && 0 != (*it)->dwItemIndex)
					return FALSE;
				else
				{
					std::advance(it, 1);
					if (0 != pSlot->dwItemIndex && 0 != (*it)->dwItemIndex)
						return FALSE;
				}
			}

			if (0 != pSlot->dwItemIndex || pSlot->dwCenterSlotNumber != pSlot->dwSlotNumber)
				if (dwItemIndex != pSlot->dwItemIndex)
					return FALSE;
		}
	}

	return TRUE;
}

I didn't find any bugs, but if you will, feel free to explain how did you find it.

Omgg thanks boyyy

[HKwork]

nice...

[jeddawee]

Originally Posted by xP3NG3Rx

Hello,

Here is an update for this fix, because it isnt' complete. If you are moving an item which size is > 1 onto the same item that makes false value.
Rubinum:

 pseudo of GF

signed int __fastcall CGridSlotWindow::CheckMoving(int a1, int a2, unsigned int a3, int a4, int a5, int a6)
{
  int v6; // edx@1
  signed int v7; // ecx@1
  unsigned int v8; // eax@2
  int v10; // ebx@8
  int *v11; // edi@8
  int v12; // esi@9
  int v13; // eax@14
  int v14; // eax@17
  int v15; // edx@18
  int v16; // ecx@19
  char v17; // zf@21
  int v18; // eax@29
  int v19; // [sp+0h] [bp-4h]@1

  v6 = a1;
  v19 = a1;
  v7 = 1;
  while ( 1 )
  {
    v8 = 45 * (4 - v7);
    if ( a3 >= v8 )
      break;
    if ( (unsigned int)++v7 >= 4 )
      goto LABEL_6;
  }
  a3 -= v8;
LABEL_6:
  if ( *(_DWORD *)(v6 + 168) != 1 )
    return 1;
  v10 = **(_DWORD **)(a5 + 20);
  v11 = *(int **)a5;
  while ( 1 )
  {
    v12 = *(_DWORD *)(a5 + 20);
    if ( !v11 || v11 != *(int **)a5 )
      sub_6FE8F6();
    if ( v10 == v12 )
      return 1;
    if ( v11 )
    {
      v13 = *v11;
    }
    else
    {
      sub_6FE8F6();
      v13 = 0;
    }
    if ( v10 == *(_DWORD *)(v13 + 20) )
      sub_6FE8F6();
    v14 = *(_DWORD *)(v10 + 8);
    if ( a6 == *(_DWORD *)(v19 + 164) )
    {
      v15 = *(_DWORD *)(v14 + 8);
      if ( a3 == v15 )
        goto LABEL_28;
      v16 = *(_DWORD *)(v14 + 12);
      if ( !v16 && v15 == *(_DWORD *)(v14 + 4) )
      {
        v17 = (*(_BYTE *)v14 & 1) == 0;
        goto LABEL_27;
      }
    }
    else
    {
      v16 = *(_DWORD *)(v14 + 12);
      if ( !v16 && *(_DWORD *)(v14 + 8) == *(_DWORD *)(v14 + 4) )
      {
        v17 = (*(_BYTE *)v14 & 1) == 0;
        goto LABEL_27;
      }
    }
    v17 = a4 == v16;
LABEL_27:
    if ( !v17 )
      return 0;
LABEL_28:
    if ( v11 )
    {
      v18 = *v11;
    }
    else
    {
      sub_6FE8F6();
      v18 = 0;
    }
    if ( v10 == *(_DWORD *)(v18 + 20) )
      sub_6FE8F6();
    v10 = *(_DWORD *)v10;
  }
}

 Fixed code

BOOL CGridSlotWindow::CheckMoving(DWORD dwSlotNumber, DWORD dwItemIndex, const std::list<TSlot*> & c_rSlotList)
{
	if (m_dwSlotStyle != SLOT_STYLE_PICK_UP)
		return TRUE;

	WORD wCellMaxPerPage = m_SlotVector.size();
	while (dwSlotNumber >= wCellMaxPerPage)
		dwSlotNumber -= wCellMaxPerPage;

	for (std::list<TSlot*>::const_iterator itor = c_rSlotList.begin(); itor != c_rSlotList.end(); ++itor)
	{
		TSlot* pSlot = *itor;
		if (dwSlotNumber == pSlot->dwSlotNumber && itor == c_rSlotList.begin())
			return TRUE;

		if (dwSlotNumber != pSlot->dwCenterSlotNumber)
		{
			if (c_rSlotList.size() == 2)
			{
				std::list<TSlot*>::const_iterator it = c_rSlotList.begin();
				std::advance(it, 1);
				if (0 != pSlot->dwItemIndex && 0 != (*it)->dwItemIndex)
					return FALSE;
			}
			if (c_rSlotList.size() == 3)
			{
				std::list<TSlot*>::const_iterator it = c_rSlotList.begin();
				std::advance(it, 1);
				if (0 != pSlot->dwItemIndex && 0 != (*it)->dwItemIndex)
					return FALSE;
				else
				{
					std::advance(it, 1);
					if (0 != pSlot->dwItemIndex && 0 != (*it)->dwItemIndex)
						return FALSE;
				}
			}

			if (0 != pSlot->dwItemIndex || pSlot->dwCenterSlotNumber != pSlot->dwSlotNumber)
				if (dwItemIndex != pSlot->dwItemIndex)
					return FALSE;
		}
	}

	return TRUE;
}

I didn't find any bugs, but if you will, feel free to explain how did you find it.

In official, I can move the item x1 slot or x2 slot to up or down, but in your fix I'm not able to do that, only if I put the item in the first page of inventory I could only move the item down .


plz fix that






.

[x"Kazuki]

Also bei mir funktioniert es nicht, hat jemand einen fix?

[pask94]

nice

[dandiman22]

you need swap sistem for this stupid guis