OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 19:29:09 +00:00
Code Releases Activity

Allow encrypted age files

Browse Source 
Yes, this bit me in the ass.
This commit is contained in:
Adam Johnson
2013-01-26 20:52:40 -05:00
parent 3e592b76ff
commit 66423478cc
2 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Sources/Tools/MaxComponent/Pch.h
View File

@ -51,6 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// Standard Library // Standard Library
#include <algorithm> #include <algorithm>
#include <map> #include <map>
#include <memory>
#include <set> #include <set>
#include <string> #include <string>
#include <vector> #include <vector>

33
Sources/Tools/MaxComponent/plMiscComponents.cpp
View File

@ -51,6 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "resource.h" #include "resource.h"
#include <iparamm2.h> #include <iparamm2.h>
#include <memory>
#include <notify.h> #include <notify.h>
#pragma hdrstop #pragma hdrstop
@ -96,6 +97,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// Location Related // Location Related
#include "plAgeDescription/plAgeDescription.h" #include "plAgeDescription/plAgeDescription.h"
#include "plFile/plEncryptedStream.h"
#include "MaxMain/plMaxCFGFile.h" #include "MaxMain/plMaxCFGFile.h"
#include "MaxMain/plAgeDescInterface.h" #include "MaxMain/plAgeDescInterface.h"
#include "plResMgr/plPageInfo.h" #include "plResMgr/plPageInfo.h"
@ -649,9 +651,9 @@ void plPageInfoComponent::IUpdateSeqNumbersFromAgeFile( plErrorMsg *errMsg )
plFileName path = plFileName::Join(ageFolder, plString::Format("%s.age", curAge)); plFileName path = plFileName::Join(ageFolder, plString::Format("%s.age", curAge));
IVerifyLatestAgeAsset( curAge, path, errMsg ); IVerifyLatestAgeAsset( curAge, path, errMsg );
std::unique_ptr<plAgeDescription> aged(plPageInfoUtils::GetAgeDesc(curAge));
hsUNIXStream s; if (!aged)
if (!s.Open(path))
{ {
errMsg->Set( true, errMsg->Set( true,
"PageInfo Convert Error", "PageInfo Convert Error",
@ -664,13 +666,8 @@ void plPageInfoComponent::IUpdateSeqNumbersFromAgeFile( plErrorMsg *errMsg )
return; return;
} }
// create and read the age desc
plAgeDescription aged;
aged.Read(&s);
s.Close();
// Update based on the age file now // Update based on the age file now
fCompPB->SetValue( kInfoSeqPrefix, 0, (int)aged.GetSequencePrefix() ); fCompPB->SetValue( kInfoSeqPrefix, 0, (int)aged->GetSequencePrefix() );
// Find our page // Find our page
const char *compPBPageName = fCompPB->GetStr( kInfoPage ); const char *compPBPageName = fCompPB->GetStr( kInfoPage );
@ -688,9 +685,9 @@ void plPageInfoComponent::IUpdateSeqNumbersFromAgeFile( plErrorMsg *errMsg )
} }
plAgePage *page; plAgePage *page;
aged.SeekFirstPage(); aged->SeekFirstPage();
while( ( page = aged.GetNextPage() ) != nil ) while( ( page = aged->GetNextPage() ) != nil )
{ {
if( page->GetName().CompareI( compPBPageName ) == 0 ) if( page->GetName().CompareI( compPBPageName ) == 0 )
{ {
@ -790,18 +787,16 @@ plAgeDescription *plPageInfoUtils::GetAgeDesc( const plString &ageName )
{ {
plFileName ageFolder = plPageInfoUtils::GetAgeFolder(); plFileName ageFolder = plPageInfoUtils::GetAgeFolder();
if (!ageFolder.IsValid() || ageName.IsNull()) if (!ageFolder.IsValid() || ageName.IsNull())
return nil; return nullptr;
hsUNIXStream s;
if (!s.Open(plFileName::Join(ageFolder, ageName + ".age")))
return nil;
// Create and read the age desc
plAgeDescription* aged = new plAgeDescription; plAgeDescription* aged = new plAgeDescription;
aged->Read( &s ); if (aged->ReadFromFile(plFileName::Join(ageFolder, ageName + ".age")))
s.Close();
return aged; return aged;
else
{
delete aged;
return nullptr;
}
} }
const char* LocCompGetPage(plComponentBase* comp) const char* LocCompGetPage(plComponentBase* comp)