Skip to content

GCC fixes (and something else) #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
3 commits merged into from
Nov 19, 2016
Merged

GCC fixes (and something else) #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
25e1eb8
Fix GCC errors
ziggi Nov 18, 2016
890de0f
Fix wLRAnalog and wUDAnalog comments
ziggi Nov 18, 2016
296c275
Add *.so and *.o to .gitignore
ziggi Nov 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Linux stuff
*.so
*.o

## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

Expand Down
32 changes: 19 additions & 13 deletions src/Structs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,23 @@
#ifndef YSF_STRUCTS_H
#define YSF_STRUCTS_H

#include "CServer.h"
#include "CVector.h"
#include "CVector2D.h"
#include "CGangZonePool.h"
#include "CPickupPool.h"
#include <map>

#include <raknet/BitStream.h>
#include <sampgdk/sampgdk.h>

#if !defined PAD
#define PAD(a, b) char a[b]
#endif

typedef unsigned long DWORD;
typedef int BOOL;
typedef unsigned char BYTE;
typedef unsigned short WORD;
typedef float FLOAT;

/* -------------------------------------------------------- */

// Defines
Expand Down Expand Up @@ -127,8 +134,8 @@ struct CAimSyncData
struct CVehicleSyncData
{
WORD wVehicleId; // 0x001F - 0x0021
WORD wLRAnalog; // 0x0023 - 0x0025
WORD wUDAnalog; // 0x0021 - 0x0023
WORD wLRAnalog; // 0x0021 - 0x0023
WORD wUDAnalog; // 0x0023 - 0x0025
WORD wKeys; // 0x0025 - 0x0027
float fQuaternion[4]; // 0x002B - 0x0037
CVector vecPosition; // 0x0037 - 0x0043
Expand Down Expand Up @@ -157,17 +164,17 @@ struct CPassengerSyncData
BYTE bytePlayerWeapon; // 0x0061 - 0x0062
BYTE bytePlayerHealth; // 0x0062 - 0x0063
BYTE bytePlayerArmour; // 0x0063 - 0x0064
WORD wLRAnalog; // 0x0066 - 0x0068
WORD wUDAnalog; // 0x0064 - 0x0066
WORD wLRAnalog; // 0x0064 - 0x0066
WORD wUDAnalog; // 0x0066 - 0x0068
WORD wKeys; // 0x0068 - 0x006A
CVector vecPosition; // 0x006A - 0x0076
// Size = 24
};

struct CSyncData
{
WORD wLRAnalog; // 0x0078 - 0x007A
WORD wUDAnalog; // 0x0076 - 0x0078
WORD wLRAnalog; // 0x0076 - 0x0078
WORD wUDAnalog; // 0x0078 - 0x007A
WORD wKeys; // 0x007A - 0x007C
CVector vecPosition; // 0x007C - 0x0088
float fQuaternion[4]; // 0x0088 - 0x008C
Expand Down Expand Up @@ -353,8 +360,8 @@ struct CPlayer
float fQuaternion[4]; // 10537 - 10553
float fAngle; // 10553 - 10557
CVector vecVelocity; // 10557 - 10569
WORD wLRAnalog; // 10571
WORD wUDAnalog; // 10569
WORD wLRAnalog; // 10569
WORD wUDAnalog; // 10571
DWORD dwKeys; // 10573 - 10577
DWORD dwOldKeys; // 10577 - 10581
BOOL bEditObject; // 10581 - 10585
Expand Down Expand Up @@ -441,9 +448,8 @@ struct CPlayerPool // sizeof = 99520
// CVehicle
/* -------------------------------------------------------- */

class CVehicleSpawn // size 36
struct CVehicleSpawn // size 36
{
public:
int iModelID;
CVector vecPos;
float fRot;
Expand Down
3 changes: 2 additions & 1 deletion src/main.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,12 @@ using sampgdk::logprintf;
#include "CPickupPool.h"
#include "CPlayerData.h"
#include "CVector.h"
#include "CServer.h"
#include "Functions.h"
#include "Hooks.h"
#include "RPCs.h"
#include "Scripting.h"
//#include "Structs.h"
#include "Structs.h"
#include "Utils.h"

// ---------
Expand Down