[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.541,2.542

Lars Persson anotherguest at users.sourceforge.net
Sat Dec 3 13:30:00 CET 2005


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31925/scumm

Modified Files:
	intern.h 
Log Message:
1. New build structure for Symbian builds to allow easier build and project updates
2. Updated framework files for new structure
3. Uncommented Debug statements in vorbis.cpp (Should probably be removed alltogether.
4. Incorporated Sevs code formatting changes in the new Symbian source structure.
5. Removed/Changed EScummVM to ScummVM instead, hopefully most cases covered.
6. Beginning vibration support to be used for Scumm shake effects (Work ongoing by SumthinWicked)
7. Replaced the ScummVM icon for the FavIcon and upscaled the icon to 32x32. I think it looks ok, comments are welcome.
8. Built for S60V1 and UIQ2 targets from the cvs
9. Updated Readme with new build instructions.

Any comments are welcome.  Hopefully the other builds are not affected by this and all Sevs code updates are also incorporated.

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.541
retrieving revision 2.542
diff -u -d -r2.541 -r2.542
--- intern.h	24 Nov 2005 23:46:46 -0000	2.541
+++ intern.h	3 Dec 2005 21:29:11 -0000	2.542
@@ -1343,9 +1343,19 @@
 	int _languageIndexSize;
 	char _lastStringTag[12+1];
 
+#if defined(__SYMBIAN32__) // for some reason VC6 cannot find the base class TextObject
+	struct SubtitleText {
+		int16 xpos, ypos;
+		byte color;
+		byte charset;
+		byte text[256];		
+		bool actorSpeechMsg;
+	};
+#else
 	struct SubtitleText : TextObject {
 		bool actorSpeechMsg;
 	};
+#endif
 
 	int _subtitleQueuePos;
 	SubtitleText _subtitleQueue[20];





More information about the Scummvm-git-logs mailing list