Commit 5a7bf81d authored by Gerhard Stein's avatar Gerhard Stein

Improved Status Screen animation in the Galaxy Engine

parent 8609c764
......@@ -158,12 +158,7 @@ bool CAudioGalaxy::LoadFromAudioCK(const CExeFile& ExeFile)
if( audio_start < audio_end )
{
/*#if defined(ANDROID)
assert( AudioCompFileData + audio_start % 4 == 0 ); // Make sure the pointer is aligned, or we'll get segfault on Android
#endif*/
const uint32_t audio_comp_data_start = audio_start+sizeof(uint32_t);
//const uint32_t *AudioCompFileData32 = (uint32_t*) (void*) (AudioCompFileData + audio_start);
const uint32_t *AudioCompFileData32 = reinterpret_cast<uint32_t*>(
reinterpret_cast<void*>(AudioCompFileData + audio_start));
......
......@@ -9,6 +9,7 @@
#include "common/CBehaviorEngine.h"
#include "graphics/CGfxEngine.h"
#include "sdl/CVideoDriver.h"
#include "sdl/input/CInput.h"
#include "graphics/effects/CScrollEffect.h"
#include "CStatusScreenGalaxyEp4.h"
//#include "CStatusScreenGalaxyEp5.h"
......@@ -42,9 +43,6 @@ void CInventory::toggleStatusScreen()
{
mp_StatusScreen->m_showstatus = !mp_StatusScreen->m_showstatus;
int scroll_pos;
if(mp_StatusScreen->m_showstatus)
{
int scroll_pos = 0;
......@@ -63,7 +61,7 @@ void CInventory::toggleStatusScreen()
else
{
// Check if it's already scrolling and get the position
scroll_pos = 160;
int scroll_pos = 160;
CScrollEffect* ScrollEffect = dynamic_cast<CScrollEffect*>(g_pGfxEngine->Effect());
......@@ -75,6 +73,8 @@ void CInventory::toggleStatusScreen()
SDL_FreeSurface(mp_StatusBgrnd);
mp_StatusBgrnd = NULL;
}
g_pInput->flushAll();
}
......
......@@ -308,10 +308,6 @@ void CGUIDialog::initGalaxyBackround(SDL_Rect Rect)
SDL_FillRect(backSfc, &scoreRect, color);
scoreRect.y = 143;
SDL_FillRect(backSfc, &scoreRect, color);
}
......
......@@ -107,12 +107,7 @@ bool CIMFPlayer::readCompressedAudiointoMemory(const CExeFile& ExeFile,
// Open the AUDIOHED so we know where tomp_IMF_Data decompress
uint32_t number_of_audiorecs = 0;
// That size must appear as integer in the ExeFile. Look for it!
/*#if defined(ANDROID)
assert( reinterpret_cast<size_t>(ExeFile.getHeaderData()) % 4 == 0 ); // Make sure the pointer is aligned, or we'll get segfault on Android
#endif*/
// TODO: Not sure, if that is a good idea
//audiohedptr = (uint32_t*) (void*) ExeFile.getHeaderData();
audiohedptr = reinterpret_cast<uint32_t*>(ExeFile.getHeaderData());
bool found = false;
for( const uint32_t *endptr = (uint32_t*) (void*) ExeFile.getHeaderData()+ExeFile.getExeDataSize()/sizeof(uint32_t);
......
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