summaryrefslogtreecommitdiffstats
path: root/src/skel
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-04-17 09:17:38 +0200
committerSergeanur <s.anureev@yandex.ua>2020-04-17 09:17:38 +0200
commitb9c8ce0d37b2f094e2d8fe1a71db009718a0a006 (patch)
tree4861c474aa232d2914f5b6b3bc11a8e62a9ceccb /src/skel
parentMerge remote-tracking branch 'samler/world' into Standalone (diff)
parentrem refs (diff)
downloadre3-b9c8ce0d37b2f094e2d8fe1a71db009718a0a006.tar
re3-b9c8ce0d37b2f094e2d8fe1a71db009718a0a006.tar.gz
re3-b9c8ce0d37b2f094e2d8fe1a71db009718a0a006.tar.bz2
re3-b9c8ce0d37b2f094e2d8fe1a71db009718a0a006.tar.lz
re3-b9c8ce0d37b2f094e2d8fe1a71db009718a0a006.tar.xz
re3-b9c8ce0d37b2f094e2d8fe1a71db009718a0a006.tar.zst
re3-b9c8ce0d37b2f094e2d8fe1a71db009718a0a006.zip
Diffstat (limited to 'src/skel')
-rw-r--r--src/skel/skeleton.cpp3
-rw-r--r--src/skel/skeleton.h2
-rw-r--r--src/skel/win/win.cpp26
-rw-r--r--src/skel/win/win.h6
4 files changed, 15 insertions, 22 deletions
diff --git a/src/skel/skeleton.cpp b/src/skel/skeleton.cpp
index 73dd8bf8..a02d7e0b 100644
--- a/src/skel/skeleton.cpp
+++ b/src/skel/skeleton.cpp
@@ -17,8 +17,7 @@ static RwBool DefaultVideoMode = TRUE;
bool TurnOnAnimViewer = false;
-//RsGlobalType RsGlobal;
-RsGlobalType &RsGlobal = *(RsGlobalType*)0x8F4360;
+RsGlobalType RsGlobal;
RwUInt32
RsTimer(void)
diff --git a/src/skel/skeleton.h b/src/skel/skeleton.h
index 6bf8d2fd..13588411 100644
--- a/src/skel/skeleton.h
+++ b/src/skel/skeleton.h
@@ -232,7 +232,7 @@ enum RsPadButtons
typedef enum RsPadButtons RsPadButtons;
-extern RsGlobalType &RsGlobal;
+extern RsGlobalType RsGlobal;
extern RsEventStatus AppEventHandler(RsEvent event, void *param);
extern RwBool AttachInputDevices(void);
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp
index acc9650c..351b7247 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -45,31 +45,25 @@
#define MAX_SUBSYSTEMS (16)
-//static RwBool ForegroundApp = TRUE;
-static RwBool &ForegroundApp = *(RwBool*)0x060F000;
+static RwBool ForegroundApp = TRUE;
-//static RwBool RwInitialised = FALSE;
-static RwBool &RwInitialised = *(RwBool*)0x885B88;
+static RwBool RwInitialised = FALSE;
static RwSubSystemInfo GsubSysInfo[MAX_SUBSYSTEMS];
static RwInt32 GnumSubSystems = 0;
static RwInt32 GcurSel = 0, GcurSelVM = 0;
-//static RwBool startupDeactivate;
-static RwBool &startupDeactivate = *(RwBool*)0x8E2878;
+static RwBool startupDeactivate;
-//static RwBool useDefault;
-static RwBool &useDefault = *(RwBool*)0x6510D4;
+static RwBool useDefault;
-//static RwBool defaultFullscreenRes = TRUE;
-static RwBool &defaultFullscreenRes = *(RwBool*)0x60EFFC;
+static RwBool defaultFullscreenRes = TRUE;
/* Class name for the MS Window's window class. */
static const RwChar *AppClassName = RWSTRING("Grand theft auto 3");
-//static psGlobalType PsGlobal;
-static psGlobalType &PsGlobal = *(psGlobalType*)0x72CF60;
+static psGlobalType PsGlobal;
#define PSGLOBAL(var) (((psGlobalType *)(RsGlobal.ps))->var)
@@ -107,14 +101,14 @@ IMediaSeeking *pMS = nil;
DWORD dwDXVersion;
DWORD _dwMemTotalPhys;
-DWORD &_dwMemAvailPhys = *(DWORD*)0x70F29C;
+DWORD _dwMemAvailPhys;
DWORD _dwMemTotalVirtual;
DWORD _dwMemAvailVirtual;
-DWORD &_dwMemTotalVideo = *(DWORD*)0x70F2A8;
+DWORD _dwMemTotalVideo;
DWORD _dwMemAvailVideo;
-DWORD &_dwOperatingSystemVersion = *(DWORD*)0x70F290;
+DWORD _dwOperatingSystemVersion;
-RwUInt32 &gGameState = *(RwUInt32*)0x8F5838;
+RwUInt32 gGameState;
CJoySticks AllValidWinJoys;
CJoySticks::CJoySticks()
diff --git a/src/skel/win/win.h b/src/skel/win/win.h
index 242438ea..ca16c4a0 100644
--- a/src/skel/win/win.h
+++ b/src/skel/win/win.h
@@ -29,9 +29,9 @@ enum eWinVersion
OS_WINXP,
};
-extern DWORD &_dwOperatingSystemVersion;
+extern DWORD _dwOperatingSystemVersion;
-extern RwUInt32 &gGameState;
+extern RwUInt32 gGameState;
/* platform specfic global data */
typedef struct
@@ -127,5 +127,5 @@ void HandleExit();
#endif /* __cplusplus */
-extern DWORD &_dwOperatingSystemVersion;
+extern DWORD _dwOperatingSystemVersion;
#endif /* (!defined(_PLATFORM_WIN_H)) */