Replace vector indexing with members
Use .x instead of [0] Also add vec_add() to util.c
This commit is contained in:
@@ -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 p2 = vec3(o[0] + bw / 2, o[1] + bw / 2, o[2] + bh / 2);
|
||||
vec3_t p3 = vec3(o[0] - bw / 2, o[1] - bw / 2, o[2] + bh / 2);
|
||||
vec3_t p4 = vec3(o[0] + bw / 2, o[1] - bw / 2, o[2] + bh / 2);
|
||||
vec3_t p5 = vec3(o[0] - bw / 2, o[1] + bw / 2, o[2] - bh / 2);
|
||||
vec3_t p6 = vec3(o[0] + bw / 2, o[1] + bw / 2, o[2] - bh / 2);
|
||||
vec3_t p7 = vec3(o[0] - bw / 2, o[1] - bw / 2, o[2] - bh / 2);
|
||||
vec3_t p8 = 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.x + bw / 2, o.y + bw / 2, o.z + bh / 2);
|
||||
vec3_t p3 = vec3(o.x - bw / 2, o.y - bw / 2, o.z + bh / 2);
|
||||
vec3_t p4 = vec3(o.x + bw / 2, o.y - bw / 2, o.z + bh / 2);
|
||||
vec3_t p5 = vec3(o.x - bw / 2, o.y + bw / 2, o.z - bh / 2);
|
||||
vec3_t p6 = vec3(o.x + bw / 2, o.y + bw / 2, o.z - bh / 2);
|
||||
vec3_t p7 = vec3(o.x - bw / 2, o.y - bw / 2, o.z - 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 top = 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.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))
|
||||
@@ -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))
|
||||
|
||||
@@ -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 vel_dir = atan2f(i_pmove->velocity[1], i_pmove->velocity[0]) - yaw;
|
||||
float yaw = DEG2RAD(viewangles.y);
|
||||
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);
|
||||
|
||||
@@ -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 new_y = cmd->viewangles[1] + (cmd->viewangles[1] < 0 ? 360 : 0);
|
||||
float old_y = old_angles.y + (old_angles.y < 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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user