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

Merge branch 'master' into omegapirate

Browse Source 
# Conflicts:
#	Runtime/GuiSys/CAuiImagePane.cpp
This commit is contained in:
Luke Street
2020-04-19 22:12:18 -04:00
parent de5513e277 1fd28d3fc3
commit 32c44cbf05
37 changed files with 149 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/MP1/World/CFlaahgra.cpp
View File

@@ -297,9 +297,9 @@ void CFlaahgra::DoUserAnimEvent(CStateManager& mgr, const CInt32POINode& node, E
return;
}
case EUserEventType::BeginAction: {
#ifndef NDEBUG
printf("BeginAction\n");
#endif
//#ifndef NDEBUG
// printf("BeginAction\n");
//#endif
x8e4_26_ = true;
x7c4_ = GetEndActionTime();
break;