diff --git a/data/translations/text.dat b/data/translations/text.dat index f990e449e..9dacc79fe 100644 --- a/data/translations/text.dat +++ b/data/translations/text.dat @@ -234,7 +234,7 @@ eng=I ; C3 FMA [STR__INGAME__FMA_C3_SB0] -eng=aaah +eng=aaah!!! [STR__INGAME__FMA_C3_BB0] eng=That is amazing, how did you manage that!! Reflecto has got nothing on you kid, you must really love your mate Trevor! [STR__INGAME__FMA_C3_SB1] @@ -273,7 +273,7 @@ eng=Anybody around here need a TV fixed??!! [STR__INGAME__FMA_C6_SB1] eng=Nope, just force that there, hit that, twist that, erm put that there!! [STR__INGAME__FMA_C6_BB0] -eng=Congratulations SpongeyBlob you earned this. Patrick is lucky to have a friend like you!. +eng=Congratulations SpongeyBlob you earned this. Patrick is lucky to have a friend like you! [STR__INGAME__FMA_C6_SB2] eng=Gee thanks!!! [STR__INGAME__FMA_C6_BB1] @@ -295,7 +295,7 @@ eng=Happy Birthday Patrick from all your friends in Bikini Bottom! [STR__INGAME__FMA_PARTY_PAT0] eng=Today’s my birthday? Hmm. I thought I was born a long time ago in a hospital. Thanks for the signed photo of my favorite superheroes anyhow. This is the best birthday ever!! [STR__INGAME__FMA_PARTY_VO0] -eng=Stand Still while I take your picture +eng=Stand Still while I take your picture. [STR__INGAME__FMA_PARTY_SB] eng=Happy Birthday! [STR__INGAME__FMA_PARTY_MM] @@ -397,8 +397,6 @@ Chapter 2 - Level 1 - 02 eng=I ain't telling you again lad! Wear your boots and you'll go far! Argh! - - ; --------------------------------------------------------------- ; End of level celebration text ; --------------------------------------------------------------- @@ -427,7 +425,7 @@ eng=Now to find a pair of Shell slippers..... and in to Kelp Jungle! [STR__INGAME__CH3__L3__SBCELEBRATE] eng=Uh Oh, those plants are moving! They're not trees....... Hellllllllppppppp! [STR__INGAME__CH3__L4__SBCELEBRATE] -eng=Right, lets get out of here and back to shady shoals!!. What is that smell!! +eng=Right, lets get out of here and back to shady shoals!! What is that smell!! [STR__INGAME__CH4__L1__SBCELEBRATE] eng=Tartar sauce! It ate my coin. Double Tartar sauce, it's empty!! diff --git a/makefile.gaz b/makefile.gaz index 523b18cad..3b7c1e501 100644 --- a/makefile.gaz +++ b/makefile.gaz @@ -173,6 +173,7 @@ fx_src := fx \ fxbasetrail \ fxbaseemitter \ fxbubble \ + fxfire \ fxthwack \ fxnrgbar \ fxjfish \ diff --git a/source/fx/fx.cpp b/source/fx/fx.cpp index d71ac8d30..5e8b34631 100644 --- a/source/fx/fx.cpp +++ b/source/fx/fx.cpp @@ -23,6 +23,7 @@ #include "FX\FXLaser.h" #include "FX\FXThwack.h" #include "FX\FXBubble.h" +#include "FX\FXFire.h" #include "FX\FXfallingTile.h" #include "FX\FXSteam.h" #include "FX\FXGeyser.h" @@ -103,13 +104,13 @@ void TestFX(DVECTOR Pos,CThing *Parent) */ /*****************************************************************************/ -int FXType=(CFX::FX_TYPE)CFX::FX_TYPE_ZZZZ; +int FXType=(CFX::FX_TYPE)CFX::FX_TYPE_FLAMES; #include "game\game.h" CFXZZZZ *TFX=0; void TestFX(DVECTOR Pos,CThing *Parent) { - Pos.vy-=16*4; +/* if (!TFX) { TFX=(CFXZZZZ*)CFX::Create((CFX::FX_TYPE)FXType,Pos); @@ -119,7 +120,8 @@ void TestFX(DVECTOR Pos,CThing *Parent) TFX->killFX(); TFX=0; } -// CFX::Create((CFX::FX_TYPE)FXType,Parent); +*/ + CFX::Create((CFX::FX_TYPE)FXType,Pos); } @@ -240,7 +242,7 @@ CFX *NewFX; ASSERT(!"FX_TYPE_GAS"); break; case FX_TYPE_FLAMES: - NewFX=new ("FXFlames") CFXBaseAnim(); + NewFX=new ("FXFlames") CFXFire(); NewFX->setBaseData(&FXFireBaseData); break; diff --git a/source/fx/fxbaseanim.cpp b/source/fx/fxbaseanim.cpp index 2de14de37..c44d44b68 100644 --- a/source/fx/fxbaseanim.cpp +++ b/source/fx/fxbaseanim.cpp @@ -87,7 +87,6 @@ int ThisFrame=CurrentFrame>>BaseData->FrameShift; } -/*****************************************************************************/ /*****************************************************************************/ /*** Render ******************************************************************/ /*****************************************************************************/ diff --git a/source/fx/fxfire.h b/source/fx/fxfire.h index d94544ec3..13fd9eb1b 100644 --- a/source/fx/fxfire.h +++ b/source/fx/fxfire.h @@ -1,21 +1,22 @@ -/*****************/ -/*** Bubble FX ***/ -/*****************/ +/***************/ +/*** Fire FX ***/ +/***************/ -#ifndef __FX_FX_BUBBLE_HEADER__ -#define __FX_FX_BUBBLE_HEADER__ +#ifndef __FX_FX_FIRE_HEADER__ +#define __FX_FX_FIRE_HEADER__ #include "fx/fxbaseanim.h" /*****************************************************************************/ -class CFXBubble : public CFXBaseAnim +class CFXFire : public CFXBaseAnim { public: void init(DVECTOR const &Pos); - void think(int _frames); - + void render(); + void SetSize(int W,int H) {SprW=W; SprH=H;} protected: - u16 XIdx; + + int SprW,SprH; }; #endif