WebSVN – spk – Diff – /Creator/src/Forms/Form1.h

 #include "../../ModMerge/src/Forms/Form1.h"
 #include "ModDiff.h"
 #include "Waiting.h"
 #include "FileExplorer.h"
 #include "SelectGame.h"
+#include "SelectFilesystem.h"
+#include <VirtualFileSystem.h>
 using namespace System;
 using namespace System::IO;
 namespace Creator {
 	///          resources associated with this form.
 	/// </summary>
 	public ref class Form1 : public System::Windows::Forms::Form
+	{
 	public:
-		Form1(array<System::String ^> ^args)
+		Form1(array<System::String ^> ^args);
-		{
-			InitializeComponent();
-			m_bAutoClose = false;
-			m_pWait = nullptr;
-			m_bTextLoaded = false;
-			this->shipToolStripMenuItem->Image = this->imageList1->Images[1];
-			this->shipToolStripMenuItem1->Image = this->imageList1->Images[1];
-			this->multiPackageToolStripMenuItem->Image = this->imageList1->Images[this->imageList1->Images->IndexOfKey("multi")];
-			this->Closed += gcnew System::EventHandler(this, &Form1::CloseEvent);
-			textList = gcnew Hashtable();
-			this->Text = "Package Creator " + GetVersionString();
-			m_pLoadedList = new CyStringList;
-			m_pGameDir = new CLinkList<SGameDir>;
-			// default settings
-			m_settings = new SSettings;
-			m_settings->bGenerateUpdate = false;
-			m_pComponents = NULL;
-			m_pDummies = NULL;
-			m_pBodies = NULL;
-			m_pShields = NULL;
-			m_pCockpits = new CLinkList<CyStringList>;
-			m_pLasers = new CLinkList<CyStringList>;
-			m_pMissiles = new CLinkList<CyStringList>;
-			m_iLocX = m_iLocY = -1;
-			this->LoadData();
-			this->toolTip1->SetToolTip(this->button1, "Closes all open windows, will ask about saving any that have been modified when they close");
-			m_pPackages = new CPackages;
-			m_pPackages->Startup(".", CyStringFromSystemString(IO::Path::GetTempPath()), CyStringFromSystemString(Environment::GetFolderPath(Environment::SpecialFolder::Personal )));
-			m_pPackages->SetLanguage(44);
-			this->UpdateDisplay();
-			// parse any switches
-			int switchType = SWITCH_NONE;
-			if ( args ) {
-				ArrayList ^list = gcnew ArrayList();
-				for ( int i = 0; i < args->Length; i++ ) {
-					String ^str = args[i];
-					if ( switchType != SWITCH_NONE ) {
-						switch(switchType) {
-							case SWITCH_CREATE:
-								this->SavePackagerScript(str);
-								m_bAutoClose = true;
-								break;
-							case SWITCH_EXTRACT:
-								this->ExtractPackage(str, false);
-								m_bAutoClose = true;
-								break;
-							case SWITCH_EXTRACTHERE:
-								this->ExtractPackage(str, true);
-								m_bAutoClose = true;
-								break;
-							case SWITCH_EXPORT:
-								this->ExportPackage(str);
-								m_bAutoClose = true;
-								break;
-						}
-						switchType = SWITCH_NONE;
-					}
-					else if ( !String::Compare(str, "--create", true) ) {
-						switchType = SWITCH_CREATE;
-					}
-					else if ( !String::Compare(str, "--extract", true) ) {
-						switchType = SWITCH_EXTRACT;
-					}
-					else if ( !String::Compare(str, "--extracthere", true) ) {
-						switchType = SWITCH_EXTRACTHERE;
-					}
-					else if ( !String::Compare(str, "--export", true) ) {
-						switchType = SWITCH_EXPORT;
-					}
-					else {
-						list->Add(args[i]);
-					}
-				}
-				if ( list->Count ) {
-					this->OpenFiles(list, true, true);
+		void parseCommandArguments(array<System::String ^> ^args);
-					m_bAutoClose = false;
-				}
-			}
-		}
 		int GetHighestGame()
+		{
 			int highest = 1;
 			for ( SGameDir *gd = m_pGameDir->First(); gd; gd = m_pGameDir->Next() )
+				}
+			}
 			return t;
+		}
+		SGameDir *findGameDir(int iGame)
+		{
+			for ( SGameDir *gd = m_pGameDir->First(); gd; gd = m_pGameDir->Next() ) {
+				int checkgame = gd->sGame.GetToken(" ", 1, 1).ToInt();
+				if ( checkgame == iGame ) return gd;
+			}
+			return NULL;
+		}
 		String ^FindText(int game, int page, int id)
