Commit 9aafde42 authored by Gerhard Stein's avatar Gerhard Stein

Fixes

parent d9d2989e
......@@ -101,9 +101,6 @@ void CMapPlayGalaxy::ponder()
// Process the AI of the object as it's given
objRef.process();
// process all the objects' events
objRef.processEvents();
// Check collision between objects using NlogN order
auto theOther = obj; theOther++;
for( ; theOther != mObjectPtr.end() ; theOther++)
......
......@@ -121,7 +121,7 @@ VectorD2<int> CPlayerWM::fetchFootDestCoord()
void CPlayerWM::pumpEvent(const CEvent *evPtr)
{
CSpriteObject::pumpEvent();
CSpriteObject::pumpEvent(evPtr);
// Events for the Player are processed here.
if( const EventPlayerEndLevel* ev = dynamic_cast<const EventPlayerEndLevel*>(evPtr) )
......
......@@ -86,7 +86,7 @@ void CVorticonSpriteObjectAI::process()
}
}
object.processEvents();
//object.processEvents();
object.InertiaAndFriction_X();
}
}
......
......@@ -70,7 +70,7 @@ void CEndingEp1::ReturnsToShip()
m_Player[0].solid = false;
m_Player[0].moveTo(VectorD2<int>(6636, 19968));
m_Player[0].sprite = PMAPLEFTFRAME;
m_Player[0].processEvents();
//m_Player[0].processEvents();
addMsgBoxString("EP1_ESEQ_PART1");
......
......@@ -161,7 +161,7 @@ bool CPlayGameVorticon::loadGameState()
while(m_Player[0].mpCamera->m_moving)
{
m_Player[0].mpCamera->process();
m_Player[0].mpCamera->processEvents();
//m_Player[0].mpCamera->processEvents();
}
mMap->drawAll();
......@@ -376,7 +376,7 @@ bool CPlayGameVorticon::loadXMLGameState()
while(m_Player[0].mpCamera->m_moving)
{
m_Player[0].mpCamera->process();
m_Player[0].mpCamera->processEvents();
//m_Player[0].mpCamera->processEvents();
}
mMap->drawAll();
......
......@@ -275,8 +275,6 @@ void CPlayGameVorticon::ponder()
g_pBehaviorEngine->EventList().add(new StartInfoSceneEvent( pHighScores ));
}
}
m_Player[0].processEvents(); // -> This shouldn't be here!
}
// Render the dialogs which are seen when the game is paused
......
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