diff --git a/makefile.gfx b/makefile.gfx index 80ec47b09..5bb4b8d59 100644 --- a/makefile.gfx +++ b/makefile.gfx @@ -235,7 +235,8 @@ PICKUP_GFX_IN := $(foreach FILE,$(PICKUP_GFX),$(PICKUP_GFX_DIR)/$(FILE).bmp) INGAMEFX_GFX_TRANS := +bubble_1 +bubble_2 +bubble_3 \ +health_full_1 +health_full_2 +health_full_3 +health_full_4 +health_full_5 \ - +health_empty_1 +health_empty_2 +health_empty_3 +health_empty_4 +health_empty_5 + +health_empty_1 +health_empty_2 +health_empty_3 +health_empty_4 +health_empty_5 \ + +spike INGAMEFX_GFX_TRANS_IN := $(foreach FILE,$(INGAMEFX_GFX_TRANS),$(INGAMEFX_GFX_DIR)/$(FILE).bmp) #### diff --git a/source/projectl/projectl.cpp b/source/projectl/projectl.cpp index d9d49dc94..6014acf82 100644 --- a/source/projectl/projectl.cpp +++ b/source/projectl/projectl.cpp @@ -306,24 +306,29 @@ void CProjectile::render() { CEnemyProjectileThing::render(); + sFrameHdr *frameHdr; DVECTOR offset; int x,y; int scrnWidth = VidGetScrW(); int scrnHeight = VidGetScrH(); - int spriteWidth = m_spriteBank->getFrameWidth(FRM_BARNACLEBOY); - int spriteHeight = m_spriteBank->getFrameHeight(FRM_BARNACLEBOY); + int spriteWidth = m_spriteBank->getFrameWidth(FRM__SPIKE); + int spriteHeight = m_spriteBank->getFrameHeight(FRM__SPIKE); offset = getScreenOffset(); - x = Pos.vx - offset.vx /*+ ( scrnWidth >> 1 )*/ - ( spriteWidth >> 1 ); - y = Pos.vy - offset.vy /*+ ( scrnHeight >> 1 )*/ - ( spriteHeight >> 1 ); + x = Pos.vx - offset.vx /*+ ( scrnWidth >> 1 ) - ( spriteWidth >> 1 )*/; + y = Pos.vy - offset.vy /*+ ( scrnHeight >> 1 ) - ( spriteHeight >> 1 )*/; if ( x < -spriteWidth || y < -spriteHeight || x > scrnWidth || y > scrnHeight ) { return; } - m_spriteBank->printFT4(FRM_BARNACLEBOY,x,y,0,0,0); + //m_spriteBank->printFT4(FRM__SPIKE,x,y,0,0,0); + + frameHdr = m_spriteBank->getFrameHeader(FRM__SPIKE); + + m_spriteBank->printRotatedScaledSprite( frameHdr, x, y, 4096, 4096, m_heading, 0 ); } DVECTOR CProjectile::getScreenOffset()