[Scummvm-cvs-logs] CVS: scummex scummex.cpp,1.21,1.22 wxwindows.cpp,1.20,1.21 wxwindows.h,1.9,1.10

[Adrien Mercier]

Update of /cvsroot/scummvm/scummex
In directory sc8-pr-cvs1:/tmp/cvs-serv13843

Modified Files:
	scummex.cpp wxwindows.cpp wxwindows.h 
Log Message:
Remember the file path, and the Scumm version

Index: scummex.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummex/scummex.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- scummex.cpp	23 Sep 2003 12:26:09 -0000	1.21
+++ scummex.cpp	23 Sep 2003 13:40:54 -0000	1.22
@@ -41,6 +41,7 @@
 	uint32 tag;
 	_encbyte = 0;
 	char buf[256];
+	_scummVersion = 0;
 	
 	if (_input.isOpen()) {
 		_input.close();
@@ -118,7 +119,8 @@
 void ScummEX::Descumm(int blockid) {
 	
 	_input.seek(_blockTable[blockid].offset, SEEK_SET);
-	_scummVersion = _gui->getScummVersionDialog();
+	if (_scummVersion == 0)
+		_scummVersion = _gui->getScummVersionDialog();
 	if (_scummVersion != 0) {
 		DeScumm(_input, _blockTable[blockid].blockSize, _scummVersion);
 	}

Index: wxwindows.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummex/wxwindows.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- wxwindows.cpp	23 Sep 2003 12:26:09 -0000	1.20
+++ wxwindows.cpp	23 Sep 2003 13:40:54 -0000	1.21
@@ -914,13 +914,16 @@
 
 void MainWindow::OnOpen(wxCommandEvent& WXUNUSED(event))
 {
-	wxFileDialog *dialog = new wxFileDialog(this, "Please select an input file.", "", "",
+	wxFileDialog *dialog = new wxFileDialog(this, "Please select an input file.", _filepath, "",
 		"All Supported Files|*|"
 		"Main Resource Files|*.001;*.la1;*.la2;*.lab;*.lfl;*.lec;*.sm1|"
 		"Directory Files|*.000;*.la0;*.lfl;*.sm0",
 		wxOPEN);
 	if (dialog->ShowModal() == wxID_OK) {
 		_filename = (const char*)dialog->GetPath();
+		_file = wxFileName(_filename);
+	
+		_filepath = _file.GetPath();
 		tree->DeleteChildren(iter[0]);
 		g_scummex->loadFile(_filename);
 	}
@@ -1237,10 +1240,9 @@
 	char msg[512];
 	const char *fname;
 	const char *fpath;
-	wxFileName *filename = new wxFileName(_filename);
 	
-	fname = filename->GetFullName();
-	fpath = filename->GetFullPath();
+	fname = _file.GetFullName();
+	fpath = _file.GetFullPath();
 	sprintf(msg, "Filename: \t\t %s\n", fname);
 	sprintf(buf, "Full Path: \t\t %s\n", fpath);
 	strcat(msg, buf);

Index: wxwindows.h
===================================================================
RCS file: /cvsroot/scummvm/scummex/wxwindows.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- wxwindows.h	23 Sep 2003 12:26:09 -0000	1.9
+++ wxwindows.h	23 Sep 2003 13:40:54 -0000	1.10
@@ -59,8 +59,10 @@
 	wxButton *SpecButton1, *SpecButton2;
 	wxTreeItemId iter[11];
 	wxTreeCtrl *tree;
+	wxFileName _file;
 
 	const char *_filename;
+	wxString _filepath;
 
 	uint32 _blockId;