git-svn-id: https://www.daphne-emu.com:9443/daphnesvn/branches/v_1_0@…

…3258 c98d566b-fa28-4d4c-8a7b-932307ef5c1a

daphne-changelog.txt

@@ -1,6 +1,20 @@
 Daphne Changelog
 -------------------------
 
+v1.0.10
+- Fixed Thayer's Quest locking up after playing synthesized speech.
+
+v1.0.9
+- Added "-fullscreen_window" and "-scalefactor" command-line options (rdg)
+- Dragon's Lair and Space Ace Euro improvements (MarkB)
+	Changed tonegen so that odd channels are outputted to left channel and even go to right channel
+	Changed LairEuro's graphics rendering to follow the schematics. 
+	Also made computer generated sound on right channel only.
+- Added Time Traveler to seektest.
+- Added Mad Dog 1 to seektest.
+- Added SINGE function "discSkipToFrame".
+- Fixed sample callback feature so it runs in the main thread and not the audio thread.
+
 v1.0.8 - The SINGE update
 
 - Revised "how_to_compile" windows and unix text files.
@@ -43,16 +57,6 @@ regardless if daphne is in windowed or full mode. Used by ALG SINGE games.
 - daphne_vs2003.vcproj - Fixed debug "Runtime Library" settings 
   from "Multi-Threaded DLL" to "Multi-Threaded Debug DLL" to avoid linker errors 
   in newer Visual C++ versions.
-
-
-+++++++++ End of v1.0.8 +++++++++ 
-
-
-Next
-- Added Time Traveler to seektest.
-- Added Mad Dog 1 to seektest.
-- Added SINGE function "discSkipToFrame".
-- Fixed sample callback feature so it runs in the main thread and not the audio thread.
 
 v1.0.7
 - Updated source code so it builds on the latest g++
@@ -165,4 +169,4 @@ v0.101.17
 - Added preliminary SINGE support.  SINGE is a scripting language to allow users to make their own laserdisc-styled games.
 
 v0.101.16 and older
-- All changes are logged in CVS and a full changelog will be available for the next official release.
+- ... :)

src/DaphneManifest.xml

@@ -2,6 +2,6 @@
 	<version>
 		<major>1</major>
 		<minor>0</minor>
-		<build>7</build>
+		<build>10</build>
 	</version>
 </manifest>

src/daphne.cpp

@@ -89,7 +89,7 @@ using namespace std;
 
 const char *get_daphne_version()
 {
-	return "1.0.7";
+	return "1.0.10";
 }
 
 unsigned char get_filename(char *s, unsigned char n)

src/daphne.rc

@@ -53,8 +53,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,1,0,7
- PRODUCTVERSION 0,1,0,7
+ FILEVERSION 0,1,0,10
+ PRODUCTVERSION 0,1,0,10
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x3L
@@ -69,13 +69,13 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "FileDescription", "DAPHNE, a Arcade Laserdisc Game Emulator"
-            VALUE "FileVersion", "0, 1, 0, 7"
+            VALUE "FileDescription", "DAPHNE, a Laserdisc Arcade Game Emulator"
+            VALUE "FileVersion", "0, 1, 0, 10"
             VALUE "InternalName", "daphne"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2009 Matt Ownby"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2010 Matt Ownby"
             VALUE "OriginalFilename", "daphne.exe"
             VALUE "ProductName", " daphne Application"
-            VALUE "ProductVersion", "0, 1, 0, 7"
+            VALUE "ProductVersion", "0, 1, 0, 10"
         END
     END
     BLOCK "VarFileInfo"

src/game/singe.cpp

@@ -281,31 +281,40 @@ void singe::OnMouseMotion(Uint16 x, Uint16 y, Sint16 xrel, Sint16 yrel)
 // game-specific command line arguments handled here
 bool singe::handle_cmdline_arg(const char *arg)
 {
+
 	bool bResult = false;
 	static bool scriptLoaded = false;
+	char s[81] = { 0 };
 
-	if (mpo_file_exists(arg))
+	if (strcasecmp(arg, "-script") == 0)
 	{
-		if (!scriptLoaded)
+		get_next_word(s, sizeof(s));
+
+		if (mpo_file_exists(s))
 		{
-			bResult = scriptLoaded = true;
-			m_strGameScript = arg;
+			if (!scriptLoaded)
+			{
+				bResult = scriptLoaded = true;
+				m_strGameScript = s;
+			}
+			else
+			{
+				printline("Only one game script may be loaded at a time!");
+				bResult = false;
+			}
 		}
 		else
 		{
-			printline("Only one game script may be loaded at a time!");
-			bResult = false;
+			string strErrMsg = "Script ";
+			strErrMsg += s;
+			strErrMsg += " does not exist.";
+			printline(strErrMsg.c_str());
 		}
-	}
-	else
-	{
-		string strErrMsg = "Script ";
-		strErrMsg += arg;
-		strErrMsg += " does not exist.";
-		printline(strErrMsg.c_str());
+
 	}
 
 	return bResult;
+
 }
 
 

