Skip to content

Commit d55d902

Browse files
committed
Merge branch 'dev'
2 parents e39fa63 + d789904 commit d55d902

File tree

8 files changed

+165
-591
lines changed

8 files changed

+165
-591
lines changed

include/hsm.h

Lines changed: 161 additions & 127 deletions
Large diffs are not rendered by default.

samples/hsm_book_samples/source/ch4/state_overrides.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ struct CharacterStates
5252
if (Owner().mJump)
5353
{
5454
Owner().mJump = false;
55-
return SiblingTransition(GetStateOverride<Jump>(), 20);
55+
return SiblingTransition(GetStateOverride<Jump>());
5656
}
5757

5858
return NoTransition();
@@ -69,14 +69,13 @@ struct CharacterStates
6969

7070
struct JumpBase
7171
{
72-
virtual void OnEnter(int height) = 0;
72+
virtual void OnEnter() = 0;
7373
};
7474

7575
struct Jump : BaseState, JumpBase
7676
{
77-
void OnEnter(int height) override
77+
void OnEnter() override
7878
{
79-
(void)height;
8079
}
8180

8281
Transition GetTransition() override
@@ -130,9 +129,8 @@ struct HeroStates
130129

131130
struct Jump : BaseState, CharacterStates::JumpBase
132131
{
133-
void OnEnter(int height) override
132+
void OnEnter() override
134133
{
135-
(void)height;
136134
}
137135

138136
Transition GetTransition() override

samples/hsm_sample_1_basic/Player.cpp

Lines changed: 0 additions & 276 deletions
This file was deleted.

samples/hsm_sample_1_basic/Player.h

Lines changed: 0 additions & 31 deletions
This file was deleted.

samples/hsm_sample_1_basic/hsm_sample_1_basic.sln

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)