This commit is contained in:
Daveo 2001-07-21 19:06:07 +00:00
parent d6b7483cc6
commit d105d9ee97
5 changed files with 21 additions and 20 deletions

View File

@ -234,7 +234,7 @@ eng=I
; C3 FMA ; C3 FMA
[STR__INGAME__FMA_C3_SB0] [STR__INGAME__FMA_C3_SB0]
eng=aaah eng=aaah!!!
[STR__INGAME__FMA_C3_BB0] [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! 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] [STR__INGAME__FMA_C3_SB1]
@ -273,7 +273,7 @@ eng=Anybody around here need a TV fixed??!!
[STR__INGAME__FMA_C6_SB1] [STR__INGAME__FMA_C6_SB1]
eng=Nope, just force that there, hit that, twist that, erm put that there!! eng=Nope, just force that there, hit that, twist that, erm put that there!!
[STR__INGAME__FMA_C6_BB0] [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] [STR__INGAME__FMA_C6_SB2]
eng=Gee thanks!!! eng=Gee thanks!!!
[STR__INGAME__FMA_C6_BB1] [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] [STR__INGAME__FMA_PARTY_PAT0]
eng=Todays 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!! eng=Todays 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] [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] [STR__INGAME__FMA_PARTY_SB]
eng=Happy Birthday! eng=Happy Birthday!
[STR__INGAME__FMA_PARTY_MM] [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! eng=I ain't telling you again lad! Wear your boots and you'll go far! Argh!
; --------------------------------------------------------------- ; ---------------------------------------------------------------
; End of level celebration text ; 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] [STR__INGAME__CH3__L3__SBCELEBRATE]
eng=Uh Oh, those plants are moving! They're not trees....... Hellllllllppppppp! eng=Uh Oh, those plants are moving! They're not trees....... Hellllllllppppppp!
[STR__INGAME__CH3__L4__SBCELEBRATE] [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] [STR__INGAME__CH4__L1__SBCELEBRATE]
eng=Tartar sauce! It ate my coin. Double Tartar sauce, it's empty!! eng=Tartar sauce! It ate my coin. Double Tartar sauce, it's empty!!

View File

@ -173,6 +173,7 @@ fx_src := fx \
fxbasetrail \ fxbasetrail \
fxbaseemitter \ fxbaseemitter \
fxbubble \ fxbubble \
fxfire \
fxthwack \ fxthwack \
fxnrgbar \ fxnrgbar \
fxjfish \ fxjfish \

View File

@ -23,6 +23,7 @@
#include "FX\FXLaser.h" #include "FX\FXLaser.h"
#include "FX\FXThwack.h" #include "FX\FXThwack.h"
#include "FX\FXBubble.h" #include "FX\FXBubble.h"
#include "FX\FXFire.h"
#include "FX\FXfallingTile.h" #include "FX\FXfallingTile.h"
#include "FX\FXSteam.h" #include "FX\FXSteam.h"
#include "FX\FXGeyser.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" #include "game\game.h"
CFXZZZZ *TFX=0; CFXZZZZ *TFX=0;
void TestFX(DVECTOR Pos,CThing *Parent) void TestFX(DVECTOR Pos,CThing *Parent)
{ {
Pos.vy-=16*4; /*
if (!TFX) if (!TFX)
{ {
TFX=(CFXZZZZ*)CFX::Create((CFX::FX_TYPE)FXType,Pos); TFX=(CFXZZZZ*)CFX::Create((CFX::FX_TYPE)FXType,Pos);
@ -119,7 +120,8 @@ void TestFX(DVECTOR Pos,CThing *Parent)
TFX->killFX(); TFX->killFX();
TFX=0; 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"); ASSERT(!"FX_TYPE_GAS");
break; break;
case FX_TYPE_FLAMES: case FX_TYPE_FLAMES:
NewFX=new ("FXFlames") CFXBaseAnim(); NewFX=new ("FXFlames") CFXFire();
NewFX->setBaseData(&FXFireBaseData); NewFX->setBaseData(&FXFireBaseData);
break; break;

View File

@ -87,7 +87,6 @@ int ThisFrame=CurrentFrame>>BaseData->FrameShift;
} }
/*****************************************************************************/
/*****************************************************************************/ /*****************************************************************************/
/*** Render ******************************************************************/ /*** Render ******************************************************************/
/*****************************************************************************/ /*****************************************************************************/

View File

@ -1,21 +1,22 @@
/*****************/ /***************/
/*** Bubble FX ***/ /*** Fire FX ***/
/*****************/ /***************/
#ifndef __FX_FX_BUBBLE_HEADER__ #ifndef __FX_FX_FIRE_HEADER__
#define __FX_FX_BUBBLE_HEADER__ #define __FX_FX_FIRE_HEADER__
#include "fx/fxbaseanim.h" #include "fx/fxbaseanim.h"
/*****************************************************************************/ /*****************************************************************************/
class CFXBubble : public CFXBaseAnim class CFXFire : public CFXBaseAnim
{ {
public: public:
void init(DVECTOR const &Pos); void init(DVECTOR const &Pos);
void think(int _frames); void render();
void SetSize(int W,int H) {SprW=W; SprH=H;}
protected: protected:
u16 XIdx;
int SprW,SprH;
}; };
#endif #endif