Backups/SA-MP
1
0
Fork 0
mirror of https://github.com/dashr9230/SA-MP.git synced 2026-10-10 03:33:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[saco] Implement/match CChatWindow::FUNC_10067940; the entry walk needs its own index bumped ahead of the rect advance, and the strlen guards are bare temps rather than a named length

Browse Source
This commit is contained in:
ricardoofnl
2026-09-05 09:54:07 +07:00
parent c735f2f750
commit 99dda3ded5
2 changed files with 98 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
saco/chatwindow.cpp
+90
View File
@@ -7,6 +7,9 @@ extern CConfig *pConfig;
extern CCmdWindow *pCmdWindow;
extern CGame *pGame;
typedef char AssertEntrySize[sizeof(CHAT_WINDOW_ENTRY) == 252 ? 1 : -1];
typedef char AssertEntryText[offsetof(CHAT_WINDOW_ENTRY, szText) == 0x20 ? 1 : -1];
typedef char AssertEntryType[offsetof(CHAT_WINDOW_ENTRY, iType) == 0xF0 ? 1 : -1];
typedef char AssertChatWindowSize[sizeof(CChatWindow) == 25578 ? 1 : -1];
typedef char AssertTimestampWidth[offsetof(CChatWindow, field_63E6) == 0x63E6 ? 1 : -1];
@@ -439,3 +442,90 @@ void CChatWindow::FUNC_10067ED0()
}
}
}
//----------------------------------------------------
// lays out the visible page of chat lines
void CChatWindow::FUNC_10067940()
{
int x = 0;
int iEntry;
RECT rect, rectName;
char szTimestamp[72];
struct tm *pTime;
int iPos;
memset(szTimestamp,0,64);
rect.top = 10;
rect.left = 45;
rect.right = 550;
rect.bottom = 110;
if(m_pScrollBar->GetTrackPos() < 1)
m_pScrollBar->SetTrackPos(1);
iPos = m_pScrollBar->GetTrackPos();
if(iPos < 1)
iPos = 1;
iEntry = iPos;
while(x != field_0)
{
if(m_bTimestamp)
{
pTime = localtime(&m_ChatWindowEntries[iEntry].tTime);
memset(szTimestamp,0,64);
if(pTime)
strftime(szTimestamp,64,"[%H:%M:%S]",pTime);
}
switch(m_ChatWindowEntries[iEntry].iType)
{
case 2:
if(m_bTimestamp)
{
if(strlen(szTimestamp) && m_ChatWindowEntries[iEntry].szName[0])
{
FUNC_10067470(szTimestamp,rect,m_ChatWindowEntries[iEntry].dwTextColor);
rect.left = field_63E6+50;
}
}
if(strlen(m_ChatWindowEntries[iEntry].szName))
{
m_pFontRender->field_0->DrawTextA(NULL,m_ChatWindowEntries[iEntry].szName,-1,&rectName,DT_CALCRECT,0xFF000000);
FUNC_10067470(m_ChatWindowEntries[iEntry].szName,rect,m_ChatWindowEntries[iEntry].dwNameColor);
rect.left += rectName.right-rectName.left+5;
}
FUNC_10067470(m_ChatWindowEntries[iEntry].szText,rect,m_ChatWindowEntries[iEntry].dwTextColor);
break;
case 4:
case 8:
if(m_bTimestamp)
{
if(strlen(szTimestamp))
{
FUNC_10067470(szTimestamp,rect,m_ChatWindowEntries[iEntry].dwTextColor);
rect.left = field_63E6+50;
}
}
FUNC_10067470(m_ChatWindowEntries[iEntry].szText,rect,m_ChatWindowEntries[iEntry].dwTextColor);
break;
}
iEntry++;
rect.top += field_63E2+1;
rect.bottom = rect.top+field_63E2+1;
rect.left = 45;
x++;
}
field_12E = rect.bottom;
}
saco/chatwindow.h
+8 -1
View File
@@ -7,7 +7,12 @@
#pragma pack(1)
typedef struct _CHAT_WINDOW_ENTRY
{
char _gap0[252];
time_t tTime;
char szName[28];
char szText[208];
int iType;
DWORD dwTextColor;
DWORD dwNameColor;
} CHAT_WINDOW_ENTRY;
class CChatWindow // size: 25578
@@ -65,6 +70,8 @@ public:
void FUNC_10067410(); // .text:10067410
void FUNC_10067470(char *szText, RECT rect, DWORD dwColor); // .text:10067470
void FUNC_10067940(); // .text:10067940
void FUNC_10067E00(); // .text:10067E00