From 26c96d8f9a00a8ed4bbcfa0ffb7a80b23ef91461 Mon Sep 17 00:00:00 2001
From: nullifiedcat <nullifiedcat@gmail.com>
Date: Sun, 26 Mar 2017 10:08:14 +0300
Subject: [PATCH] FIX: bhop doesn't work when disguised, mannpower powerups
 don't show in ESP, added git commit hash/date to info, probably fixed one
 random crash

---
 makefile                    | 5 +++++
 src/hacks/Bunnyhop.cpp      | 4 +++-
 src/helpers.cpp             | 2 +-
 src/hooks/PaintTraverse.cpp | 4 ++++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/makefile b/makefile
index 247633fd..1af71c2c 100644
--- a/makefile
+++ b/makefile
@@ -17,6 +17,11 @@ OBJECTS = $(SOURCES:.cpp=.o)
 DEPENDS = $(SOURCES:.cpp=.d)
 SRC_SUBDIRS=$(shell find $(SRC_DIR) -type d -print)
 
+GIT_COMMIT_HASH=$(shell git log -1 --pretty="%h")
+GIT_COMMIT_DATE=$(shell git log -1 --pretty="%ai")
+
+CXXFLAGS += -DGIT_COMMIT_HASH="\"$(GIT_COMMIT_HASH)\"" -DGIT_COMMIT_DATE="\"$(GIT_COMMIT_DATE)\""
+
 .PHONY: clean directories
 
 all:
diff --git a/src/hacks/Bunnyhop.cpp b/src/hacks/Bunnyhop.cpp
index 20ce10e4..fe62f8f9 100644
--- a/src/hacks/Bunnyhop.cpp
+++ b/src/hacks/Bunnyhop.cpp
@@ -19,9 +19,11 @@ int iTicksLastJump { 0 };
 
 void CreateMove() {
 	if (!enabled) return;
-	if (HasCondition(g_pLocalPlayer->entity, TFCond_GrapplingHook)) return;
+	//if (HasCondition(g_pLocalPlayer->entity, TFCond_GrapplingHook)) return;
 	int flags = CE_INT(g_pLocalPlayer->entity, netvar.iFlags);
 
+	if (CE_INT(g_pLocalPlayer->entity, netvar.movetype) == MOVETYPE_FLY) return;
+
 	bool ground = (flags & (1 << 0));
 	bool jump = (g_pUserCmd->buttons & IN_JUMP);
 
diff --git a/src/helpers.cpp b/src/helpers.cpp
index cd5b8b96..c95c77d4 100644
--- a/src/helpers.cpp
+++ b/src/helpers.cpp
@@ -160,7 +160,7 @@ void ReplaceString(std::string& input, const std::string& what, const std::strin
 }
 
 powerup_type GetPowerupOnPlayer(CachedEntity* player) {
-	if (!CE_BAD(player)) return powerup_type::not_powerup;
+	if (CE_BAD(player)) return powerup_type::not_powerup;
 	if (HasCondition(player, TFCond_RuneStrength)) return powerup_type::strength;
 	if (HasCondition(player, TFCond_RuneHaste)) return powerup_type::haste;
 	if (HasCondition(player, TFCond_RuneRegen)) return powerup_type::regeneration;
diff --git a/src/hooks/PaintTraverse.cpp b/src/hooks/PaintTraverse.cpp
index 9d0693b8..62829326 100644
--- a/src/hooks/PaintTraverse.cpp
+++ b/src/hooks/PaintTraverse.cpp
@@ -86,6 +86,10 @@ void PaintTraverse_hook(void* p, unsigned int vp, bool fr, bool ar) {
 
 	if (logo) {
 		AddSideString("cathook by d4rkc4t", colors::RainbowCurrent());
+#if defined(GIT_COMMIT_HASH) && defined(GIT_COMMIT_DATE)
+		AddSideString("commit #" GIT_COMMIT_HASH);
+		AddSideString("at " GIT_COMMIT_DATE);
+#endif
 	}
 
 	if (!hacks::shared::airstuck::IsStuck()) {