mirror of
https://github.com/electronicarts/CNC_TS_and_RA2_Mission_Editor.git
synced 2025-07-17 19:56:38 -04:00
more adaption for x64
This commit is contained in:
parent
3e334ca731
commit
9235ac60c1
16 changed files with 214 additions and 234 deletions
|
@ -278,7 +278,9 @@ void CMapData::CalcMapRect()
|
|||
m_maprect.right = atoi(custr);
|
||||
|
||||
cucomma = strchr(&msize[cupos], ','); // we check again... could be there is a new ini format
|
||||
if (cucomma == NULL) cucomma = (char*)((int)msize + strlen(msize));
|
||||
if (cucomma == NULL) {
|
||||
cucomma = msize + strlen(msize);
|
||||
}
|
||||
memcpy_s(custr, custr_size, &msize[cupos], (cucomma - msize) - cupos + 1);
|
||||
custr[((cucomma - msize)) - cupos] = 0;
|
||||
cupos = cucomma - msize + 1;
|
||||
|
@ -321,7 +323,9 @@ void CMapData::CalcMapRect()
|
|||
|
||||
|
||||
cucomma = strchr(&msize[cupos], ','); // we check again... could be there is a new ini format
|
||||
if (cucomma == NULL) cucomma = (char*)((int)msize + strlen(msize));
|
||||
if (cucomma == NULL) {
|
||||
cucomma = msize + strlen(msize);
|
||||
}
|
||||
memcpy_s(custr, custr_size, &msize[cupos], (cucomma - msize) - cupos + 1);
|
||||
custr[((cucomma - msize)) - cupos] = 0;
|
||||
cupos = cucomma - msize + 1;
|
||||
|
@ -1092,7 +1096,7 @@ void CMapData::Pack(BOOL bCreatePreview, BOOL bCompression)
|
|||
BYTE* hexpacked = NULL; // must be freed!
|
||||
|
||||
|
||||
errstream << "Values allocated. Pointer: " << (int)values << endl;
|
||||
errstream << "Values allocated. Pointer: " << std::hex << values << endl;
|
||||
errstream.flush();
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue