From cc131b99f9fee8754977bc4c003dcfb7f37f7169 Mon Sep 17 00:00:00 2001 From: Iru Cai Date: Mon, 20 Aug 2018 10:30:29 +0800 Subject: put the global data in global.h and complete the type of gwindowhandle, g_rect --- csrc/global.h | 22 ++++++++++++++++++++++ csrc/main.c | 6 +++--- csrc/media_init.c | 2 ++ 3 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 csrc/global.h diff --git a/csrc/global.h b/csrc/global.h new file mode 100644 index 0000000..eb5e703 --- /dev/null +++ b/csrc/global.h @@ -0,0 +1,22 @@ +#include + +/* media_init.c */ +extern IDirectDraw *pddraw; // 0x0048a0d8 + +extern DDSURFACEDESC sfdesc1; // 0x0048a068 +extern IDirectDrawSurface *pddrawsf1; // 0x0048a0dc +extern IDirectDrawSurface *pddrawsf2; // 0x0048a0e0 + +extern int mkf_data; // 0x48a0e4 +extern int mkf_speaking; // 0x48a054 +extern int mkf_panel; // 0x48a05c +extern int mkf_effect; // 0x48a058 + +extern HHOOK ghook; // 0x48a050 + +char * read_mkf(int mkf_idx, int a1, char *buf, int *bufsize); + +/* main.c */ +extern HINSTANCE ghInstance; // 48a064 +extern HWND gwindowHandle; // 48a0d4 +extern RECT g_rect; /* struct tagRECT { left, top, right, bottom } @ 0x46cadc */ diff --git a/csrc/main.c b/csrc/main.c index e85f7ac..e0eb664 100644 --- a/csrc/main.c +++ b/csrc/main.c @@ -1,8 +1,8 @@ #include HINSTANCE ghInstance; // 48a064 -gwindowHandle; // 48a0d4 -uint32_t dw_46cadc; +HWND gwindowHandle; // 48a0d4 +RECT g_rect; Surface **sf1; @@ -113,7 +113,7 @@ int WINAPI WinMain(HINSTANCE hInstance, } ShowWindow(gwindowHandle, SW_SHOW); UpdateWindow(gwindowHandle); - play_avi("START.AVI", &dw_46cadc, 1); + play_avi("START.AVI", &g_rect, 1); case_401de8_0: w_4991b6 = 0; w_4991b8 = 0; diff --git a/csrc/media_init.c b/csrc/media_init.c index 0c893c4..724523d 100644 --- a/csrc/media_init.c +++ b/csrc/media_init.c @@ -1,3 +1,5 @@ +#include "global.h" + IDirectDraw *pddraw; // 0x0048a0d8 DDSURFACEDESC sfdesc1; // 0x0048a068 -- cgit v1.2.3