about summary refs log tree commit diff
diff options
context:
space:
mode:
authoroy <Tom_Adams@web.de>2010-06-23 20:09:15 +0200
committeroy <Tom_Adams@web.de>2010-06-23 20:09:15 +0200
commit822b002344b2da7fa6bc1565aa4ae8db0e801bae (patch)
treeafe3d1a7eb765da584ffc05f14aa1a5cea8c8fe7
parentc9828a22293d9959606c678b926ecac810e70b55 (diff)
downloadzcatch-822b002344b2da7fa6bc1565aa4ae8db0e801bae.tar.gz
zcatch-822b002344b2da7fa6bc1565aa4ae8db0e801bae.zip
fixed the ninja tip cut off and made its weapon and pickup sprite equal. Closes #127
-rw-r--r--datasrc/content.py4
-rw-r--r--src/game/client/components/items.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/datasrc/content.py b/datasrc/content.py
index 2c353f24..e510a19f 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 70479e53..b29bee99 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;
 		}
 	}