[Scummvm-cvs-logs] CVS: scummvm/backends/wince screen.cpp,1.13,1.14
Nicolas Bacca
arisme at users.sourceforge.net
Fri Apr 4 05:21:29 CEST 2003
Update of /cvsroot/scummvm/scummvm/backends/wince
In directory sc8-pr-cvs1:/tmp/cvs-serv18052
Modified Files:
screen.cpp
Log Message:
Latest local version, rewrite pending ...
Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/screen.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- screen.cpp 26 Jan 2003 21:40:06 -0000 1.13
+++ screen.cpp 4 Apr 2003 13:20:24 -0000 1.14
@@ -21,7 +21,7 @@
#ifdef _WIN32_WCE
-#define POCKETSCUMM_VERSION "CVS build 0.3.1cvs"
+#define POCKETSCUMM_VERSION "PPC build 03.02.09/1"
/* Original GFX code by Vasyl Tsvirkunov */
@@ -34,6 +34,8 @@
//#include "resource.h"
//#include "dynamic_imports.h"
+#include <tlhelp32.h>
+
#define COLORCONV565(r,g,b) \
(((r&0xf8)<<(11-3))|((g&0xfc)<<(5-2))|((b&0xf8)>>3))
#define COLORCONV555(r,g,b) \
@@ -99,6 +101,7 @@
UBYTE highlighted_zone[8 * 220];
int _highlighted_index = -1;
+
bool _gfx_mode_switch;
int _game_selection_X_offset;
int _game_selection_Y_offset;
@@ -603,6 +606,8 @@
void SetPalEntry(int ent, UBYTE r, UBYTE g, UBYTE b)
{
+ int i;
+
if (ent >= MAX_CLR)
return;
@@ -616,6 +621,7 @@
pal[ent] = COLORCONV555(r,g,b);
else if(gxdp.ffFormat & kfDirect)
pal[ent] = COLORCONVMONO(r,g,b);
+
}
/* *************** CLS IMPLEMENTATIONS ****************** */
@@ -2045,7 +2051,7 @@
if (!own_palette) {
register first = *(src + 0);
register second = *(src + 1);
-
+
r = (3*palRed[first] + palRed[second])>>2;
g = (3*palGreen[first] + palGreen[second])>>2;
b = (3*palBlue[first] + palBlue[second])>>2;
@@ -2054,7 +2060,7 @@
register second = 3 * *(src + 1);
r = (3 * own_palette[first] +
- own_palette[second]) >> 2;
+ own_palette[second]) >> 2;
g = (3 * own_palette[first + 1] +
own_palette[second + 1]) >> 2;
b = (3 * own_palette[first + 2] +
@@ -2068,7 +2074,7 @@
if (!own_palette) {
register first = *(src + 1);
register second = *(src + 2);
-
+
r = (palRed[first] + palRed[second])>>1;
g = (palGreen[first] + palGreen[second])>>1;
b = (palBlue[first] + palBlue[second])>>1;
@@ -2084,9 +2090,9 @@
b = (own_palette[first + 2] +
own_palette[second + 2]) >> 1;
}
-
+
*(unsigned short*)dst = COLORCONV565(r,g,b);
-
+
dst += pixelstep;
src += 3;
More information about the Scummvm-git-logs
mailing list