Commit e5535b3b authored by Gerhard Stein's avatar Gerhard Stein

Fixed small bug where touching council did not finished the level.

parent 9e5c0642
v2.2.2:
-------
- More settings in the Launcher finally working!
v2.2.1:
-------
- Thumb animation
......
......@@ -86,7 +86,7 @@ CMessages::extractStringOff( const std::string matchingstring, unsigned long sta
{
std::string Text;
for(unsigned long pos=start ; ; pos++)
for(unsigned long pos=start ; ; pos++)
{
while(mp_exe[pos] == 0xA)
{
......
......@@ -33,8 +33,8 @@ GameMenu(GsRect<float>(0.15f, 0.20f, 0.65f, 0.55f), style )
mpShowCursorSwitch = new Switch("Cursor", style);
mpMenuDialog->addControl( mpShowCursorSwitch );
mpTiltScreenSwitch = new Switch("TiltedScreen", style);
mpMenuDialog->addControl( mpTiltScreenSwitch );
//mpTiltScreenSwitch = new Switch("TiltedScreen", style);
//mpMenuDialog->addControl( mpTiltScreenSwitch );
// Create the fps config selection control
std::list<std::string> List;
......@@ -89,7 +89,7 @@ void CVideoSettings::refresh()
mpFrameSkip->enable( (iFPS> 0.0) ? true : false );
mpShowCursorSwitch->enable( mUsersConf.mShowCursor );
mpTiltScreenSwitch->enable( mUsersConf.mTiltedScreen );
//mpTiltScreenSwitch->enable( mUsersConf.mTiltedScreen );
mpVPadSwitch->enable( mUsersConf.mVPad );
......@@ -117,7 +117,7 @@ void CVideoSettings::release()
{
// Save up the changed stuff
mUsersConf.mShowCursor = mpShowCursorSwitch->isEnabled();
mUsersConf.mTiltedScreen = mpTiltScreenSwitch->isEnabled();
//mUsersConf.mTiltedScreen = mpTiltScreenSwitch->isEnabled();
gTimer.setFPS( mpFPSSelection->getSelection() );
......
......@@ -35,7 +35,7 @@ public:
private:
Switch *mpTiltScreenSwitch = nullptr;
//Switch *mpTiltScreenSwitch = nullptr;
Switch *mpShowCursorSwitch = nullptr;
Switch *mpVPadSwitch = nullptr;
NumberControl *mpFPSSelection = nullptr;
......
......@@ -138,28 +138,35 @@ bool CPlayerLevel::verifyforPole()
// Now check if Player has the chance to climb a pole or something similar
// 1 = this tile is a pole (Property)
if( ( yDir < 0 && hitdetectWithTileProperty(1, l_x, l_y_up) ) ||
( yDir > 0 && hitdetectWithTileProperty(1, l_x, l_y_down) ) )
{
cancelAllMoveTasks();
// Move to the proper X Coordinates, so Keen really grabs it!
moveTo(Vector2D<int>(l_x - (7<<STC), getYPosition()));
if(yDir == 0) return false;
// TODO: I think we need to snap him to the pole position
for(int x = l_x ; x<l_x+(2<<CSF) ; x+=(1<<CSF))
{
if( ( yDir < 0 && hitdetectWithTileProperty(1, x, l_y_up) ) ||
( yDir > 0 && hitdetectWithTileProperty(1, x, l_y_down) ) )
{
cancelAllMoveTasks();
xinertia = 0;
// Move to the proper X Coordinates, so Keen really grabs it!
moveTo(Vector2D<int>(l_x - (7<<STC), getYPosition()));
//next.x = 0;
//next.y = 64*yDir;
// TODO: I think we need to snap him to the pole position
xinertia = 0;
//next.x = 0;
//next.y = 64*yDir;
// Set Keen in climb mode
setAction(A_KEEN_POLE);
mIsClimbing = true;
mClipped = false;
solid = false;
return true;
}
}
// Set Keen in climb mode
setAction(A_KEEN_POLE);
mIsClimbing = true;
mClipped = false;
solid = false;
return true;
}
return false;
}
......@@ -2735,7 +2742,8 @@ void CPlayerLevel::process()
msgs.push_back( new CMessageBoxBitmapGalaxy(
fuse_msg,
*gGraphics.getBitmapFromStr("KEENTHUMBSUP"),
RIGHT,
LEFT,
false,
evExit) );
showMsgVec( msgs );
......
......@@ -28,7 +28,7 @@ public:
const GsBitmap &BitmapRef,
const direction_t alignment,
const bool animation,
CEvent *closeEv = nullptr);
CEvent *closeEv);
virtual ~CMessageBoxBitmapGalaxy() {}
......
......@@ -132,13 +132,13 @@ void CCouncilMember::performJanitorMode()
std::vector<CMessageBoxGalaxy*> msgs;
msgs.push_back( new CMessageBoxBitmapGalaxy(elder_text[0],
gGraphics.getBitmapFromId(104), LEFT, false) );
gGraphics.getBitmapFromId(104), LEFT, false, nullptr) );
msgs.push_back( new CMessageBoxBitmapGalaxy(elder_text[1],
*gGraphics.getBitmapFromStr("KEENTALKING"), RIGHT, false) );
*gGraphics.getBitmapFromStr("KEENTALKING"), RIGHT, false, nullptr) );
msgs.push_back( new CMessageBoxBitmapGalaxy(elder_text[2],
gGraphics.getBitmapFromId(104), LEFT, false) );
gGraphics.getBitmapFromId(104), LEFT, false, nullptr) );
msgs.push_back( new CMessageBoxBitmapGalaxy(elder_text[3],
*gGraphics.getBitmapFromStr("KEENTALKING"), RIGHT, false) );
*gGraphics.getBitmapFromStr("KEENTALKING"), RIGHT, false, nullptr) );
showMsgVec( msgs );
......@@ -206,7 +206,7 @@ void CCouncilMember::getTouchedBy(CSpriteObject &theObject)
std::vector<CMessageBoxGalaxy*> msgs;
msgs.push_back( new CMessageBoxBitmapGalaxy(elder_text[0],
gGraphics.getBitmapFromId(104), LEFT, false) );
gGraphics.getBitmapFromId(104), LEFT, false, nullptr) );
rescuedelders++;
......@@ -214,12 +214,12 @@ void CCouncilMember::getTouchedBy(CSpriteObject &theObject)
{
msgs.push_back( new CMessageBoxBitmapGalaxy(elder_text[1],
*gGraphics.getBitmapFromStr("KEENTHUMBSUP"),
RIGHT, false) );
RIGHT, false, nullptr) );
msgs.push_back( new CMessageBoxBitmapGalaxy(gBehaviorEngine.getString(answermap[8]),
*gGraphics.getBitmapFromStr("KEENTHUMBSUP"),
RIGHT,false) );
RIGHT,false, nullptr) );
gEventManager.add(new OpenComputerWrist(4));
gEventManager.add(new EventEndGamePlay());
......@@ -235,6 +235,7 @@ void CCouncilMember::getTouchedBy(CSpriteObject &theObject)
elder_text[1],
*gGraphics.getBitmapFromStr("KEENTHUMBSUP"),
RIGHT,
false,
evExit) );
}
......
......@@ -107,18 +107,18 @@ void CLindsey::getTouchedBy(CSpriteObject &theObject)
if(!customDlgs)
{
msgs.push_back( new CMessageBoxBitmapGalaxy(lindsey_text[0],
gGraphics.getBitmapFromId(108), LEFT, false) );
gGraphics.getBitmapFromId(108), LEFT, false, nullptr) );
msgs.push_back( new CMessageBoxBitmapGalaxy(lindsey_text[1],
gGraphics.getBitmapFromId(108), LEFT, false) );
gGraphics.getBitmapFromId(108), LEFT, false, nullptr) );
msgs.push_back( new CMessageBoxBitmapGalaxy(lindsey_text[2],
*gGraphics.getBitmapFromStr("KEENTHUMBSUP"), RIGHT, false) );
*gGraphics.getBitmapFromStr("KEENTHUMBSUP"), RIGHT, false, nullptr) );
}
else
{
msgs.push_back( new CMessageBoxBitmapGalaxy(lindsey_text[0],
gGraphics.getBitmapFromId(108), LEFT, false) );
gGraphics.getBitmapFromId(108), LEFT, false, nullptr) );
msgs.push_back( new CMessageBoxBitmapGalaxy(lindsey_text[1],
*gGraphics.getBitmapFromStr("KEENTHUMBSUP"), RIGHT, false) );
*gGraphics.getBitmapFromStr("KEENTHUMBSUP"), RIGHT, false, nullptr) );
}
showMsgVec( msgs );
......
......@@ -206,7 +206,7 @@ void CFuse::getTouchedBy(CSpriteObject &theObject)
msg,
gGraphics.getBitmapFromId(mLevelTestBmp),
RIGHT,
true) );
true, nullptr) );
showMsgVec( msgs );
mIsDead = true;
......
#ifndef CG_VERSION_H
#define CG_VERSION_H
#define CGVERSION "2.2.1-Release"
#define CGVERSION "2.2.2-Release"
#endif
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