[Scummvm-git-logs] scummvm master -> 61ffb6f55361a1343ecab71f203226448a5be207

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
e33fba2d14 DEVTOOLS: Update create_classicmacfonts.sh to the latest changes in fonts
61ffb6f553 DIRECTOR: Added more debug output to text display


Commit: e33fba2d149860252a8ec39ffdc178d022494740
    https://github.com/scummvm/scummvm/commit/e33fba2d149860252a8ec39ffdc178d022494740
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-01-28T11:24:02+01:00

Commit Message:
DEVTOOLS: Update create_classicmacfonts.sh to the latest changes in fonts

Changed paths:
    devtools/create_classicmacfonts.sh


diff --git a/devtools/create_classicmacfonts.sh b/devtools/create_classicmacfonts.sh
index 517f3f5..73ceca3 100755
--- a/devtools/create_classicmacfonts.sh
+++ b/devtools/create_classicmacfonts.sh
@@ -39,6 +39,7 @@ echo_n "Mounting System 7.0.1 image..."
 
 macbinary decode System_7.0.1.smi.bin
 hdiutil convert -quiet System\ 7.0.1.smi -format UDRO -o sys7.dmg
+rm System_7.0.1.smi.bin
 hdiutil attach -quiet sys7.dmg
 
 if test ! -f /Volumes/7.0.1\ \(1440k.images\)/Fonts.image; then
@@ -73,47 +74,13 @@ echo ...Done
 
 hdiutil detach -quiet `hdiutil info|grep "/Volumes/Fonts"|cut -f 1`
 
-if test ! -f fondu_src-060102.tgz; then
-	echo_n "Getting fondu_src-060102.tgz..."
-	curl -s http://fondu.sourceforge.net/fondu_src-060102.tgz -o fondu_src-060102.tgz
-	tar xf fondu_src-060102.tgz
-fi
-
-if test ! -d fondu-060102; then
-	echo "Failed to download fondu_src-060102.tgz"
-	exit
-fi
-
-echo done
-
-if test ! -x fondu-060102/fondu; then
-	echo_n "Compiling fondu..."
-	cd fondu-060102
-	./configure >configure.log 2>&1 && make 2>&1 >make.log
-	cd ..
-fi
-
-if test ! -x fondu-060102/fondu; then
-	echo "Failed to build fondu. See configure.log and make.log"
-	exit
-else
-	rm -f configure.log make.log
-fi
-
-echo done
-
-echo_n "Converting fonts..."
-fondu-060102/fondu -force *.bin
-echo done
-
-zip -9 classicmacfonts *.bdf
+zip -9 classicmacfonts *.bin
 mv classicmacfonts.zip classicmacfonts.dat
 
 echo_n "Cleaning up..."
-rm *.bdf
-rm *.ttf
 rm *.bin
 rm *.dmg
+rm *.smi
 echo done
 
 ls -l classicmacfonts.dat


Commit: 61ffb6f55361a1343ecab71f203226448a5be207
    https://github.com/scummvm/scummvm/commit/61ffb6f55361a1343ecab71f203226448a5be207
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-01-28T11:24:02+01:00

Commit Message:
DIRECTOR: Added more debug output to text display

Changed paths:
    engines/director/frame.cpp


diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index 94bb462..402056a 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -830,19 +830,23 @@ void Frame::renderText(Graphics::ManagedSurface &surface, uint16 spriteId, Commo
 	uint16 formattingCount = textStream->readUint16();
 	while (formattingCount) {
 		uint32 formatStartOffset = textStream->readUint32();
-		textStream->readUint16();
-		textStream->readUint16();
+		uint16 unk1f = textStream->readUint16();
+		uint16 unk2f = textStream->readUint16();
 
 		textCast->fontId = textStream->readUint16();
 		textCast->textSlant = textStream->readByte();
-		textStream->readByte();
+		byte unk3f = textStream->readByte();
 		textCast->fontSize = textStream->readUint16();
 
 		textCast->palinfo1 = textStream->readUint16();
 		textCast->palinfo2 = textStream->readUint16();
 		textCast->palinfo3 = textStream->readUint16();
 
-		debugC(3, kDebugText, "renderText: formattingCount: %u formatStartOffset: %d", formattingCount, formatStartOffset);
+		debugC(3, kDebugText, "renderText: formattingCount: %u, formatStartOffset: %d, unk1: %d unk2: %d, fontId: %d, textSlant: %d",
+				formattingCount, formatStartOffset, unk1f, unk2f, textCast->fontId, textCast->textSlant);
+
+		debugC(3, kDebugText, "        unk3: %d, fontSize: %d, p0: %x p1: %x p2: %x", unk3f, textCast->fontSize,
+				textCast->palinfo1, textCast->palinfo2, textCast->palinfo3);
 
 		formattingCount--;
 	}