Commit d02ac9ec authored by gerstrong@gmail.com's avatar gerstrong@gmail.com

Cleanups

parent 3e675c73
......@@ -159,6 +159,7 @@ bool CGameLauncher::setupMenu()
0.75f ),
GsRect<float>(0.0f, 0.0f, 0.069f, 0.069f) );
/*
#ifdef VIRTUALPAD
mLauncherDialog.addControl(new GsButton( "VPad", new OpenVGamePadSettingsEvent(),
GsControl::Style::NONE,
......@@ -167,6 +168,7 @@ bool CGameLauncher::setupMenu()
1.0f ),
GsRect<float>(0.75f, 0.0f, 0.17f, 0.069f) );
#endif
*/
mLauncherDialog.addControl(new GsButton( "|", new OpenSettingsMenuEvent(),
......@@ -649,13 +651,14 @@ void CGameLauncher::pumpEvent(const CEvent *evPtr)
gEventManager.add( new OpenMenuEvent(
new SettingsMenu(GsControl::Style::NONE) ) );
}
/*
#ifdef VIRTUALPAD
else if( dynamic_cast<const OpenVGamePadSettingsEvent*>(evPtr) )
{
gInput.setInVPadConfigState(true);
}
#endif
*/
......
......@@ -12,7 +12,7 @@ $2806W #Robo Red shot smash
namespace galaxy {
const Uint32 speed = 10;
const Uint32 hittime = 100;
//const Uint32 hittime = 100;
enum REDSHOTACTIONS
{
......
......@@ -22,7 +22,7 @@ A_SPARKY_TURN = 20,
A_SPARKY_STUNNED = 23
};
constexpr int TIME_UNTIL_MOVE = 5;
//constexpr int TIME_UNTIL_MOVE = 5;
constexpr int TIME_FOR_LOOK = 150;
constexpr int WALK_SPEED = 25;
constexpr int CSF_DISTANCE_TO_FOLLOW = 6<<CSF;
......
......@@ -19,7 +19,6 @@ constexpr int RUN_SPEED = 45;
CBlooglet::CBlooglet(CMap *pmap, const Uint16 foeID, const int actionOff, const bool carriesGem,
const Uint32 x, const Uint32 y) :
CStunnable(pmap, foeID, x, y),
mTimer(0),
mCarriesGem(carriesGem)
{
mActionMap[A_BLOOGLET_RUN] = (GASOFctr) &CBlooglet::processRunning;
......
......@@ -27,7 +27,7 @@ public:
void getTouchedBy(CSpriteObject &theObject);
private:
int mTimer;
// int mTimer;
const bool mCarriesGem;
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment