Skip to content
Permalink
Browse files

game: fix build (oops)

  • Loading branch information...
Aranud committed Jul 1, 2019
1 parent ad7f19c commit 00fc9386b88a8af8095dfb065af65385ae8b5ffa
Showing with 2 additions and 5 deletions.
  1. +2 −2 src/game/g_combat.c
  2. +0 −3 src/game/g_lua.c
@@ -1325,7 +1325,7 @@ void G_Damage(gentity_t *targ, gentity_t *inflictor, gentity_t *attacker, vec3_t
}

// set weapons means less knockback
if (targ->client && (targ->client->pmext.silencedSideArm & WALTTYPE_BIPOD))
if (targ->client && (targ->client->pmext.silencedSideArm & WALTTYPE_BIPOD))
{
knockback *= 0.5;
}
@@ -1482,7 +1482,7 @@ void G_Damage(gentity_t *targ, gentity_t *inflictor, gentity_t *attacker, vec3_t
{
G_AddEvent(targ, EV_LOSE_HAT, DirToByte(dir));

if (mod != MOD_K43_SCOPE && mod != MOD_GARAND_SCOPE)
if ((mod != MOD_K43 && mod != MOD_GARAND) || !(attacker->client->pmext.silencedSideArm & WALTTYPE_SCOPE))
{
take *= .8f; // helmet gives us some protection
}
@@ -2546,7 +2546,6 @@ static void registerModConstants(lua_vm_t *vm)
lua_regconstinteger(vm->L, MOD_GARAND);

lua_regconstinteger(vm->L, MOD_FG42);
lua_regconstinteger(vm->L, MOD_FG42SCOPE);
lua_regconstinteger(vm->L, MOD_PANZERFAUST);
lua_regconstinteger(vm->L, MOD_GRENADE_LAUNCHER);
lua_regconstinteger(vm->L, MOD_FLAMETHROWER);
@@ -2583,14 +2582,12 @@ static void registerModConstants(lua_vm_t *vm)

lua_regconstinteger(vm->L, MOD_SMOKEBOMB);
lua_regconstinteger(vm->L, MOD_MOBILE_MG42);
lua_regconstinteger(vm->L, MOD_GARAND_SCOPE);

lua_regconstinteger(vm->L, MOD_CRUSH_CONSTRUCTION);
lua_regconstinteger(vm->L, MOD_CRUSH_CONSTRUCTIONDEATH);
lua_regconstinteger(vm->L, MOD_CRUSH_CONSTRUCTIONDEATH_NOATTACKER);

lua_regconstinteger(vm->L, MOD_K43);
lua_regconstinteger(vm->L, MOD_K43_SCOPE);

lua_regconstinteger(vm->L, MOD_MORTAR);

0 comments on commit 00fc938

Please sign in to comment.
You can’t perform that action at this time.