diff --git a/server/format.cpp b/server/format.cpp new file mode 100644 index 0000000..e69de29 diff --git a/server/format.h b/server/format.h new file mode 100644 index 0000000..e69de29 diff --git a/server/main.h b/server/main.h index 52c9b17..b276fda 100644 --- a/server/main.h +++ b/server/main.h @@ -41,6 +41,7 @@ #include #include + #include #include #else #define SLEEP(x) { usleep(x * 1000); } diff --git a/server/mathutils.cpp b/server/mathutils.cpp index 213281e..6b69dd8 100644 --- a/server/mathutils.cpp +++ b/server/mathutils.cpp @@ -8,7 +8,7 @@ //---------------------------------------------------- -bool unnamed_1(PVECTOR vec) +bool FUNC_1(PVECTOR vec) { if( vec->X <= 1.0f && vec->X >= -1.0f && vec->Y <= 1.0f && vec->Y >= -1.0f && @@ -21,7 +21,7 @@ bool unnamed_1(PVECTOR vec) //---------------------------------------------------- -bool unnamed_2(PVECTOR vec) +bool FUNC_2(PVECTOR vec) { if( vec->X < 20000.0f && vec->X > -20000.0f && vec->Y < 20000.0f && vec->Y > -20000.0f && @@ -34,7 +34,7 @@ bool unnamed_2(PVECTOR vec) //---------------------------------------------------- -bool unnamed_3(PVECTOR vec) +bool FUNC_3(PVECTOR vec) { if( vec->X < 100.0f && vec->X > -100.0f && vec->Y < 100.0f && vec->Y > -100.0f && diff --git a/server/mathutils.h b/server/mathutils.h index 28186a7..c1efa7c 100644 --- a/server/mathutils.h +++ b/server/mathutils.h @@ -1,7 +1,7 @@ -bool unnamed_1(PVECTOR vec); // unused -bool unnamed_2(PVECTOR vec); -bool unnamed_3(PVECTOR vec); +bool FUNC_1(PVECTOR vec); // unused +bool FUNC_2(PVECTOR vec); +bool FUNC_3(PVECTOR vec); float GetLength(PVECTOR vec); void CrossProduct(PVECTOR out, PVECTOR vec1, PVECTOR vec2); // unused void Transform(PVECTOR out, PMATRIX4X4 mat, PVECTOR vec); // unused diff --git a/server/netgame.cpp b/server/netgame.cpp index b0e58cc..70c0086 100644 --- a/server/netgame.cpp +++ b/server/netgame.cpp @@ -645,6 +645,22 @@ void CNetGame::Process() */ } +void CNetGame::BroadcastData(char *szUniqueID, + RakNet::BitStream *bitStream, + PLAYERID excludedPlayer, + char orderingStream) +{ + // TODO: CNetGame::BroadcastData W: .text:0048E190 L: .text:080ABAD0 +} + +void CNetGame::SendToPlayer(char *szUniqueID, + RakNet::BitStream *bitStream, + PLAYERID playerId, + char orderingChannel) +{ + // TODO: CNetGame::SendToPlayer W: .text:0048E440 L: .text:080AC1D0 +} + void CNetGame::LoadBanList() { // TODO: CNetGame::LoadBanList W: 48EAE0 L: 80AF1A0 diff --git a/server/netgame.h b/server/netgame.h index 9b2ac11..2ad1cac 100644 --- a/server/netgame.h +++ b/server/netgame.h @@ -4,7 +4,9 @@ #define MAX_SPAWNS 319 +#define GAMESTATE_STOPPED 0 #define GAMESTATE_RUNNING 1 +#define GAMESTATE_RESTARTING 2 #define INVALID_ID 0xFFFF @@ -94,6 +96,16 @@ public: void Process(); + void BroadcastData( char *szUniqueID, + RakNet::BitStream *bitStream, + PLAYERID excludedPlayer, + char orderingStream ); + + void SendToPlayer( char *szUniqueID, + RakNet::BitStream *bitStream, + PLAYERID playerId, + char orderingChannel ); + void LoadBanList(); // CLASS SYSTEM diff --git a/server/playerpool.h b/server/playerpool.h index e6e11af..c2623e9 100644 --- a/server/playerpool.h +++ b/server/playerpool.h @@ -2,6 +2,8 @@ #ifndef SAMPSRV_PLAYERPOOL_H #define SAMPSRV_PLAYERPOOL_H +#define INVALID_PLAYER_ID 0xFFFF + class CPlayerPool // size: WL 199024 { private: diff --git a/server/server.vcproj b/server/server.vcproj index 993ae51..f1b9f05 100644 --- a/server/server.vcproj +++ b/server/server.vcproj @@ -740,6 +740,12 @@ + + + + @@ -815,6 +821,12 @@ + + + + diff --git a/server/sqlite/sqlite_amx.cpp b/server/sqlite/sqlite_amx.cpp index 5198c0d..f0597d6 100644 --- a/server/sqlite/sqlite_amx.cpp +++ b/server/sqlite/sqlite_amx.cpp @@ -10,6 +10,7 @@ static cell AMX_NATIVE_CALL n_open(AMX* amx, cell* params) { // TODO: n_open + return 0; } // native db_close(DB:db);