Commit 224cfd7d authored by Gerhard Stein's avatar Gerhard Stein

Team Update and Pointers

parent e5a1d85f
......@@ -4,8 +4,12 @@
(c)2008-2012 Gerstrong
(c)2009-2012 Albert
(c)2009-2012 Pizza2004
(c)2009-2012 Tulip
Porting:
(c)2009-2012 Pizza2004 (MacOs X)
(c)2010-2012 Pelya (Android)
Released under GNU/GPL
Release v0.4.0-Beta3
......
......@@ -4,8 +4,12 @@
(c)2008-2012 Gerstrong
(c)2009-2012 Albert
(c)2009-2012 Pizza2004
(c)2009-2012 Tulip
Porting:
(c)2009-2012 Pizza2004 (MacOs X)
(c)2010-2012 Pelya (Android)
Released under GNU/GPL
Release v${CG_VERSION}
......
......@@ -109,6 +109,9 @@ public:
unsigned int mPlayers;
Difficulty mDifficulty;
EpisodeInfoStruct* getEpisodeInfoStructRef(const unsigned int episode)
{ return &EpisodeInfoStruct[episode-4]; }
void setEpisodeInfoStructPtr(const EpisodeInfoStruct* epStruct)
{ pEpisodeInfo = epStruct; }
......
......@@ -122,6 +122,7 @@ CEGAGraphics(ExeFile.getEpisode(), ExeFile.getDataDirectory()),
m_Exefile(ExeFile)
{
createBitmapsIDs();
setEpisodeInfoStructPtr(EpisodeInfo);
}
int CEGAGraphicsGalaxy::getNumSprites()
......
......@@ -7,6 +7,9 @@
#include "CGalaxySpriteObject.h"
static int spriteOffset;
CGalaxySpriteObject::CGalaxySpriteObject(CMap *pmap, const Uint16 foeID, Uint32 x, Uint32 y) :
CSpriteObject(pmap, x, y),
mFoeID(foeID),
......@@ -28,7 +31,9 @@ m_climbing(false),
mClipped(false),
m_jumpdown(false),
mEndOfAction(false)
{}
{
spriteOffset = g_pBehaviorEngine->getEpisodeInfoStructRef(g_pBehaviorEngine->getEpisode());
}
void CGalaxySpriteObject::setupGalaxyObjectOnMap(const size_t ActionBaseOffset,
const size_t ActionNumber )
......@@ -280,9 +285,9 @@ void CGalaxySpriteObject::setAction(size_t ActionNumber)
void CGalaxySpriteObject::setActionSprite()
{
if(xDirection == LEFT || xDirection == NONE)
sprite = m_Action.spriteLeft-124;
sprite = m_Action.spriteLeft-spriteOffset;
else if(xDirection == RIGHT)
sprite = m_Action.spriteRight-124;
sprite = m_Action.spriteRight-spriteOffset;
}
......
......@@ -17,8 +17,9 @@ void CEGAGraphicsGalaxy::createBitmapsIDs()
{
/// Set the bitmap names
// Keen 4 Bitmap IDs
m_BitmapNameMap[0][97] = "KEENSWATCH";
m_BitmapNameMap[0][103] = "TITLE";
m_BitmapNameMap[0][97] = "KEENSWATCH";
m_BitmapNameMap[0][106] = "KEENTHUMBSUP";
// Menu Labels
m_BitmapNameMap[0][82] = "MAINMENULABEL";
......@@ -61,11 +62,11 @@ void CEGAGraphicsGalaxy::createBitmapsIDs()
m_BitmapNameMap[2][20] = "KEENSWATCH";
// Menu Labels
m_BitmapNameMap[2][5] = "MAINMENULABEL";
m_BitmapNameMap[2][6] = "NEWGAMELABEL";
m_BitmapNameMap[2][7] = "LOADMENULABEL";
m_BitmapNameMap[2][8] = "SAVEMENULABEL";
m_BitmapNameMap[2][9] = "CONFIGMENULABEL";
m_BitmapNameMap[2][5] = "MAINMENULABEL";
m_BitmapNameMap[2][6] = "NEWGAMELABEL";
m_BitmapNameMap[2][7] = "LOADMENULABEL";
m_BitmapNameMap[2][8] = "SAVEMENULABEL";
m_BitmapNameMap[2][9] = "CONFIGMENULABEL";
m_BitmapNameMap[2][10] = "SNDEFFMENULABEL";
m_BitmapNameMap[2][11] = "MUSICMENULABEL";
m_BitmapNameMap[2][12] = "KEYBMENULABEL";
......
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