nullworks/cathook
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove v9 + fix the Joy emoji overlapping with Thinking (#1112)

Browse Source 
* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload
This commit is contained in:
G-4-M-3-R 2020-09-28 20:56:32 +09:30 committed by GitHub
parent de2008f6f3
commit f84279d4e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/textures/atlas.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 410 KiB

After

Width:  |  Height:  |  Size: 378 KiB

BIN
data/textures/atlas.xcf
View File

Binary file not shown.

2
src/hacks/DominateMark.cpp
View File

@ -44,7 +44,7 @@ static InitRoutine init([]() {
Vector out;
if (draw::WorldToScreen(*draw_pos, out))
{
static textures::sprite sprite = textures::atlas().create_sprite(447, 257, 64, 64);
static textures::sprite sprite = textures::atlas().create_sprite(448, 257, 64, 64);
sprite.draw(int(out.x - size / 2.0f), int(out.y - size), int(size), int(size), colors::white);
}
}

6
src/hacks/ESP.cpp
View File

@ -75,8 +75,6 @@ static settings::Boolean entity_info{ "esp.debug.entity", "false" };
static settings::Boolean entity_model{ "esp.debug.model", "false" };
static settings::Boolean entity_id{ "esp.debug.id", "true" };
static settings::Boolean v9mode{ "esp.v952-mode", "false" };
// Unknown
std::mutex threadsafe_mutex;
// Storage array for keeping strings and other data
@ -385,8 +383,6 @@ void _FASTCALL emoji(CachedEntity *ent)
if (draw::WorldToScreen(hit->center, head_scr))
{
float size = emoji_esp_scaling ? fabs(hbm.y - hbx.y) : *emoji_esp_size;
if (v9mode)
size *= 1.4;
if (!size || !emoji_min_size)
return;
if (emoji_esp_scaling && (size < *emoji_min_size))
@ -419,7 +415,7 @@ void _FASTCALL emoji(CachedEntity *ent)
}
}
if (!hascall)
draw::RectangleTextured(head_scr.x - size / 2, head_scr.y - size / 2, size, size, colors::white, atlas, (3 + (v9mode ? 3 : (int) emoji_esp)) * 64, (v9mode ? 3 : 4) * 64, 64, 64, 0);
draw::RectangleTextured(head_scr.x - size / 2, head_scr.y - size / 2, size, size, colors::white, atlas, (3 + (int) emoji_esp) * 64, 4 * 64, 64, 64, 0);
}
}
}

3
src/visual/fidgetspinner.cpp
View File

@ -13,7 +13,6 @@
#ifndef FEATURE_FIDGET_SPINNER_ENABLED
static settings::Boolean enable_spinner{ "visual.fidget-spinner.enable", "false" };
static settings::Boolean v9mode{ "visual.fidget-spinner.v952-mode", "false" };
static settings::Float spinner_speed_cap{ "visual.fidget-spinner.speed-cap", "30" };
static settings::Float spinner_speed_scale{ "visual.fidget-spinner.speed-scale", "0.03" };
static settings::Float spinner_decay_speed{ "visual.fidget-spinner.decay-speed", "0.1" };
@ -80,7 +79,7 @@ void DrawSpinner()
angle += speed_scale * real_speed;
int state = min(3, int(spinning_speed / 250));
draw::RectangleTextured(draw::width / 2 - size * 0.5f, draw::height / 2 - size * 0.5f, size, size, colors::white, textures::atlas().texture, 64 * state, (3 + (v9mode ? 0 : 1)) * 64, 64, 64, angle);
draw::RectangleTextured(draw::width / 2 - size * 0.5f, draw::height / 2 - size * 0.5f, size, size, colors::white, textures::atlas().texture, 64 * state, 4 * 64, 64, 64, angle);
if (angle > PI * 4)
angle -= PI * 4;
}