+		{
 			this->LoadText(false, false);
 			String ^text;
-			if ( game == -1 )
+			if ( game == -1 ) {
-			{
-				for ( int game = (GAME_MAX - 1); game >= 0; game-- )
+				for ( int game = (GAME_MAX - 1); game >= 0; game-- ) {
-				{
-					String ^key = Convert::ToString(game) + "," + Convert::ToString(page) + "," + Convert::ToString(id);
+					SGameDir *gd = findGameDir(game - 1);
+					if ( !gd ) continue;
-					if ( this->textList->ContainsKey(key) )
+					if ( gd->pVfs->textExists(44, page, id) ) {
-					{
-						text = ParseText(game, Convert::ToString(this->textList[key]));
+						text = ParseText(game, SystemStringFromCyString(gd->pVfs->findText(44, page, id)));
 						break;
+					}
+				}
+			}
 			else
+			{
-				String ^key = Convert::ToString(game) + "," + Convert::ToString(page) + "," + Convert::ToString(id);
+				SGameDir *gd = findGameDir(game);
+				if ( gd ) {
-				if ( this->textList->ContainsKey(key) )
+					if ( gd->pVfs->textExists(44, page, id) ) {
-					text = ParseText(game, Convert::ToString(this->textList[key]));
+						text = ParseText(game, SystemStringFromCyString(gd->pVfs->findText(44, page, id)));
+					}
+				}
+			}
 			return text;
+		}
 		bool			 m_bTextLoaded;
 		String			^m_sConvertFile;
 		Waiting			^m_pWait;
 		CBaseFile		*m_pConverted;
-		System::Collections::Hashtable ^textList;
+		//System::Collections::Hashtable ^textList;
 	private: System::Windows::Forms::MenuStrip^  menuStrip1;
 	private: System::Windows::Forms::ToolStripMenuItem^  fileToolStripMenuItem;
 	private: System::Windows::Forms::ToolStripMenuItem^  newToolStripMenuItem;
 	private: System::Windows::Forms::ToolStripMenuItem^  packageToolStripMenuItem;
 private: System::Windows::Forms::ToolStripMenuItem^  fromArchiveToolStripMenuItem;
 private: System::ComponentModel::BackgroundWorker^  backgroundWorker1;
 private: System::Windows::Forms::ToolStripMenuItem^  generatePackageUpdatesToolStripMenuItem;
 private: System::Windows::Forms::ToolStripSeparator^  toolStripSeparator11;
 private: System::Windows::Forms::ToolStripMenuItem^  fileExplorerToolStripMenuItem;
+private: System::Windows::Forms::ToolStripMenuItem^  importShipFromVFSToolStripMenuItem;
 	private: System::Windows::Forms::ToolStripMenuItem^  exitToolStripMenuItem;
 	private:
+			 }
 			 return nullptr;
+		}
+		void ImportShip();
+		void ImportShipFromVFS();
-		void ImportShip()
-		{
-			OpenFileDialog ^ofd = gcnew OpenFileDialog();
-			ofd->Filter = "X Catalog Files (*.cat)|*.cat";
-			ofd->Title = "Select the mod file to import a ship from";
-			ofd->FilterIndex = 1;
-			ofd->RestoreDirectory = true;
-			ofd->Multiselect = false;
-			if ( ofd->ShowDialog(this) == System::Windows::Forms::DialogResult::OK )
-			{
-				this->UseWaitCursor = true;
-				// if its a cat file, lets load the text
-				Hashtable ^catText = gcnew Hashtable();
-				CyStringList readText;
-				if ( m_pPackages->ReadTextPage(CyStringFromSystemString(ofd->FileName), &readText, false, 17) )
-				{
-					for ( SStringList *str = readText.Head(); str; str = str->next )
-					{
-						String ^key = SystemStringFromCyString(str->str);
+		String ^getShipSelection(CVirtualFileSystem *pVfs);
-						if ( catText->ContainsKey(key) )
-							catText[key] = SystemStringFromCyString(str->data);
-						else
-							catText->Add(key, SystemStringFromCyString(str->data));
-					}
-				}
-				CyStringList list;
-				if ( m_pPackages->LoadShipData(CyStringFromSystemString(ofd->FileName), &list) )
-				{
-					LoadShip ^ls = gcnew LoadShip();
-					for ( SStringList *str = list.Head(); str; str = str->next )
-					{
-						int tId = str->data.GetToken(";", 7, 7).ToInt();
-						String ^name;
-						if ( catText->ContainsKey(Convert::ToString(tId)) )
-							name = Convert::ToString(catText[Convert::ToString(tId)]);
-						else
-							name = this->FindText(-1, 17, tId);
-						String ^text = this->FindText(-1, 1266, str->data.GetToken(";", 46, 46).ToInt()) + " " + name;
-						int variation = str->data.GetToken(";", 51, 51).ToInt();
-						if ( variation )
-							text = text + " " + this->FindText(-1, 17, 10000 + variation);
-						ls->AddShip(SystemStringFromCyString(str->str), text);
-					}
-					if ( ls->ShowDialog(this) == System::Windows::Forms::DialogResult::OK )
-					{
-						SStringList *str = list.FindString(CyStringFromSystemString(ls->GetData()));
-						if ( str )
-						{
-							Creator::ImportShip ^import = gcnew Creator::ImportShip(m_pPackages, ofd->FileName, ls->GetData(), nullptr);
-							import->ShowDialog(this);
-							CXspFile *newShip = (import->Error()) ? NULL : import->GetShip();
-							if ( !newShip ) {
-								if ( MessageBox::Show(this, "There was a problem when trying to import the ship\n" + ofd->FileName + " (" + ls->GetData() + ")\n\nError: " + import->getErrorString() + "\n\nWould you like to read files from another mod as well?", "Error Importing Ship", MessageBoxButtons::YesNo, MessageBoxIcon::Question) == System::Windows::Forms::DialogResult::Yes ) {
-									// load in another file
-									System::String ^sFilename = ofd->FileName;
-									if ( ofd->ShowDialog(this) == System::Windows::Forms::DialogResult::OK ) {
-										Creator::ImportShip ^import = gcnew Creator::ImportShip(m_pPackages, sFilename, ls->GetData(), ofd->FileName);
-										import->ShowDialog(this);
-										newShip = (import->Error()) ? NULL : import->GetShip();
-										if ( !newShip ) {
-											MessageBox::Show(this, "There was a problem when trying to import the ship\n" + ofd->FileName + " (" + ls->GetData() + ")\n\nError: " + import->getErrorString(), "Error Importing Ship", MessageBoxButtons::OK, MessageBoxIcon::Error);
-										}
-									}
-								}
-							}
-							if ( newShip ) {
-								PackageForm ^childForm = this->OpenPackage(true, newShip, "", "Imported Ship");
-								childForm->Text = "Imported Ship";
-								newShip->SetChanged(true);
-								childForm->UpdateChanged();
-							}
-						}
-					}
-				}
-				else
-					MessageBox::Show(this, "Unable to load ship data from mod file\n" + ofd->FileName, "Error Importing", MessageBoxButtons::OK, MessageBoxIcon::Error);
-				this->UseWaitCursor = false;
-			}
-		}
 		void OpenDirectory(System::String ^dir)
+		{
 			if ( !System::IO::Directory::Exists(dir) )
+			{
 			tp->ImageIndex = this->imageList1->Images->IndexOfKey(file);
 			if ( tp->ImageIndex == -1 )
 				tp->ImageIndex = 0;
 			ToolStripMenuItem ^toolBut = gcnew ToolStripMenuItem((file->Empty) ? title : file, this->imageList1->Images[tp->ImageIndex]);
-			MultiForm ^childForm = gcnew MultiForm(this, tabControl1, tp, toolBut, m_pPackages, this->imageList1, this->textList, this->m_settings);
+			MultiForm ^childForm = gcnew MultiForm(this, tabControl1, tp, toolBut, m_pPackages, this->imageList1, this->m_settings);
 			childForm->SetImageLists(this->imageListSmall, this->imageListLarge, this->imageListGames);
 			this->windowsToolStripMenuItem->DropDownItems->Add(toolBut);
 			childForm->WindowState = FormWindowState::Minimized;
 			tp->ImageIndex = this->imageList1->Images->IndexOfKey(file);
 			if ( tp->ImageIndex == -1 )
 				tp->ImageIndex = 0;
 			ToolStripMenuItem ^toolBut = gcnew ToolStripMenuItem((file->Empty) ? title : file, this->imageList1->Images[tp->ImageIndex]);
-			PackageForm ^childForm = gcnew PackageForm(this, tabControl1, tp, toolBut, m_pPackages, this->imageList1, this->textList, this->m_settings);
+			PackageForm ^childForm = gcnew PackageForm(this, tabControl1, tp, toolBut, m_pPackages, this->imageList1, this->m_settings);
 			childForm->SetImageLists(this->imageListSmall, this->imageListLarge, this->imageListGames, this->imageListFiles);
 			this->windowsToolStripMenuItem->DropDownItems->Add(toolBut);
 			childForm->WindowState = FormWindowState::Minimized;
 			this->ProcessOpen(false, tp, childForm);
 				tp->Text = "New Ship";
 			 else
 				tp->Text = "New Package";
 			 ToolStripMenuItem ^toolBut = gcnew ToolStripMenuItem(tp->Text, this->imageList1->Images[tp->ImageIndex]);
  			 this->windowsToolStripMenuItem->DropDownItems->Add(toolBut);
-			 PackageForm ^childForm = gcnew PackageForm(this, tabControl1, tp, toolBut, m_pPackages, this->imageList1, this->textList, this->m_settings);
+			 PackageForm ^childForm = gcnew PackageForm(this, tabControl1, tp, toolBut, m_pPackages, this->imageList1, this->m_settings);
 			 childForm->SetImageLists(this->imageListSmall, this->imageListLarge, this->imageListGames, this->imageListFiles);
 			 tp->Parent = tabControl1;
 			 tabControl1->SelectedTab = tp;
 			 if ( ship )
 			 TabPage ^tp = gcnew TabPage();
   			 tp->ImageIndex = 0;
 			 tp->Text = "New Mutli Package";
 			 ToolStripMenuItem ^toolBut = gcnew ToolStripMenuItem(tp->Text, this->imageList1->Images[tp->ImageIndex]);
  			 this->windowsToolStripMenuItem->DropDownItems->Add(toolBut);
-			 MultiForm ^childForm = gcnew MultiForm(this, tabControl1, tp, toolBut, m_pPackages, this->imageList1, this->textList, this->m_settings);
+			 MultiForm ^childForm = gcnew MultiForm(this, tabControl1, tp, toolBut, m_pPackages, this->imageList1, this->m_settings);
 			 childForm->SetImageLists(this->imageListSmall, this->imageListLarge, this->imageListGames);
 			 tp->Parent = tabControl1;
 			 tabControl1->SelectedTab = tp;
 			 childForm->CreatePackage();
 						else if ( start.Compare("GameDir") )
+						{
 							SGameDir *gd = new SGameDir;
 							gd->sDir = rest.GetToken(";", 1, 1);
 							gd->sGame = rest.GetToken(";", 2, 2);
+							gd->iGame = gd->sGame.GetToken(" ", 1, 1).ToInt();
+							SGameExe *exe = m_pPackages->GetGameExe()->GetGame(gd->iGame);
 							gd->bLoad = rest.GetToken(";", 3, 3).ToBool();
+							gd->pVfs = new CVirtualFileSystem();
+							gd->pVfs->setLanguage(44);
+							gd->pVfs->LoadFilesystem(gd->sDir.ToString());
+							if ( exe ) {
+								gd->pVfs->SetAddon(exe->sAddon.ToString());
+							}
 							m_pGameDir->push_back(gd);
+						}
+					}
 					delete lines;
+		{
 			if ( m_bTextLoaded && !reload )
 				return;
 			m_bTextLoaded = true;
-			textList->Clear();
 			if ( m_pGameDir->empty() )
 				return;
-			Creator::LoadText ^load = gcnew Creator::LoadText(m_pGameDir, m_pPackages, textList);
+			Creator::LoadText ^load = gcnew Creator::LoadText(m_pGameDir, m_pPackages);
 			if ( center )
 				load->StartPosition = Windows::Forms::FormStartPosition::CenterScreen;
 			load->ShowDialog(this);
+		}
 			this->toolTip1 = (gcnew System::Windows::Forms::ToolTip(this->components));
 			this->imageListSmall = (gcnew System::Windows::Forms::ImageList(this->components));
 			this->imageListLarge = (gcnew System::Windows::Forms::ImageList(this->components));
 			this->imageListFiles = (gcnew System::Windows::Forms::ImageList(this->components));
 			this->backgroundWorker1 = (gcnew System::ComponentModel::BackgroundWorker());
+			this->importShipFromVFSToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem());
 			this->menuStrip1->SuspendLayout();
 			this->PanelTab->SuspendLayout();
 			this->toolStrip1->SuspendLayout();
 			this->statusStrip1->SuspendLayout();
 			this->SuspendLayout();
 			this->toolStrip1->TabIndex = 7;
 			this->toolStrip1->Text = L"toolStrip1";
 			//
 			// toolStripButton1
 			//
-			this->toolStripButton1->DropDownItems->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^  >(9) {this->packageToolStripMenuItem1,
+			this->toolStripButton1->DropDownItems->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^  >(10) {this->packageToolStripMenuItem1,
 				this->shipToolStripMenuItem1, this->multiPackageToolStripMenuItem, this->toolStripSeparator4, this->fromPackagerScriptToolStripMenuItem,
-				this->fromArchiveToolStripMenuItem, this->importShipFromModToolStripMenuItem, this->toolStripSeparator7, this->packageCreationWizardToolStripMenuItem1});
+				this->fromArchiveToolStripMenuItem, this->importShipFromModToolStripMenuItem, this->importShipFromVFSToolStripMenuItem, this->toolStripSeparator7,
+				this->packageCreationWizardToolStripMenuItem1});
 			this->toolStripButton1->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"toolStripButton1.Image")));
 			this->toolStripButton1->ImageTransparentColor = System::Drawing::Color::Magenta;
 			this->toolStripButton1->Name = L"toolStripButton1";
 			this->toolStripButton1->Size = System::Drawing::Size(76, 36);
 			this->toolStripButton1->Text = L"New";
 			this->backgroundWorker1->WorkerReportsProgress = true;
 			this->backgroundWorker1->WorkerSupportsCancellation = true;
 			this->backgroundWorker1->DoWork += gcnew System::ComponentModel::DoWorkEventHandler(this, &Form1::backgroundWorker1_DoWork);
 			this->backgroundWorker1->RunWorkerCompleted += gcnew System::ComponentModel::RunWorkerCompletedEventHandler(this, &Form1::backgroundWorker1_RunWorkerCompleted);
 			//
