mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2025-01-25 18:24:59 +01:00
Code Issues Releases Wiki Activity
VVVVVV/desktop_version/src/Network.c

158 lines
3.1 KiB
C
Raw Normal View History

Remove unnecessary includes from header files Including a header file inside another header file means a bunch of files are going to be unnecessarily recompiled whenever that inner header file is changed. So I minimized the amount of header files included in a header file, and only included the ones that were necessary (system includes don't count, I'm only talking about includes from within this project). Then the includes are only in the .cpp files themselves. This also minimizes problems such as a NO_CUSTOM_LEVELS build failing because some file depended on an include that got included in editor.h, which is another benefit of removing unnecessary includes from header files.
2020-07-19 12:05:41 -07:00
#include <stdint.h>
Add support for multiple Network backends, stub in GOGNetwork
2020-01-13 11:15:17 -05:00
Ifdef out network code for M&P M&P contains network code despite M&P not being a Steam/GOG release (as Steam/GOG releases are full releases of the game, not custom-levels-only releases). While unlocking achievements is already ifdef'd out in M&P, let's remove the network code entirely to make sure people can't do other shenanigans with M&P builds, and also to have a smaller binary size.
2020-08-02 20:35:00 -07:00
#include "MakeAndPlay.h"
Factor out UNUSED macro to header file This is so it can be used in other files without having to copy-paste the define.
2021-05-20 14:12:51 -07:00
#include "Unused.h"
Allow for conditional building of Steam and GOG APIs I think it's a bit silly to always include the Steam and GOG APIs whenever we build VVVVVV, since the only time they'll ever be used is in a live build and not a dev build. So now Steam and GOG are disabled by default. If you want them, you'll need to add -DSTEAM=ON or -DGOG=ON respectively at CMake time. They're also both automatically enabled for release builds.
2020-06-01 09:23:07 -07:00
Ifdef out network code for M&P M&P contains network code despite M&P not being a Steam/GOG release (as Steam/GOG releases are full releases of the game, not custom-levels-only releases). While unlocking achievements is already ifdef'd out in M&P, let's remove the network code entirely to make sure people can't do other shenanigans with M&P builds, and also to have a smaller binary size.
2020-08-02 20:35:00 -07:00
#ifdef MAKEANDPLAY
#ifdef STEAM_NETWORK
#undef STEAM_NETWORK
#endif
#ifdef GOG_NETWORK
#undef GOG_NETWORK
#endif
#endif
Allow for conditional building of Steam and GOG APIs I think it's a bit silly to always include the Steam and GOG APIs whenever we build VVVVVV, since the only time they'll ever be used is in a live build and not a dev build. So now Steam and GOG are disabled by default. If you want them, you'll need to add -DSTEAM=ON or -DGOG=ON respectively at CMake time. They're also both automatically enabled for release builds.
2020-06-01 09:23:07 -07:00
#ifdef STEAM_NETWORK
#define STEAM_NUM 1
#else
#define STEAM_NUM 0
#endif
#ifdef GOG_NETWORK
#define GOG_NUM 1
#else
#define GOG_NUM 0
#endif
#define NUM_BACKENDS (STEAM_NUM+GOG_NUM)
Add support for multiple Network backends, stub in GOGNetwork
2020-01-13 11:15:17 -05:00
#define DECLARE_BACKEND(name) \
Explicitly declare void for all void parameter functions (#628) Apparently in C, if you have `void test();`, it's completely okay to do `test(2);`. The function will take in the argument, but just discard it and throw it away. It's like a trash can, and a rude one at that. If you declare it like `void test(void);`, this is prevented. This is not a problem in C++ - doing `void test();` and `test(2);` is guaranteed to result in a compile error (this also means that right now, at least in all `.cpp` files, nobody is ever calling a void parameter function with arguments and having their arguments be thrown away). However, we may not be using C++ in the future, so I just want to lay down the precedent that if a function takes in no arguments, you must explicitly declare it as such. I would've added `-Wstrict-prototypes`, but it produces an annoying warning message saying it doesn't work in C++ mode if you're compiling in C++ mode. So it can be added later.
2021-02-25 14:23:59 -08:00
int32_t name##_init(void); \
void name##_shutdown(void); \
void name##_update(void); \
void name##_unlockAchievement(const char *name); \
Remove unnecessary externs from network func forward decls Forward declarations are already externed, there's no need to have an extern keyword here.
2020-08-02 20:38:16 -07:00
int32_t name##_getAchievementProgress(const char *name); \
void name##_setAchievementProgress(const char *name, int32_t stat);
Allow for conditional building of Steam and GOG APIs I think it's a bit silly to always include the Steam and GOG APIs whenever we build VVVVVV, since the only time they'll ever be used is in a live build and not a dev build. So now Steam and GOG are disabled by default. If you want them, you'll need to add -DSTEAM=ON or -DGOG=ON respectively at CMake time. They're also both automatically enabled for release builds.
2020-06-01 09:23:07 -07:00
#ifdef STEAM_NETWORK
Add support for multiple Network backends, stub in GOGNetwork
2020-01-13 11:15:17 -05:00
DECLARE_BACKEND(STEAM)
Allow for conditional building of Steam and GOG APIs I think it's a bit silly to always include the Steam and GOG APIs whenever we build VVVVVV, since the only time they'll ever be used is in a live build and not a dev build. So now Steam and GOG are disabled by default. If you want them, you'll need to add -DSTEAM=ON or -DGOG=ON respectively at CMake time. They're also both automatically enabled for release builds.
2020-06-01 09:23:07 -07:00
#endif
#ifdef GOG_NETWORK
Add support for multiple Network backends, stub in GOGNetwork
2020-01-13 11:15:17 -05:00
DECLARE_BACKEND(GOG)
Allow for conditional building of Steam and GOG APIs I think it's a bit silly to always include the Steam and GOG APIs whenever we build VVVVVV, since the only time they'll ever be used is in a live build and not a dev build. So now Steam and GOG are disabled by default. If you want them, you'll need to add -DSTEAM=ON or -DGOG=ON respectively at CMake time. They're also both automatically enabled for release builds.
2020-06-01 09:23:07 -07:00
#endif
Add support for multiple Network backends, stub in GOGNetwork
2020-01-13 11:15:17 -05:00
#undef DECLARE_BACKEND
typedef struct NetworkBackend
{
int32_t IsInit;
Explicitly declare void for all void parameter functions (#628) Apparently in C, if you have `void test();`, it's completely okay to do `test(2);`. The function will take in the argument, but just discard it and throw it away. It's like a trash can, and a rude one at that. If you declare it like `void test(void);`, this is prevented. This is not a problem in C++ - doing `void test();` and `test(2);` is guaranteed to result in a compile error (this also means that right now, at least in all `.cpp` files, nobody is ever calling a void parameter function with arguments and having their arguments be thrown away). However, we may not be using C++ in the future, so I just want to lay down the precedent that if a function takes in no arguments, you must explicitly declare it as such. I would've added `-Wstrict-prototypes`, but it produces an annoying warning message saying it doesn't work in C++ mode if you're compiling in C++ mode. So it can be added later.
2021-02-25 14:23:59 -08:00
int32_t (*Init)(void);
void (*Shutdown)(void);
void (*Update)(void);
void (*UnlockAchievement)(const char*);
Add support for multiple Network backends, stub in GOGNetwork
2020-01-13 11:15:17 -05:00
int32_t (*GetAchievementProgress)(const char*);
void (*SetAchievementProgress)(const char*, int32_t);
} NetworkBackend;
Allow for conditional building of Steam and GOG APIs I think it's a bit silly to always include the Steam and GOG APIs whenever we build VVVVVV, since the only time they'll ever be used is in a live build and not a dev build. So now Steam and GOG are disabled by default. If you want them, you'll need to add -DSTEAM=ON or -DGOG=ON respectively at CMake time. They're also both automatically enabled for release builds.
2020-06-01 09:23:07 -07:00
#if NUM_BACKENDS > 0
Add support for multiple Network backends, stub in GOGNetwork
2020-01-13 11:15:17 -05:00
static NetworkBackend backends[NUM_BACKENDS];
Allow for conditional building of Steam and GOG APIs I think it's a bit silly to always include the Steam and GOG APIs whenever we build VVVVVV, since the only time they'll ever be used is in a live build and not a dev build. So now Steam and GOG are disabled by default. If you want them, you'll need to add -DSTEAM=ON or -DGOG=ON respectively at CMake time. They're also both automatically enabled for release builds.
2020-06-01 09:23:07 -07:00
#endif
Add support for multiple Network backends, stub in GOGNetwork
2020-01-13 11:15:17 -05:00
Explicitly declare void for all void parameter functions (#628) Apparently in C, if you have `void test();`, it's completely okay to do `test(2);`. The function will take in the argument, but just discard it and throw it away. It's like a trash can, and a rude one at that. If you declare it like `void test(void);`, this is prevented. This is not a problem in C++ - doing `void test();` and `test(2);` is guaranteed to result in a compile error (this also means that right now, at least in all `.cpp` files, nobody is ever calling a void parameter function with arguments and having their arguments be thrown away). However, we may not be using C++ in the future, so I just want to lay down the precedent that if a function takes in no arguments, you must explicitly declare it as such. I would've added `-Wstrict-prototypes`, but it produces an annoying warning message saying it doesn't work in C++ mode if you're compiling in C++ mode. So it can be added later.
2021-02-25 14:23:59 -08:00
int NETWORK_init(void)
Add support for multiple Network backends, stub in GOGNetwork
2020-01-13 11:15:17 -05:00
{
Allow for conditional building of Steam and GOG APIs I think it's a bit silly to always include the Steam and GOG APIs whenever we build VVVVVV, since the only time they'll ever be used is in a live build and not a dev build. So now Steam and GOG are disabled by default. If you want them, you'll need to add -DSTEAM=ON or -DGOG=ON respectively at CMake time. They're also both automatically enabled for release builds.
2020-06-01 09:23:07 -07:00
int32_t any = 0;
Add support for multiple Network backends, stub in GOGNetwork
2020-01-13 11:15:17 -05:00
#define ASSIGN_BACKEND(name, index) \
backends[index].Init = name##_init; \
This is a wild guess but I think I assigned init at some point
2020-01-13 11:25:54 -05:00
backends[index].Shutdown = name##_shutdown; \
backends[index].Update = name##_update; \
backends[index].UnlockAchievement = name##_unlockAchievement; \
backends[index].GetAchievementProgress = name##_getAchievementProgress; \
backends[index].SetAchievementProgress = name##_setAchievementProgress;
Allow for conditional building of Steam and GOG APIs I think it's a bit silly to always include the Steam and GOG APIs whenever we build VVVVVV, since the only time they'll ever be used is in a live build and not a dev build. So now Steam and GOG are disabled by default. If you want them, you'll need to add -DSTEAM=ON or -DGOG=ON respectively at CMake time. They're also both automatically enabled for release builds.
2020-06-01 09:23:07 -07:00
#ifdef STEAM_NETWORK
Add support for multiple Network backends, stub in GOGNetwork
2020-01-13 11:15:17 -05:00
ASSIGN_BACKEND(STEAM, 0)
Allow for conditional building of Steam and GOG APIs I think it's a bit silly to always include the Steam and GOG APIs whenever we build VVVVVV, since the only time they'll ever be used is in a live build and not a dev build. So now Steam and GOG are disabled by default. If you want them, you'll need to add -DSTEAM=ON or -DGOG=ON respectively at CMake time. They're also both automatically enabled for release builds.
2020-06-01 09:23:07 -07:00
#endif
#ifdef GOG_NETWORK
ASSIGN_BACKEND(GOG, STEAM_NUM)
#endif
Add support for multiple Network backends, stub in GOGNetwork
2020-01-13 11:15:17 -05:00
#undef ASSIGN_BACKEND
Allow for conditional building of Steam and GOG APIs I think it's a bit silly to always include the Steam and GOG APIs whenever we build VVVVVV, since the only time they'll ever be used is in a live build and not a dev build. So now Steam and GOG are disabled by default. If you want them, you'll need to add -DSTEAM=ON or -DGOG=ON respectively at CMake time. They're also both automatically enabled for release builds.
2020-06-01 09:23:07 -07:00
#if NUM_BACKENDS > 0
int32_t i;
Add support for multiple Network backends, stub in GOGNetwork
2020-01-13 11:15:17 -05:00
for (i = 0; i < NUM_BACKENDS; i += 1)
{
backends[i].IsInit = backends[i].Init();
any |= backends[i].IsInit;
}
Allow for conditional building of Steam and GOG APIs I think it's a bit silly to always include the Steam and GOG APIs whenever we build VVVVVV, since the only time they'll ever be used is in a live build and not a dev build. So now Steam and GOG are disabled by default. If you want them, you'll need to add -DSTEAM=ON or -DGOG=ON respectively at CMake time. They're also both automatically enabled for release builds.
2020-06-01 09:23:07 -07:00
#endif
Add support for multiple Network backends, stub in GOGNetwork
2020-01-13 11:15:17 -05:00
return any;
}
Explicitly declare void for all void parameter functions (#628) Apparently in C, if you have `void test();`, it's completely okay to do `test(2);`. The function will take in the argument, but just discard it and throw it away. It's like a trash can, and a rude one at that. If you declare it like `void test(void);`, this is prevented. This is not a problem in C++ - doing `void test();` and `test(2);` is guaranteed to result in a compile error (this also means that right now, at least in all `.cpp` files, nobody is ever calling a void parameter function with arguments and having their arguments be thrown away). However, we may not be using C++ in the future, so I just want to lay down the precedent that if a function takes in no arguments, you must explicitly declare it as such. I would've added `-Wstrict-prototypes`, but it produces an annoying warning message saying it doesn't work in C++ mode if you're compiling in C++ mode. So it can be added later.
2021-02-25 14:23:59 -08:00
void NETWORK_shutdown(void)
Add support for multiple Network backends, stub in GOGNetwork
2020-01-13 11:15:17 -05:00
{
Allow for conditional building of Steam and GOG APIs I think it's a bit silly to always include the Steam and GOG APIs whenever we build VVVVVV, since the only time they'll ever be used is in a live build and not a dev build. So now Steam and GOG are disabled by default. If you want them, you'll need to add -DSTEAM=ON or -DGOG=ON respectively at CMake time. They're also both automatically enabled for release builds.
2020-06-01 09:23:07 -07:00
#if NUM_BACKENDS > 0
Add support for multiple Network backends, stub in GOGNetwork
2020-01-13 11:15:17 -05:00
int32_t i;
for (i = 0; i < NUM_BACKENDS; i += 1)
if (backends[i].IsInit)
{
backends[i].Shutdown();
}
Allow for conditional building of Steam and GOG APIs I think it's a bit silly to always include the Steam and GOG APIs whenever we build VVVVVV, since the only time they'll ever be used is in a live build and not a dev build. So now Steam and GOG are disabled by default. If you want them, you'll need to add -DSTEAM=ON or -DGOG=ON respectively at CMake time. They're also both automatically enabled for release builds.
2020-06-01 09:23:07 -07:00
#endif
Add support for multiple Network backends, stub in GOGNetwork
2020-01-13 11:15:17 -05:00
}
Explicitly declare void for all void parameter functions (#628) Apparently in C, if you have `void test();`, it's completely okay to do `test(2);`. The function will take in the argument, but just discard it and throw it away. It's like a trash can, and a rude one at that. If you declare it like `void test(void);`, this is prevented. This is not a problem in C++ - doing `void test();` and `test(2);` is guaranteed to result in a compile error (this also means that right now, at least in all `.cpp` files, nobody is ever calling a void parameter function with arguments and having their arguments be thrown away). However, we may not be using C++ in the future, so I just want to lay down the precedent that if a function takes in no arguments, you must explicitly declare it as such. I would've added `-Wstrict-prototypes`, but it produces an annoying warning message saying it doesn't work in C++ mode if you're compiling in C++ mode. So it can be added later.
2021-02-25 14:23:59 -08:00
void NETWORK_update(void)
Add support for multiple Network backends, stub in GOGNetwork
2020-01-13 11:15:17 -05:00
{
Allow for conditional building of Steam and GOG APIs I think it's a bit silly to always include the Steam and GOG APIs whenever we build VVVVVV, since the only time they'll ever be used is in a live build and not a dev build. So now Steam and GOG are disabled by default. If you want them, you'll need to add -DSTEAM=ON or -DGOG=ON respectively at CMake time. They're also both automatically enabled for release builds.
2020-06-01 09:23:07 -07:00
#if NUM_BACKENDS > 0
Add support for multiple Network backends, stub in GOGNetwork
2020-01-13 11:15:17 -05:00
int32_t i;
for (i = 0; i < NUM_BACKENDS; i += 1)
if (backends[i].IsInit)
{
backends[i].Update();
}
Allow for conditional building of Steam and GOG APIs I think it's a bit silly to always include the Steam and GOG APIs whenever we build VVVVVV, since the only time they'll ever be used is in a live build and not a dev build. So now Steam and GOG are disabled by default. If you want them, you'll need to add -DSTEAM=ON or -DGOG=ON respectively at CMake time. They're also both automatically enabled for release builds.
2020-06-01 09:23:07 -07:00
#endif
Add support for multiple Network backends, stub in GOGNetwork
2020-01-13 11:15:17 -05:00
}
void NETWORK_unlockAchievement(const char *name)
{
Allow for conditional building of Steam and GOG APIs I think it's a bit silly to always include the Steam and GOG APIs whenever we build VVVVVV, since the only time they'll ever be used is in a live build and not a dev build. So now Steam and GOG are disabled by default. If you want them, you'll need to add -DSTEAM=ON or -DGOG=ON respectively at CMake time. They're also both automatically enabled for release builds.
2020-06-01 09:23:07 -07:00
#if NUM_BACKENDS > 0
Add support for multiple Network backends, stub in GOGNetwork
2020-01-13 11:15:17 -05:00
int32_t i;
for (i = 0; i < NUM_BACKENDS; i += 1)
if (backends[i].IsInit)
{
backends[i].UnlockAchievement(name);
}
Allow for conditional building of Steam and GOG APIs I think it's a bit silly to always include the Steam and GOG APIs whenever we build VVVVVV, since the only time they'll ever be used is in a live build and not a dev build. So now Steam and GOG are disabled by default. If you want them, you'll need to add -DSTEAM=ON or -DGOG=ON respectively at CMake time. They're also both automatically enabled for release builds.
2020-06-01 09:23:07 -07:00
#else
UNUSED(name);
#endif
Add support for multiple Network backends, stub in GOGNetwork
2020-01-13 11:15:17 -05:00
}
int32_t NETWORK_getAchievementProgress(const char *name)
{
/* The highest stat gets priority, will eventually pass to the others */
Allow for conditional building of Steam and GOG APIs I think it's a bit silly to always include the Steam and GOG APIs whenever we build VVVVVV, since the only time they'll ever be used is in a live build and not a dev build. So now Steam and GOG are disabled by default. If you want them, you'll need to add -DSTEAM=ON or -DGOG=ON respectively at CMake time. They're also both automatically enabled for release builds.
2020-06-01 09:23:07 -07:00
int32_t max = 0;
#if NUM_BACKENDS > 0
int32_t i, stat;
Add support for multiple Network backends, stub in GOGNetwork
2020-01-13 11:15:17 -05:00
for (i = 0; i < NUM_BACKENDS; i += 1)
if (backends[i].IsInit)
{
stat = backends[i].GetAchievementProgress(name);
if (stat > max)
{
max = stat;
}
}
Allow for conditional building of Steam and GOG APIs I think it's a bit silly to always include the Steam and GOG APIs whenever we build VVVVVV, since the only time they'll ever be used is in a live build and not a dev build. So now Steam and GOG are disabled by default. If you want them, you'll need to add -DSTEAM=ON or -DGOG=ON respectively at CMake time. They're also both automatically enabled for release builds.
2020-06-01 09:23:07 -07:00
#else
UNUSED(name);
#endif
Add support for multiple Network backends, stub in GOGNetwork
2020-01-13 11:15:17 -05:00
return max;
}
void NETWORK_setAchievementProgress(const char *name, int32_t stat)
{
Allow for conditional building of Steam and GOG APIs I think it's a bit silly to always include the Steam and GOG APIs whenever we build VVVVVV, since the only time they'll ever be used is in a live build and not a dev build. So now Steam and GOG are disabled by default. If you want them, you'll need to add -DSTEAM=ON or -DGOG=ON respectively at CMake time. They're also both automatically enabled for release builds.
2020-06-01 09:23:07 -07:00
#if NUM_BACKENDS > 0
Add support for multiple Network backends, stub in GOGNetwork
2020-01-13 11:15:17 -05:00
int32_t i;
for (i = 0; i < NUM_BACKENDS; i += 1)
if (backends[i].IsInit)
{
backends[i].SetAchievementProgress(name, stat);
}
Allow for conditional building of Steam and GOG APIs I think it's a bit silly to always include the Steam and GOG APIs whenever we build VVVVVV, since the only time they'll ever be used is in a live build and not a dev build. So now Steam and GOG are disabled by default. If you want them, you'll need to add -DSTEAM=ON or -DGOG=ON respectively at CMake time. They're also both automatically enabled for release builds.
2020-06-01 09:23:07 -07:00
#else
UNUSED(name);
UNUSED(stat);
#endif
Add support for multiple Network backends, stub in GOGNetwork
2020-01-13 11:15:17 -05:00
}
Reference in a new issue Copy permalink