Merge branch 'dev'

amaiorano · Oct 10, 2017 · d55d902 · d55d902
2 parents e39fa63 + d789904
commit d55d902
Show file tree

Hide file tree

Showing 8 changed files with 165 additions and 591 deletions.
diff --git a/include/hsm.h b/include/hsm.h
diff --git a/samples/hsm_book_samples/source/ch4/state_overrides.cpp b/samples/hsm_book_samples/source/ch4/state_overrides.cpp
@@ -52,7 +52,7 @@ struct CharacterStates
 			if (Owner().mJump)
 			{
 				Owner().mJump = false;
-				return SiblingTransition(GetStateOverride<Jump>(), 20);
+				return SiblingTransition(GetStateOverride<Jump>());
 			}
 
 			return NoTransition();
@@ -69,14 +69,13 @@ struct CharacterStates
 
 	struct JumpBase
 	{
-		virtual void OnEnter(int height) = 0;
+		virtual void OnEnter() = 0;
 	};
 
 	struct Jump : BaseState, JumpBase
 	{
-		void OnEnter(int height) override
+		void OnEnter() override
 		{
-			(void)height;
 		}
 
 		Transition GetTransition() override
@@ -130,9 +129,8 @@ struct HeroStates
 
 	struct Jump : BaseState, CharacterStates::JumpBase
 	{
-		void OnEnter(int height) override
+		void OnEnter() override
 		{
-			(void)height;
 		}
 
 		Transition GetTransition() override

diff --git a/samples/hsm_sample_1_basic/Player.cpp b/samples/hsm_sample_1_basic/Player.cpp
diff --git a/samples/hsm_sample_1_basic/Player.h b/samples/hsm_sample_1_basic/Player.h
diff --git a/samples/hsm_sample_1_basic/hsm_sample_1_basic.sln b/samples/hsm_sample_1_basic/hsm_sample_1_basic.sln