[Scummvm-cvs-logs] CVS: scummvm/wince pocketpc.cpp,1.14,1.15 PocketSCUMM.vcp,1.4,1.5
Nicolas Bacca
arisme at users.sourceforge.net
Tue Apr 30 17:32:03 CEST 2002
Update of /cvsroot/scummvm/scummvm/wince
In directory usw-pr-cvs1:/tmp/cvs-serv31737
Modified Files:
pocketpc.cpp PocketSCUMM.vcp
Log Message:
Compile with new config-file support - not used yet, this will be fixed tomorrow
Index: pocketpc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/wince/pocketpc.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** pocketpc.cpp 23 Apr 2002 05:36:51 -0000 1.14
--- pocketpc.cpp 1 May 2002 00:31:16 -0000 1.15
***************
*** 35,38 ****
--- 35,50 ----
Gui gui;
Scumm *g_scumm;
+ Config *scummcfg;
+
+ extern void Cls();
+
+ extern BOOL isPrescanning();
+ extern void changeScanPath();
+ extern void startScan();
+ extern void endScanPath();
+ extern void abortScanPath();
+
+ void registry_init();
+ void keypad_init();
extern void Cls();
***************
*** 129,133 ****
HMODULE hInst;
HWND hWnd;
! bool _display_cursor;
bool _simulate_right_up;
--- 141,145 ----
HMODULE hInst;
HWND hWnd;
! bool _display_cursor;
bool _simulate_right_up;
***************
*** 341,344 ****
--- 353,357 ----
char* argv[3];
char argdir[MAX_PATH];
+
sound_activated = true;
hide_toolbar = false;
***************
*** 352,355 ****
--- 365,370 ----
return 0;
+ scummcfg = new Config("scummvm.ini", "scummvm");
+
if (detector.detectMain(argc, argv))
return (-1);
***************
*** 372,376 ****
g_scumm = scumm;
! keypad_init();
registry_init();
--- 387,391 ----
g_scumm = scumm;
! keypad_init();
registry_init();
***************
*** 477,484 ****
break;
case IDC_SKIP:
! if (g_scumm->vm.cutScenePtr[g_scumm->vm.cutSceneStackPointer])
! wm->_event.kbd.ascii = g_scumm->_vars[g_scumm->VAR_CUTSCENEEXIT_KEY];
! else
! wm->_event.kbd.ascii = g_scumm->_vars[g_scumm->VAR_TALKSTOP_KEY];
break;
case IDC_LOADSAVE:
--- 492,499 ----
break;
case IDC_SKIP:
! if (g_scumm->vm.cutScenePtr[g_scumm->vm.cutSceneStackPointer])
! wm->_event.kbd.ascii = g_scumm->_vars[g_scumm->VAR_CUTSCENEEXIT_KEY];
! else
! wm->_event.kbd.ascii = g_scumm->_vars[g_scumm->VAR_TALKSTOP_KEY];
break;
case IDC_LOADSAVE:
***************
*** 503,512 ****
break;
! case IDC_LANDSCAPE:
! 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
if (!hide_toolbar)
--- 518,527 ----
break;
! case IDC_LANDSCAPE:
! 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
if (!hide_toolbar)
***************
*** 537,549 ****
}
! break;
!
! case WM_KEYUP:
! if (wParam) {
! if (wm->_simulate_right_up) {
! wm->_event.event_code = EVENT_RBUTTONUP;
! wm->_simulate_right_up = false;
! }
! }
break;
--- 552,564 ----
}
! break;
!
! case WM_KEYUP:
! if (wParam) {
! if (wm->_simulate_right_up) {
! wm->_event.event_code = EVENT_RBUTTONUP;
! wm->_simulate_right_up = false;
! }
! }
break;
***************
*** 642,649 ****
break;
case ToolbarSkip:
! wm->_event.event_code = EVENT_KEYDOWN;
! if (g_scumm->vm.cutScenePtr[g_scumm->vm.cutSceneStackPointer])
! wm->_event.kbd.ascii = g_scumm->_vars[g_scumm->VAR_CUTSCENEEXIT_KEY];
! else
wm->_event.kbd.ascii = g_scumm->_vars[g_scumm->VAR_TALKSTOP_KEY];
break;
--- 657,664 ----
break;
case ToolbarSkip:
! wm->_event.event_code = EVENT_KEYDOWN;
! if (g_scumm->vm.cutScenePtr[g_scumm->vm.cutSceneStackPointer])
! wm->_event.kbd.ascii = g_scumm->_vars[g_scumm->VAR_CUTSCENEEXIT_KEY];
! else
wm->_event.kbd.ascii = g_scumm->_vars[g_scumm->VAR_TALKSTOP_KEY];
break;
***************
*** 667,671 ****
wm->_event.event_code = EVENT_LBUTTONUP;
wm->_event.mouse.x = x;
! wm->_event.mouse.y = y;
wm->_last_mouse_event = wm->_event;
}
--- 682,686 ----
wm->_event.event_code = EVENT_LBUTTONUP;
wm->_event.mouse.x = x;
! wm->_event.mouse.y = y;
wm->_last_mouse_event = wm->_event;
}
***************
*** 766,770 ****
void OSystem_WINCE3::addEventRightButtonClicked() {
_last_mouse_event.event_code = EVENT_RBUTTONDOWN;
! _event = _last_mouse_event;
_simulate_right_up = true;
}
--- 781,785 ----
void OSystem_WINCE3::addEventRightButtonClicked() {
_last_mouse_event.event_code = EVENT_RBUTTONDOWN;
! _event = _last_mouse_event;
_simulate_right_up = true;
}
***************
*** 804,811 ****
OSystem_WINCE3* system;
system = (OSystem_WINCE3*)g_scumm->_system;
!
! if (g_scumm->vm.cutScenePtr[g_scumm->vm.cutSceneStackPointer])
! system->addEventKeyPressed(g_scumm->_vars[g_scumm->VAR_CUTSCENEEXIT_KEY]);
! else
system->addEventKeyPressed(g_scumm->_vars[g_scumm->VAR_TALKSTOP_KEY]);
}
--- 819,826 ----
OSystem_WINCE3* system;
system = (OSystem_WINCE3*)g_scumm->_system;
!
! if (g_scumm->vm.cutScenePtr[g_scumm->vm.cutSceneStackPointer])
! system->addEventKeyPressed(g_scumm->_vars[g_scumm->VAR_CUTSCENEEXIT_KEY]);
! else
system->addEventKeyPressed(g_scumm->_vars[g_scumm->VAR_TALKSTOP_KEY]);
}
***************
*** 933,937 ****
_gfx_buf = (byte*)malloc((320 * 240) * sizeof(byte));
! _ms_backup = (byte*)malloc((40 * 40) * sizeof(byte));
}
--- 948,952 ----
_gfx_buf = (byte*)malloc((320 * 240) * sizeof(byte));
! _ms_backup = (byte*)malloc((40 * 40 * 3) * sizeof(byte));
}
***************
*** 1083,1093 ****
_ms_hotspot_y = hotspot_y;
! _ms_buf = (byte*)buf;
!
! // Refresh mouse cursor
!
! if (!hide_cursor) {
! undraw_mouse();
! draw_mouse();
}
}
--- 1098,1108 ----
_ms_hotspot_y = hotspot_y;
! _ms_buf = (byte*)buf;
!
! // Refresh mouse cursor
!
! if (!hide_cursor) {
! undraw_mouse();
! draw_mouse();
}
}
***************
*** 1119,1123 ****
for (;;) {
! MSG msg;
_event.event_code = -1;
--- 1134,1138 ----
for (;;) {
! MSG msg;
_event.event_code = -1;
Index: PocketSCUMM.vcp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/wince/PocketSCUMM.vcp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PocketSCUMM.vcp 19 Apr 2002 06:33:10 -0000 1.4
--- PocketSCUMM.vcp 1 May 2002 00:31:16 -0000 1.5
***************
*** 256,260 ****
CPP=clarm.exe
# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /Oxs /M$(CECrtMT) /c
! # ADD CPP /nologo /W3 /I "." /I "missing" /I ".." /I "../sound" /I "gapi/inc" /I "SDLAudio/include" /I "mad/include" /D "ARM" /D "_ARM_" /D "NDEBUG" /D "WIN32" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /FR /YX /Oxs /M$(CECrtMT) /c
MTL=midl.exe
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
--- 256,260 ----
CPP=clarm.exe
# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /Oxs /M$(CECrtMT) /c
! # ADD CPP /nologo /W3 /I "." /I "missing" /I ".." /I "../sound" /I "gapi/inc" /I "SDLAudio/include" /I "mad/include" /D "ARM" /D "_ARM_" /D "NDEBUG" /D "WIN32" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "COMPRESSED_SOUND_FILE" /FR /YX /Oxs /M$(CECrtMT) /c
MTL=midl.exe
[...1456 lines suppressed...]
+ ".\SDLAudio\include\SDL_error.h"\
+ ".\SDLAudio\include\SDL_events.h"\
+ ".\SDLAudio\include\SDL_getenv.h"\
+ ".\SDLAudio\include\SDL_joystick.h"\
+ ".\SDLAudio\include\SDL_keyboard.h"\
+ ".\SDLAudio\include\SDL_keysym.h"\
+ ".\SDLAudio\include\SDL_main.h"\
+ ".\SDLAudio\include\SDL_mouse.h"\
+ ".\SDLAudio\include\SDL_mutex.h"\
+ ".\SDLAudio\include\SDL_quit.h"\
+ ".\SDLAudio\include\SDL_rwops.h"\
+ ".\SDLAudio\include\SDL_thread.h"\
+ ".\SDLAudio\include\SDL_timer.h"\
+ ".\SDLAudio\include\SDL_types.h"\
+ ".\SDLAudio\include\SDL_version.h"\
+ ".\SDLAudio\include\SDL_video.h"\
{$(INCLUDE)}"Aygshell.h"\
{$(INCLUDE)}"sipapi.h"\
More information about the Scummvm-git-logs
mailing list