Revert "Fix cvars not showing up"

This reverts commit 0e7f955c7d.

Makefile

@@ -5,7 +5,7 @@ INCLUDES=-Isrc/include/sdk/common -Isrc/include/sdk/public -Isrc/include/sdk/pm_
 CFLAGS=-Wall -Wextra -Wno-write-strings -m32 -fPIC $(INCLUDES)
 LDFLAGS=-lm
 
-OBJS=obj/main.c.o obj/globals.c.o obj/cvars.c.o obj/hooks.c.o obj/detour.c.o obj/util.c.o obj/features/movement.c.o obj/features/esp.c.o obj/features/chams.c.o obj/features/misc.c.o
+OBJS=obj/main.c.o obj/globals.c.o obj/cvars.c.o obj/hooks.c.o obj/detour.c.o obj/util.c.o obj/features/movement.c.o obj/features/esp.c.o obj/features/chams.c.o obj/features/aim.c.o obj/features/misc.c.o
 BIN=libhlcheat.so
 
 .PHONY: clean all inject

README.org

@@ -1,14 +1,20 @@
 #+title: Half-Life cheat
 #+options: toc:nil
 #+startup: showeverything
-#+author: 8dcc
+#+author: Wizzard (Original arthur: [[https://github.com/8dcc/][8dcc]])
 
-*Linux cheat for Half-Life 1 (and goldsrc).*
+*Linux cheat for goldsrc games.*
 
 #+TOC: headlines 2
 
 * Description
