diff --git a/data/config/player.ini b/data/config/player.ini index 0d3b093..a51ce65 100644 --- a/data/config/player.ini +++ b/data/config/player.ini @@ -41,8 +41,12 @@ JOY_RTRIGGER_1 = Pick # Shuffle [Player1@Player] Input = Player1Input +Hand = Hand1 Color = (255, 90, 90) +[Hand1@Hand] +Color = @Player1 + [Player2Input] -JOY_LX_2 = MoveLLeft +JOY_LX_2 = MoveLRight @@ -68,8 +72,12 @@ JOY_RTRIGGER_2 = Pick # Shuffle [Player2@Player] Input = Player2Input +Hand = Hand2 Color = (25, 150, 255) +[Hand2@Hand] +Color = @Player2 + [Player3Input] -JOY_LX_3 = MoveLLeft +JOY_LX_3 = MoveLRight @@ -95,8 +103,12 @@ JOY_RTRIGGER_3 = Pick # Shuffle [Player3@Player] Input = Player3Input +Hand = Hand3 Color = (100, 255, 100) +[Hand3@Hand] +Color = @Player3 + [Player4Input] -JOY_LX_4 = MoveLLeft +JOY_LX_4 = MoveLRight @@ -122,7 +134,11 @@ JOY_RTRIGGER_4 = Pick # Shuffle [Player4@Player] Input = Player4Input -Color = (100, 255, 100) +Hand = Hand4 +Color = (240, 250, 90) + +[Hand4@Hand] +Color = @Player4 [Move] 0 = Object.Create MoveSound @@ -134,17 +150,22 @@ Color = (100, 255, 100) Scale = 4 Graphic = @ Texture = highlight.png +TextureOrigin = (0, 0) +TextureSize = (41, 41) +AnimationSet = HandAnimSet +FXList = Pulse + +[HandAnimSet] +Texture = highlight.png FrameSize = (41, 41) TextureOrigin = (0, 0) TextureSize = (41, 41) -AnimationSet = @ KeyDuration = 1 StartAnim = Left Left = 0 Right = 0 Left-> = Left # .Right Right-> = Right # .Left -FXList = Pulse [Pulse] Loop = true diff --git a/src/Player.cpp b/src/Player.cpp index 21c98bd..5ce4232 100644 --- a/src/Player.cpp +++ b/src/Player.cpp @@ -37,7 +37,7 @@ void Player::OnCreate() orxConfig_SetBool("IsPlayer", orxTRUE); for(orxU32 i = 0; i < 2; i++) { - astHands[i].poHand = roGame.CreateObject("Hand"); + astHands[i].poHand = roGame.CreateObject(orxConfig_GetString("Hand")); orxObject_SetOwner(astHands[i].poHand->GetOrxObject(), GetOrxObject()); astHands[i].poHand->SetAnim((i & 1) ? "Right" : "Left"); Select(i, orxU32_UNDEFINED);