This commit is contained in:
parent
545a3d1304
commit
f92df2b5bf
12 changed files with 352 additions and 55 deletions
|
@ -393,7 +393,7 @@ void CBubicleFactory::shutdown()
|
|||
Params:
|
||||
Returns:
|
||||
---------------------------------------------------------------------- */
|
||||
void CBubicleFactory::think()
|
||||
void CBubicleFactory::think(int _frames)
|
||||
{
|
||||
ASSERT(s_initialised);
|
||||
|
||||
|
@ -402,20 +402,18 @@ void CBubicleFactory::think()
|
|||
CBubicleEmitter *emt;
|
||||
CBubicle *bub;
|
||||
|
||||
frames=GameState::getFramesSinceLast();
|
||||
|
||||
emt=s_emitters;
|
||||
for(i=0;i<NUM_EMITTERS;i++,emt++)
|
||||
{
|
||||
if(emt->isActive())
|
||||
emt->think(frames);
|
||||
emt->think(_frames);
|
||||
}
|
||||
|
||||
bub=s_bubicles;
|
||||
for(i=0;i<NUM_BUBICLES;i++,bub++)
|
||||
{
|
||||
if(bub->isActive())
|
||||
bub->think(frames);
|
||||
bub->think(_frames);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -156,7 +156,7 @@ class CBubicleFactory
|
|||
public:
|
||||
static void init();
|
||||
static void shutdown();
|
||||
static void think();
|
||||
static void think(int _frames);
|
||||
static void render();
|
||||
|
||||
static CBubicleEmitter *spawnEmitter(BubicleEmitterData *_init);
|
||||
|
@ -169,7 +169,7 @@ private:
|
|||
enum
|
||||
{
|
||||
NUM_EMITTERS=10,
|
||||
NUM_BUBICLES=100,
|
||||
NUM_BUBICLES=150,
|
||||
};
|
||||
|
||||
CBubicleFactory() {;}
|
||||
|
|
|
@ -78,7 +78,7 @@ private:
|
|||
DEFAULT_G=128,
|
||||
DEFAULT_B=128,
|
||||
DEFAULT_JUSTIFICATION=JUST_LEFT,
|
||||
DEFAULT_OT=1,
|
||||
DEFAULT_OT=10,
|
||||
};
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue