Commit f18838cc authored by Gerhard Stein's avatar Gerhard Stein

Shiplevel in Keen 6 finally works!

parent 7095c153
...@@ -932,10 +932,8 @@ void CPlayerLevel::stun() ...@@ -932,10 +932,8 @@ void CPlayerLevel::stun()
setAction(A_KEEN_STUNNED); setAction(A_KEEN_STUNNED);
mEndOfAction = false; mEndOfAction = false;
//m_ActionNumber = ActionNumber;
m_Action.setActionFormat(0x1868); m_Action.setActionFormat(0x1868);
//sprite = 39;
mStunTimer = 0; mStunTimer = 0;
} }
......
...@@ -798,7 +798,10 @@ void CPlayerWM::startLevel(Uint16 object) ...@@ -798,7 +798,10 @@ void CPlayerWM::startLevel(Uint16 object)
int level = object - 0xC000; int level = object - 0xC000;
Uint16 flag_dest = level + 0xF000; Uint16 flag_dest = level + 0xF000;
if(mp_Map->findTile(flag_dest, &x, &y, 2) || g_pBehaviorEngine->m_option[OPT_LVLREPLAYABILITY].value || level >= 18) const int ep = g_pBehaviorEngine->getEpisode();
const int shipLevel = (ep < 6) ? 18 : 17;
if(mp_Map->findTile(flag_dest, &x, &y, 2) || g_pBehaviorEngine->m_option[OPT_LVLREPLAYABILITY].value || level >= shipLevel)
{ {
g_pBehaviorEngine->m_EventList.add(new EventEnterLevel(object)); g_pBehaviorEngine->m_EventList.add(new EventEnterLevel(object));
} }
......
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