[Scummvm-cvs-logs] CVS: scummvm/wince screen.cpp,1.5,1.6 screen.h,1.5,1.6 bitmaps.cpp,1.1,1.2
Nicolas Bacca
arisme at users.sourceforge.net
Thu Jul 18 15:55:01 CEST 2002
Update of /cvsroot/scummvm/scummvm/wince
In directory usw-pr-cvs1:/tmp/cvs-serv17667
Modified Files:
screen.cpp screen.h bitmaps.cpp
Log Message:
New GFX rendering for Landscape toolbar & other toolbar issues
Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/wince/screen.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- screen.cpp 14 May 2002 22:29:08 -0000 1.5
+++ screen.cpp 18 Jul 2002 22:53:54 -0000 1.6
@@ -27,13 +27,26 @@
static UBYTE invert = 0;
static int colorscale = 0;
-extern UBYTE item_toolbar[];
-extern UBYTE item_keyboard[];
-extern UBYTE item_disk[];
-extern UBYTE item_skip[];
-extern UBYTE item_set_sound_on[];
-extern UBYTE item_set_sound_off[];
-extern UBYTE item_options[];
+extern UBYTE item_toolbar[];
[...1174 lines suppressed...]
+ else
+ *(unsigned short*)dst =
+ COLORCONV565(own_palette[3 * *src],
+ own_palette[(3 * *src) + 1],
+ own_palette[(3 * *src) + 2]);
dst += pixelstep;
src ++;
- }
-
- scraddr += linestep;
- scr_ptr += 320;
- src_limit += 320;
+ }
+
+ scraddr += linestep;
+ scr_ptr += width;
+ src_limit += width;
}
}
Index: screen.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/wince/screen.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- screen.h 14 May 2002 22:29:08 -0000 1.5
+++ screen.h 18 Jul 2002 22:53:54 -0000 1.6
@@ -21,13 +21,14 @@
/* meaning: 0 - portrait, 1 - left hand landscape, 2 - right hand landscape */
void SetScreenMode(int mode);
int GetScreenMode();
+void drawWait();
void Translate(int* x, int* y);
typedef enum ToolbarSelected {
ToolbarNone,
ToolbarSaveLoad,
- ToolbarExit,
+ ToolbarMode,
ToolbarSkip,
ToolbarSound
} ToolbarSelected;
Index: bitmaps.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/wince/bitmaps.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- bitmaps.cpp 14 Mar 2002 21:56:24 -0000 1.1
+++ bitmaps.cpp 18 Jul 2002 22:53:54 -0000 1.2
@@ -2,4286 +2,3076 @@
// Bitmaps used for WCE
-// FIXME - use palette|bitmap format for paletted devices
-
#include <windows.h>
#include "screen.h"
+// *************************************************************************
+// PORTRAIT
+// *************************************************************************
[...19414 lines suppressed...]
+ 0x29, 0x35, 0x35, 0x35, 0x0e, 0x01, 0x01, 0x01, 0x01,
+ 0x35, 0x35, 0x35, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x29,
+ 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x1b, 0x1a,
+ 0x06, 0x01, 0x01, 0x01, 0x01, 0x1a, 0x06, 0x1a, 0x29,
+ 0x29, 0x29, 0x29, 0x29, 0x29, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x29, 0x29, 0x29, 0x29, 0x29,
+ 0x36, 0x08, 0x36, 0x1a, 0x08, 0x08, 0x36, 0x01, 0x01,
+ 0x36, 0x08, 0x08, 0x08, 0x36, 0x08, 0x36, 0x29, 0x29,
+ 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
#endif
More information about the Scummvm-git-logs
mailing list