From 8c92f794b9161b7dc995e8539d667d08106dc34a Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 13 Oct 2023 13:06:05 -0700 Subject: some more minor matches --- src/d/d_s_actor_data_mng.cpp | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'src/d/d_s_actor_data_mng.cpp') diff --git a/src/d/d_s_actor_data_mng.cpp b/src/d/d_s_actor_data_mng.cpp index e68b2bd8..a3863756 100644 --- a/src/d/d_s_actor_data_mng.cpp +++ b/src/d/d_s_actor_data_mng.cpp @@ -10,16 +10,22 @@ dADM_CharTbl::dADM_CharTbl() { } +dADM_CharTbl::~dADM_CharTbl() { +} + /* 800C2758-800C2844 .text SetData__12dADM_CharTblFUlUlUlUlUlUlUl */ -void dADM_CharTbl::SetData(u32 offs, u32 row_num, u32 pRow, u32 colum_num, u32 pColumn, u32 dat_size, u32 data) { - for (u32 i = 0; i < row_num; i++, pRow += 4) - *((u32*)pRow) += offs; +void dADM_CharTbl::SetData(u32 offs, u32 row_num, u32 row_offs, u32 colum_num, u32 colum_offs, u32 dat_size, u32 data) { + char** row = (char**)row_offs; + char** colum = (char**)colum_offs; + + for (u32 i = 0; i < row_num; i++, row_offs += 4) + *((u32*)row_offs) += offs; - for (u32 i = 0; i < colum_num; i++, pColumn += 4) - *((u32*)pColumn) += offs; + for (u32 i = 0; i < colum_num; i++, colum_offs += 4) + *((u32*)colum_offs) += offs; JUT_ASSERT(0x39, dat_size == row_num * colum_num); - cDT::Set(row_num, (char**)pRow, colum_num, (char**)pColumn, (u8*)data); + cDT::Set(row_num, row, colum_num, colum, (u8*)data); SetUpIndex(); } @@ -60,7 +66,8 @@ int dADM_CharTbl::GetNameIndex2(const char* pName, int index) const { if (col == -1) return -1; - int inf = GetInf(mIndex_ARG, col); + start = col; + int inf = GetInf(mIndex_ARG, start); if (index == inf) return start; } -- cgit v1.2.3