Commit cc969c90 authored by Gerhard Stein's avatar Gerhard Stein

fix in keen galaxy engine and undid chad change of fallspeed increase. 4 is...

fix in keen galaxy engine and undid chad change of fallspeed increase. 4 is better. The other one still must be adjusted
parent accb23d1
......@@ -16,7 +16,7 @@
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactName="CommanderGenius" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.cross.exe.debug.628712671" name="Debug" parent="cdt.managedbuild.config.gnu.cross.exe.debug.628712671">
<configuration artifactName="CommanderGenius" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.cross.exe.debug.628712671" name="Debug">
<folderInfo id="cdt.managedbuild.config.gnu.cross.exe.debug.628712671." name="/" resourcePath="">
<toolChain id="cdt.managedbuild.toolchain.gnu.base.12968022" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.base">
<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.gnu.platform.base.15543418" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/>
......
......@@ -139,7 +139,7 @@ SET(ALL_SRCS ${COMMON_S} ${MENU_S} ${DIALOG_S} ${ENGINE_S}
${SDLVIDEO_S} ${ROOT_S} src/CGLogo.o)
ELSE(BUILD_TYPE STREQUAL WIN32)
SET(ALL_SRCS ${COMMON_S} ${MENU_S} ${DIALOG_S} ${ENGINE_S}
${AI_S} ${GALAXY_S} ${INFOSCENES_S} ${PLAYGAME_S} ${VORTICON_S} ${FINALE_S} ${VPLAYGAME_S} ${FILEIO_S}
${AI_S} ${GALAXY_S} ${GALAXY_AI_S} ${INFOSCENES_S} ${PLAYGAME_S} ${VORTICON_S} ${FINALE_S} ${VPLAYGAME_S} ${FILEIO_S}
${COMPRESSION_S} ${GRAPHICS_S} ${EFFECTS_S} ${HQP_S} ${SCALE2X_S} ${SDL_S} ${SDLSOUND_S} ${SDLSYS_S}
${SDLVIDEO_S} ${ROOT_S})
ENDIF(BUILD_TYPE STREQUAL WIN32)
......
......@@ -21,7 +21,7 @@ CPhysicsSettings::CPhysicsSettings() {
// when falling keen's Y inertia increases up to maximum
player.max_fallspeed = 105;
player.fallspeed_decrease = 5;
player.fallspeed_increase = 4;
// Pogo values
player.pogoforce_x = 30;
......
......@@ -28,7 +28,7 @@ public:
int impossiblepogospeed;
int max_fallspeed;
int fallspeed_decrease;
int fallspeed_increase;
// pogo settings
int pogoforce_x;
......
......@@ -678,7 +678,7 @@ CPhysicsSettings &PhysicsSettings = g_pBehaviorEngine->getPhysicsSettings();
if (pfallspeed>PhysicsSettings.player.max_fallspeed)
pfallspeed = PhysicsSettings.player.max_fallspeed;
else if (pfallspeed<PhysicsSettings.player.max_fallspeed)
pfallspeed += PhysicsSettings.player.fallspeed_decrease;
pfallspeed += PhysicsSettings.player.fallspeed_increase;
// add current fall speed to player Y or make him fly in godmode with pogo
if( !godmode || !ppogostick || !g_pInput->getHoldedCommand(IC_JUMP) )
......
......@@ -30,6 +30,7 @@ bool CPlayGameGalaxy::loadGameState()
bool CPlayGameGalaxy::init()
{
loadLevel();
m_WorldMap.setActive(true);
return false;
}
......
......@@ -14,6 +14,7 @@
namespace galaxy {
CWorldMap::CWorldMap(CExeFile &ExeFile):
m_active(false),
m_ExeFile(ExeFile)
{}
......
......@@ -4,4 +4,3 @@
#define CGVERSION "032"
#endif
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