Subversion Repositories spk

Rev

Rev 160 | Rev 182 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 160 Rev 175
Line 246... Line 246...
246 
			if ( !m_pLoadedShip )
 246 
			if ( !m_pLoadedShip )
247 
				MessageBox::Show(this, "There is currently no ship loaded to convert", "Ship Save", MessageBoxButtons::OK, MessageBoxIcon::Warning);
 247 
				MessageBox::Show(this, "There is currently no ship loaded to convert", "Ship Save", MessageBoxButtons::OK, MessageBoxIcon::Warning);
248 
			else
 248 
			else
249 
			{
 249 
			{
250 
				this->SaveMasks();
 250 
				this->SaveMasks();
251 
				if ( m_pLoadedShip->WriteFile(m_pLoadedShip->filename()) )
 251 
				if ( m_pLoadedShip->writeFile(m_pLoadedShip->filename()) )
252 
				{
 252 
				{
253 
					MessageBox::Show(this, "Ship File: " + _US(m_pLoadedShip->filename()) + "\n\nHas been written", "Ship Saved", MessageBoxButtons::OK, MessageBoxIcon::Information);
 253 
					MessageBox::Show(this, "Ship File: " + _US(m_pLoadedShip->filename()) + "\n\nHas been written", "Ship Saved", MessageBoxButtons::OK, MessageBoxIcon::Information);
254 
					m_bChanged = false;
 254 
					m_bChanged = false;
255 
				}
 255 
				}
256 
			}
 256 
			}
Line 269... Line 269...
269 
				ofd->FilterIndex = 1;
 269 
				ofd->FilterIndex = 1;
270 
				ofd->RestoreDirectory = true;
 270 
				ofd->RestoreDirectory = true;
271 
				if ( ofd->ShowDialog() == System::Windows::Forms::DialogResult::OK )
 271 
				if ( ofd->ShowDialog() == System::Windows::Forms::DialogResult::OK )
272 
				{
 272 
				{
273 
					this->SaveMasks();
 273 
					this->SaveMasks();
274 
					if ( m_pLoadedShip->WriteFile(CyStringFromSystemString(ofd->FileName)) )
 274 
					if ( m_pLoadedShip->writeFile(_S(ofd->FileName)) )
275 
					{
 275 
					{
276 
						MessageBox::Show(this, "Ship File: " + ofd->FileName + "\n\nHas been written", "Ship Saved", MessageBoxButtons::OK, MessageBoxIcon::Information);
 276 
						MessageBox::Show(this, "Ship File: " + ofd->FileName + "\n\nHas been written", "Ship Saved", MessageBoxButtons::OK, MessageBoxIcon::Information);
277 
						m_bChanged = false;
 277 
						m_bChanged = false;
278 
					}
 278 
					}
279 
				}
 279 
				}
Line 399... Line 399...
399 
		}
 399 
		}
400 
 
 400 
 
401 
		void OpenFile(System::String ^open)
 401 
		void OpenFile(System::String ^open)
402 
		{
 402 
		{
403 
				CXspFile *shipFile = new CXspFile;
 403 
				CXspFile *shipFile = new CXspFile;
404 
				int check = CSpkFile::CheckFile(CyStringFromSystemString(open));
 404 
				int check = CSpkFile::CheckFile(_S(open));
405 
				bool loaded = false;
 405 
				bool loaded = false;
406 
 
 406 
 
407 
				m_bChanged = false;
 407 
				m_bChanged = false;
408 
 
 408 
 
409 
				if ( check == SPKFILE_SINGLESHIP )
 409 
				if ( check == SPKFILE_SINGLESHIP )
410 
					loaded = shipFile->ReadFile(CyStringFromSystemString(open));
 410 
					loaded = shipFile->readFile(_S(open));
411 
				else if ( check == SPKFILE_INVALID )
 411 
				else if ( check == SPKFILE_INVALID )
412 
				{
 412 
				{
413 
					loaded = shipFile->ConvertOld(_S(open));
 413 
					loaded = shipFile->ConvertOld(_S(open));
414 
					if ( loaded )
 414 
					if ( loaded )
415 
						m_bChanged = true;
 415 
						m_bChanged = true;