Windows build fixes

This commit is contained in:
Jack Andersen 2017-04-14 20:16:38 -10:00
parent 664cbec769
commit 6056857cab
11 changed files with 7 additions and 21 deletions

View File

@ -29,7 +29,7 @@ void CAutoMapper::SAutoMapperRenderState::InterpolateWithClamp(const SAutoMapper
else else
easeInOut = zeus::clamp(0.f, 1.f - (0.5f * std::sqrt(2.f * omt - 1.f) + 0.5f), 1.f); easeInOut = zeus::clamp(0.f, 1.f - (0.5f * std::sqrt(2.f * omt - 1.f) + 0.5f), 1.f);
float eases[] = {}; float eases[5] = {};
eases[1] = t; eases[1] = t;
eases[2] = easeOut; eases[2] = easeOut;
eases[3] = easeIn; eases[3] = easeIn;
@ -766,7 +766,7 @@ zeus::CVector2i CAutoMapper::GetMiniMapViewportSize()
zeus::CVector2i CAutoMapper::GetMapScreenViewportSize() zeus::CVector2i CAutoMapper::GetMapScreenViewportSize()
{ {
return {g_Viewport.x8_width, g_Viewport.xc_height}; return {int(g_Viewport.x8_width), int(g_Viewport.xc_height)};
} }
float CAutoMapper::GetMapAreaMaxDrawDepth(const CStateManager&, TAreaId aid) const float CAutoMapper::GetMapAreaMaxDrawDepth(const CStateManager&, TAreaId aid) const

View File

@ -49,7 +49,7 @@ if(APPLE)
endif() endif()
add_library(RuntimeCommon add_library(RuntimeCommon
RetroTypes.hpp RetroTypes.cpp RetroTypes.hpp
${CLIENT_SOURCES} ${CLIENT_SOURCES}
${MP1_SOURCES} ${MP1_SOURCES}
${AUDIO_SOURCES} ${AUDIO_SOURCES}
@ -109,7 +109,7 @@ add_library(RuntimeCommon
CPlayMovieBase.hpp CPlayMovieBase.hpp
CGameDebug.hpp CGameDebug.cpp CGameDebug.hpp CGameDebug.cpp
CGameHintInfo.hpp CGameHintInfo.cpp CGameHintInfo.hpp CGameHintInfo.cpp
rstl.hpp rstl.cpp rstl.hpp
GameGlobalObjects.hpp GameGlobalObjects.cpp GameGlobalObjects.hpp GameGlobalObjects.cpp
MkCastTo.py MkCastTo.py
TCastTo.hpp TCastTo.cpp TCastTo.hpp TCastTo.cpp

View File

@ -17,7 +17,7 @@ CENTITY_TYPES = (
('CDestroyableRock', 'World/CDestroyableRock.hpp'), ('CDestroyableRock', 'World/CDestroyableRock.hpp'),
('CEnergyProjectile', 'Weapon/CEnergyProjectile.hpp'), ('CEnergyProjectile', 'Weapon/CEnergyProjectile.hpp'),
('CEntity', 'World/CEntity.hpp'), ('CEntity', 'World/CEntity.hpp'),
('CExplosion', 'Weapon/CExplosion.hpp'), ('CExplosion', 'World/CExplosion.hpp'),
('CFirstPersonCamera', 'Camera/CFirstPersonCamera.hpp'), ('CFirstPersonCamera', 'Camera/CFirstPersonCamera.hpp'),
('CFishCloud', 'World/CFishCloud.hpp'), ('CFishCloud', 'World/CFishCloud.hpp'),
('CGameCamera', 'Camera/CGameCamera.hpp'), ('CGameCamera', 'Camera/CGameCamera.hpp'),

View File

@ -1,7 +0,0 @@
#include "RetroTypes.hpp"
#include "zeus/CVector3f.hpp"
namespace urde
{
}

View File

@ -24,7 +24,6 @@ set(WEAPON_SOURCES
CPlasmaProjectile.hpp CPlasmaProjectile.cpp CPlasmaProjectile.hpp CPlasmaProjectile.cpp
CEnergyProjectile.cpp CEnergyProjectile.cpp CEnergyProjectile.cpp CEnergyProjectile.cpp
CProjectileWeapon.hpp CProjectileWeapon.cpp CProjectileWeapon.hpp CProjectileWeapon.cpp
CExplosion.hpp CExplosion.cpp
CBomb.hpp CBomb.cpp CBomb.hpp CBomb.cpp
CPowerBomb.hpp CPowerBomb.cpp) CPowerBomb.hpp CPowerBomb.cpp)

View File

@ -3,6 +3,7 @@
#include "CEffect.hpp" #include "CEffect.hpp"
#include "Particle/CElementGen.hpp" #include "Particle/CElementGen.hpp"
#include "Particle/CGenDescription.hpp"
namespace urde namespace urde
{ {

View File

@ -1 +0,0 @@
#include "CHUDMemoParms.hpp"

View File

@ -105,7 +105,7 @@ set(WORLD_SOURCES
CPatternedInfo.hpp CPatternedInfo.cpp CPatternedInfo.hpp CPatternedInfo.cpp
CHealthInfo.hpp CHealthInfo.cpp CHealthInfo.hpp CHealthInfo.cpp
CPatterned.hpp CPatterned.cpp CPatterned.hpp CPatterned.cpp
CHUDMemoParms.hpp CHUDMemoParms.cpp CHUDMemoParms.hpp
CWorldShadow.hpp CWorldShadow.cpp CWorldShadow.hpp CWorldShadow.cpp
CProjectedShadow.hpp CProjectedShadow.cpp CProjectedShadow.hpp CProjectedShadow.cpp
CGameLight.hpp CGameLight.cpp CGameLight.hpp CGameLight.cpp

View File

@ -1,6 +0,0 @@
#include "rstl.hpp"
namespace rstl
{
}