summaryrefslogtreecommitdiffhomepage
path: root/src/con_.c
diff options
context:
space:
mode:
authorMichael Smith <mikesmiffy128@gmail.com>2022-01-18 22:56:54 +0000
committerMichael Smith <mikesmiffy128@gmail.com>2022-01-18 22:56:54 +0000
commit98378138a521fa52758f1ed3501900e6c323c474 (patch)
tree2671a6cc1ba80d9790995b33205536c4184f55b2 /src/con_.c
parente388efa5eba02ce6909193f700f11fe1385230e9 (diff)
Very slightly tidy RTTI stuff
More handwavey Linux prep, nothing too significant.
Diffstat (limited to 'src/con_.c')
-rw-r--r--src/con_.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/con_.c b/src/con_.c
index 357430b..7525229 100644
--- a/src/con_.c
+++ b/src/con_.c
@@ -96,7 +96,7 @@ static inline void initval(struct con_var *v) {
// right next to each other.
static int vtidx_InternalSetValue;
-// implementatiosn of virtual functions for our vars and commands below...
+// implementation of virtual functions for our vars and commands below...
static void VCALLCONV dtor(void *_) {} // we don't use constructors/destructors
@@ -305,16 +305,16 @@ void *_con_vtab_cmd[14 + NVDTOR] = {
// the engine does dynamic_casts on ConVar at some points so we have to fill out
// bare minimum rtti to prevent crashes. oh goody.
#ifdef _WIN32
-DEF_MSVC_BASIC_RTTI(static, varrtti, _con_realvtab_var, "sst_ConVar")
+DEF_MSVC_BASIC_RTTI(static, varrtti, _con_vtab_var, "sst_ConVar")
+#else
+DEF_ITANIUM_BASIC_RTTI(static, varrtti, "sst_ConVar")
#endif
-void *_con_realvtab_var[20] = {
-#ifdef _WIN32
- &varrtti,
-#else
- // this, among many other things, will be totally different on linux
-#warning FIX THIS TOO!
+struct _con_vtab_var_wrap _con_vtab_var_wrap = {
+#ifndef _WIN32
+ 0, // this *is* the top, no offset needed :)
#endif
+ &varrtti,
(void *)&dtor,
#ifndef _WIN32
(void *)&dtor,