Commit a5fd47db authored by Gerhard Stein's avatar Gerhard Stein

Disabled some obsolete Menu entries for android

parent 6f9affd2
......@@ -140,7 +140,9 @@ private:
bool mPausedGamePlay;
EpisodeInfoStruct *pEpisodeInfo;
EpisodeInfoStruct *pEpisodeInfo;
int mBwbLevel = 99;
};
#endif /* CBEHAVIORENGINE_H_ */
......@@ -199,8 +199,6 @@ void CMap::setupAnimationTimer()
for( size_t x=0 ; x<m_width ; x++)
{
bool draw = false;
const int offset = stride + x;
timersBack[offset] = backTileProperties[*p_back_tile].animationTime;
......@@ -379,7 +377,7 @@ bool CMap::findTile(unsigned int tile, int *xout, int *yout, int plane)
{
for(x=2;x<m_width-2;x++)
{
if (m_Plane[plane].getMapDataAt(x,y)==tile)
if (m_Plane[plane].getMapDataAt(x,y) == tile)
{
*xout = x;
*yout = y;
......
......@@ -172,6 +172,11 @@ bool CMessages::extractEp4Strings(std::map<std::string, std::string>& StringMap)
StringMap.insert( extractString( "KEEN_LAST_ELDER_TEXT", 0x30B6B, 0x30BB2 ) );
StringMap.insert( extractString( "ELDERS_UNDERWATER_TEXT", 0x30BB3, 0x30C16 ) );
StringMap.insert( extractString( "ELDERS_TEXT", 0x30C17, 0x30C6A ) );
StringMap.insert( extractString( "ELDERS_TEXT", 0x30C17, 0x30C6A ) );
setDecodeOffset(0x2F41A);
StringMap.insert( extractNextString( "WARP_LEVEL_TEXT" ) );
return true;
} break;
}
......
......@@ -10,8 +10,10 @@
struct stCheat
{
bool jump, god, noclipping, items;
stCheat() : jump(false), god(false), noclipping(false), items(false) {}
bool jump = false;
bool god = false;
bool noclipping = false;
bool items = false;
};
#endif // __CHEAT_STRUCT__
......@@ -595,9 +595,6 @@ void CPlayGameGalaxy::ponder(const float deltaT)
cheat.items = false;
}
// menuButtonRect
}
void CPlayGameGalaxy::render()
......
......@@ -396,6 +396,7 @@ void CMapLoaderGalaxy::spawnFoes(CMap &Map)
Map.mNumFuses = 0;
Map.mFuseInLevel = false;
data_ptr = start_data;
for(size_t y=0 ; y<height ; y++)
{
for(size_t x=0 ; x<width ; x++)
......@@ -418,7 +419,9 @@ void CMapLoaderGalaxy::spawnFoes(CMap &Map)
std::shared_ptr<CGalaxySpriteObject> pNewfoe( addFoe(Map, foeID, x<<CSF, y<<CSF) );
if(pNewfoe)
{
m_ObjectPtr.push_back(pNewfoe);
}
}
data_ptr++;
......
......@@ -1003,9 +1003,9 @@ void CPlayerWM::startLevel(Uint16 object)
{
int x, y;
int level = object - 0xC000;
Uint16 flag_dest = level + 0xF000;
const auto ep = gpBehaviorEngine->getEpisode();
//int shipLevel = gpBehaviorEngine->;
int shipLevel;
switch(ep)
......@@ -1016,8 +1016,17 @@ void CPlayerWM::startLevel(Uint16 object)
default : shipLevel = 0;
};
/*if(ep == 4)
{
shipLevel = gKeenFiles.exeFile.getRawData()[0x60FD];
}*/
const Uint16 flag_dest = level + 0xF000;
// Check if there already exists a flag. If that's not the case enter the level
if( mp_Map->findTile(flag_dest, &x, &y, 2) || gpBehaviorEngine->m_option[OPT_LVLREPLAYABILITY].value || level >= shipLevel)
if( mp_Map->findTile(flag_dest, &x, &y, 2) ||
gpBehaviorEngine->m_option[OPT_LVLREPLAYABILITY].value ||
level >= shipLevel)
{
gEventManager.add(new EventEnterLevel(object));
......@@ -1084,7 +1093,7 @@ bool CPlayerWM::finishLevel(const int object)
// Mark the tileinfo on the map as level finished,
// so player cannot just re-enter. Exception: If option "replayability" is enabled,
// or any special level like the bwb rocket, which can be accessed always
// or any special level like the bwb rocket, which can be accessed at any time
mp_Map->setTile( x, y, 0, true, 2);
return true;
......
......@@ -28,15 +28,19 @@ namespace galaxy
SettingsMenu::SettingsMenu() :
GalaxyMenu( GsRect<float>(0.25f, 0.24f, 0.5f, 0.40f) )
{
#if !defined(EMBEDDED)
mpMenuDialog->addControl(new GalaxyButton( "Video",
new OpenMenuEvent( new CVideoSettings() ) ) );
mpMenuDialog->addControl(new GalaxyButton( "Audio",
new OpenMenuEvent( new CAudioSettings() ) ) );
#endif
mpMenuDialog->addControl(new GalaxyButton( "Options",
new OpenMenuEvent( new COptions() ) ) );
#if !defined(EMBEDDED)
#if defined (SINGLEPLAYER)
mpMenuDialog->addControl( new GalaxyButton( "Controls",
new OpenMenuEvent( new CControlsettings(1) ) ) );
......@@ -44,7 +48,7 @@ GalaxyMenu( GsRect<float>(0.25f, 0.24f, 0.5f, 0.40f) )
mpMenuDialog->addControl(new GalaxyButton( "Controls",
new OpenMenuEvent( new CPlayersSelection<OpenControlMenuEvent>() ) ) );
#endif
#endif
#if !defined(EMBEDDED)
mpMenuDialog->addControl( new GalaxyButton( "Camera",
......@@ -54,8 +58,6 @@ GalaxyMenu( GsRect<float>(0.25f, 0.24f, 0.5f, 0.40f) )
mpMenuDialog->addControl(new GalaxyButton( "Cheats",
new OpenMenuEvent( new CheatsMenu() ) ) );
/*mpMenuDialog->addControl(new GalaxyButton( "Profile",
new OpenMenuEvent( new CProfilesMenu() ) ) );*/
setMenuLabel("CONFIGMENULABEL");
}
......
......@@ -45,7 +45,7 @@ void CPlatform::process()
if (movedir==RIGHT)
{
if (blockedr || getXRightPos() > (mp_Map->m_width<<CSF) )
if (blockedr || getXRightPos() > int(mp_Map->m_width<<CSF) )
{
movedir = LEFT;
waittimer = 0;
......
......@@ -28,11 +28,14 @@ namespace vorticon
CSettingsMenu::CSettingsMenu() :
VorticonMenu( GsRect<float>(0.25f, 0.24f, 0.5f, 0.32f) )
{
#if !defined(EMBEDDED)
mpMenuDialog->addControl(new Button( "Video",
new OpenMenuEvent( new CVideoSettings() ) ) );
mpMenuDialog->addControl(new Button( "Audio",
new OpenMenuEvent( new CAudioSettings() ) ) );
#endif
mpMenuDialog->addControl(new Button( "Options",
new OpenMenuEvent( new COptions() ) ) );
......@@ -47,6 +50,7 @@ VorticonMenu( GsRect<float>(0.25f, 0.24f, 0.5f, 0.32f) )
*
* */
#if !defined(EMBEDDED)
#if defined (SINGLEPLAYER)
mpMenuDialog->addControl( new Button( "Controls",
new OpenMenuEvent( new vorticon::CControlsettings(1) ) ) );
......@@ -54,6 +58,7 @@ VorticonMenu( GsRect<float>(0.25f, 0.24f, 0.5f, 0.32f) )
mpMenuDialog->addControl(new Button( "Controls",
new OpenMenuEvent( new vorticon::CPlayersSelection<OpenControlMenuEvent>() ) ) );
#endif
#endif
#if !defined(EMBEDDED)
......
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