AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-10 01:07:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into elitepirate

Browse Source 
# Conflicts:
#	Runtime/World/CPatterned.hpp
This commit is contained in:
Luke Street
2020-04-01 15:02:56 -04:00
parent 0c1f4fa738 da75543c76
commit 1e15e0d1f3
277 changed files with 3688 additions and 6747 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Runtime/World/CPatterned.hpp
View File

@@ -26,6 +26,7 @@ namespace urde {
class CPatternedInfo;
class CProjectileInfo;
class CPathFindSearch;
using CPatternedTryFunc = void (CPatterned::*)(CStateManager&, int);
class CPatterned : public CAi {