[Scummvm-cvs-logs] CVS: scummvm/sky struc.h,1.7,1.8 text.cpp,1.15,1.16 text.h,1.8,1.9
Joost Peters
joostp at users.sourceforge.net
Tue Apr 29 10:43:04 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sky autoroute.cpp,1.7,1.8 autoroute.h,1.4,1.5 grid.cpp,1.4,1.5 grid.h,1.2,1.3 skychannel.cpp,1.2,1.3 skychannel.h,1.1,1.2 skymusic.cpp,1.1,1.2 skymusic.h,1.1,1.2
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky intro.cpp,1.13,1.14 logic.cpp,1.16,1.17 logic.h,1.7,1.8 sky.cpp,1.23,1.24 skydefs.h,1.6,1.7 struc.h,1.8,1.9 text.cpp,1.16,1.17 text.h,1.9,1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv31007/sky
Modified Files:
struc.h text.cpp text.h
Log Message:
changed return type for displayText()
Index: struc.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/struc.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- struc.h 27 Apr 2003 21:45:28 -0000 1.7
+++ struc.h 29 Apr 2003 17:42:07 -0000 1.8
@@ -22,6 +22,11 @@
#ifndef SKYSTRUC_H
#define SKYSTRUC_H
+struct displayText_t {
+ byte *textData;
+ uint32 textWidth;
+};
+
struct dataFileHeader {
uint16 flag; // bit 0: set for colour data, clear for not
// bit 1: set for compressed, clear for uncompressed
Index: text.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/text.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- text.cpp 28 Apr 2003 14:47:38 -0000 1.15
+++ text.cpp 29 Apr 2003 17:42:07 -0000 1.16
@@ -163,12 +163,12 @@
return (bool)(((_inputValue) >> (_shiftBits)) & 1);
}
-void SkyText::displayText(uint8 *dest, bool centre, uint16 pixelWidth, uint8 color) {
+displayText_t SkyText::displayText(uint8 *dest, bool centre, uint16 pixelWidth, uint8 color) {
//Render text in _textBuffer in buffer *dest
- displayText(this->_textBuffer, dest, centre, pixelWidth, color);
+ return displayText(this->_textBuffer, dest, centre, pixelWidth, color);
}
-void SkyText::displayText(char *textPtr, uint8 *dest, bool centre, uint16 pixelWidth, uint8 color) {
+displayText_t SkyText::displayText(char *textPtr, uint8 *dest, bool centre, uint16 pixelWidth, uint8 color) {
//Render text pointed to by *textPtr in buffer *dest
@@ -272,7 +272,11 @@
prevDest = curDest;
} while (textChar >= 10);
-
+
+ struct displayText_t ret;
+ ret.textData = _dtData;
+ ret.textWidth = _dtLastWidth;
+ return ret;
}
void SkyText::makeGameCharacter(char textChar, uint8 *charSetPtr, uint8 *&dest, uint8 color) {
Index: text.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/text.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- text.h 25 Apr 2003 15:17:53 -0000 1.8
+++ text.h 29 Apr 2003 17:42:07 -0000 1.9
@@ -28,8 +28,8 @@
public:
SkyText(SkyDisk *skyDisk, uint32 gameVersion);
void getText(uint32 textNr, uint16 language);
- void displayText(uint8 *dest, bool centre, uint16 pixelWidth, uint8 color);
- void displayText(char *textPtr, uint8 *dest, bool centre, uint16 pixelWidth, uint8 color);
+ struct displayText_t displayText(uint8 *dest, bool centre, uint16 pixelWidth, uint8 color);
+ struct displayText_t displayText(char *textPtr, uint8 *dest, bool centre, uint16 pixelWidth, uint8 color);
void makeGameCharacter(char textChar, uint8 *charSetPtr, uint8 *&data, uint8 color);
protected:
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sky autoroute.cpp,1.7,1.8 autoroute.h,1.4,1.5 grid.cpp,1.4,1.5 grid.h,1.2,1.3 skychannel.cpp,1.2,1.3 skychannel.h,1.1,1.2 skymusic.cpp,1.1,1.2 skymusic.h,1.1,1.2
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky intro.cpp,1.13,1.14 logic.cpp,1.16,1.17 logic.h,1.7,1.8 sky.cpp,1.23,1.24 skydefs.h,1.6,1.7 struc.h,1.8,1.9 text.cpp,1.16,1.17 text.h,1.9,1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list