forked from cafeberry/cafeberry
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e3e5c54847 |
@@ -406,6 +406,12 @@ bool DLCManager::processDLCDataFile(DWORD &dwFilesProcessed, PBYTE pbData, DWORD
|
|||||||
unsigned int uiVersion=*(unsigned int *)pbData;
|
unsigned int uiVersion=*(unsigned int *)pbData;
|
||||||
uiCurrentByte+=sizeof(int);
|
uiCurrentByte+=sizeof(int);
|
||||||
|
|
||||||
|
if(uiVersion > CURRENT_DLC_VERSION_NUM)
|
||||||
|
{
|
||||||
|
if(pbData!=NULL) delete [] pbData;
|
||||||
|
app.DebugPrintf("DLC version of %d is newer than this build can read (%d)\n", uiVersion, CURRENT_DLC_VERSION_NUM);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
if(uiVersion < CURRENT_DLC_VERSION_NUM)
|
if(uiVersion < CURRENT_DLC_VERSION_NUM)
|
||||||
{
|
{
|
||||||
if(pbData!=NULL) delete [] pbData;
|
if(pbData!=NULL) delete [] pbData;
|
||||||
@@ -613,6 +619,11 @@ DWORD DLCManager::retrievePackID(PBYTE pbData, DWORD dwLength, DLCPack *pack)
|
|||||||
unsigned int uiVersion=*(unsigned int *)pbData;
|
unsigned int uiVersion=*(unsigned int *)pbData;
|
||||||
uiCurrentByte+=sizeof(int);
|
uiCurrentByte+=sizeof(int);
|
||||||
|
|
||||||
|
if(uiVersion > CURRENT_DLC_VERSION_NUM)
|
||||||
|
{
|
||||||
|
app.DebugPrintf("DLC version of %d is newer than this build can read (%d)\n", uiVersion, CURRENT_DLC_VERSION_NUM);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
if(uiVersion < CURRENT_DLC_VERSION_NUM)
|
if(uiVersion < CURRENT_DLC_VERSION_NUM)
|
||||||
{
|
{
|
||||||
app.DebugPrintf("DLC version of %d is too old to be read\n", uiVersion);
|
app.DebugPrintf("DLC version of %d is too old to be read\n", uiVersion);
|
||||||
|
|||||||
@@ -454,12 +454,7 @@ void CXuiSceneAbstractContainer::SetPointerText(vector<HtmlString> *description,
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
wstring combinedText;
|
wstring combinedText = HtmlString::Compose(description);
|
||||||
for(size_t i = 0; i < description->size(); ++i)
|
|
||||||
{
|
|
||||||
combinedText += (*description)[i].text;
|
|
||||||
if(i + 1 < description->size()) combinedText += L"\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
vector<wstring> unformattedStrings;
|
vector<wstring> unformattedStrings;
|
||||||
for(size_t i = 0; i < description->size(); ++i)
|
for(size_t i = 0; i < description->size(); ++i)
|
||||||
|
|||||||
Reference in New Issue
Block a user