-Simple linux cheat for Half-Life 1 (and most /goldsrc/ games) made in C.
+Simple linux cheat for most goldsrc games, made in C.
+
+Supported games:
+- [[https://store.steampowered.com/app/70/HalfLife/][Half-Life 1]]
+- [[https://store.steampowered.com/app/10/CounterStrike/][Counter-Strike 1.6]]
+- [[https://store.steampowered.com/app/20/Team_Fortress_Classic/][Team Fortress Classic]]
+- [[https://store.steampowered.com/app/30/Day_of_Defeat/][Day of Defeat]]
 
 This project was heavily inspired by [[https://github.com/UnkwUsr/hlhax][UnkwUsr/hlhax]], and would not have been
 possible without his help. Make sure to check out his repo too.
@@ -19,22 +25,40 @@ Also make sure to check out [[https://github.com/deboogerxyz/ahc][deboogerxyz/ah
 
 | Feature    | Command       | Values (0..n)          |
 |------------+---------------+------------------------|
-| Bhop       | =cv_bhop=       | off/on                 |
+| Bhop       | =dz_bhop=       | off/on                 |
-| ESP        | =cv_esp=        | off/3d-box/name/all    |
+| Autostrafe | =dz_autostrafe= | off/rage/legit         |
-| Autostrafe | =sv_autostrafe= | off/rage/legit         |
+| Aimbot     | =dz_aimbot=     | off/fov*               |
-| Chams      | =cv_chams=      | off/players/hands/all* |
+| Autoshoot  | =dz_autoshoot=  | off/on*                |
-| Crosshair  | =cv_crosshair=  | off/length             |
+| ESP        | =dz_esp=        | off/3d-box/name/all    |
+| Chams      | =dz_chams=      | off/players/hands/all* |
+| Crosshair  | =dz_crosshair=  | off/length             |
+| Tracers    | =dz_tracers=    | off/on*                |
+
+
+#+begin_quote
+*Note:* Aimbot FOV goes from 0 (off) to 180 (all enemies)
+#+end_quote
+
+#+begin_quote
+*Note:* If =dz_autoshoot= is enabled, and =dz_aimbot= is enabled, it will stop
+attacking if there is no visible target.
+#+end_quote
 
 #+begin_quote
 *Note:* Chams color can be changed from the =h_glColor4f()= function inside
-[[https://github.com/8dcc/hl-cheat/blob/main/src/hooks.c][src/hooks.c]]. Since this cheat is not hard to compile, I rather have less
+[[https://git.deadzone.lol/Wizzard/goldsource-cheat/src/branch/main/src/hooks.c][src/hooks.c]]. Since this cheat is not hard to compile, I rather have less
 console variables than more customization at runtime.
 #+end_quote
 
+#+begin_quote
+*Note:* Bullet tracer color, width and time can be changed at the bottom of the
+=bullet_tracers()= function inside [[https://git.deadzone.lol/Wizzard/goldsource-cheat/src/branch/main/src/features/misc.c][src/features/misc.c]]. See previous chams note.
+#+end_quote
+
 * Building
 #+begin_src console
-$ git clone --recurse-submodules https://github.com/8dcc/hl-cheat
+$ git clone --recurse-submodules https://git.deadzone.lol/Wizzard/goldsource-cheat
-$ cd hl-cheat
+$ cd goldsource-cheat
 $ make
 ...
 #+end_src
@@ -43,7 +67,7 @@ Note that you will need to clone with =--recurse-submodules= for the sdk. If you
 have already cloned it, you can just:
 
 #+begin_src console
-$ cd hl-cheat
+$ cd goldsource-cheat
 $ git submodule update --init --recursive
 #+end_src
 
@@ -56,5 +80,5 @@ $ ./injector.sh
 
 ...
 
-hl-cheat loaded!
+goldsource-cheat loaded!
 #+end_src

inject.sh

@@ -30,7 +30,7 @@ if [ "$1" == "unload" ]; then
 fi
 
 if grep -q "$libpath" "/proc/$pid/maps"; then
-    echo -e "hl-cheat already loaded. Reloading...\n";
+    echo -e "goldsource-cheat already loaded. Reloading...\n";
 
     # 0x2 -> RTLD_NOW
     # 0x6 -> RTLD_LAZY | RTLD_NOLOAD

src/cvars.c

@@ -5,18 +5,26 @@
 
 DECL_CVAR(bhop);
 DECL_CVAR(autostrafe);
+DECL_CVAR(aimbot);
+DECL_CVAR(autoshoot);
 DECL_CVAR(esp);
 DECL_CVAR(chams);
 DECL_CVAR(crosshair);
+DECL_CVAR(tracers);
 DECL_CVAR(clmove);
+DECL_CVAR(watermark);
 
 bool cvars_init(void) {
-    cv_bhop       = REGISTER_CVAR("bhop", "1");
+    REGISTER_CVAR(bhop, 1);
-    cv_autostrafe = REGISTER_CVAR("autostrafe", "0");
+    REGISTER_CVAR(autostrafe, 1);
-    cv_esp        = REGISTER_CVAR("esp", "3");
+    REGISTER_CVAR(aimbot, 0);
-    cv_chams      = REGISTER_CVAR("chams", "1");
+    REGISTER_CVAR(autoshoot, 0); /* Only works with aimbot enabled */
-    cv_crosshair  = REGISTER_CVAR("crosshair", "0");
+    REGISTER_CVAR(esp, 3);
-    cv_clmove     = REGISTER_CVAR("clmove", "0");
+    REGISTER_CVAR(chams, 1);
+    REGISTER_CVAR(crosshair, 0);
+    REGISTER_CVAR(tracers, 1);
+    REGISTER_CVAR(clmove, 0);
+    REGISTER_CVAR(watermark, 1);
 
     return true;
 }

src/features/aim.c

@@ -0,0 +1,106 @@
+
+#include <math.h>
+
+#include "features.h"
+#include "../include/sdk.h"
+#include "../include/cvars.h"
+#include "../include/util.h"
+
+/* Game units to add to the entity origin to get the head */
+#define HEAD_OFFSET 25.f
+
+/* Scale factor for aim punch */
+#define AIM_PUNCH_MULT 2
+
+static bool is_visible(vec3_t start, vec3_t end) {
+    /* Syntax: PM_TraceLine(start, end, flags, usehulll, ignore_pe); */
+    pmtrace_t* tr =
+      i_engine->PM_TraceLine(start, end, PM_TRACELINE_PHYSENTSONLY, 2, -1);
+
+    /* We didn't hit a valid entity */
+    if (tr->ent <= 0)
+        return false;
+
+    /* Get entity index from physents, check if we can't get a valid player */
+    const int ent_idx = i_pmove->physents[tr->ent].info;
+    if (!get_player(ent_idx))
+        return false;
+
+    /* We hit a valid player */
+    return true;
+}
+
+static vec3_t get_closest_delta(vec3_t viewangles) {
+    /* Compensate aim punch. We get g_punchAngles from CalcRefdef hook */
+    viewangles.x += g_punchAngles.x * AIM_PUNCH_MULT;
+    viewangles.y += g_punchAngles.y * AIM_PUNCH_MULT;
+    viewangles.z += g_punchAngles.z * AIM_PUNCH_MULT;
+
+    vec3_t view_height;
+    i_engine->pEventAPI->EV_LocalPlayerViewheight(view_height);
+    vec3_t local_eyes = vec_add(localplayer->origin, view_height);
+
+    /* These 2 vars are used to store the best target across iterations.
+     * NOTE: The default value of best_fov will be the aimbot fov */
+    float best_fov    = dz_aimbot->value;
+    vec3_t best_delta = { 0, 0, 0 };
+
+    for (int i = 1; i <= i_engine->GetMaxClients(); i++) {
+        cl_entity_t* ent = get_player(i);
+
+        if (!is_alive(ent) || is_friend(ent))
+            continue;
+
+        /* TODO: Get bones origin instead of calculating from ent origin */
+        vec3_t head_pos = ent->origin;
+        if (ent->curstate.usehull != 1) /* Get head if not crouched */
+            head_pos.z += HEAD_OFFSET;
+
+        if (!is_visible(local_eyes, head_pos)) /* We can't see player */
+            continue;
+
+        const vec3_t enemy_angle = vec_to_ang(vec_sub(head_pos, local_eyes));
+        const vec3_t delta       = vec_sub(enemy_angle, viewangles);
+        vec_norm(delta);
+
+        float fov = hypotf(delta.x, delta.y);
+        if (fov > 360.0f)
+            fov = remainderf(fov, 360.0f);
+        if (fov > 180.0f)
+            fov = 360.0f - fov;
+
+        if (fov < best_fov) {
+            best_fov = fov;
+            vec_copy(best_delta, delta);
+        }
+    }
+
+    return best_delta;
+}
+
+void aimbot(usercmd_t* cmd) {
+    if (!CVAR_ON(aimbot) || !(cmd->buttons & IN_ATTACK) || !can_shoot())
+        return;
+
+    /* Calculate delta with the engine viewangles, not with the cmd ones */
+    vec3_t engine_viewangles;
+    i_engine->GetViewAngles(engine_viewangles);
+
+    /* TODO: Add setting for lowest health */
+    vec3_t best_delta = get_closest_delta(engine_viewangles);
+    if (!vec_is_zero(best_delta)) {
+        /* NOTE: We can divide the best delta here to add smoothing */
+
+        engine_viewangles.x += best_delta.x;
+        engine_viewangles.y += best_delta.y;
+        engine_viewangles.z += best_delta.z;
+    } else if (CVAR_ON(autoshoot)) {
+        /* No valid target and we have autoshoot, don't shoot */
+        cmd->buttons &= ~IN_ATTACK;
+    }
+
+    vec_copy(cmd->viewangles, engine_viewangles);
+
+    /* NOTE: Uncomment to disable silent aim */
+    /* i_engine->SetViewAngles(engine_viewangles); */
+}

src/features/chams.c

@@ -15,7 +15,7 @@ enum chams_settings {
 visible_flags visible_mode;
 
 bool chams(void* this_ptr) {
-    const int setting = cv_chams->value == 5.0f ? 7 : cv_chams->value;
+    const int setting = dz_chams->value == 5.0f ? 7 : dz_chams->value;
     if (setting == DISABLED)
         return false;
 

src/features/esp.c

@@ -5,7 +5,7 @@
 #include "../include/cvars.h"
 #include "../include/util.h"
 
-/* For cv_esp */
+/* For dz_esp */
 enum esp_values {
     ESP_OFF  = 0,
     ESP_BOX  = 1,
@@ -36,14 +36,14 @@ bool gl_draw3dbox(vec3_t o, int bh, int bw, int lw) {
      *   |/ O|/     z(-)
      *   7---8
      */
-    vec3_t p1 = vec3(o[0] - bw / 2, o[1] + bw / 2, o[2] + bh / 2);
+    vec3_t p1 = vec3(o.x - bw / 2, o.y + bw / 2, o.z + bh / 2);
-    vec3_t p2 = vec3(o[0] + bw / 2, o[1] + bw / 2, o[2] + bh / 2);
+    vec3_t p2 = vec3(o.x + bw / 2, o.y + bw / 2, o.z + bh / 2);
-    vec3_t p3 = vec3(o[0] - bw / 2, o[1] - bw / 2, o[2] + bh / 2);
+    vec3_t p3 = vec3(o.x - bw / 2, o.y - bw / 2, o.z + bh / 2);
-    vec3_t p4 = vec3(o[0] + bw / 2, o[1] - bw / 2, o[2] + bh / 2);
+    vec3_t p4 = vec3(o.x + bw / 2, o.y - bw / 2, o.z + bh / 2);
-    vec3_t p5 = vec3(o[0] - bw / 2, o[1] + bw / 2, o[2] - bh / 2);
+    vec3_t p5 = vec3(o.x - bw / 2, o.y + bw / 2, o.z - bh / 2);
-    vec3_t p6 = vec3(o[0] + bw / 2, o[1] + bw / 2, o[2] - bh / 2);
+    vec3_t p6 = vec3(o.x + bw / 2, o.y + bw / 2, o.z - bh / 2);
-    vec3_t p7 = vec3(o[0] - bw / 2, o[1] - bw / 2, o[2] - bh / 2);
+    vec3_t p7 = vec3(o.x - bw / 2, o.y - bw / 2, o.z - bh / 2);
-    vec3_t p8 = vec3(o[0] + bw / 2, o[1] - bw / 2, o[2] - bh / 2);
+    vec3_t p8 = vec3(o.x + bw / 2, o.y - bw / 2, o.z - bh / 2);
 
     vec2_t s1, s2, s3, s4, s5, s6, s7, s8;
     if (!world_to_screen(p1, s1) || !world_to_screen(p2, s2) ||
@@ -78,8 +78,8 @@ static bool gl_draw2dbox(vec3_t o, int bh) {
     const rgb_t out_col = { 0, 0, 0 };       /* Outline */
 
     /* Get top and bottom of player from origin with box height */
-    const vec3_t bot = vec3(o[0], o[1], o[2] - bh / 2);
+    const vec3_t bot = vec3(o.x, o.y, o.z - bh / 2);
-    const vec3_t top = vec3(o[0], o[1], o[2] + bh / 2);
+    const vec3_t top = vec3(o.x, o.y, o.z + bh / 2);
 
     vec2_t s_bot, s_top;
     if (!world_to_screen(bot, s_bot) || !world_to_screen(top, s_top))
@@ -98,7 +98,7 @@ static bool gl_draw2dbox(vec3_t o, int bh) {
 }
 
 void esp(void) {
-    const int setting = (int)cv_esp->value;
+    const int setting = (int)dz_esp->value;
     if (setting == ESP_OFF)
         return;
 
@@ -121,7 +121,7 @@ void esp(void) {
             continue;
 
         /* Draw name on top of the player. */
-        vec3_t top = vec3(ent->origin[0], ent->origin[1], ent->origin[2] + bh);
+        vec3_t top = vec3(ent->origin.x, ent->origin.y, ent->origin.z + bh);
         vec2_t s_top;
 
         if (!world_to_screen(top, s_top))

src/features/features.h

@@ -26,7 +26,11 @@ void correct_movement(usercmd_t* cmd, vec3_t old_angles);
 extern visible_flags visible_mode;
 bool chams(void* this_ptr);
 
+/* src/features/aim.c */
+void aimbot(usercmd_t* cmd);
+
 /* src/features/misc.c */
 void custom_crosshair(void);
+void bullet_tracers(usercmd_t* cmd);
 
 #endif /* FEATURES_H_ */

src/features/misc.c

@@ -14,7 +14,7 @@ void custom_crosshair(void) {
     int my = game_info->m_height / 2;
 
     /* The real length is sqrt(2 * (len^2)) */
-    const int len   = cv_crosshair->value;
+    const int len   = dz_crosshair->value;
     const int gap   = 1;
     const float w   = 1;
     const rgb_t col = { 255, 255, 255 };
@@ -29,3 +29,30 @@ void custom_crosshair(void) {
     gl_drawline(mx - gap, my + gap, mx - gap - len, my + gap + len, w, col);
     gl_drawline(mx + gap, my + gap, mx + gap + len, my + gap + len, w, col);
 }
+
+void bullet_tracers(usercmd_t* cmd) {
+    /* Only draw if we are holding attack and we can shoot */
+    if (!CVAR_ON(tracers) || !(cmd->buttons & IN_ATTACK) || !can_shoot() ||
+        !is_alive(localplayer))
+        return;
+
+    /* Get player eye pos, start of tracer */
+    vec3_t view_height;
+    i_engine->pEventAPI->EV_LocalPlayerViewheight(view_height);
+    vec3_t local_eyes = vec_add(localplayer->origin, view_height);
+
+    /* Get forward vector from viewangles */
+    vec3_t fwd;
+    i_engine->pfnAngleVectors(cmd->viewangles, fwd, NULL, NULL);
+
+    const int tracer_len = 3000;
+    vec3_t end;
+    end.x = local_eyes.x + fwd.x * tracer_len;
+    end.y = local_eyes.y + fwd.y * tracer_len;
+    end.z = local_eyes.z + fwd.z * tracer_len;
+
+    /* NOTE: Change tracer settings here */
+    const float w    = 0.8;
+    const float time = 2;
+    draw_tracer(local_eyes, end, (rgb_t){ 66, 165, 245 }, 1, w, time);
+}

src/features/movement.c

@@ -31,7 +31,7 @@ static void autostrafe_rage(usercmd_t* cmd) {
     /* TODO: Get at runtime */
     const float sv_airaccelerate = 10.0f;
     const float sv_maxspeed      = 320.0f;
-    const float cl_forwardspeed  = 400.0f;
+    const float cl_forwardspeed  = 425.0f;
     const float cl_sidespeed     = 400.0f;
 
     float speed = vec_len2d(i_pmove->velocity);
@@ -53,8 +53,8 @@ static void autostrafe_rage(usercmd_t* cmd) {
     i_engine->GetViewAngles(viewangles);
 
     /* Get our desired angles and delta */
-    float yaw        = DEG2RAD(viewangles[1]);
+    float yaw        = DEG2RAD(viewangles.y);
-    float vel_dir    = atan2f(i_pmove->velocity[1], i_pmove->velocity[0]) - yaw;
+    float vel_dir    = atan2f(i_pmove->velocity.y, i_pmove->velocity.x) - yaw;
     float target_ang = atan2f(-cmd->sidemove, cmd->forwardmove);
     float delta      = angle_delta_rad(vel_dir, target_ang);
 
@@ -82,7 +82,7 @@ void bhop(usercmd_t* cmd) {
 
     /* Autostrafe if enabled. Check if we are in the air and holding space. */
     if (is_jumping) {
-        switch ((int)cv_autostrafe->value) {
+        switch ((int)dz_autostrafe->value) {
             case 1:
                 autostrafe_rage(cmd);
                 break;
@@ -101,8 +101,8 @@ void bhop(usercmd_t* cmd) {
  *   https://github.com/deboogerxyz/ahc/blob/0492646e28dd7234a8cd431d37b152dc18a21b04/ahc.c#L377
  */
 void correct_movement(usercmd_t* cmd, vec3_t old_angles) {
-    float old_y = old_angles[1] + (old_angles[1] < 0 ? 360 : 0);
+    float old_y = old_angles.y + (old_angles.y < 0 ? 360 : 0);
-    float new_y = cmd->viewangles[1] + (cmd->viewangles[1] < 0 ? 360 : 0);
+    float new_y = cmd->viewangles.y + (cmd->viewangles.y < 0 ? 360 : 0);
     float delta = (new_y < old_y) ? fabsf(new_y - old_y)
                                   : 360 - fabsf(new_y - old_y);
 

src/globals.c

@@ -8,7 +8,12 @@
 #include "include/sdk.h"
 #include "include/util.h"
 
-enum game_id this_game_id = HL;
+game_id this_game_id = HL;
+vec3_t g_punchAngles = { 0, 0, 0 };
+
+/* Weapon info */
+float g_flNextAttack = 0.f, g_flNextPrimaryAttack = 0.f;
+int g_iClip = 0;
 
 void* hw;
 void** h_client;
@@ -37,13 +42,13 @@ bool globals_init(void) {
      */
     hw = dlopen("hw.so", RTLD_LAZY | RTLD_NOLOAD);
     if (!hw) {
-        printf("hl-cheat: globals_init: can't open hw.so\n");
+        printf("goldsource-cheat: globals_init: can't open hw.so\n");
         return false;
     }
 
     h_client = (void**)dlsym(hw, "hClientDLL");
     if (!h_client) {
-        printf("hl-cheat: globals_init: can't find hClientDLL\n");
+        printf("goldsource-cheat: globals_init: can't find hClientDLL\n");
         return false;
     }
 
@@ -62,12 +67,12 @@ bool globals_init(void) {
 
     if (!i_engine || !i_client || !i_pmove || !i_enginestudio ||
         !i_studiomodelrenderer || !game_info) {
-        printf("hl-cheat: globals_init: couldn't load some symbols\n");
+        printf("goldsource-cheat: globals_init: couldn't load some symbols\n");
         return false;
     }
 
     if (!protect_addr(i_studiomodelrenderer, PROT_READ | PROT_WRITE)) {
-        printf("hl-cheat: globals_init: couldn't unprotect address of SMR\n");
+        printf("goldsource-cheat: globals_init: couldn't unprotect address of SMR\n");
         return false;
     }
 

src/hooks.c

@@ -11,6 +11,8 @@
 DECL_HOOK(CL_CreateMove);
 DECL_HOOK(HUD_Redraw);
 DECL_HOOK(StudioRenderModel);
+DECL_HOOK(CalcRefdef);
+DECL_HOOK(HUD_PostRunCmd);
 
 /* OpenGL hooks */
 DECL_HOOK(glColor4f);
@@ -27,6 +29,8 @@ bool hooks_init(void) {
     HOOK(i_client, CL_CreateMove);
     HOOK(i_client, HUD_Redraw);
     HOOK(i_studiomodelrenderer, StudioRenderModel);
+    HOOK(i_client, CalcRefdef);
+    HOOK(i_client, HUD_PostRunCmd);
 
     /* OpenGL hooks */
     GL_HOOK(glColor4f);
@@ -58,6 +62,8 @@ void h_CL_CreateMove(float frametime, usercmd_t* cmd, int active) {
     localplayer = i_engine->GetLocalPlayer();
 
     bhop(cmd);
+    aimbot(cmd);
+    bullet_tracers(cmd);
 
     correct_movement(cmd, old_angles);
     vec_clamp(cmd->viewangles);
@@ -68,8 +74,10 @@ void h_CL_CreateMove(float frametime, usercmd_t* cmd, int active) {
 int h_HUD_Redraw(float time, int intermission) {
     int ret = ORIGINAL(HUD_Redraw, time, intermission);
 
+    if (dz_watermark->value) {
         /* Watermark */
-    engine_draw_text(5, 5, "8dcc/hl-cheat", (rgb_t){ 255, 255, 255 });
+        engine_draw_text(5, 5, "https://git.deadzone.lol/Wizzard/goldsource-cheat", (rgb_t){ 0, 255, 255 });
+    }
 
     esp();
     custom_crosshair();
@@ -86,6 +94,31 @@ void h_StudioRenderModel(void* this_ptr) {
 
 /*----------------------------------------------------------------------------*/
 
+void h_CalcRefdef(ref_params_t* params) {
+    /* Store punch angles for CreateMove */
+    vec_copy(g_punchAngles, params->punchangle);
+
+    ORIGINAL(CalcRefdef, params);
+}
+
+/*----------------------------------------------------------------------------*/
+
+void h_HUD_PostRunCmd(struct local_state_s* from, struct local_state_s* to,
+                      struct usercmd_s* cmd, int runfuncs, double time,
+                      unsigned int random_seed) {
+    ORIGINAL(HUD_PostRunCmd, from, to, cmd, runfuncs, time, random_seed);
+
+    /* Store attack information to check if we can shoot */
+    if (runfuncs) {
+        g_flNextAttack = to->client.m_flNextAttack;
+        g_flNextPrimaryAttack =
+          to->weapondata[to->client.m_iId].m_flNextPrimaryAttack;
+        g_iClip = to->weapondata[to->client.m_iId].m_iClip;
+    }
+}
+
+/*----------------------------------------------------------------------------*/
+
 void h_glColor4f(GLfloat r, GLfloat g, GLfloat b, GLfloat a) {
     /* This visible_mode variable is changed inside the chams() function, which
      * is called from the StudioRenderModel hook.
@@ -131,8 +164,8 @@ void h_glColor4f(GLfloat r, GLfloat g, GLfloat b, GLfloat a) {
 /*----------------------------------------------------------------------------*/
 
 void h_CL_Move() {
-    if (cv_clmove->value != 0) {
+    if (dz_clmove->value != 0) {
-        for (int i = 0; i < (int)cv_clmove->value; i++)
+        for (int i = 0; i < (int)dz_clmove->value; i++)
             CALL_ORIGINAL(detour_data_clmove, clmove_type);
     }
 

src/include/cvars.h

@@ -5,7 +5,7 @@
 #include "sdk.h"
 #include "globals.h"
 
-#define CVAR_PREFIX  "cv_"
+#define CVAR_PREFIX  "dz_"
 #define CVAR_HACK_ID 0x4000 /* (1<<14) One that is not in use by the game */
 
 /*
@@ -16,25 +16,30 @@
  *
  * prefix | meaning
  * -------+-------------------------------
- * cv_*   | cvar variable
+ * dz_*   | cvar variable
  */
-#define DECL_CVAR(name) cvar_t* cv_##name = NULL;
+#define DECL_CVAR(name) cvar_t* dz_##name = NULL;
 
-#define DECL_CVAR_EXTERN(name) extern cvar_t* cv_##name;
+#define DECL_CVAR_EXTERN(name) extern cvar_t* dz_##name;
 
 #define REGISTER_CVAR(name, value) \
-    i_engine->pfnRegisterVariable(CVAR_PREFIX name, value, CVAR_HACK_ID);
+    dz_##name =                    \
+      i_engine->pfnRegisterVariable(CVAR_PREFIX #name, #value, CVAR_HACK_ID);
 
-#define CVAR_ON(name) (cv_##name->value != 0.0f)
+#define CVAR_ON(name) (dz_##name->value != 0.0f)
 
 /*----------------------------------------------------------------------------*/
 
 DECL_CVAR_EXTERN(bhop);
 DECL_CVAR_EXTERN(autostrafe);
+DECL_CVAR_EXTERN(aimbot);
+DECL_CVAR_EXTERN(autoshoot);
 DECL_CVAR_EXTERN(esp);
 DECL_CVAR_EXTERN(chams);
 DECL_CVAR_EXTERN(crosshair);
+DECL_CVAR_EXTERN(tracers);
 DECL_CVAR_EXTERN(clmove);
+DECL_CVAR_EXTERN(watermark);
 
 /*----------------------------------------------------------------------------*/
 

src/include/globals.h

@@ -34,6 +34,9 @@ enum game_id {
 /*----------------------------------------------------------------------------*/
 
 extern game_id this_game_id;
+extern vec3_t g_punchAngles;
+extern float g_flNextAttack, g_flNextPrimaryAttack;
+extern int g_iClip;
 
 extern void* hw;
 extern void** h_client; /* hClientDLL hander */

src/include/hooks.h

@@ -95,6 +95,10 @@ void hooks_restore(void);
 DECL_HOOK_EXTERN(void, CL_CreateMove, float, usercmd_t*, int);
 DECL_HOOK_EXTERN(int, HUD_Redraw, float, int);
 DECL_HOOK_EXTERN(void, StudioRenderModel, void*);
+DECL_HOOK_EXTERN(void, CalcRefdef, ref_params_t*);
+DECL_HOOK_EXTERN(void, HUD_PostRunCmd, struct local_state_s*,
+                 struct local_state_s*, struct usercmd_s*, int, double,
+                 unsigned int);
 
 /* OpenGL hooks */
 DECL_HOOK_EXTERN(void, glColor4f, GLfloat, GLfloat, GLfloat, GLfloat);

src/include/main.h

@@ -3,6 +3,7 @@
 #define MAIN_H_
 
 void load(void);
+void unload(void);
 void self_unload(void);
 
 #endif /* MAIN_H_ */

src/include/sdk.h

@@ -11,6 +11,9 @@
 #include "sdk/cl_dll/wrect.h"
 #include "sdk/cl_dll/cl_dll.h"
 
+/* event_api_s */
+#include "sdk/common/event_api.h"
+
 /* usercmd_t */
 #include "sdk/common/usercmd.h"
 
@@ -32,6 +35,9 @@
 /* engine_studio_api_t */
 #include "sdk/common/r_studioint.h"
 
+typedef float matrix_3x4[3][4];
+typedef matrix_3x4 bone_matrix[128];
+
 /*
  * Credits:
  *   https://github.com/UnkwUsr/hlhax/blob/26491984996c8389efec977ed940c5a67a0ecca4/src/sdk.h#L45
@@ -56,7 +62,7 @@ typedef struct cl_clientfuncs_s {
     void (*CL_CameraOffset)(float* ofs);
     struct kbutton_s* (*KB_Find)(const char* name);
     void (*CAM_Think)(void);
-    void (*V_CalcRefdef)(struct ref_params_s* pparams);
+    void (*CalcRefdef)(struct ref_params_s* pparams);
     int (*HUD_AddEntity)(int type, struct cl_entity_s* ent,
                          const char* modelname);
 

src/include/util.h

@@ -14,28 +14,42 @@ typedef struct {
     uint8_t r, g, b;
 } rgb_t;
 
-#define DEG2RAD(n) ((n)*M_PI / 180.0)
+#define DEG2RAD(n) ((n)*M_PI / 180.0f)
+#define RAD2DEG(n) ((n)*180.0f / M_PI)
 #define CLAMP(val, min, max) \
     (((val) > (max)) ? (max) : (((val) < (min)) ? (min) : (val)))
 
 #define gl_drawline_points(p0, p1, w, col) \
     gl_drawline(p0[0], p0[1], p1[0], p1[1], w, col);
 
+/* Use indexes so it works for float[] as well as vec3_t */
+#define vec_copy(dst, src) \
+    dst[0] = src[0];       \
+    dst[1] = src[1];       \
+    dst[2] = src[2];
+
 /*----------------------------------------------------------------------------*/
 
 cl_entity_t* get_player(int ent_idx);
 bool is_alive(cl_entity_t* ent);
 bool valid_player(cl_entity_t* ent);
 bool is_friend(cl_entity_t* ent);
+bool can_shoot(void);
 char* get_name(int ent_idx);
 game_id get_cur_game(void);
 vec3_t vec3(float x, float y, float z);
+vec3_t vec_add(vec3_t a, vec3_t b);
+vec3_t vec_sub(vec3_t a, vec3_t b);
 bool vec_is_zero(vec3_t v);
 float vec_len2d(vec3_t v);
 void vec_clamp(vec3_t v);
+void vec_norm(vec3_t v);
 float angle_delta_rad(float a, float b);
+vec3_t vec_to_ang(vec3_t v);
+vec3_t matrix_3x4_origin(matrix_3x4 m);
 bool world_to_screen(vec3_t vec, vec2_t screen);
 void engine_draw_text(int x, int y, char* s, rgb_t c);
+void draw_tracer(vec3_t start, vec3_t end, rgb_t c, float a, float w, float t);
 void gl_drawbox(int x, int y, int w, int h, rgb_t c);
 void gl_drawline(int x0, int y0, int x1, int y1, float w, rgb_t col);
 bool protect_addr(void* ptr, int new_flags);

src/main.c

@@ -13,25 +13,25 @@ static bool loaded = false;
 
 __attribute__((constructor)) /* Entry point when injected */
 void load(void) {
-    printf("hl-cheat injected!\n");
+    printf("goldsource-cheat injected!\n");
 
     /* Initialize globals/interfaces */
     if (!globals_init()) {
-        fprintf(stderr, "hl-cheat: load: error loading globals, aborting\n");
+        fprintf(stderr, "goldsource-cheat: load: error loading globals, aborting\n");
         self_unload();
         return;
     }
 
     /* Create cvars for settings */
     if (!cvars_init()) {
-        fprintf(stderr, "hl-cheat: load: error creating cvars, aborting\n");
+        fprintf(stderr, "goldsource-cheat: load: error creating cvars, aborting\n");
         self_unload();
         return;
     }
 
     /* Hook functions */
     if (!hooks_init()) {
-        fprintf(stderr, "hl-cheat: load: error hooking functions, aborting\n");
+        fprintf(stderr, "goldsource-cheat: load: error hooking functions, aborting\n");
         self_unload();
         return;
     }
@@ -39,13 +39,13 @@ void load(void) {
     /* Get game version after injecting */
     this_game_id = get_cur_game();
 
-    i_engine->pfnClientCmd("echo \"hl-cheat loaded successfully!\"");
+    i_engine->pfnClientCmd("echo \"goldsource-cheat loaded successfully!\"");
 
     loaded = true;
 }
 
 __attribute__((destructor)) /* Entry point when unloaded */
-void unload() {
+void unload(void) {
     if (loaded) {
         /* TODO: Remove our cvars */
 
@@ -55,7 +55,7 @@ void unload() {
         GL_UNHOOK(glColor4f); /* Manually restore OpenGL hooks here */
     }
 
-    printf("hl-cheat unloaded.\n\n");
+    printf("goldsource-cheat unloaded.\n\n");
 }
 
 void self_unload(void) {

src/util.c

@@ -63,6 +63,11 @@ bool is_friend(cl_entity_t* ent) {
     }
 }
 
+bool can_shoot(void) {
+    return g_iClip > 0 && g_flNextAttack <= 0.0f &&
+           g_flNextPrimaryAttack <= 0.0f;
+}
+
 char* get_name(int ent_idx) {
     hud_player_info_t info;
     i_engine->pfnGetPlayerInfo(ent_idx, &info);
@@ -93,15 +98,35 @@ game_id get_cur_game(void) {
 vec3_t vec3(float x, float y, float z) {
     vec3_t ret;
 
-    ret[0] = x;
+    ret.x = x;
-    ret[1] = y;
+    ret.y = y;
-    ret[2] = z;
+    ret.z = z;
+
+    return ret;
+}
+
+vec3_t vec_add(vec3_t a, vec3_t b) {
+    vec3_t ret;
+
+    ret.x = a.x + b.x;
+    ret.y = a.y + b.y;
+    ret.z = a.z + b.z;
+
+    return ret;
+}
+
+vec3_t vec_sub(vec3_t a, vec3_t b) {
+    vec3_t ret;
+
+    ret.x = a.x - b.x;
+    ret.y = a.y - b.y;
+    ret.z = a.z - b.z;
 
     return ret;
 }
 
 bool vec_is_zero(vec3_t v) {
-    return v[0] == 0.0f && v[1] == 0.0f && v[2] == 0.0f;
+    return v.x == 0.0f && v.y == 0.0f && v.z == 0.0f;
 }
 
 float vec_len2d(vec3_t v) {
@@ -109,9 +134,15 @@ float vec_len2d(vec3_t v) {
 }
 
 void vec_clamp(vec3_t v) {
-    v[0] = CLAMP(v[0], -89.0f, 89.0f);
+    v.x = CLAMP(v.x, -89.0f, 89.0f);
-    v[1] = CLAMP(remainderf(v[1], 360.0f), -180.0f, 180.0f); /* v.y % 360 */
+    v.y = CLAMP(remainderf(v.y, 360.0f), -180.0f, 180.0f); /* v.y % 360 */
-    v[2] = CLAMP(v[2], -50.0f, 50.0f);
+    v.z = CLAMP(v.z, -50.0f, 50.0f);
+}
+
+void vec_norm(vec3_t v) {
+    v.x = isfinite(v.x) ? remainder(v.x, 360) : 0;
+    v.y = isfinite(v.y) ? remainder(v.y, 360) : 0;
+    v.z = 0.0f;
 }
 
 float angle_delta_rad(float a, float b) {
@@ -125,6 +156,26 @@ float angle_delta_rad(float a, float b) {
     return delta;
 }
 
+vec3_t vec_to_ang(vec3_t v) {
+    vec3_t ret;
+
+    ret.x = RAD2DEG(atan2(-v.z, hypot(v.x, v.y)));
+    ret.y = RAD2DEG(atan2(v.y, v.x));
+    ret.z = 0.0f;
+
+    return ret;
+}
+
+vec3_t matrix_3x4_origin(matrix_3x4 m) {
+    vec3_t ret;
+
+    ret.x = m[0][3];
+    ret.y = m[1][3];
+    ret.z = m[2][3];
+
+    return ret;
+}
+
 bool world_to_screen(vec3_t vec, vec2_t screen) {
     if (vec_is_zero(vec))
         return false;
@@ -158,6 +209,19 @@ void engine_draw_text(int x, int y, char* s, rgb_t c) {
     i_engine->pfnDrawConsoleString(x, y, s);
 }
 
+void draw_tracer(vec3_t start, vec3_t end, rgb_t c, float a, float w,
+                 float time) {
+    static const char* MDL_STR = "sprites/laserbeam.spr";
+    static int beam_idx = i_engine->pEventAPI->EV_FindModelIndex(MDL_STR);
+
+    float r = c.r / 255.f;
+    float g = c.g / 255.f;
+    float b = c.b / 255.f;
+
+    i_engine->pEfxAPI->R_BeamPoints(start, end, beam_idx, time, w, 0, a, 0, 0,
+                                    0, r, g, b);
+}
+
 void gl_drawbox(int x, int y, int w, int h, rgb_t c) {
     /* Line width */
     const int lw = 1;
@@ -207,7 +271,7 @@ bool protect_addr(void* ptr, int new_flags) {
     int pgsz = getpagesize();
 
     if (mprotect(p, pgsz, new_flags) == -1) {
-        printf("hl-cheat: error protecting %p\n", ptr);
+        printf("goldsource-cheat: error protecting %p\n", ptr);
         return false;
     }