[Scummvm-cvs-logs] CVS: scummvm/common system.h,1.26,1.27
Chris Apers
chrilith at users.sourceforge.net
Fri May 2 02:24:22 CEST 2003
Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1:/tmp/cvs-serv21655
Modified Files:
system.h
Log Message:
Change int16 to NewGuiColor in overlay/RGB functions
Index: system.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/system.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- system.h 25 Mar 2003 00:26:53 -0000 1.26
+++ system.h 2 May 2003 09:23:56 -0000 1.27
@@ -171,8 +171,8 @@
virtual void show_overlay() = 0;
virtual void hide_overlay() = 0;
virtual void clear_overlay() = 0;
- virtual void grab_overlay(int16 *buf, int pitch) = 0;
- virtual void copy_rect_overlay(const int16 *buf, int pitch, int x, int y, int w, int h) = 0;
+ virtual void grab_overlay(NewGuiColor *buf, int pitch) = 0;
+ virtual void copy_rect_overlay(const NewGuiColor *buf, int pitch, int x, int y, int w, int h) = 0;
// Low-level graphics access
virtual int16 get_height() {return 200;}
@@ -180,10 +180,10 @@
// Methods that convert RGB to/from colors suitable for the overlay.
// Default implementation assumes 565 mode.
- virtual int16 RGBToColor(uint8 r, uint8 g, uint8 b) {
+ virtual NewGuiColor RGBToColor(uint8 r, uint8 g, uint8 b) {
return ((((r >> 3) & 0x1F) << 11) | (((g >> 2) & 0x3F) << 5) | ((b >> 3) & 0x1F));
}
- virtual void colorToRGB(int16 color, uint8 &r, uint8 &g, uint8 &b) {
+ virtual void colorToRGB(NewGuiColor color, uint8 &r, uint8 &g, uint8 &b) {
r = (((color >> 11) & 0x1F) << 3);
g = (((color >> 5) & 0x3F) << 2);
b = ((color&0x1F) << 3);
More information about the Scummvm-git-logs
mailing list