Commit 0f8a137b authored by Gerstrong's avatar Gerstrong

cleanups

parent be7526a4
......@@ -8,8 +8,8 @@ OPTION(CREATE_DEBS "Will create Debian Packages" No)
# Generation of Packages. Common stuff and Basic variables
SET(CPACK_PACKAGE_NAME "CGenius")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The ultimate Commander Keen interpreter")
SET(CPACK_PACKAGE_DESCRIPTION "Commander Genius aka CloneKeenPlus is an engine which interprets Commander Keen 1-3 (Vorticons Series).\n .\n As fans and developers we try to implement new features, improve the game play and give the feeling, you are playing the original game.\n .\n Obviously you need the game data of the games to play it.\nCommander Keen 1 comes included in this package.\nEpisode 2 and 3 are registered versions which can be purchased by 3D Realms or Apogee, or bought by someone else.\n If you still have the old games of the registered version, then give it a try. You will be surprised, how well they will look!\n Commander Keen 4 support is under heavy development. Some parts are suddenly starting to work.")
SET(CPACK_PACKAGE_VENDOR "The Commmander Genius Team")
SET(CPACK_PACKAGE_DESCRIPTION "Commander-Genius aka CloneKeenPlus is an engine which interprets Commander Keen 1-3 (Vorticons Series).\n .\n As fans and developers we try to implement new features, improve the game play and give the feeling, you are playing the original game.\n .\n Obviously you need the game data of the games to play it.\n Commander Keen 1 comes included in this package.\n Episode 2 and 3 are registered versions which can be purchased by 3D Realms or Apogee, or bought by someone else.\n If you still have the old games of the registered version, then give it a try. You will be surprised, how well they will look!\n Commander Keen 4 support is under heavy development. Some parts are suddenly starting to work.")
SET(CPACK_PACKAGE_VENDOR "The Commmander-Genius Team")
SET(CPACK_PACKAGE_VERSION ${CG_VERSION})
SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/readme.txt")
SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${BUILD_TYPE}")
......@@ -26,7 +26,7 @@ IF(BUILD_TYPE STREQUAL WIN32)
# There is a bug in NSI that does not handle full unix paths properly. Make
# sure there is at least one set of four (4) backlasshes.
SET(CPACK_NSIS_INSTALLED_ICON_NAME "CGenius.exe")
SET(CPACK_NSIS_DISPLAY_NAME "Commander Genius")
SET(CPACK_NSIS_DISPLAY_NAME "Commander-Genius")
SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\clonekeenplus.sourceforge.net")
SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\clonekeenplus.sourceforge.net")
SET(CPACK_NSIS_CONTACT "gerstrong@gmail.com")
......
......@@ -107,8 +107,8 @@ public:
/**
* Just return the absolute end of the pointer.
*/
T *getEndPtr()
{ return mp_end; }
T *getLastElem()
{ return mp_end-1; }
/**
......
......@@ -26,7 +26,7 @@ m_opl_emulator(opl_emulator),
m_numreadysamples(0),
m_samplesPerMusicTick(m_AudioDevSpec.freq / m_opl_emulator.getIMFClockRate()),
m_IMFDelay(0),
m_mix_buffer(new Sint32[m_samplesPerMusicTick])
m_mix_buffer(new Sint32[m_AudioDevSpec.samples])
{
// Load the IMF File here!
FILE *fp;
......@@ -58,7 +58,7 @@ m_mix_buffer(new Sint32[m_samplesPerMusicTick])
else
{
// Put a zero delay to that data structure so it will be rewound correctly!
m_IMF_Data.getEndPtr()->Delay=0;
m_IMF_Data.getLastElem()->Delay=0;
fclose(fp);
}
}
......@@ -192,7 +192,7 @@ m_mix_buffer(new Sint32[m_AudioDevSpec.samples])
m_IMF_Data.reserve(imf_chunks);
memcpy(m_IMF_Data.getStartPtr(), imf_data_ptr, data_size);
// Put a zero delay to that data structure so it will be rewound correctly!
m_IMF_Data.getEndPtr()->Delay=0;
m_IMF_Data.getLastElem()->Delay=0;
}
}
}
......@@ -205,7 +205,7 @@ CIMFPlayer::~CIMFPlayer()
bool CIMFPlayer::open()
{
m_IMFDelay = 0;
m_numreadysamples = m_IMFDelay = 0;
m_samplesPerMusicTick = m_AudioDevSpec.freq / m_opl_emulator.getIMFClockRate();
return (!m_IMF_Data.empty());
......@@ -213,7 +213,7 @@ bool CIMFPlayer::open()
void CIMFPlayer::close()
{
m_numreadysamples = 0;
m_numreadysamples = m_IMFDelay = 0;
m_opl_emulator.ShutAL();
play(false);
......
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