[Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.60,1.61 imuse.cpp,2.69,2.70

Max Horn fingolfin at users.sourceforge.net
Mon Jul 14 19:17:04 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv17891/scumm

Modified Files:
	dialogs.cpp imuse.cpp 
Log Message:
replaced SCUMMVM_VERSION/SCUMMVM_CVS by gScummVMVersion/gScummVMBuildDate/gScummVMFullVersion; made engine.o depend on all other .o files, so that the build date in it is always up-to-date

Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- dialogs.cpp	15 Jul 2003 00:20:04 -0000	1.60
+++ dialogs.cpp	15 Jul 2003 02:16:33 -0000	1.61
@@ -580,8 +580,8 @@
 AboutDialog::AboutDialog(NewGui *gui, Scumm *scumm)
 	: ScummDialog(gui, scumm, 30, 20, 260, 124) {
 	addButton((_w - kButtonWidth)/2, 100, queryCustomString(23), kCloseCmd, 'C');	// Close dialog - FIXME
-	new StaticTextWidget(this, 10, 10, 240, 16, "ScummVM " SCUMMVM_VERSION " (" SCUMMVM_CVS ")", kTextAlignCenter);
-	new StaticTextWidget(this, 10, 20, 240, 16, "(built on " __DATE__ ")", kTextAlignCenter);
+	new StaticTextWidget(this, 10, 10, 240, 16, gScummVMFullVersion, kTextAlignCenter);
+//	new StaticTextWidget(this, 10, 20, 240, 16, "(built on " __DATE__ ")", kTextAlignCenter);
 
 	new StaticTextWidget(this, 10, 30, 240, 16, "http://www.scummvm.org", kTextAlignCenter);
 	new StaticTextWidget(this, 10, 50, 240, 16, "SCUMM Games (c) LucasArts", kTextAlignCenter);

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.69
retrieving revision 2.70
diff -u -d -r2.69 -r2.70
--- imuse.cpp	7 Jul 2003 05:45:55 -0000	2.69
+++ imuse.cpp	15 Jul 2003 02:16:33 -0000	2.70
@@ -1104,32 +1104,38 @@
 
 void IMuseInternal::initMidiDriver (MidiDriver *midi) {
 	// Open MIDI driver
-	midi->property (MidiDriver::PROP_OLD_ADLIB, _old_adlib_instruments ? 1 : 0);
+	midi->property(MidiDriver::PROP_OLD_ADLIB, _old_adlib_instruments ? 1 : 0);
 
 	int result = midi->open();
 	if (result)
 		error("IMuse initialization - %s", MidiDriver::getErrorName(result));
 
 	// In case we have an MT-32 attached.
-	initMT32 (midi);
+	initMT32(midi);
 
 	// Connect to the driver's timer
-	midi->setTimerCallback (midi, &IMuseInternal::midiTimerCallback);
+	midi->setTimerCallback(midi, &IMuseInternal::midiTimerCallback);
 }
 
 void IMuseInternal::initMT32 (MidiDriver *midi) {
 	byte buffer[32] = "\x41\x10\x16\x12\x00\x00\x00                        ";
+	char info[256] = "ScummVM ";
+	int len;
+	
+	// Compute version string (truncated to 20 chars max.)
+	strcat(info, gScummVMVersion);
+	len = strlen(info);
+	if (len > 20)
+		len = 20;
 
 	// Reset the MT-32
-	memcpy (&buffer[4], "\x7f\x00\x00\x01\x00", 5);
-	midi->sysEx (buffer, 9);
+	memcpy(&buffer[4], "\x7f\x00\x00\x01\x00", 5);
+	midi->sysEx(buffer, 9);
 
 	// Display a welcome message on MT-32 displays.
-	memcpy (&buffer[4], "\x20\x00\x00", 3);
-	memcpy (&buffer[7], "                    ", 20);
-	memcpy (buffer + 7 + (20 - strlen ("ScummVM " SCUMMVM_VERSION)) / 2,
-	        "ScummVM " SCUMMVM_VERSION,
-	        strlen ("ScummVM " SCUMMVM_VERSION));
+	memcpy(&buffer[4], "\x20\x00\x00", 3);
+	memcpy(&buffer[7], "                    ", 20);
+	memcpy(buffer + 7 + (20 - len) / 2, info, len);
 	byte checksum = 0;
 	for (int i = 4; i < 27; ++i)
 		checksum -= buffer[i];
@@ -1163,7 +1169,7 @@
 		if (!ptr->time_left)
 			continue;
 		if (ptr->time_left <= advance) {
-			doCommand (ptr->a, ptr->b, ptr->c, ptr->d, ptr->e, ptr->f, 0, 0);
+			doCommand(ptr->a, ptr->b, ptr->c, ptr->d, ptr->e, ptr->f, 0, 0);
 			ptr->time_left = advance;
 		}
 		ptr->time_left -= advance;





More information about the Scummvm-git-logs mailing list