From b6c117830751312e24d59ddab963bf25bfea54b8 Mon Sep 17 00:00:00 2001 From: junknewera <163715534+junknewera@users.noreply.github.com> Date: Tue, 13 Oct 2026 15:30:33 +0300 Subject: [PATCH 1/2] fix gcc build errors in server and shared code MSVC accepts non-standard code and omitted headers that GCC rejects. Needed to build the server on Linux. --- client/src/CPacketFactory.h | 6 ++++++ server/src/CNetwork.cpp | 4 ++-- server/src/CPacketFactory.h | 6 ++++++ server/src/CServerTime.cpp | 12 ++++++++++-- shared/logger.h | 4 ++++ shared/network/CNetworkEntitySerializer.h | 3 +-- shared/network/packet.h | 3 ++- shared/network/serializable_types.h | 3 ++- 8 files changed, 33 insertions(+), 8 deletions(-) diff --git a/client/src/CPacketFactory.h b/client/src/CPacketFactory.h index ead1d9f5..913173e8 100644 --- a/client/src/CPacketFactory.h +++ b/client/src/CPacketFactory.h @@ -46,3 +46,9 @@ extern inline CPacketFactory& GetPacketFactory() static CPacketFactory factory; return factory; } + +template +PacketRegistrar::PacketRegistrar() +{ + GetPacketFactory().RegisterPacket(new PacketT); +} diff --git a/server/src/CNetwork.cpp b/server/src/CNetwork.cpp index 001d10bc..949e068d 100644 --- a/server/src/CNetwork.cpp +++ b/server/src/CNetwork.cpp @@ -167,7 +167,7 @@ void CNetwork::HandlePlayerConnected(ENetPeer* pENetPeer, Packets::System::Playe playerid_t newPlayerId = CNetworkPlayerManager::AllocatePlayerId(); CNetworkPlayer* pNewNetworkPlayer = new CNetworkPlayer(pENetPeer, newPlayerId); - strcpy_s(pNewNetworkPlayer->m_Name, playerConnected.payload.name); + snprintf(pNewNetworkPlayer->m_Name, sizeof(pNewNetworkPlayer->m_Name), "%s", playerConnected.payload.name); CNetworkPlayerManager::Add(pNewNetworkPlayer); logger::info("playerid %s name %s version %s", to_string(newPlayerId).c_str(), playerConnected.payload.name, buffer); @@ -192,7 +192,7 @@ void CNetwork::HandlePlayerConnected(ENetPeer* pENetPeer, Packets::System::Playe continue; } oldPlayerConnected.payload.SetPlayerId(pNetworkPlayer->m_playerId); - strcpy_s(oldPlayerConnected.payload.name, pNetworkPlayer->m_Name); + snprintf(oldPlayerConnected.payload.name, sizeof(oldPlayerConnected.payload.name), "%s", pNetworkPlayer->m_Name); GetPacketFactory().Send(oldPlayerConnected, pNewNetworkPlayer); } diff --git a/server/src/CPacketFactory.h b/server/src/CPacketFactory.h index f62356df..6ab4f514 100644 --- a/server/src/CPacketFactory.h +++ b/server/src/CPacketFactory.h @@ -24,4 +24,10 @@ extern inline CPacketFactory& GetPacketFactory() { static CPacketFactory factory; return factory; +} + +template +PacketRegistrar::PacketRegistrar() +{ + GetPacketFactory().RegisterPacket(new PacketT); } \ No newline at end of file diff --git a/server/src/CServerTime.cpp b/server/src/CServerTime.cpp index ea3d7ae3..bdbdea05 100644 --- a/server/src/CServerTime.cpp +++ b/server/src/CServerTime.cpp @@ -1,17 +1,25 @@ #include "stdafx.h" +#include server_time_t g_serverTime = 0; uint32_t CServerTime::m_serverStartedAt = 0; +// wraps like GetTickCount, unsigned subtraction keeps the elapsed time correct +static uint32_t GetTickCountMs() +{ + using namespace std::chrono; + return static_cast(duration_cast(steady_clock::now().time_since_epoch()).count()); +} + void CServerTime::Init() { - m_serverStartedAt = GetTickCount(); + m_serverStartedAt = GetTickCountMs(); } void CServerTime::Update() { - g_serverTime = GetTickCount() - m_serverStartedAt; + g_serverTime = GetTickCountMs() - m_serverStartedAt; } PACKET_HANDLER(ePacketType::SERVER_TIME_REQUEST, Packets::System::ServerTimeRequest* pServerTimeRequest, diff --git a/shared/logger.h b/shared/logger.h index a0792f89..6bdac6cc 100644 --- a/shared/logger.h +++ b/shared/logger.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + class logger { private: diff --git a/shared/network/CNetworkEntitySerializer.h b/shared/network/CNetworkEntitySerializer.h index 9a26f583..065efb3b 100644 --- a/shared/network/CNetworkEntitySerializer.h +++ b/shared/network/CNetworkEntitySerializer.h @@ -1,8 +1,7 @@ #pragma once #include "network/ids.h" - -enum eNetworkEntityType : uint8_t; +#include "eNetworkEntityType.h" class CNetworkEntitySerializer { diff --git a/shared/network/packet.h b/shared/network/packet.h index 6858b914..debfcc87 100644 --- a/shared/network/packet.h +++ b/shared/network/packet.h @@ -32,11 +32,12 @@ constexpr ePacketReliability GetChannelReliability(ePacketChannel channel) return aChannelReliability[static_cast(channel)]; } +// constructor is defined in CPacketFactory.h, after GetPacketFactory() is declared template class PacketRegistrar { public: - PacketRegistrar() { GetPacketFactory().RegisterPacket(new PacketT); } + PacketRegistrar(); }; #define DEFINE_PACKET_TYPE(packet_class, type, channel) \ diff --git a/shared/network/serializable_types.h b/shared/network/serializable_types.h index 6e99453c..cfc990c7 100644 --- a/shared/network/serializable_types.h +++ b/shared/network/serializable_types.h @@ -1,5 +1,6 @@ #pragma once +#include #include "CPad.h" #include "CVector.h" #include "math_utils.h" @@ -82,7 +83,7 @@ struct MoveSpeedCompressed : public CVector bool isZero = false; if (Stream::IsWriting) { - if (abs(x) < PRECISION && abs(y) < PRECISION && abs(z) < PRECISION) + if (std::fabs(x) < PRECISION && std::fabs(y) < PRECISION && std::fabs(z) < PRECISION) { isZero = true; } From 057f1aec4f58bc0a2f5e54eab075b2e1a3b56865 Mon Sep 17 00:00:00 2001 From: junknewera <163715534+junknewera@users.noreply.github.com> Date: Wed, 21 Oct 2026 01:22:15 +0300 Subject: [PATCH 2/2] make server build and run on linux Allows hosting the server on Linux and adds an Ubuntu CI build. Replaces Windows-only SDK headers and fixes cross-platform chat packets. --- .github/workflows/ci.yml | 21 +++- server/src/CNetwork.cpp | 3 +- server/src/main.cpp | 3 +- server/src/sdk/CEntryExit.h | 4 + server/src/sdk/CExplosion.h | 22 ++++ server/src/sdk/CGame.h | 27 ++++ server/src/sdk/CPad.h | 39 ++++++ server/src/sdk/CPed.h | 17 +++ server/src/sdk/CRadar.h | 116 ++++++++++++++++++ server/src/sdk/CVector.h | 41 +++++++ server/src/sdk/CVehicle.h | 41 +++++++ server/src/sdk/CWeapon.h | 16 +++ server/src/sdk/CWeather.h | 30 +++++ server/src/sdk/PluginBase.h | 10 ++ .../plugin-sdk/plugin_sa/game_sa/CEntryExit.h | 65 +--------- .../plugin_sa/game_sa/SEntryExitFlags.h | 73 +++++++++++ third_party/serialize.h | 19 ++- xmake.lua | 46 ++++--- 18 files changed, 505 insertions(+), 88 deletions(-) create mode 100644 server/src/sdk/CEntryExit.h create mode 100644 server/src/sdk/CExplosion.h create mode 100644 server/src/sdk/CGame.h create mode 100644 server/src/sdk/CPad.h create mode 100644 server/src/sdk/CPed.h create mode 100644 server/src/sdk/CRadar.h create mode 100644 server/src/sdk/CVector.h create mode 100644 server/src/sdk/CVehicle.h create mode 100644 server/src/sdk/CWeapon.h create mode 100644 server/src/sdk/CWeather.h create mode 100644 server/src/sdk/PluginBase.h create mode 100644 third_party/plugin-sdk/plugin_sa/game_sa/SEntryExitFlags.h diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 21a5992a..6a2d7642 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: Build on Windows +name: Build on: push: @@ -31,4 +31,21 @@ jobs: run: xmake build proxy - name: Build launcher - run: xmake build launcher \ No newline at end of file + run: xmake build launcher + + build-linux: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + + - name: Install Xmake + uses: xmake-io/github-action-setup-xmake@v1 + with: + xmake-version: latest + + - name: Build server + run: xmake build -y server + + - name: Run server + run: timeout 5 xmake run server || [ $? -eq 124 ] diff --git a/server/src/CNetwork.cpp b/server/src/CNetwork.cpp index 949e068d..a553693a 100644 --- a/server/src/CNetwork.cpp +++ b/server/src/CNetwork.cpp @@ -192,7 +192,8 @@ void CNetwork::HandlePlayerConnected(ENetPeer* pENetPeer, Packets::System::Playe continue; } oldPlayerConnected.payload.SetPlayerId(pNetworkPlayer->m_playerId); - snprintf(oldPlayerConnected.payload.name, sizeof(oldPlayerConnected.payload.name), "%s", pNetworkPlayer->m_Name); + snprintf( + oldPlayerConnected.payload.name, sizeof(oldPlayerConnected.payload.name), "%s", pNetworkPlayer->m_Name); GetPacketFactory().Send(oldPlayerConnected, pNewNetworkPlayer); } diff --git a/server/src/main.cpp b/server/src/main.cpp index e546a896..3be3082f 100644 --- a/server/src/main.cpp +++ b/server/src/main.cpp @@ -62,6 +62,5 @@ int main(int argc, char* argv[]) CConfigManager::Init(); CServerTime::Init(); - CNetwork::Init(CConfigManager::GetConfigPort()); - return 0; + return CNetwork::Init(CConfigManager::GetConfigPort()) ? 0 : 1; } \ No newline at end of file diff --git a/server/src/sdk/CEntryExit.h b/server/src/sdk/CEntryExit.h new file mode 100644 index 00000000..218d7cf8 --- /dev/null +++ b/server/src/sdk/CEntryExit.h @@ -0,0 +1,4 @@ +// Server stand-in for plugin-sdk CEntryExit.h: only what the shared packets need. +#pragma once + +#include "SEntryExitFlags.h" diff --git a/server/src/sdk/CExplosion.h b/server/src/sdk/CExplosion.h new file mode 100644 index 00000000..ddfbd1ed --- /dev/null +++ b/server/src/sdk/CExplosion.h @@ -0,0 +1,22 @@ +// Server stand-in for plugin-sdk CExplosion.h: only what the shared packets need. +// Keep in sync with third_party/plugin-sdk/plugin_sa/game_sa/CExplosion.h +#pragma once + +#include "CVector.h" + +enum eExplosionType +{ + EXPLOSION_GRENADE, + EXPLOSION_MOLOTOV, + EXPLOSION_ROCKET, + EXPLOSION_WEAK_ROCKET, + EXPLOSION_CAR, + EXPLOSION_QUICK_CAR, + EXPLOSION_BOAT, + EXPLOSION_AIRCRAFT, + EXPLOSION_MINE, + EXPLOSION_OBJECT, + EXPLOSION_TANK_FIRE, + EXPLOSION_SMALL, + EXPLOSION_RC_VEHICLE +}; diff --git a/server/src/sdk/CGame.h b/server/src/sdk/CGame.h new file mode 100644 index 00000000..18370b8b --- /dev/null +++ b/server/src/sdk/CGame.h @@ -0,0 +1,27 @@ +// Server stand-in for plugin-sdk CGame.h: only what the shared packets need. +// Keep in sync with third_party/plugin-sdk/plugin_sa/game_sa/CGame.h +#pragma once + +enum eVisibleArea +{ + AREA_MAIN_MAP = 0, + AREA_HOTEL, + AREA_MANSION, + AREA_BANK, + AREA_MALL, + AREA_STRIP_CLUB, + AREA_LAWYERS, + AREA_COFFEE_SHOP, + AREA_CONCERT_HALL, + AREA_STUDIO, + AREA_RIFLE_RANGE, + AREA_BIKER_BAR, + AREA_POLICE_STATION, + AREA_EVERYWHERE, + AREA_DIRT, + AREA_BLOOD, + AREA_OVALRING, + AREA_MALIBU_CLUB, + AREA_PRINT_WORKS, + MAX_VISIBLE_AREAS +}; diff --git a/server/src/sdk/CPad.h b/server/src/sdk/CPad.h new file mode 100644 index 00000000..2eadd7f8 --- /dev/null +++ b/server/src/sdk/CPad.h @@ -0,0 +1,39 @@ +// Server stand-in for plugin-sdk CPad.h: only what the shared packets need. +// Keep in sync with third_party/plugin-sdk/plugin_sa/game_sa/CPad.h +#pragma once + +class CControllerState +{ +public: + signed short LeftStickX; // move/steer left (-128?)/right (+128) + signed short LeftStickY; // move back(+128)/forwards(-128?) + signed short RightStickX; // numpad 6(+128)/numpad 4(-128?) + signed short RightStickY; + + signed short LeftShoulder1; + signed short LeftShoulder2; + signed short RightShoulder1; // target / hand brake + signed short RightShoulder2; + + signed short DPadUp; // radio change up Next radio station / Call gang forward/Recruit gang member + signed short DPadDown; // radio change down Previous radio station / Gang stay back/Release gang (hold) + signed short DPadLeft; // Skip trip/Action / Negative talk reply + signed short DPadRight; // Next user MP3 track / Positive talk reply + + signed short Start; // Pause + signed short Select; // Camera modes + + signed short ButtonSquare; // jump / reverse Break/Reverse / Jump/Climb + signed short ButtonTriangle; // get in/out Exit vehicle / Enter veihcle + signed short ButtonCross; // sprint / accelerate Accelerate / Sprint/Swim + signed short ButtonCircle; // fire Fire weapon + + signed short ShockButtonL; + signed short ShockButtonR; // look behind + + signed short m_bChatIndicated; + signed short m_bPedWalk; + signed short m_bVehicleMouseLook; + signed short m_bRadioTrackSkip; +}; +static_assert(sizeof(CControllerState) == 0x30, "Invalid structure size of CControllerState"); diff --git a/server/src/sdk/CPed.h b/server/src/sdk/CPed.h new file mode 100644 index 00000000..a662a245 --- /dev/null +++ b/server/src/sdk/CPed.h @@ -0,0 +1,17 @@ +// Server stand-in for plugin-sdk CPed.h: only what the shared packets need. +// Keep in sync with third_party/plugin-sdk/plugin_sa/game_sa/CPed.h +#pragma once + +#include "ePedType.h" + +enum PLUGIN_API eMoveState +{ + PEDMOVE_NONE = 0, + PEDMOVE_STILL, + PEDMOVE_TURN_L, + PEDMOVE_TURN_R, + PEDMOVE_WALK, + PEDMOVE_JOG, + PEDMOVE_RUN, + PEDMOVE_SPRINT +}; diff --git a/server/src/sdk/CRadar.h b/server/src/sdk/CRadar.h new file mode 100644 index 00000000..c4570634 --- /dev/null +++ b/server/src/sdk/CRadar.h @@ -0,0 +1,116 @@ +// Server stand-in for plugin-sdk CRadar.h: only what the shared packets need. +// Keep in sync with third_party/plugin-sdk/plugin_sa/game_sa/CRadar.h +#pragma once + +#define MAX_RADAR_TRACES (175) + +enum eBlipType +{ + BLIP_NONE, + BLIP_CAR, + BLIP_CHAR, + BLIP_OBJECT, + BLIP_COORD, + BLIP_CONTACTPOINT, + BLIP_SPOTLIGHT, + BLIP_PICKUP, + BLIP_AIRSTRIP +}; + +enum eCoordBlipAppearance +{ + COORD_BLIP_APPEARANCE_NORMAL, + COORD_BLIP_APPEARANCE_FRIEND, + COORD_BLIP_APPEARANCE_ENEMY +}; + +enum eBlipDisplay +{ + BLIP_DISPLAY_NEITHER, // 0 + BLIP_DISPLAY_MARKER_ONLY, // 1 + BLIP_DISPLAY_BLIP_ONLY, // 2 + BLIP_DISPLAY_BOTH // 3 +}; + +enum eBlipColour +{ + BLIP_COLOUR_RED, // 0 + BLIP_COLOUR_GREEN, // 1 + BLIP_COLOUR_BLUE, // 2 + BLIP_COLOUR_WHITE, // 3 + BLIP_COLOUR_YELLOW, // 4 + BLIP_COLOUR_REDCOPY, // 5 - What? It was BLIP_COLOUR_PURPLE. + BLIP_COLOUR_BLUECOPY, // 6 - Why? It was BLIP_COLOUR_CYAN. + BLIP_COLOUR_THREAT, // 7 - If BLIP_FLAG_FRIENDLY is not set (by default) it is BLIP_COLOUR_RED, else + // BLIP_COLOUR_BLUE. + BLIP_COLOUR_DESTINATION // 8 - Default color. +}; + +enum eRadarSprite { + RADAR_SPRITE_NONE, // 0 + RADAR_SPRITE_WHITE, // 1 + RADAR_SPRITE_CENTRE, // 2 + RADAR_SPRITE_MAP_HERE, // 3 + RADAR_SPRITE_NORTH, // 4 + RADAR_SPRITE_AIRYARD, // 5 + RADAR_SPRITE_AMMUGUN, // 6 + RADAR_SPRITE_BARBERS, // 7 + RADAR_SPRITE_BIGSMOKE, // 8 + RADAR_SPRITE_BOATYARD, // 9 + RADAR_SPRITE_BURGERSHOT, // 10 + RADAR_SPRITE_BULLDOZER, // 11 + RADAR_SPRITE_CATALINAPINK, // 12 + RADAR_SPRITE_CESARVIAPANDO, // 13 - What? R* mistype? + RADAR_SPRITE_CHICKEN, // 14 + RADAR_SPRITE_CJ, // 15 + RADAR_SPRITE_CRASH1, // 16 + RADAR_SPRITE_DINER, // 17 - Yet another one? + RADAR_SPRITE_EMMETGUN, // 18 + RADAR_SPRITE_ENEMYATTACK, // 19 + RADAR_SPRITE_FIRE, // 20 + RADAR_SPRITE_GIRLFRIEND, // 21 + RADAR_SPRITE_HOSTPITAL, // 22 - Again? + RADAR_SPRITE_LOGOSYNDICATE, // 23 + RADAR_SPRITE_MADDOG, // 24 + RADAR_SPRITE_MAFIACASINO, // 25 + RADAR_SPRITE_MCSTRAP, // 26 + RADAR_SPRITE_MODGARAGE, // 27 + RADAR_SPRITE_OGLOC, // 28 + RADAR_SPRITE_PIZZA, // 29 + RADAR_SPRITE_POLICE, // 30 + RADAR_SPRITE_PROPERTYG, // 31 + RADAR_SPRITE_PROPERTYR, // 32 + RADAR_SPRITE_RACE, // 33 + RADAR_SPRITE_RYDER, // 34 + RADAR_SPRITE_SAVEGAME, // 35 + RADAR_SPRITE_SCHOOL, // 36 + RADAR_SPRITE_QMARK, // 37 + RADAR_SPRITE_SWEET, // 38 + RADAR_SPRITE_TATTOO, // 39 + RADAR_SPRITE_THETRUTH, // 40 + RADAR_SPRITE_WAYPOINT, // 41 + RADAR_SPRITE_TORENORANCH, // 42 + RADAR_SPRITE_TRIADS, // 43 + RADAR_SPRITE_TRIADSCASINO, // 44 + RADAR_SPRITE_TSHIRT, // 45 + RADAR_SPRITE_WOOZIE, // 46 + RADAR_SPRITE_ZERO, // 47 + RADAR_SPRITE_DATEDISCO, // 48 + RADAR_SPRITE_DATEDRINK, // 49 + RADAR_SPRITE_DATEFOOD, // 50 + RADAR_SPRITE_TRUCK, // 51 + RADAR_SPRITE_CASH, // 52 + RADAR_SPRITE_FLAG, // 53 + RADAR_SPRITE_GYM, // 54 + RADAR_SPRITE_IMPOUND, // 55 + RADAR_SPRITE_LIGHT, // 56 + RADAR_SPRITE_RUNWAY, // 57 + RADAR_SPRITE_GANGB, // 58 + RADAR_SPRITE_GANGP, // 59 + RADAR_SPRITE_GANGY, // 60 + RADAR_SPRITE_GANGN, // 61 + RADAR_SPRITE_GANGG, // 62 + RADAR_SPRITE_SPRAY,/*, // 63 + RADAR_SPRITE_TORENO*/ // 64 + RADAR_SPRITE_COUNT, +}; diff --git a/server/src/sdk/CVector.h b/server/src/sdk/CVector.h new file mode 100644 index 00000000..52c9e4dd --- /dev/null +++ b/server/src/sdk/CVector.h @@ -0,0 +1,41 @@ +// Server stand-in for plugin-sdk CVector.h: only what the shared packets need. +// Keep in sync with third_party/plugin-sdk/plugin_sa/game_sa/CVector.h +#pragma once + +#include "PluginBase.h" + +class CVector +{ +public: + float x, y, z; + + CVector() { x = y = z = 0.0f; } + CVector(float X, float Y, float Z) + { + x = X; + y = Y; + z = Z; + } +}; + +inline CVector operator-(const CVector& vecOne, const CVector& vecTwo) +{ + return CVector(vecOne.x - vecTwo.x, vecOne.y - vecTwo.y, vecOne.z - vecTwo.z); +} + +inline CVector operator+(const CVector& vecOne, const CVector& vecTwo) +{ + return CVector(vecOne.x + vecTwo.x, vecOne.y + vecTwo.y, vecOne.z + vecTwo.z); +} + +inline CVector operator*(const CVector& vec, float multiplier) +{ + return CVector(vec.x * multiplier, vec.y * multiplier, vec.z * multiplier); +} + +inline CVector operator*(float multiplier, const CVector& vec) +{ + return CVector(vec.x * multiplier, vec.y * multiplier, vec.z * multiplier); +} + +VALIDATE_SIZE(CVector, 0xC); diff --git a/server/src/sdk/CVehicle.h b/server/src/sdk/CVehicle.h new file mode 100644 index 00000000..e048759c --- /dev/null +++ b/server/src/sdk/CVehicle.h @@ -0,0 +1,41 @@ +// Server stand-in for plugin-sdk CVehicle.h: only what the shared packets need. +// Keep in sync with third_party/plugin-sdk/plugin_sa/game_sa/CVehicle.h +#pragma once + +#include "CDamageManager.h" + +enum eDoorLock : unsigned int +{ + DOORLOCK_NOT_USED, + DOORLOCK_UNLOCKED, + DOORLOCK_LOCKED, + DOORLOCK_LOCKOUT_PLAYER_ONLY, + DOORLOCK_LOCKED_PLAYER_INSIDE, + DOORLOCK_COP_CAR, + DOORLOCK_FORCE_SHUT_DOORS, + DOORLOCK_SKIP_SHUT_DOORS +}; + +enum eVehicleType +{ + VEHICLE_AUTOMOBILE, + VEHICLE_MTRUCK, + VEHICLE_QUAD, + VEHICLE_HELI, + VEHICLE_PLANE, + VEHICLE_BOAT, + VEHICLE_TRAIN, + VEHICLE_FHELI, + VEHICLE_FPLANE, + VEHICLE_BIKE, + VEHICLE_BMX, + VEHICLE_TRAILER +}; + +enum eVehicleCreatedBy +{ + RANDOM_VEHICLE = 1, + MISSION_VEHICLE = 2, + PARKED_VEHICLE = 3, + PERMANENT_VEHICLE = 4 +}; diff --git a/server/src/sdk/CWeapon.h b/server/src/sdk/CWeapon.h new file mode 100644 index 00000000..b217a87d --- /dev/null +++ b/server/src/sdk/CWeapon.h @@ -0,0 +1,16 @@ +// Server stand-in for plugin-sdk CWeapon.h: only what the shared packets need. +// Keep in sync with third_party/plugin-sdk/plugin_sa/game_sa/CWeapon.h +#pragma once + +#include "eWeaponType.h" +#include "CVector2D.h" +#include "ePedPieceTypes.h" + +enum eWeaponState : unsigned int +{ + WEAPONSTATE_READY, + WEAPONSTATE_FIRING, + WEAPONSTATE_RELOADING, + WEAPONSTATE_OUT_OF_AMMO, + WEAPONSTATE_MELEE_MADECONTACT +}; diff --git a/server/src/sdk/CWeather.h b/server/src/sdk/CWeather.h new file mode 100644 index 00000000..6bc3d9b7 --- /dev/null +++ b/server/src/sdk/CWeather.h @@ -0,0 +1,30 @@ +// Server stand-in for plugin-sdk CWeather.h: only what the shared packets need. +// Keep in sync with third_party/plugin-sdk/plugin_sa/game_sa/CWeather.h +#pragma once + +enum eWeatherType +{ + WEATHER_EXTRASUNNY_LA = 0, + WEATHER_SUNNY_LA = 1, + WEATHER_EXTRASUNNY_SMOG_LA = 2, + WEATHER_SUNNY_SMOG_LA = 3, + WEATHER_CLOUDY_LA = 4, + WEATHER_SUNNY_SF = 5, + WEATHER_EXTRASUNNY_SF = 6, + WEATHER_CLOUDY_SF = 7, + WEATHER_RAINY_SF = 8, + WEATHER_FOGGY_SF = 9, + WEATHER_SUNNY_VEGAS = 10, + WEATHER_EXTRASUNNY_VEGAS = 11, + WEATHER_CLOUDY_VEGAS = 12, + WEATHER_EXTRASUNNY_COUNTRYSIDE = 13, + WEATHER_SUNNY_COUNTRYSIDE = 14, + WEATHER_CLOUDY_COUNTRYSIDE = 15, + WEATHER_RAINY_COUNTRYSIDE = 16, + WEATHER_EXTRASUNNY_DESERT = 17, + WEATHER_SUNNY_DESERT = 18, + WEATHER_SANDSTORM_DESERT = 19, + WEATHER_UNDERWATER = 20, + WEATHER_EXTRACOLOURS_1 = 21, + WEATHER_EXTRACOLOURS_2 = 22 +}; diff --git a/server/src/sdk/PluginBase.h b/server/src/sdk/PluginBase.h new file mode 100644 index 00000000..615748a1 --- /dev/null +++ b/server/src/sdk/PluginBase.h @@ -0,0 +1,10 @@ +// Server stand-in for plugin-sdk PluginBase.h. The real one pulls injector (windows.h, x86 only), +// this is just enough for the data-only plugin-sdk headers (CDamageManager.h, CPedClothesDesc.h, ...) +// to compile on any platform. +#pragma once + +#include +#include + +#define PLUGIN_API +#define VALIDATE_SIZE(struc, size) static_assert(sizeof(struc) == size, "Invalid structure size of " #struc) diff --git a/third_party/plugin-sdk/plugin_sa/game_sa/CEntryExit.h b/third_party/plugin-sdk/plugin_sa/game_sa/CEntryExit.h index d3073abe..7fe036fe 100644 --- a/third_party/plugin-sdk/plugin_sa/game_sa/CEntryExit.h +++ b/third_party/plugin-sdk/plugin_sa/game_sa/CEntryExit.h @@ -10,73 +10,10 @@ #include "CRect.h" #include "CVector.h" #include "CObject.h" +#include "SEntryExitFlags.h" class CPed; -struct SEntryExitFlags -{ - SEntryExitFlags() - { - bUnknownInterior = false; - bUnknownPairing = false; - bCreateLinkedPair = false; - bRewardInterior = false; - bUsedRewardEntrance = false; - bCarsAndAircraft = false; - bBikesAndMotorcycles = false; - bDisableOnFoot = false; - bAcceptNpcGroup = false; - bFoodDateFlag = false; - bUnknownBurglary = false; - bDisableExit = false; - bBurglaryAccess = false; - bEnteredWithoutExit = false; - bEnableAccess = false; - bDeleteEnex = false; - } - unsigned short bUnknownInterior : 1; - unsigned short bUnknownPairing : 1; - unsigned short bCreateLinkedPair : 1; - unsigned short bRewardInterior : 1; - unsigned short bUsedRewardEntrance : 1; - unsigned short bCarsAndAircraft : 1; - unsigned short bBikesAndMotorcycles : 1; - unsigned short bDisableOnFoot : 1; - - unsigned short bAcceptNpcGroup : 1; - unsigned short bFoodDateFlag : 1; - unsigned short bUnknownBurglary : 1; - unsigned short bDisableExit : 1; - unsigned short bBurglaryAccess : 1; - unsigned short bEnteredWithoutExit : 1; - unsigned short bEnableAccess : 1; - unsigned short bDeleteEnex : 1; - - - template - bool Serialize(Stream& stream) - { - serialize_bool(stream, bUnknownInterior); - serialize_bool(stream, bUnknownPairing); - serialize_bool(stream, bCreateLinkedPair); - serialize_bool(stream, bRewardInterior); - serialize_bool(stream, bUsedRewardEntrance); - serialize_bool(stream, bCarsAndAircraft); - serialize_bool(stream, bBikesAndMotorcycles); - serialize_bool(stream, bDisableOnFoot); - serialize_bool(stream, bAcceptNpcGroup); - serialize_bool(stream, bFoodDateFlag); - serialize_bool(stream, bUnknownBurglary); - serialize_bool(stream, bDisableExit); - serialize_bool(stream, bBurglaryAccess); - serialize_bool(stream, bEnteredWithoutExit); - serialize_bool(stream, bEnableAccess); - serialize_bool(stream, bDeleteEnex); - return true; - } -}; -VALIDATE_SIZE(SEntryExitFlags, 0x2); - class PLUGIN_API CEntryExit { PLUGIN_NO_DEFAULT_CONSTRUCTION(CEntryExit) diff --git a/third_party/plugin-sdk/plugin_sa/game_sa/SEntryExitFlags.h b/third_party/plugin-sdk/plugin_sa/game_sa/SEntryExitFlags.h new file mode 100644 index 00000000..05b4e819 --- /dev/null +++ b/third_party/plugin-sdk/plugin_sa/game_sa/SEntryExitFlags.h @@ -0,0 +1,73 @@ +/* + Plugin-SDK (Grand Theft Auto San Andreas) header file + Authors: GTA Community. See more here + https://github.com/DK22Pac/plugin-sdk + Do not delete this comment block. Respect others' work! +*/ +#pragma once + +#include "PluginBase.h" + +struct SEntryExitFlags +{ + SEntryExitFlags() + { + bUnknownInterior = false; + bUnknownPairing = false; + bCreateLinkedPair = false; + bRewardInterior = false; + bUsedRewardEntrance = false; + bCarsAndAircraft = false; + bBikesAndMotorcycles = false; + bDisableOnFoot = false; + bAcceptNpcGroup = false; + bFoodDateFlag = false; + bUnknownBurglary = false; + bDisableExit = false; + bBurglaryAccess = false; + bEnteredWithoutExit = false; + bEnableAccess = false; + bDeleteEnex = false; + } + unsigned short bUnknownInterior : 1; + unsigned short bUnknownPairing : 1; + unsigned short bCreateLinkedPair : 1; + unsigned short bRewardInterior : 1; + unsigned short bUsedRewardEntrance : 1; + unsigned short bCarsAndAircraft : 1; + unsigned short bBikesAndMotorcycles : 1; + unsigned short bDisableOnFoot : 1; + + unsigned short bAcceptNpcGroup : 1; + unsigned short bFoodDateFlag : 1; + unsigned short bUnknownBurglary : 1; + unsigned short bDisableExit : 1; + unsigned short bBurglaryAccess : 1; + unsigned short bEnteredWithoutExit : 1; + unsigned short bEnableAccess : 1; + unsigned short bDeleteEnex : 1; + + + template + bool Serialize(Stream& stream) + { + serialize_bool(stream, bUnknownInterior); + serialize_bool(stream, bUnknownPairing); + serialize_bool(stream, bCreateLinkedPair); + serialize_bool(stream, bRewardInterior); + serialize_bool(stream, bUsedRewardEntrance); + serialize_bool(stream, bCarsAndAircraft); + serialize_bool(stream, bBikesAndMotorcycles); + serialize_bool(stream, bDisableOnFoot); + serialize_bool(stream, bAcceptNpcGroup); + serialize_bool(stream, bFoodDateFlag); + serialize_bool(stream, bUnknownBurglary); + serialize_bool(stream, bDisableExit); + serialize_bool(stream, bBurglaryAccess); + serialize_bool(stream, bEnteredWithoutExit); + serialize_bool(stream, bEnableAccess); + serialize_bool(stream, bDeleteEnex); + return true; + } +}; +VALIDATE_SIZE(SEntryExitFlags, 0x2); diff --git a/third_party/serialize.h b/third_party/serialize.h index 17fae929..23c65def 100644 --- a/third_party/serialize.h +++ b/third_party/serialize.h @@ -1603,7 +1603,15 @@ namespace serialize } serialize_int( stream, length, 0, buffer_size - 1 ); - serialize_bytes( stream, (uint8_t*)string, length * sizeof(wchar_t) ); + // 16 bits per wchar_t whatever sizeof(wchar_t) is (2 on Windows, 4 on Linux), + // byte-identical to the old serialize_bytes of a 2-byte wchar_t string. + // On Linux a code point above U+FFFF gets truncated, relayed UTF-16 is fine + if ( !stream.SerializeAlign() ) + return false; + for ( int i = 0; i < length; i++ ) + { + serialize_bits( stream, string[i], 16 ); + } if ( Stream::IsReading ) { string[length] = L'\0'; @@ -2007,10 +2015,11 @@ namespace serialize #define write_wstring( stream, string, buffer_size ) \ do \ { \ - int length = (int) wcslen( string ); \ - serialize_assert( length < buffer_size ); \ - write_int( stream, length, 0, buffer_size - 1 ); \ - write_bytes( stream, (uint8_t*)string, length * sizeof(wchar_t) ); \ + wchar_t * string_ptr = (wchar_t*) string; \ + if ( !serialize_wstring_internal( stream, string_ptr, buffer_size ) ) \ + { \ + return false; \ + } \ } while (0) #define write_align( stream ) \ diff --git a/xmake.lua b/xmake.lua index e4603aba..756acb44 100644 --- a/xmake.lua +++ b/xmake.lua @@ -1,11 +1,12 @@ set_project("CoopAndreas") set_languages("cxx17") -set_arch("x86") add_rules("mode.debug", "mode.release") if is_os("windows") then + set_arch("x86") + if is_mode("debug") then set_runtimes("MTd") else @@ -17,7 +18,11 @@ target("client", function() set_kind("shared") set_plat("windows") - set_toolchains("msvc") + if is_os("windows") then + set_toolchains("msvc") + else + set_enabled(false) + end set_basename("CoopAndreasSA") set_arch("x86") @@ -105,7 +110,6 @@ end) target("server", function () set_kind("binary") - set_arch("x86") set_languages("c++17") add_files("server/src/**.cpp") @@ -116,15 +120,15 @@ target("server", function () add_headerfiles("shared/**.h") add_headerfiles("third_party/enet/*.h") + -- server/src/sdk stands in for the plugin-sdk headers that need windows.h and x86, + -- so it has to come before game_sa, which supplies the data-only ones add_includedirs( "server/src/", - "third_party/plugin-sdk/shared", - "third_party/plugin-sdk/shared/game", - "third_party/plugin-sdk/plugin_sa", - "third_party/plugin-sdk/plugin_sa/game_sa" + "server/src/sdk" ) add_includedirs("shared", "third_party") + add_includedirs("third_party/plugin-sdk/plugin_sa/game_sa") set_pcxxheader("server/src/stdafx.h") @@ -148,17 +152,20 @@ target("server", function () add_deps("enet") if is_os("windows") then + set_arch("x86") add_files("server/version.rc") add_defines("_CRT_SECURE_NO_WARNINGS", "WIN32", "_CONSOLE") - elseif is_os("linux") then - -- TODO end end) target("proxy", function () set_kind("shared") - set_toolchains("msvc") + if is_os("windows") then + set_toolchains("msvc") + else + set_enabled(false) + end set_arch("x86") set_plat("windows") @@ -190,7 +197,11 @@ end) target("plugin_sa", function () set_kind("static") - set_toolchains("msvc") + if is_os("windows") then + set_toolchains("msvc") + else + set_enabled(false) + end set_arch("x86") set_plat("windows") @@ -221,7 +232,6 @@ target("enet", function () add_headerfiles("third_party/enet/*.h") - add_includedirs("third_party/enet/") add_includedirs("third_party/") set_pcxxheader("third_party/enet/enet.h") @@ -232,7 +242,11 @@ target("discordrpc", function () set_languages("c++17") - set_toolchains("msvc") + if is_os("windows") then + set_toolchains("msvc") + else + set_enabled(false) + end add_includedirs("third_party/DiscordRPC/SDK/include") add_files("third_party/DiscordRPC/SDK/src/*.cpp") @@ -249,7 +263,11 @@ target("launcher", function () set_plat("windows") set_basename("LaunchCoopAndreas") - set_toolchains("msvc") + if is_os("windows") then + set_toolchains("msvc") + else + set_enabled(false) + end add_files("launcher/src/*.cpp") add_headerfiles("launcher/src/*.h")