Skip to content

Commit

Permalink
fixed crash bug from MOAIAction:OnStop
Browse files Browse the repository at this point in the history
  • Loading branch information
Patrick Meehan authored and Patrick Meehan committed Jul 11, 2011
1 parent 369ff81 commit a518bf1
Show file tree
Hide file tree
Showing 4 changed files with 11,634 additions and 11,627 deletions.
4 changes: 3 additions & 1 deletion src/moaicore/MOAIAction.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,6 @@ void MOAIAction::RemoveChild ( MOAIAction& action ) {
action.UnblockSelf ();
action.UnblockAll ();
action.mParent = 0;
action.OnStop ();
action.Release ();
}
}
Expand All @@ -311,7 +310,10 @@ void MOAIAction::Start ( MOAIAction& parent ) {
void MOAIAction::Stop () {

if ( this->mParent ) {
this->Retain ();
this->mParent->RemoveChild ( *this );
this->OnStop ();
this->Release ();
}
}

Expand Down
7 changes: 6 additions & 1 deletion src/moaicore/MOAIBox2DFixture.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,12 @@ int MOAIBox2DFixture::_destroy ( lua_State* L ) {

//----------------------------------------------------------------//
/** @name setCollisionHandler
@text Sets a Lua function to call when collisions occur.
@text Sets a Lua function to call when collisions occur. The handler should
accept the following parameters: ( phase, fixtureA, fixtureB, arbiter ). 'phase' will
be one of the phase masks. 'fixtureA' will be the fixture receiving the collision.
'fixtureB' will be the other fixture in the collision. 'arbiter' will be the
MOAIArbiter. Note that the arbiter is only good for the current collision: do
not keep references to it for later use.
@in MOAIBox2DFixture self
@in function handler
Expand Down
72 changes: 36 additions & 36 deletions vs2008/moaicore/moaicore.vcproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="..\bin\$(PlatformName)\$(ConfigurationName)\"
IntermediateDirectory="$(ConfigurationName)"
Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="2"
>
Expand All @@ -103,7 +103,6 @@
/>
<Tool
Name="VCCustomBuildTool"
CommandLine=""
/>
<Tool
Name="VCXMLDataGeneratorTool"
Expand All @@ -113,28 +112,26 @@
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/vmg"
Optimization="3"
EnableIntrinsicFunctions="false"
FavorSizeOrSpeed="1"
OmitFramePointers="false"
AdditionalIncludeDirectories="..\..\src;..\..\3rdparty;&quot;..\..\3rdparty\lua-5.1.3\src&quot;;&quot;..\..\3rdparty\glew-1.5.6\include&quot;;&quot;..\..\3rdparty\zlib-1.2.3&quot;;&quot;..\..\3rdparty\sqlite-3.6.16&quot;;..\..\3rdparty\tinyxml;&quot;..\..\3rdparty\curl-7.19.7\include&quot;;..\..\3rdparty\lpng140;&quot;..\..\3rdparty\expat-2.0.1\lib&quot;;&quot;..\..\3rdparty\jansson-2.1\src&quot;;&quot;..\..\3rdparty\freetype-2.4.4\include&quot;;&quot;..\..\3rdparty\box2d-2.1.2\Box2D&quot;;&quot;..\..\3rdparty\chipmunk-5.3.4\include&quot;"
PreprocessorDefinitions="WIN32;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_NO_WARNINGS;XML_STATIC"
Optimization="0"
AdditionalIncludeDirectories="&quot;..\..\src&quot;;&quot;..\..\3rdparty\lua-5.1.3\src&quot;;&quot;..\..\3rdparty\SOIL\src&quot;;&quot;..\..\3rdparty\openGL\include&quot;;&quot;..\..\3rdparty\zlib-1.2.3&quot;;&quot;..\..\3rdparty\sqlite-3.6.16&quot;;&quot;..\..\3rdparty\tinyxml&quot;;&quot;..\..\3rdparty\gsoap-2.7\gsoap&quot;;&quot;..\..\3rdparty\FMOD\inc&quot;;&quot;..\..\3rdparty\curl-7.19.7\include&quot;;&quot;..\..\3rdparty\lpng140&quot;;&quot;..\..\3rdparty\expat-2.0.1\lib&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;AKU_STATIC;XML_STATIC"
StringPooling="true"
MinimalRebuild="true"
ExceptionHandling="1"
RuntimeLibrary="2"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
BufferSecurityCheck="false"
EnableEnhancedInstructionSet="0"
TreatWChar_tAsBuiltInType="true"
ForceConformanceInForLoopScope="true"
RuntimeTypeInfo="false"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="pch.h"
WarningLevel="4"
DebugInformationFormat="0"
WarningLevel="3"
DebugInformationFormat="3"
ShowIncludes="false"
/>
<Tool
Name="VCManagedResourceCompilerTool"
Expand All @@ -147,10 +144,9 @@
/>
<Tool
Name="VCLibrarianTool"
LinkLibraryDependencies="true"
AdditionalOptions="/LTCG"
AdditionalDependencies="iphlpapi.lib"
OutputFile="$(OutDir)\$(ProjectName).lib"
AdditionalLibraryDirectories=""
IgnoreAllDefaultLibraries="true"
/>
<Tool
Name="VCALinkTool"
Expand All @@ -166,13 +162,13 @@
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine=""
CommandLine="&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
Name="Release|Win32"
OutputDirectory="..\bin\$(PlatformName)\$(ConfigurationName)\"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="2"
>
Expand All @@ -181,6 +177,7 @@
/>
<Tool
Name="VCCustomBuildTool"
CommandLine=""
/>
<Tool
Name="VCXMLDataGeneratorTool"
Expand All @@ -190,26 +187,28 @@
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/vmg"
Optimization="0"
AdditionalIncludeDirectories="&quot;..\..\src&quot;;&quot;..\..\3rdparty\lua-5.1.3\src&quot;;&quot;..\..\3rdparty\SOIL\src&quot;;&quot;..\..\3rdparty\openGL\include&quot;;&quot;..\..\3rdparty\zlib-1.2.3&quot;;&quot;..\..\3rdparty\sqlite-3.6.16&quot;;&quot;..\..\3rdparty\tinyxml&quot;;&quot;..\..\3rdparty\gsoap-2.7\gsoap&quot;;&quot;..\..\3rdparty\FMOD\inc&quot;;&quot;..\..\3rdparty\curl-7.19.7\include&quot;;&quot;..\..\3rdparty\lpng140&quot;;&quot;..\..\3rdparty\expat-2.0.1\lib&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;AKU_STATIC;XML_STATIC"
Optimization="3"
EnableIntrinsicFunctions="false"
FavorSizeOrSpeed="1"
OmitFramePointers="false"
AdditionalIncludeDirectories="..\..\src;..\..\3rdparty;&quot;..\..\3rdparty\lua-5.1.3\src&quot;;&quot;..\..\3rdparty\glew-1.5.6\include&quot;;&quot;..\..\3rdparty\zlib-1.2.3&quot;;&quot;..\..\3rdparty\sqlite-3.6.16&quot;;..\..\3rdparty\tinyxml;&quot;..\..\3rdparty\curl-7.19.7\include&quot;;..\..\3rdparty\lpng140;&quot;..\..\3rdparty\expat-2.0.1\lib&quot;;&quot;..\..\3rdparty\jansson-2.1\src&quot;;&quot;..\..\3rdparty\freetype-2.4.4\include&quot;;&quot;..\..\3rdparty\box2d-2.1.2\Box2D&quot;;&quot;..\..\3rdparty\chipmunk-5.3.4\include&quot;"
PreprocessorDefinitions="WIN32;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_NO_WARNINGS;XML_STATIC"
StringPooling="true"
MinimalRebuild="true"
ExceptionHandling="1"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeLibrary="2"
BufferSecurityCheck="false"
EnableEnhancedInstructionSet="0"
TreatWChar_tAsBuiltInType="true"
ForceConformanceInForLoopScope="true"
RuntimeTypeInfo="false"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="pch.h"
WarningLevel="3"
DebugInformationFormat="3"
ShowIncludes="false"
WarningLevel="4"
DebugInformationFormat="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
Expand All @@ -222,9 +221,10 @@
/>
<Tool
Name="VCLibrarianTool"
AdditionalDependencies="iphlpapi.lib"
OutputFile="$(OutDir)\$(ProjectName).lib"
LinkLibraryDependencies="true"
AdditionalOptions="/LTCG"
AdditionalLibraryDirectories=""
IgnoreAllDefaultLibraries="true"
/>
<Tool
Name="VCALinkTool"
Expand All @@ -240,7 +240,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="&#x0D;&#x0A;"
CommandLine=""
/>
</Configuration>
<Configuration
Expand Down
Loading

0 comments on commit a518bf1

Please sign in to comment.