[Scummvm-cvs-logs] CVS: scummvm/wince bitmaps.cpp,1.3,1.4 findgame.cpp,1.9,1.10 gapi_keys.cpp,1.4,1.5 newres.h,1.3,1.4 pocketpc.cpp,1.25,1.26 screen.cpp,1.7,1.8 screen.h,1.7,1.8
Nicolas Bacca
arisme at users.sourceforge.net
Mon Jul 22 14:48:05 CEST 2002
Update of /cvsroot/scummvm/scummvm/wince
In directory usw-pr-cvs1:/tmp/cvs-serv17607
Modified Files:
bitmaps.cpp findgame.cpp gapi_keys.cpp newres.h pocketpc.cpp
screen.cpp screen.h
Log Message:
CR things
Index: bitmaps.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/wince/bitmaps.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- bitmaps.cpp 19 Jul 2002 21:39:40 -0000 1.3
+++ bitmaps.cpp 22 Jul 2002 21:47:26 -0000 1.4
@@ -1,10410 +1,10410 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001/2002 The ScummVM project
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
[...20788 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
Index: findgame.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/wince/findgame.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- findgame.cpp 19 Jul 2002 21:39:41 -0000 1.9
+++ findgame.cpp 22 Jul 2002 21:47:26 -0000 1.10
@@ -1,24 +1,24 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001/2002 The ScummVM project
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Header$
- *
- */
-
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2001/2002 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * $Header$
+ *
+ */
+
#ifdef _WIN32_WCE
// Browse directories to locate SCUMM games
Index: gapi_keys.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/wince/gapi_keys.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gapi_keys.cpp 19 Jul 2002 21:39:41 -0000 1.4
+++ gapi_keys.cpp 22 Jul 2002 21:47:26 -0000 1.5
@@ -1,24 +1,24 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001/2002 The ScummVM project
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Header$
- *
- */
-
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2001/2002 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * $Header$
+ *
+ */
+
#ifdef _WIN32_WCE
// Handle mapping of actions to hardware keys
Index: newres.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/wince/newres.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- newres.h 14 Mar 2002 22:37:50 -0000 1.3
+++ newres.h 22 Jul 2002 21:47:26 -0000 1.4
@@ -1,41 +1,41 @@
-#ifndef __NEWRES_H__
-#define __NEWRES_H__
-
-#if !defined(UNDER_CE)
-#define UNDER_CE _WIN32_WCE
-#endif
-
-#if defined(_WIN32_WCE)
- #if !defined(WCEOLE_ENABLE_DIALOGEX)
- #define DIALOGEX DIALOG DISCARDABLE
- #endif
- #include <commctrl.h>
- #define SHMENUBAR RCDATA
- #if defined(WIN32_PLATFORM_PSPC) && (_WIN32_WCE >= 300)
- #include <aygshell.h>
- #define AFXCE_IDR_SCRATCH_SHMENU 28700
- #else
- #define I_IMAGENONE (-2)
- #define NOMENU 0xFFFF
- #define IDS_SHNEW 1
-
- #define IDM_SHAREDNEW 10
- #define IDM_SHAREDNEWDEFAULT 11
- #endif // _WIN32_WCE_PSPC
- #define AFXCE_IDD_SAVEMODIFIEDDLG 28701
-#endif // _WIN32_WCE
-
-#ifdef RC_INVOKED
-#ifndef _INC_WINDOWS
-#define _INC_WINDOWS
- #include "winuser.h" // extract from windows header
- #include "winver.h"
-#endif
-#endif
-
-#ifdef IDC_STATIC
-#undef IDC_STATIC
-#endif
-#define IDC_STATIC (-1)
-
-#endif //__NEWRES_H__
+#ifndef __NEWRES_H__
+#define __NEWRES_H__
+
+#if !defined(UNDER_CE)
+#define UNDER_CE _WIN32_WCE
+#endif
+
+#if defined(_WIN32_WCE)
+ #if !defined(WCEOLE_ENABLE_DIALOGEX)
+ #define DIALOGEX DIALOG DISCARDABLE
+ #endif
+ #include <commctrl.h>
+ #define SHMENUBAR RCDATA
+ #if defined(WIN32_PLATFORM_PSPC) && (_WIN32_WCE >= 300)
+ #include <aygshell.h>
+ #define AFXCE_IDR_SCRATCH_SHMENU 28700
+ #else
+ #define I_IMAGENONE (-2)
+ #define NOMENU 0xFFFF
+ #define IDS_SHNEW 1
+
+ #define IDM_SHAREDNEW 10
+ #define IDM_SHAREDNEWDEFAULT 11
+ #endif // _WIN32_WCE_PSPC
+ #define AFXCE_IDD_SAVEMODIFIEDDLG 28701
+#endif // _WIN32_WCE
+
+#ifdef RC_INVOKED
+#ifndef _INC_WINDOWS
+#define _INC_WINDOWS
+ #include "winuser.h" // extract from windows header
+ #include "winver.h"
+#endif
+#endif
+
+#ifdef IDC_STATIC
+#undef IDC_STATIC
+#endif
+#define IDC_STATIC (-1)
+
+#endif //__NEWRES_H__
Index: pocketpc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/wince/pocketpc.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- pocketpc.cpp 19 Jul 2002 21:39:41 -0000 1.25
+++ pocketpc.cpp 22 Jul 2002 21:47:26 -0000 1.26
@@ -1,24 +1,24 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001/2002 The ScummVM project
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Header$
- *
- */
-
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2001/2002 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * $Header$
+ *
+ */
+
#include "stdafx.h"
#include <assert.h>
@@ -157,13 +157,13 @@
void addEventKeyPressed(int ascii_code);
- void addEventRightButtonClicked();
-
- // Mutex functions
-
- void* create_mutex();
- void lock_mutex(void*);
- void unlock_mutex(void*);
+ void addEventRightButtonClicked();
+
+ // Mutex functions
+
+ void* create_mutex();
+ void lock_mutex(void*);
+ void unlock_mutex(void*);
void delete_mutex(void*);
private:
@@ -273,10 +273,10 @@
extern void getSelectedGame(int, char*, TCHAR*);
extern void palette_update();
-//#define SHMenuBar_GetMenu(hWndMB,ID_MENU) (HMENU)SendMessage((hWndMB), SHCMBM_GETSUBMENU, (WPARAM)0, (LPARAM)ID_MENU)
-
-/* Monkey2 keyboard stuff */
-bool monkey2_keyboard;
+//#define SHMenuBar_GetMenu(hWndMB,ID_MENU) (HMENU)SendMessage((hWndMB), SHCMBM_GETSUBMENU, (WPARAM)0, (LPARAM)ID_MENU)
+
+/* Monkey2 keyboard stuff */
+bool monkey2_keyboard;
int monkey2_keyboard_count;
void do_quit() {
@@ -413,14 +413,14 @@
// No default toolbar for zak256
if (strcmp(game_name, "zak256") == 0)
- hide_toolbar = true;
-
- // Keyboard activated for Monkey Island 2
- if (strcmp(game_name, "monkey2") == 0) {
- draw_keyboard = true;
- monkey2_keyboard = true;
- monkey2_keyboard_count = 0;
- }
+ hide_toolbar = true;
+
+ // Keyboard activated for Monkey Island 2
+ if (strcmp(game_name, "monkey2") == 0) {
+ draw_keyboard = true;
+ monkey2_keyboard = true;
+ monkey2_keyboard_count = 0;
+ }
if (detector.detectMain(argc, argv))
return (-1);
@@ -538,12 +538,12 @@
if (!hide_toolbar)
toolbar_drawn = false;
// SHHandleWMActivate(hWnd, wParam, lParam, &sai, SHA_INPUTDIALOG);
-
- SHSipPreference(hWnd, SIP_FORCEDOWN);
- SHFullScreen(hWnd, SHFS_HIDETASKBAR);
- MoveWindow(hWnd, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), TRUE);
- SetCapture(hWnd);
-
+
+ SHSipPreference(hWnd, SIP_FORCEDOWN);
+ SHFullScreen(hWnd, SHFS_HIDETASKBAR);
+ MoveWindow(hWnd, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), TRUE);
+ SetCapture(hWnd);
+
/*
if (LOWORD(wParam) == WA_ACTIVE) {
if (GetScreenMode()) {
@@ -556,7 +556,7 @@
SHFullScreen(hWnd, SHFS_SHOWTASKBAR);
MoveWindow(hWnd, 0, 0, GetSystemMetrics(SM_CYSCREEN), GetSystemMetrics(SM_CXSCREEN), TRUE);
}
- }
+ }
*/
return 0;
@@ -573,9 +573,9 @@
if (!hide_toolbar)
toolbar_drawn = false;
return 0;
-
+
- case WM_COMMAND:
+ case WM_COMMAND:
/*
switch(wParam)
{
@@ -641,7 +641,7 @@
if (taskbar)
ShowWindow(taskbar, SW_HIDE);*/
/*SHSipPreference(hWnd, SIP_FORCEDOWN);
- SHFullScreen(hWnd, SHFS_HIDETASKBAR);*/
+ SHFullScreen(hWnd, SHFS_HIDETASKBAR);*/
/*
SetForegroundWindow(hWnd);
MoveWindow(hWnd, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), TRUE);
@@ -651,8 +651,8 @@
toolbar_drawn = false;
break;
- }
- */
+ }
+ */
return 0;
@@ -696,33 +696,33 @@
{
ToolbarSelected toolbar_selection;
int x = ((int16*)&lParam)[0];
- int y = ((int16*)&lParam)[1];
-
- //FILE *toto;
-
- Translate(&x, &y);
-
- /*
- fprintf(toto, "Non translated %d %d Translated %d %d\n",
- ((int16*)&lParam)[0], ((int16*)&lParam)[1],
- x, y);
- fclose(toto);
- */
-
+ int y = ((int16*)&lParam)[1];
+
+ //FILE *toto;
+
+ Translate(&x, &y);
+
+ /*
+ fprintf(toto, "Non translated %d %d Translated %d %d\n",
+ ((int16*)&lParam)[0], ((int16*)&lParam)[1],
+ x, y);
+ fclose(toto);
+ */
+
if (draw_keyboard) {
- // Handle keyboard selection
- int offset_y;
- int saved_x = x;
- int saved_y = y;
-
- /*
- if (!GetScreenMode()) {
- x = ((int16*)&lParam)[0];
- y = ((int16*)&lParam)[1];
- }
- */
-
+ // Handle keyboard selection
+ int offset_y;
+ int saved_x = x;
+ int saved_y = y;
+
+ /*
+ if (!GetScreenMode()) {
+ x = ((int16*)&lParam)[0];
+ y = ((int16*)&lParam)[1];
+ }
+ */
+
offset_y = (GetScreenMode() ? 0 : 40 + 22);
if (x<185 && y>=(200 + offset_y)) {
@@ -735,13 +735,14 @@
}
else
if (x>=186 && y>=(200 + offset_y) && x<=255) {
- // Numeric selection
- if (monkey2_keyboard)
- monkey2_keyboard_count++;
- if (monkey2_keyboard_count == 4) {
- monkey2_keyboard = false;
- draw_keyboard = false;
- toolbar_drawn = false;
+ // Numeric selection
+ if (monkey2_keyboard) {
+ monkey2_keyboard_count++;
+ if (monkey2_keyboard_count == 4) {
+ monkey2_keyboard = false;
+ draw_keyboard = false;
+ toolbar_drawn = false;
+ }
}
wm->_event.event_code = EVENT_KEYDOWN;
wm->_event.kbd.ascii =
@@ -763,9 +764,9 @@
wm->_event.kbd.ascii = mapKey(VK_RETURN);
break;
}
-
- x = saved_x;
- y = saved_y;
+
+ x = saved_x;
+ y = saved_y;
wm->_event.event_code = EVENT_LBUTTONDOWN;
wm->_event.mouse.x = x;
@@ -777,15 +778,15 @@
toolbar_selection = (hide_toolbar || get_key_mapping ? ToolbarNone :
- getToolbarSelection(
- (GetScreenMode() ? x : ((int16*)&lParam)[0]),
+ getToolbarSelection(
+ (GetScreenMode() ? x : ((int16*)&lParam)[0]),
(GetScreenMode() ? y : ((int16*)&lParam)[1])));
if (toolbar_selection == ToolbarNone) {
wm->_event.event_code = EVENT_LBUTTONDOWN;
wm->_event.mouse.x = x;
wm->_event.mouse.y = y;
wm->_last_mouse_event = wm->_event;
-
+
/*
if(y > 200 && !hide_toolbar)
{
@@ -809,7 +810,7 @@
hDC = BeginPaint (hWnd, &ps);
EndPaint (hWnd, &ps);
}
- }
+ }
*/
}
else {
@@ -827,9 +828,11 @@
wm->_event.event_code = EVENT_KEYDOWN;
wm->_event.kbd.ascii = mapKey(VK_F5);
break;
- case ToolbarMode:
- SetScreenMode(!GetScreenMode());
- if (!hide_toolbar)
+ case ToolbarMode:
+ SetScreenMode(!GetScreenMode());
+ scummcfg->set("DisplayMode", GetScreenMode(), "wince");
+ scummcfg->flush();
+ if (!hide_toolbar)
toolbar_drawn = false;
break;
case ToolbarSkip:
@@ -1059,6 +1062,7 @@
/************* OSystem Main **********************/
OSystem *OSystem_WINCE3::create(int gfx_mode, bool full_screen) {
+ const char *display_mode;
OSystem_WINCE3 *syst = new OSystem_WINCE3();
syst->_mode = gfx_mode;
syst->_full_screen = full_screen;
@@ -1090,7 +1094,7 @@
ShowWindow(syst->hWnd, SW_SHOW);
UpdateWindow(syst->hWnd);
-
+
/*
SHMENUBARINFO smbi;
smbi.cbSize = sizeof(smbi);
@@ -1103,13 +1107,13 @@
smbi.hwndMB = NULL;
BOOL res = SHCreateMenuBar(&smbi);
hWnd_MainMenu = smbi.hwndMB;
- */
+ */
- /* Sound is activated on default - initialize it in the menu */
+ /* Sound is activated on default - initialize it in the menu */
/*
CheckMenuItem((HMENU)SHMenuBar_GetMenu (hWnd_MainMenu, IDM_POCKETSCUMM),
IDC_SOUND, MF_BYCOMMAND | MF_CHECKED);
- */
+ */
GraphicsOn(syst->hWnd);
@@ -1122,11 +1126,16 @@
if (SDL_Init(SDL_INIT_AUDIO)==-1) {
exit(1);
- }
-
- Cls();
+ }
+
+ Cls();
drawWait();
+ // Set mode, portrait or landscape
+ display_mode = scummcfg->get("DisplayMode", "wince");
+ if (display_mode)
+ SetScreenMode(atoi(display_mode));
+
return syst;
}
@@ -1428,20 +1437,20 @@
bool OSystem_WINCE3::poll_cdrom() {return 0;}
void OSystem_WINCE3::update_cdrom() {;}
-void ScummDebugger::attach(Scumm *s) {;}
-
-/* Mutex stuff */
-void* OSystem_WINCE3::create_mutex() {
- return (void*)CreateMutex(NULL, FALSE, NULL);
+void ScummDebugger::attach(Scumm *s) {;}
+
+/* Mutex stuff */
+void* OSystem_WINCE3::create_mutex() {
+ return (void*)CreateMutex(NULL, FALSE, NULL);
}
-void OSystem_WINCE3::lock_mutex(void *handle) {
- WaitForSingleObject((HANDLE)handle, INFINITE);
-}
-
-void OSystem_WINCE3::unlock_mutex(void *handle) {
- ReleaseMutex((HANDLE)handle);
-}
-
-void OSystem_WINCE3::delete_mutex(void *handle) {
- CloseHandle((HANDLE)handle);
+void OSystem_WINCE3::lock_mutex(void *handle) {
+ WaitForSingleObject((HANDLE)handle, INFINITE);
+}
+
+void OSystem_WINCE3::unlock_mutex(void *handle) {
+ ReleaseMutex((HANDLE)handle);
+}
+
+void OSystem_WINCE3::delete_mutex(void *handle) {
+ CloseHandle((HANDLE)handle);
}
Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/wince/screen.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- screen.cpp 19 Jul 2002 21:39:41 -0000 1.7
+++ screen.cpp 22 Jul 2002 21:47:26 -0000 1.8
@@ -1,27 +1,27 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001/2002 The ScummVM project
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
[...1327 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 += width;
- src_limit += width;
+ }
+
+ scraddr += linestep;
+ scr_ptr += width;
+ src_limit += width;
}
}
Index: screen.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/wince/screen.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- screen.h 19 Jul 2002 21:39:41 -0000 1.7
+++ screen.h 22 Jul 2002 21:47:26 -0000 1.8
@@ -1,58 +1,58 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001/2002 The ScummVM project
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Header$
- *
- */
-
-/* Original code by Vasyl Tsvirkunov */
-
-#ifndef SCREEN_H
-#define SCREEN_H
-
-#ifndef UBYTE
-#define UBYTE unsigned char
-#endif
-
-void SetScreenGeometry(int w, int h);
-void LimitScreenGeometry();
-void RestoreScreenGeometry();
-int GraphicsOn(HWND hWndMain);
-void GraphicsOff();
-void GraphicsSuspend();
-void GraphicsResume();
-
-void SetPalEntry(int ent, UBYTE r, UBYTE g, UBYTE b);
-void Blt(UBYTE * scr_ptr);
-
-/* 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,
- ToolbarMode,
- ToolbarSkip,
- ToolbarSound
-} ToolbarSelected;
-
-
-#endif
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2001/2002 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * $Header$
+ *
+ */
+
+/* Original code by Vasyl Tsvirkunov */
+
+#ifndef SCREEN_H
+#define SCREEN_H
+
+#ifndef UBYTE
+#define UBYTE unsigned char
+#endif
+
+void SetScreenGeometry(int w, int h);
+void LimitScreenGeometry();
+void RestoreScreenGeometry();
+int GraphicsOn(HWND hWndMain);
+void GraphicsOff();
+void GraphicsSuspend();
+void GraphicsResume();
+
+void SetPalEntry(int ent, UBYTE r, UBYTE g, UBYTE b);
+void Blt(UBYTE * scr_ptr);
+
+/* 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,
+ ToolbarMode,
+ ToolbarSkip,
+ ToolbarSound
+} ToolbarSelected;
+
+
+#endif
More information about the Scummvm-git-logs
mailing list