Subversion Repositories spk

Rev

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

Rev 216 Rev 218
Line 405... Line 405...
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(_S(open));
410
					loaded = shipFile->readFile(_WS(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(_WS(open));
414
					if ( loaded )
414
					if ( loaded )
415
						m_bChanged = true;
415
						m_bChanged = true;
416
				}
416
				}
417
 
417
 
418
				this->ComboCockpits->Items->Clear();
418
				this->ComboCockpits->Items->Clear();
Line 423... Line 423...
423
				{
423
				{
424
					m_bLoading = true;
424
					m_bLoading = true;
425
					if ( m_pLoadedShip )
425
					if ( m_pLoadedShip )
426
						delete m_pLoadedShip;
426
						delete m_pLoadedShip;
427
					m_pLoadedShip = shipFile;
427
					m_pLoadedShip = shipFile;
428
					m_pLoadedShip->setFilename(_S(open));
428
					m_pLoadedShip->setFilename(_WS(open));
429
		
429
		
430
					this->PanelMain->Show();
430
					this->PanelMain->Show();
431
					this->PanelNotLoaded->Hide();
431
					this->PanelNotLoaded->Hide();
432
 
432
 
433
					m_iOldGame = -1;
433
					m_iOldGame = -1;