Skip to content

Commit

Permalink
Resolve c_te_legacytempents.cpp.rej
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewmcwatters committed Dec 24, 2024
1 parent bb052e1 commit 114f534
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 15 deletions.
7 changes: 6 additions & 1 deletion mp/src/game/client/c_te_legacytempents.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@
#include "c_te_effect_dispatch.h"
#include "c_props.h"
#include "c_basedoor.h"
#ifdef LUA_SDK
#include "weapon_hl2mpbase_scriptedweapon.h"
#include "luamanager.h"
#include "lbasecombatweapon_shared.h"
#include "mathlib/lvector.h"
#endif

// NOTE: Always include this last!
#include "tier0/memdbgon.h"
Expand Down Expand Up @@ -3459,4 +3465,3 @@ void CTempEnts::CSEjectBrass( const Vector &vecPosition, const QAngle &angVeloci


}

14 changes: 0 additions & 14 deletions mp/src/game/client/c_te_legacytempents.cpp.rej

This file was deleted.

0 comments on commit 114f534

Please sign in to comment.