diff options
author | Michael Smith <mikesmiffy128@gmail.com> | 2022-09-13 21:46:21 +0100 |
---|---|---|
committer | Michael Smith <mikesmiffy128@gmail.com> | 2022-09-13 22:50:30 +0100 |
commit | 792463cb133f65645feb48743bbc03ef8eb96bdd (patch) | |
tree | 3879cd6895fe5c8f597f445af2410a41bcf00f73 /src/sst.c | |
parent | 378892d089b6742a95b8d573af58535597f19d25 (diff) |
Move towards C23, improve events and vcall macros
Another big one. Here's a list of things:
- Since the upcoming C23 standardises typeof(), use it as an extension
for the time being in order to allow passing arbitrary types as
macro/codegen parameters. It wouldn't have been a big leap to do this
even without standardisation since it's apparently an easy extension
to implement - and also, to be honest, this project is essentially glued
to Clang anyway so who cares.
- Likewise, bool, true and false are becoming pre-defined, so
pre-pre-define them now in order to get the benefit of not having to
remember one header everywhere.
- Really ungodly/amazing vcall macro stuff now allows us to call C++
virtual functions like regular C functions. It's pretty cool!
- Events can now take arbitrary parameters and come in two types:
regular events and predicates.
All this makes the base code even uglier but makes the feature
implementation nicer. In other words, it places more of the cognitive
burden on myself and less on other people who might want to contribute.
This is a good tradeoff, because I'm a genius.
Diffstat (limited to 'src/sst.c')
-rw-r--r-- | src/sst.c | 14 |
1 files changed, 5 insertions, 9 deletions
@@ -14,7 +14,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#include <stdbool.h> #include <string.h> #ifdef _WIN32 @@ -429,20 +428,17 @@ DECL_VFUNC_DYN(void, ServerCommand, const char *) DEF_CVAR(_sst_onload_echo, "EXPERIMENTAL! Don't rely on this existing!", "", CON_HIDDEN) -DEF_EVENT(ClientActive) -DEF_EVENT(Tick) +DEF_EVENT(ClientActive, struct edict */*player*/) +DEF_EVENT(Tick, bool /*simulating*/) // Quick and easy server tick event. Eventually, we might want a deeper hook // for anything timing-sensitive, but this will do for our current needs. static void VCALLCONV GameFrame(void *this, bool simulating) { - EMIT_EVENT(Tick); + EMIT_Tick(simulating); } static void VCALLCONV ClientActive(void *this, struct edict *player) { - // XXX: it's kind of dumb that we get handed the edict here then go look it - // up again in fov.c but I can't be bothered refactoring any further now - // that this finally works, do something later lol - EMIT_EVENT(ClientActive); + EMIT_ClientActive(player); // continuing dumb portal hack. didn't even seem worth adding a feature for if (has_vtidx_ServerCommand && con_getvarstr(_sst_onload_echo)[0]) { @@ -454,7 +450,7 @@ static void VCALLCONV ClientActive(void *this, struct edict *player) { memcpy(s + 6, con_getvarstr(_sst_onload_echo), _sst_onload_echo->strlen); memcpy(s + 6 + _sst_onload_echo->strlen - 1, "\"\n", 3); - VCALL(engserver, ServerCommand, s); + ServerCommand(engserver, s); free(s); } } |