[Scummvm-cvs-logs] CVS: scummvm/wince findgame.cpp,1.7,1.8 pocketpc.cpp,1.20,1.21
Nicolas Bacca
arisme at users.sourceforge.net
Wed May 15 12:35:04 CEST 2002
Update of /cvsroot/scummvm/scummvm/wince
In directory usw-pr-cvs1:/tmp/cvs-serv10581
Modified Files:
findgame.cpp pocketpc.cpp
Log Message:
Added config-file include, removed from scumm.h
Index: findgame.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/wince/findgame.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- findgame.cpp 14 May 2002 23:08:15 -0000 1.7
+++ findgame.cpp 15 May 2002 19:34:49 -0000 1.8
@@ -8,6 +8,7 @@
#include <Winnls.h>
#include "resource.h"
#include "scumm.h"
+#include "config-file.h"
extern Config *scummcfg;
@@ -28,13 +29,13 @@
TCHAR directory[MAX_PATH];
};
-static const ScummGame GameList[] = {
- {
- "Simon The Sorcerer 1 (dos)",
- "Completable",
- "", "1631.VGA", "GAMEPC",
- "simon1dos",
- 0
+static const ScummGame GameList[] = {
+ {
+ "Simon The Sorcerer 1 (dos)",
+ "Completable",
+ "", "1631.VGA", "GAMEPC",
+ "simon1dos",
+ 0
},
{
"Simon The Sorcerer 1 (win)",
Index: pocketpc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/wince/pocketpc.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- pocketpc.cpp 14 May 2002 22:29:08 -0000 1.20
+++ pocketpc.cpp 15 May 2002 19:34:49 -0000 1.21
@@ -8,6 +8,7 @@
#include "gameDetector.h"
#include "simon/simon.h"
#include "gapi_keys.h"
+#include "config-file.h"
#include "commctrl.h"
@@ -27,18 +28,18 @@
#define MAX(a,b) (((a)<(b)) ? (b) : (a))
#define MIN(a,b) (((a)>(b)) ? (b) : (a))
-#define POCKETSCUMM_BUILD "051302"
+#define POCKETSCUMM_BUILD "051502"
#define VERSION "Build " POCKETSCUMM_BUILD " (VM " SCUMMVM_CVS ")"
-
-typedef int (*tTimeCallback)(int);
+
+typedef int (*tTimeCallback)(int);
GameDetector detector;
Gui gui;
Scumm *g_scumm;
-Config *scummcfg;
-tTimeCallback timer_callback;
-int timer_interval;
+Config *scummcfg;
+tTimeCallback timer_callback;
+int timer_interval;
extern void Cls();
@@ -117,9 +118,9 @@
void stop_cdrom();
// Update cdrom audio status
- void update_cdrom();
-
- // Add a new callback timer
+ void update_cdrom();
+
+ // Add a new callback timer
void set_timer(int timer, int (*callback)(int));
// Quit
@@ -356,29 +357,29 @@
int argc = 3;
char* argv[3];
- char argdir[MAX_PATH];
+ char argdir[MAX_PATH];
char *game_name;
sound_activated = true;
hide_toolbar = false;
- scummcfg = new Config("scummvm.ini", "scummvm");
+ scummcfg = new Config("scummvm.ini", "scummvm");
scummcfg->set_writing(true);
-
- game_name = GameSelector();
- if (!game_name)
- return 0;
+
+ game_name = GameSelector();
+ if (!game_name)
+ return 0;
argv[0] = NULL;
sprintf(argdir, "-p%s", _directory);
- argv[1] = argdir;
+ argv[1] = argdir;
argv[2] = game_name;
if (!argv[2])
- return 0;
-
- // No default toolbar for zak256
- if (strcmp(game_name, "zak256") == 0)
+ return 0;
+
+ // No default toolbar for zak256
+ if (strcmp(game_name, "zak256") == 0)
hide_toolbar = true;
if (detector.detectMain(argc, argv))
@@ -475,7 +476,7 @@
} else {
SHSipPreference(hWnd, SIP_FORCEDOWN);
}
- */
+ */
SHSipPreference(hWnd, SIP_FORCEDOWN);
}
// SHSipPreference(hWnd, SIP_UP); /* Hack! */
@@ -483,12 +484,12 @@
wm->update_screen();
return 0;
- case WM_ACTIVATE:
+ case WM_ACTIVATE:
case WM_SETFOCUS:
GraphicsResume();
if (!hide_toolbar)
toolbar_drawn = false;
-// SHHandleWMActivate(hWnd, wParam, lParam, &sai, SHA_INPUTDIALOG);
+// SHHandleWMActivate(hWnd, wParam, lParam, &sai, SHA_INPUTDIALOG);
if (LOWORD(wParam) == WA_ACTIVE) {
if (GetScreenMode()) {
@@ -501,11 +502,11 @@
SHFullScreen(hWnd, SHFS_SHOWTASKBAR);
MoveWindow(hWnd, 0, 0, GetSystemMetrics(SM_CYSCREEN), GetSystemMetrics(SM_CXSCREEN), TRUE);
}
- }
+ }
return 0;
- case WM_HIBERNATE:
+ case WM_HIBERNATE:
case WM_KILLFOCUS:
GraphicsSuspend();
if (!hide_toolbar)
@@ -556,25 +557,25 @@
break;
- case IDC_LANDSCAPE:
+ case IDC_LANDSCAPE:
//HWND taskbar;
//SHFullScreen (hWnd, SHFS_HIDESIPBUTTON | SHFS_HIDETASKBAR | SHFS_HIDESTARTICON);
//InvalidateRect(HWND_DESKTOP, NULL, TRUE);
SetScreenMode(!GetScreenMode());
//SHSipPreference(hWnd,SIP_FORCEDOWN);
//MoveWindow(hWnd, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), TRUE);
- //SetCapture(hWnd); // to prevent input panel from getting taps
- /*taskbar = FindWindow(TEXT("HHTaskBar"), NULL);
- if (taskbar)
+ //SetCapture(hWnd); // to prevent input panel from getting taps
+ /*taskbar = FindWindow(TEXT("HHTaskBar"), NULL);
+ 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);
- SetCapture(hWnd);
+ SetCapture(hWnd);
UpdateWindow(hWnd);
if (!hide_toolbar)
- toolbar_drawn = false;
+ toolbar_drawn = false;
break;
}
@@ -739,10 +740,10 @@
break;
case WM_LBUTTONDBLCLK: // doesn't seem to work right now
//wm->_scumm->_rightBtnPressed |= msClicked | msDown;
- break;
- case WM_TIMER:
- timer_callback(timer_interval);
- break;
+ break;
+ case WM_TIMER:
+ timer_callback(timer_interval);
+ break;
default:
return DefWindowProc(hWnd, message, wParam, lParam);
}
@@ -876,10 +877,10 @@
}
void action_hide() {
- hide_toolbar = !hide_toolbar;
- if (hide_toolbar)
- RestoreScreenGeometry();
- else
+ hide_toolbar = !hide_toolbar;
+ if (hide_toolbar)
+ RestoreScreenGeometry();
+ else
LimitScreenGeometry();
Cls();
toolbar_drawn = hide_toolbar;
@@ -901,17 +902,17 @@
void action_cursoronoff() {
hide_cursor = !hide_cursor;
-}
-
-void action_subtitleonoff() {
- g_scumm->_noSubtitles = !g_scumm->_noSubtitles;
+}
+
+void action_subtitleonoff() {
+ g_scumm->_noSubtitles = !g_scumm->_noSubtitles;
}
void keypad_init() {
static pAction actions[TOTAL_ACTIONS] =
{ action_pause, action_save, action_quit, action_skip, action_hide,
- action_keyboard, action_sound, action_right_click, action_cursoronoff,
- action_subtitleonoff
+ action_keyboard, action_sound, action_right_click, action_cursoronoff,
+ action_subtitleonoff
};
GAPIKeysInit(actions);
@@ -954,7 +955,7 @@
hWnd_Window = syst->hWnd;
SetWindowLong(syst->hWnd, GWL_USERDATA, (long)syst);
- ShowWindow(syst->hWnd, SW_SHOW);
+ ShowWindow(syst->hWnd, SW_SHOW);
UpdateWindow(syst->hWnd);
SHMENUBARINFO smbi;
@@ -992,12 +993,12 @@
OSystem *OSystem_WINCE3_create() {
return OSystem_WINCE3::create(0, 0);
}
-
-void OSystem_WINCE3::set_timer(int timer, int (*callback)(int)) {
- SetTimer(hWnd, 1, timer, NULL);
- timer_interval = timer;
- timer_callback = callback;
-}
+
+void OSystem_WINCE3::set_timer(int timer, int (*callback)(int)) {
+ SetTimer(hWnd, 1, timer, NULL);
+ timer_interval = timer;
+ timer_callback = callback;
+}
void OSystem_WINCE3::set_palette(const byte *colors, uint start, uint num) {
const byte *b = colors;
@@ -1022,7 +1023,7 @@
}
void OSystem_WINCE3::init_size(uint w, uint h) {
- load_gfx_mode();
+ load_gfx_mode();
SetScreenGeometry(w, h);
}
@@ -1186,7 +1187,7 @@
Sleep(msecs);
}
-void *OSystem_WINCE3::create_thread(ThreadProc *proc, void *param) {
+void *OSystem_WINCE3::create_thread(ThreadProc *proc, void *param) {
// needed for emulated MIDI support (Sam'n'Max)
return CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)proc, param, 0, NULL);
}
More information about the Scummvm-git-logs
mailing list