This commit is contained in:
parent
1282474508
commit
989616b543
Binary file not shown.
Binary file not shown.
@ -361,7 +361,8 @@ triggers_src := trigger \
|
|||||||
twindleft \
|
twindleft \
|
||||||
twindright \
|
twindright \
|
||||||
toilgeyser \
|
toilgeyser \
|
||||||
tspeech
|
tspeech \
|
||||||
|
tbuttfly
|
||||||
|
|
||||||
|
|
||||||
utils_src := utils \
|
utils_src := utils \
|
||||||
|
@ -749,6 +749,7 @@ void CNpcMotherJellyfishEnemy::render()
|
|||||||
SprFrame = m_actorGfx->Render(renderPos,m_animNo,( m_frame >> 8 ),false);
|
SprFrame = m_actorGfx->Render(renderPos,m_animNo,( m_frame >> 8 ),false);
|
||||||
m_actorGfx->RotateScale( SprFrame, renderPos, 0, m_renderScale, m_renderScale );
|
m_actorGfx->RotateScale( SprFrame, renderPos, 0, m_renderScale, m_renderScale );
|
||||||
|
|
||||||
|
setShadeTex(SprFrame,0);
|
||||||
setRGB0( SprFrame, ( m_RGB & 255 ), ( ( m_RGB >> 8 ) & 255 ), ( ( m_RGB >> 16 ) & 255 ) );
|
setRGB0( SprFrame, ( m_RGB & 255 ), ( ( m_RGB >> 8 ) & 255 ), ( ( m_RGB >> 16 ) & 255 ) );
|
||||||
|
|
||||||
sBBox boundingBox = m_actorGfx->GetBBox();
|
sBBox boundingBox = m_actorGfx->GetBBox();
|
||||||
|
@ -71,6 +71,7 @@ void CJellyfishGenerator::init()
|
|||||||
case 2:
|
case 2:
|
||||||
{
|
{
|
||||||
m_level = 3;
|
m_level = 3;
|
||||||
|
m_on = false;
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -28,6 +28,7 @@ public:
|
|||||||
static void init();
|
static void init();
|
||||||
static void think( int _frames, CLevel *level );
|
static void think( int _frames, CLevel *level );
|
||||||
static void decCounter();
|
static void decCounter();
|
||||||
|
static void start() {m_on=true;}
|
||||||
protected:
|
protected:
|
||||||
static u8 m_jellyfishCount;
|
static u8 m_jellyfishCount;
|
||||||
static s32 m_timer;
|
static s32 m_timer;
|
||||||
|
@ -167,6 +167,10 @@
|
|||||||
#include "triggers\tlook.h"
|
#include "triggers\tlook.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef __TRIGGERS_TBUTTFLY_H__
|
||||||
|
#include "triggers\tbuttfly.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef __GAME_GAME_H__
|
#ifndef __GAME_GAME_H__
|
||||||
#include "game\game.h"
|
#include "game\game.h"
|
||||||
#endif
|
#endif
|
||||||
@ -435,6 +439,10 @@ CTrigger *trigger;
|
|||||||
trigger = (CLookTrigger*)new("LookTrigger") CLookTrigger();
|
trigger = (CLookTrigger*)new("LookTrigger") CLookTrigger();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case TRIGGER_BUTTERFLY_ON:
|
||||||
|
trigger = (CButterflyTrigger*)new("ButterflyTrigger") CButterflyTrigger();
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
trigger=NULL;
|
trigger=NULL;
|
||||||
}
|
}
|
||||||
|
@ -68,6 +68,7 @@ enum TRIGGER_TYPE
|
|||||||
TRIGGER_SPEECH_USE_BUBBLE,
|
TRIGGER_SPEECH_USE_BUBBLE,
|
||||||
TRIGGER_SPEECH_WEIGHT,
|
TRIGGER_SPEECH_WEIGHT,
|
||||||
TRIGGER_CAMERAYPOSITIONTRIGGER,
|
TRIGGER_CAMERAYPOSITIONTRIGGER,
|
||||||
|
TRIGGER_BUTTERFLY_ON,
|
||||||
|
|
||||||
// Code based triggers
|
// Code based triggers
|
||||||
TRIGGER_PLATFORM,
|
TRIGGER_PLATFORM,
|
||||||
|
@ -176,6 +176,7 @@ SpeechFirstBubble=41
|
|||||||
SpeechUseBubble=42
|
SpeechUseBubble=42
|
||||||
SpeechWeight=43
|
SpeechWeight=43
|
||||||
CameraYPositionTrigger=44
|
CameraYPositionTrigger=44
|
||||||
|
StartButterfly=45
|
||||||
|
|
||||||
################################################
|
################################################
|
||||||
# FX
|
# FX
|
||||||
|
@ -97,3 +97,5 @@ HasBox=1
|
|||||||
|
|
||||||
[CameraYPositionTrigger]
|
[CameraYPositionTrigger]
|
||||||
HasVal=1
|
HasVal=1
|
||||||
|
|
||||||
|
[StartButterfly]
|
@ -2313,6 +2313,14 @@ SOURCE=..\..\..\source\triggers\tboss.h
|
|||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=..\..\..\source\triggers\tbuttfly.cpp
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=..\..\..\source\triggers\tbuttfly.h
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=..\..\..\source\triggers\tcamlock.cpp
|
SOURCE=..\..\..\source\triggers\tcamlock.cpp
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
Loading…
Reference in New Issue
Block a user