src/game/singe.h

@@ -26,6 +26,7 @@
 #include "../io/mpo_fileio.h"
 #include "../io/error.h"
 #include "../io/dll.h"
+#include "../io/cmdline.h"  // for get_next_word  (rdg2010)
 #include "../ldp-out/ldp.h"
 #include "../sound/samples.h"
 #include "../video/palette.h"

src/game/thayers.cpp

@@ -40,7 +40,8 @@
 #include "../cpu/cpu.h"
 #include "../cpu/generic_z80.h"
 
-thayers::thayers()
+thayers::thayers() :
+m_pScoreboard(NULL)
 {
 	struct cpudef cpu;
 

src/io/cmdline.cpp

@@ -1149,7 +1149,7 @@ bool parse_cmd_line(int argc, char **argv)
 		}
 		else
 		{
-			printline("Unknown command line parameter:");
+			printline("Unknown command line parameter or parameter value:");
 			printline(s);
 			result = false;
 		}

src/make_linux_update.sh

@@ -46,7 +46,7 @@ ZIPNAME=daphne-updater-$VERSION-linux.zip
 zip $ZIPNAME $UPDATENAME
 
 # upload it to server
-scp $ZIPNAME [email protected]:/var/www/download/linux/.
+scp $ZIPNAME [email protected]:/var/www/daphne/download/linux/.
 
 # clean-up ...
 rm $TMPTAR

src/make_win32_update.sh

@@ -40,7 +40,7 @@ cd ..
 chmod 644 $ZIPNAME
 
 # upload it to server
-scp $ZIPNAME [email protected]:/var/www/download/win32-uploads/.
+scp $ZIPNAME [email protected]:/var/www/daphne/download/win32-uploads/.
 
 # clean-up ...
 rm $TMPZIP

src/sound/ssi263.cpp

@@ -487,6 +487,7 @@ void ssi263_say_phones(char *phonemes, int len)
 		// The proper fix to this is to return to the ROM some signal that our sample has finished playing.
 		while ((g_bSamplePlaying) && (!get_quitflag()))
 		{
+			samples_do_queued_callbacks();	// hack to ensure sound callbacks are called in a thread-safe way.  In the next major version, this hack must be done away with.
 			SDL_Delay(10);
 			SDL_check_input();
 		}

src/video/video.cpp

@@ -86,7 +86,7 @@ SDL_Surface *g_screen = NULL;	// our primary display
 SDL_Surface *g_screen_blitter = NULL;	// the surface we blit to (we don't blit directly to g_screen because opengl doesn't like that)
 bool g_console_initialized = false;	// 1 once console is initialized
 bool g_fullscreen = false;	// whether we should initialize video in fullscreen mode or not
-bool g_fakefullscreen = false; // by RDG2010 -- whether daphne should fake fullscreen (for ALG lightgun games).
+bool g_fakefullscreen = false; // by RDG2010 -- whether daphne should do fullscreen window
 int g_scalefactor = 100; // by RDG2010 -- scales the image to this percentage value (for CRT TVs with overscan problems).
 int sboverlay_characterset = 1;
 
@@ -251,7 +251,7 @@ bool init_display()
 		{
 			// by RDG2010
 			// Step 2. Create a borderless SDL window.
-			// If doing lightgun support, make the window bordeless (no title bar).			
+			// If doing fullscreen window, make the window bordeless (no title bar).			
 			// This is achieved by adding the SDL_NOFRAME flag.			
 
 			if (get_fakefullscreen()) sdl_flags = sdl_flags | SDL_NOFRAME; 
@@ -300,15 +300,15 @@ bool init_display()
 					// Position Window to top-left corner of the screen.
 					if(!SetWindowPos(handle, NULL, 0, 0, 0, 0, SWP_NOREPOSITION|SWP_NOZORDER|SWP_NOSIZE)) 
 					{
-						printline("Error occurred with 'SetWindowPos'. Lightgun mode failed.");
+						printline("Error occurred with 'SetWindowPos'. Fullscreen window failed.");
 						result = 0;
 					}
 
 				}
 				else
 				{
 					// Error occurred with 'SDL_GetWMInfo' 
-					printline("Error occurred with 'SDL_GetWMInfo'. Lightgun mode failed.");
+					printline("Error occurred with 'SDL_GetWMInfo'. Fullscreen window failed.");
 					result = 0;
 
 				} // endif
@@ -378,7 +378,7 @@ bool init_opengl()
 
 	// by RDG2010
 	// Step 2. Create a borderless SDL window (on the OpenGL side).
-	// If doing lightgun support, make the window bordeless (no title bar).			
+	// If doing fullscreen window, make the window bordeless (no title bar).			
 	// This is achieved by adding the SDL_NOFRAME flag.
 	// Tested OK on both Windows and Ubuntu Linux.