From 822b002344b2da7fa6bc1565aa4ae8db0e801bae Mon Sep 17 00:00:00 2001 From: oy Date: Wed, 23 Jun 2010 20:09:15 +0200 Subject: [PATCH] fixed the ninja tip cut off and made its weapon and pickup sprite equal. Closes #127 --- datasrc/content.py | 4 ++-- src/game/client/components/items.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/datasrc/content.py b/datasrc/content.py index 2c353f24d..e510a19fd 100644 --- a/datasrc/content.py +++ b/datasrc/content.py @@ -305,7 +305,7 @@ container.sprites.Add(Sprite("weapon_hammer_body", set_game, 2,1,4,3)) container.sprites.Add(Sprite("weapon_hammer_cursor", set_game, 0,0,2,2)) container.sprites.Add(Sprite("weapon_hammer_proj", set_game, 0,0,0,0)) -container.sprites.Add(Sprite("weapon_ninja_body", set_game, 2,10,7,2)) +container.sprites.Add(Sprite("weapon_ninja_body", set_game, 2,10,8,2)) container.sprites.Add(Sprite("weapon_ninja_cursor", set_game, 0,10,2,2)) container.sprites.Add(Sprite("weapon_ninja_proj", set_game, 0,0,0,0)) @@ -323,7 +323,7 @@ container.sprites.Add(Sprite("weapon_ninja_muzzle3", set_game, 25,8,7,4)) container.sprites.Add(Sprite("pickup_health", set_game, 10,2,2,2)) container.sprites.Add(Sprite("pickup_armor", set_game, 12,2,2,2)) container.sprites.Add(Sprite("pickup_weapon", set_game, 3,0,6,2)) -container.sprites.Add(Sprite("pickup_ninja", set_game, 3,10,7,2)) +container.sprites.Add(Sprite("pickup_ninja", set_game, 2,10,8,2)) container.sprites.Add(Sprite("flag_blue", set_game, 12,8,4,8)) container.sprites.Add(Sprite("flag_red", set_game, 16,8,4,8)) diff --git a/src/game/client/components/items.cpp b/src/game/client/components/items.cpp index 70479e53e..b29bee990 100644 --- a/src/game/client/components/items.cpp +++ b/src/game/client/components/items.cpp @@ -104,7 +104,7 @@ void CItems::RenderPickup(const CNetObj_Pickup *pPrev, const CNetObj_Pickup *pCu { m_pClient->m_pEffects->PowerupShine(Pos, vec2(96,18)); Size *= 2.0f; - Pos.x += 10.0f; + Pos.x -= 10.0f; } }