+			// importShipFromVFSToolStripMenuItem
+			//
+			this->importShipFromVFSToolStripMenuItem->Name = L"importShipFromVFSToolStripMenuItem";
+			this->importShipFromVFSToolStripMenuItem->Size = System::Drawing::Size(221, 38);
+			this->importShipFromVFSToolStripMenuItem->Text = L"Import Ship from VFS";
+			this->importShipFromVFSToolStripMenuItem->Click += gcnew System::EventHandler(this, &Form1::importShipFromVFSToolStripMenuItem_Click);
+			//
 			// Form1
 			//
 			this->AllowDrop = true;
 			this->AutoScaleDimensions = System::Drawing::SizeF(6, 13);
 			this->AutoScaleMode = System::Windows::Forms::AutoScaleMode::Font;
 			 GeneratePackageUpdates();
+		 }
 private: System::Void fileExplorerToolStripMenuItem_Click(System::Object^  sender, System::EventArgs^  e) {
 			 OpenFileExplorer();
+		 }
+private: System::Void importShipFromVFSToolStripMenuItem_Click(System::Object^  sender, System::EventArgs^  e) {
+			 ImportShipFromVFS();
+		 }
 };
+}

Subversion Repositories spk

(root)/Creator/src/Forms/Form1.h – Rev 31 → 36