diff --git a/GOESP/SDK/Entity.h b/GOESP/SDK/Entity.h index d7283b1c..76e0368e 100644 --- a/GOESP/SDK/Entity.h +++ b/GOESP/SDK/Entity.h @@ -73,14 +73,14 @@ class Entity { VIRTUAL_METHOD_V(Collideable*, getCollideable, 3, (), (this)) VIRTUAL_METHOD(Vector&, getAbsOrigin, WIN32_UNIX(10, 12), (), (this)) - VIRTUAL_METHOD(Team, getTeamNumber, WIN32_UNIX(87, 127), (), (this)) - VIRTUAL_METHOD(int, getHealth, WIN32_UNIX(121, 166), (), (this)) - VIRTUAL_METHOD(bool, isAlive, WIN32_UNIX(155, 207), (), (this)) - VIRTUAL_METHOD(bool, isPlayer, WIN32_UNIX(157, 209), (), (this)) - VIRTUAL_METHOD(bool, isWeapon, WIN32_UNIX(165, 217), (), (this)) + VIRTUAL_METHOD(Team, getTeamNumber, WIN32_UNIX(88, 128), (), (this)) + VIRTUAL_METHOD(int, getHealth, WIN32_UNIX(122, 167), (), (this)) + VIRTUAL_METHOD(bool, isAlive, WIN32_UNIX(156, 208), (), (this)) + VIRTUAL_METHOD(bool, isPlayer, WIN32_UNIX(158, 210), (), (this)) + VIRTUAL_METHOD(bool, isWeapon, WIN32_UNIX(166, 218), (), (this)) - VIRTUAL_METHOD(WeaponType, getWeaponType, WIN32_UNIX(454, 522), (), (this)) - VIRTUAL_METHOD(WeaponInfo*, getWeaponInfo, WIN32_UNIX(460, 528), (), (this)) + VIRTUAL_METHOD(WeaponType, getWeaponType, WIN32_UNIX(455, 523), (), (this)) + VIRTUAL_METHOD(WeaponInfo*, getWeaponInfo, WIN32_UNIX(461, 529), (), (this)) static CSPlayer* asPlayer(Entity* entity) noexcept { @@ -128,28 +128,28 @@ class Entity { class CSPlayer : public Entity { public: - VIRTUAL_METHOD(Entity*, getActiveWeapon, WIN32_UNIX(267, 330), (), (this)) - VIRTUAL_METHOD(ObsMode, getObserverMode, WIN32_UNIX(293, 356), (), (this)) - VIRTUAL_METHOD(Entity*, getObserverTarget, WIN32_UNIX(294, 357), (), (this)) + VIRTUAL_METHOD(Entity*, getActiveWeapon, WIN32_UNIX(268, 331), (), (this)) + VIRTUAL_METHOD(ObsMode, getObserverMode, WIN32_UNIX(294, 357), (), (this)) + VIRTUAL_METHOD(Entity*, getObserverTarget, WIN32_UNIX(295, 358), (), (this)) #if IS_WIN32() auto getEyePosition() noexcept { Vector v; - VirtualMethod::call(this, std::ref(v)); + VirtualMethod::call(this, std::ref(v)); return v; } auto getAimPunch() noexcept { Vector v; - VirtualMethod::call(this, std::ref(v)); + VirtualMethod::call(this, std::ref(v)); return v; } #else - VIRTUAL_METHOD(Vector, getEyePosition, 347, (), (this)) - VIRTUAL_METHOD(Vector, getAimPunch, 408, (), (this)) + VIRTUAL_METHOD(Vector, getEyePosition, 348, (), (this)) + VIRTUAL_METHOD(Vector, getAimPunch, 409, (), (this)) #endif bool canSee(Entity* other, const Vector& pos) noexcept; diff --git a/GOESP/SDK/WeaponInfo.h b/GOESP/SDK/WeaponInfo.h index cc15e65a..44c22058 100644 --- a/GOESP/SDK/WeaponInfo.h +++ b/GOESP/SDK/WeaponInfo.h @@ -38,7 +38,7 @@ struct WeaponInfo { float armorRatio; int bullets; float penetration; - PAD(8) + PAD(12) float range; float rangeModifier; PAD(16)