Commit 64b68074 authored by Gerstrong's avatar Gerstrong

Lick has been added. The AI is still missing.

parent 134d364a
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include "engine/galaxy/ai/ep4/CWaterMine.h" #include "engine/galaxy/ai/ep4/CWaterMine.h"
#include "engine/galaxy/ai/ep4/CDevilSprite.h" #include "engine/galaxy/ai/ep4/CDevilSprite.h"
#include "engine/galaxy/ai/ep4/CSchoolFish.h" #include "engine/galaxy/ai/ep4/CSchoolFish.h"
#include "engine/galaxy/ai/ep4/CLick.h"
// General stuff // General stuff
#include "engine/galaxy/ai/CSpriteItem.h" #include "engine/galaxy/ai/CSpriteItem.h"
...@@ -461,6 +462,12 @@ void CMapLoaderGalaxy::addFoe(CMap &Map, word foe, size_t x, size_t y) ...@@ -461,6 +462,12 @@ void CMapLoaderGalaxy::addFoe(CMap &Map, word foe, size_t x, size_t y)
RIGHT, m_Inventory, m_Cheatmode); RIGHT, m_Inventory, m_Cheatmode);
break; break;
case 47:
// This is the Lick
p_newfoe = new galaxy::CLick(&Map, x, y);
break;
case 71: case 71:
// Watermine vertical // Watermine vertical
p_newfoe = new galaxy::CWaterMine(&Map, x, y, true); p_newfoe = new galaxy::CWaterMine(&Map, x, y, true);
......
...@@ -232,9 +232,8 @@ void CPlayGameGalaxy::process() ...@@ -232,9 +232,8 @@ void CPlayGameGalaxy::process()
m_WorldMap.setActive(true); m_WorldMap.setActive(true);
m_LevelName = m_WorldMap.getLevelName(); m_LevelName = m_WorldMap.getLevelName();
m_WorldMap.loadAndPlayMusic(); m_WorldMap.loadAndPlayMusic();
const EventExitLevel exiteventinfo = *ev; EventContainer.add( new EventPlayerEndLevel(*ev) );
EventContainer.pop_Event(); EventContainer.pop_Event();
EventContainer.add( new EventPlayerEndLevel(exiteventinfo) );
} }
else if( EventPlayTrack *ev = EventContainer.occurredEvent<EventPlayTrack>() ) else if( EventPlayTrack *ev = EventContainer.occurredEvent<EventPlayTrack>() )
{ {
......
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