This commit is contained in:
BenCat07 2018-03-26 13:55:57 +02:00
parent bc21b5b4e4
commit b66babe0c5
4 changed files with 55 additions and 51 deletions

View File

@ -18,7 +18,7 @@ CatVar communicate(CV_SWITCH, "identify", "1", "identify",
"Auto identify for other cathook users");
CatVar enabled(CV_SWITCH, "aa_enabled", "0", "Anti-Aim",
"Master AntiAim switch");
CatVar trueang(CV_SWITCH, "aa_realfakes", "1", "Real fakes",
CatVar trueang(CV_SWITCH, "aa_realfakes", "0", "Real fakes",
"Do real fakeangles (Unresolveable)");
CatVar yaw(CV_FLOAT, "aa_yaw", "0.0", "Yaw", "Static yaw (left/right)", 360.0);
CatVar pitch(CV_FLOAT, "aa_pitch", "-89.0", "Pitch", "Static pitch (up/down)",

View File

@ -167,7 +167,8 @@ void CreateMove()
// Return as its a waste to check anymore, we detonated
// and all the rest of the stickys are gone
return;
if (!HasWeapon(LOCAL_E, 130))
return;
// Since legit mode is on, check if the sticky can see
// the local player

View File

@ -149,59 +149,61 @@ void CreateMove()
if (!g_pUserCmd->command_number)
return;
int amount = 0;
for (int i = 1; i < HIGHEST_ENTITY; i++)
{
if (!point2)
{
CachedEntity *pEnt = ENTITY(i);
if (!CE_GOOD(pEnt))
continue;
const model_t *model = RAW_ENT(pEnt)->GetModel();
if (!model)
continue;
const char *model_name = g_IModelInfo->GetModelName(model);
if (strstr("models/props_trainyard/bomb_cart.mdl", model_name))
point2 = model;
}
if (!point3)
{
CachedEntity *pEnt = ENTITY(i);
if (!CE_GOOD(pEnt))
continue;
const model_t *model = RAW_ENT(pEnt)->GetModel();
if (!model)
continue;
const char *model_name = g_IModelInfo->GetModelName(model);
if (strstr("models/props_2fort/trainwheel001.mdl", model_name))
point3 = model;
}
if (!point4)
{
CachedEntity *pEnt = ENTITY(i);
if (!CE_GOOD(pEnt))
continue;
const model_t *model = RAW_ENT(pEnt)->GetModel();
if (!model)
continue;
const char *model_name = g_IModelInfo->GetModelName(model);
if (strstr("models/custom/dirty_bomb_cart.mdl", model_name))
point4 = model;
}
if (!point5)
{
CachedEntity *pEnt = ENTITY(i);
if (!CE_GOOD(pEnt))
continue;
const model_t *model = RAW_ENT(pEnt)->GetModel();
if (!model)
continue;
const char *model_name = g_IModelInfo->GetModelName(model);
if (strstr("models/props_trainyard/bomb_cart_red.mdl", model_name))
point5 = model;
}
}
if (cart)
{
for (int i = 1; i < HIGHEST_ENTITY; i++)
{
if (!point2)
{
CachedEntity *pEnt = ENTITY(i);
if (!CE_GOOD(pEnt))
continue;
const model_t *model = RAW_ENT(pEnt)->GetModel();
if (!model)
continue;
const char *model_name = g_IModelInfo->GetModelName(model);
if (strstr("models/props_trainyard/bomb_cart.mdl", model_name))
point2 = model;
}
if (!point3)
{
CachedEntity *pEnt = ENTITY(i);
if (!CE_GOOD(pEnt))
continue;
const model_t *model = RAW_ENT(pEnt)->GetModel();
if (!model)
continue;
const char *model_name = g_IModelInfo->GetModelName(model);
if (strstr("models/props_2fort/trainwheel001.mdl", model_name))
point3 = model;
}
if (!point4)
{
CachedEntity *pEnt = ENTITY(i);
if (!CE_GOOD(pEnt))
continue;
const model_t *model = RAW_ENT(pEnt)->GetModel();
if (!model)
continue;
const char *model_name = g_IModelInfo->GetModelName(model);
if (strstr("models/custom/dirty_bomb_cart.mdl", model_name))
point4 = model;
}
if (!point5)
{
CachedEntity *pEnt = ENTITY(i);
if (!CE_GOOD(pEnt))
continue;
const model_t *model = RAW_ENT(pEnt)->GetModel();
if (!model)
continue;
const char *model_name = g_IModelInfo->GetModelName(model);
if (strstr("models/props_trainyard/bomb_cart_red.mdl",
model_name))
point5 = model;
}
if (!point2 && !point3 && !point4 && !point5)
continue;
CachedEntity *pEnt = ENTITY(i);

View File

@ -1194,6 +1194,7 @@ void Move()
if (!prevlvlname)
prevlvlname = g_IEngine->GetLevelName();
std::string prvlvlname = format(prevlvlname);
logging::Info("%s", prevlvlname);
if (boost::contains(prvlvlname, "pl_"))
{
bool ret = false;