metin-server/m2dev-client-src
3
0
Fork 1
Code Issues 1 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

client almost builds

Browse Source
This commit is contained in:
d1str4ught
2025-08-19 00:20:40 +02:00
parent 4be475f111
commit be56f3f31a
1090 changed files with 126610 additions and 14032 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/EterPythonLib/CMakeLists.txt
View File

@@ -2,7 +2,9 @@
add_library(EterPythonLib STATIC ${FILE_SOURCES})
# target_link_libraries(EterPythonLib
# )
target_link_libraries(EterPythonLib
lzo2
cryptopp-static
)
GroupSourcesByFolder(EterPythonLib)

22
src/EterPythonLib/PythonGraphic.cpp
View File

@@ -217,7 +217,7 @@ bool CPythonGraphic::SaveScreenShot(const char * c_pszFileName)
return false;
}
BYTE* pbyBuffer = new BYTE[uWidth * uHeight * 3];
uint8_t* pbyBuffer = new uint8_t[uWidth * uHeight * 3];
if (pbyBuffer == NULL) {
lpSurface->UnlockRect();
lpSurface->Release();
@@ -225,10 +225,10 @@ bool CPythonGraphic::SaveScreenShot(const char * c_pszFileName)
TraceError("Failed to allocate screenshot buffer");
return false;
}
BYTE* pbySource = (BYTE*) lockRect.pBits;
BYTE* pbyDestination = (BYTE*) pbyBuffer;
uint8_t* pbySource = (uint8_t*) lockRect.pBits;
uint8_t* pbyDestination = (uint8_t*) pbyBuffer;
for(UINT y = 0; y < uHeight; ++y) {
BYTE *pRow = pbySource;
uint8_t*pRow = pbySource;
switch( stSurfaceDesc.Format ) {
case D3DFMT_R8G8B8 :
@@ -252,9 +252,9 @@ bool CPythonGraphic::SaveScreenShot(const char * c_pszFileName)
{
for(UINT x = 0; x < uWidth; ++x) {
UINT uColor = *((UINT *) pRow);
BYTE byBlue = (uColor >> 11) & 0x1F;
BYTE byGreen = (uColor >> 5) & 0x3F;
BYTE byRed = uColor & 0x1F;
uint8_t byBlue = (uColor >> 11) & 0x1F;
uint8_t byGreen = (uColor >> 5) & 0x3F;
uint8_t byRed = uColor & 0x1F;
*pbyDestination++ = (byBlue << 3) | (byBlue >> 2); // Blue
*pbyDestination++ = (byGreen << 2) | (byGreen >> 2); // Green
@@ -268,9 +268,9 @@ bool CPythonGraphic::SaveScreenShot(const char * c_pszFileName)
{
for(UINT x = 0; x < uWidth; ++x) {
UINT uColor = *((UINT *) pRow);
BYTE byBlue = (uColor >> 10) & 0x1F;
BYTE byGreen = (uColor >> 5) & 0x1F;
BYTE byRed = uColor & 0x1F;
uint8_t byBlue = (uColor >> 10) & 0x1F;
uint8_t byGreen = (uColor >> 5) & 0x1F;
uint8_t byRed = uColor & 0x1F;
*pbyDestination++ = (byBlue << 3) | (byBlue >> 2); // Blue
*pbyDestination++ = (byGreen << 3) | (byGreen >> 2); // Green
@@ -493,7 +493,7 @@ void CPythonGraphic::RenderCoolTimeBox(float fxCenter, float fyCenter, float fRa
if (fTime >= 1.0f)
return;
fTime = max(0.0f, fTime);
fTime = std::max(0.0f, fTime);
static D3DXCOLOR color = D3DXCOLOR(0.0f, 0.0f, 0.0f, 0.5f);
static WORD s_wBoxIndicies[10] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };

8
src/EterPythonLib/PythonGridSlotWindow.cpp
View File

@@ -55,10 +55,10 @@ void CGridSlotWindow::OnRenderPickingSlot()
for (std::list<TSlot*>::iterator itor = SlotList.begin(); itor != SlotList.end(); ++itor)
{
TSlot * pSlot = *itor;
Rect.left = min(Rect.left, m_rect.left + pSlot->ixPosition);
Rect.top = min(Rect.top, m_rect.top + pSlot->iyPosition);
Rect.right = max(Rect.right, m_rect.left + pSlot->ixPosition + pSlot->byxPlacedItemSize*ITEM_WIDTH);
Rect.bottom = max(Rect.bottom, m_rect.top + pSlot->iyPosition + pSlot->byxPlacedItemSize*ITEM_HEIGHT);
Rect.left = std::min(Rect.left, m_rect.left + pSlot->ixPosition);
Rect.top = std::min(Rect.top, m_rect.top + pSlot->iyPosition);
Rect.right = std::max(Rect.right, m_rect.left + pSlot->ixPosition + pSlot->byxPlacedItemSize*ITEM_WIDTH);
Rect.bottom = std::max(Rect.bottom, m_rect.top + pSlot->iyPosition + pSlot->byxPlacedItemSize*ITEM_HEIGHT);
}
CPythonGraphic::Instance().RenderBar2d(Rect.left, Rect.top, Rect.right, Rect.bottom);

4
src/EterPythonLib/PythonSlotWindow.cpp
View File

@@ -1230,8 +1230,8 @@ BOOL CSlotWindow::GetPickedSlotPointer(TSlot ** ppSlot)
// NOTE : Item이 Hide 되어있을 경우를 위한..
if (rSlot.isItem)
{
ixCellSize = max(rSlot.ixCellSize, int(rSlot.byxPlacedItemSize * ITEM_WIDTH));
iyCellSize = max(rSlot.iyCellSize, int(rSlot.byyPlacedItemSize * ITEM_HEIGHT));
ixCellSize = std::max(rSlot.ixCellSize, int(rSlot.byxPlacedItemSize * ITEM_WIDTH));
iyCellSize = std::max(rSlot.iyCellSize, int(rSlot.byyPlacedItemSize * ITEM_HEIGHT));
}
if (ixLocal >= rSlot.ixPosition)

8
src/EterPythonLib/PythonWindow.cpp
View File

@@ -1976,10 +1976,10 @@ namespace UI
void CDragButton::OnChangePosition()
{
m_x = max(m_x, m_restrictArea.left);
m_y = max(m_y, m_restrictArea.top);
m_x = min(m_x, max(0, m_restrictArea.right - m_lWidth));
m_y = min(m_y, max(0, m_restrictArea.bottom - m_lHeight));
m_x = std::max(m_x, m_restrictArea.left);
m_y = std::max(m_y, m_restrictArea.top);
m_x = std::min(m_x, std::max(0l, m_restrictArea.right - m_lWidth));
m_y = std::min(m_y, std::max(0l, m_restrictArea.bottom - m_lHeight));
m_rect.left = m_x;
m_rect.top = m_y;

2
src/EterPythonLib/PythonWindowManagerModule.cpp
View File

@@ -1260,7 +1260,7 @@ PyObject * wndMgrSetSlotCoolTime(PyObject * poSelf, PyObject * poArgs)
PyObject * wndMgrSetToggleSlot(PyObject * poSelf, PyObject * poArgs)
{
assert(!"wndMgrSetToggleSlot - 사용하지 않는 함수");
assert(!"wndMgrSetToggleSlot");
return Py_BuildNone();
}