Commit as 1.0.13.1 to refect argument additions/changes

DavidGriffith · Dec 27, 2019 · 53848fc · 53848fc
1 parent fee5d77
commit 53848fc
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/daphne-changelog.txt b/daphne-changelog.txt
@@ -1,6 +1,10 @@
 Daphne Changelog
 -------------------------
 
+v1.0.13.1
+- Add -keymapfile flag to specify alternate dapinput.ini keymap files.
+- Restrict -vertical_stretch values to 0-25 to avoid segfault in g_vertical_offset calculations
+
 v1.0.13
 - Changed inpout library so it only loads (and thus installs itself) if parallel port is actually used.
 

diff --git a/src/daphne.cpp b/src/daphne.cpp
@@ -89,7 +89,7 @@ using namespace std;
 
 const char *get_daphne_version()
 {
-	return "1.0.13";
+	return "1.0.13.1";
 }
 
 unsigned char get_filename(char *s, unsigned char n)

diff --git a/src/daphne.rc b/src/daphne.rc
@@ -53,8 +53,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,1,0,13
- PRODUCTVERSION 0,1,0,13
+ FILEVERSION 0,1,0,13.1
+ PRODUCTVERSION 0,1,0,13.1
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x3L
@@ -70,12 +70,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "DAPHNE, a Laserdisc Arcade Game Emulator"
-            VALUE "FileVersion", "0, 1, 0, 13"
+            VALUE "FileVersion", "0, 1, 0, 13, 1"
             VALUE "InternalName", "daphne"
             VALUE "LegalCopyright", "Copyright (C) 1999-2013 Matt Ownby"
             VALUE "OriginalFilename", "daphne.exe"
             VALUE "ProductName", " daphne Application"
-            VALUE "ProductVersion", "0, 1, 0, 13"
+            VALUE "ProductVersion", "0, 1, 0, 13, 1"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/src/io/input.cpp b/src/io/input.cpp
@@ -171,16 +171,22 @@ void CFG_Keys()
 //	bool done = false;
 	int max_buttons = (int) (sizeof(joystick_buttons_map) / sizeof(int));
 
+#ifdef LINUX
+	string fullpath = strdup(g_inputini_file.c_str());
+	string inifile = basename(fullpath.c_str());
+#else
+	string inifile = strdup(g_inputini_file.c_str());
+#endif
+
 	if (m_altInputFileSet) {
 		string keyinput_notice = "Loading alternate keymap file: ";
-		keyinput_notice += g_inputini_file.c_str();
+		keyinput_notice += inifile.c_str();
 		printline(keyinput_notice.c_str());
 	}
 
 	// find where the keymap ini file is (if the file doesn't exist, this string will be empty)
-	string strDapInput = g_homedir.find_file(g_inputini_file.c_str(), true);
+	string strDapInput = g_homedir.find_file(inifile.c_str(), true);
 	io = mpo_open(strDapInput.c_str(), MPO_OPEN_READONLY);
-
 	if (io)
 	{
 		printline("Remapping input ...");