mirror of https://github.com/AxioDL/metaforce.git
Windows fixes
This commit is contained in:
parent
8e7773aa94
commit
c8e22a6873
|
@ -10,7 +10,7 @@ namespace DataSpec
|
|||
|
||||
struct ITweakPlayerRes : ITweak
|
||||
{
|
||||
using ResId = int64_t;
|
||||
using ResId = uint64_t;
|
||||
using EBeamId = urde::CPlayerState::EBeamId;
|
||||
|
||||
ResId x4_saveStationIcon;
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
#include "AutoMapper/CMapArea.hpp"
|
||||
#include "zeus/CEulerAngles.hpp"
|
||||
#include "World/CPlayer.hpp"
|
||||
#include "Particle/CGenDescription.hpp"
|
||||
|
||||
namespace urde
|
||||
{
|
||||
|
@ -118,8 +119,8 @@ zeus::CVector2i CAutoMapper::GetMiniMapViewportSize()
|
|||
{
|
||||
float scaleX = g_Viewport.x8_width / 640.f;
|
||||
float scaleY = g_Viewport.xc_height / 480.f;
|
||||
return {scaleX * g_tweakAutoMapper->GetMiniMapViewportWidth(),
|
||||
scaleY * g_tweakAutoMapper->GetMiniMapViewportHeight()};
|
||||
return {int(scaleX * g_tweakAutoMapper->GetMiniMapViewportWidth()),
|
||||
int(scaleY * g_tweakAutoMapper->GetMiniMapViewportHeight())};
|
||||
}
|
||||
|
||||
float CAutoMapper::GetMapAreaMiniMapDrawAlphaSurfaceVisited(const CStateManager& stateMgr)
|
||||
|
|
|
@ -7,11 +7,11 @@
|
|||
#include "zeus/CTransform.hpp"
|
||||
#include "IFactory.hpp"
|
||||
#include "CToken.hpp"
|
||||
#include "CMapArea.hpp"
|
||||
|
||||
namespace urde
|
||||
{
|
||||
class CStateManager;
|
||||
class CMapArea;
|
||||
class CMapUniverse
|
||||
{
|
||||
public:
|
||||
|
|
|
@ -6,11 +6,11 @@
|
|||
#include "zeus/CColor.hpp"
|
||||
#include "zeus/CVector3f.hpp"
|
||||
#include "zeus/CTransform.hpp"
|
||||
#include "CMapArea.hpp"
|
||||
|
||||
namespace urde
|
||||
{
|
||||
class IWorld;
|
||||
class CMapArea;
|
||||
class CMapWorldInfo;
|
||||
class CStateManager;
|
||||
class CMapWorld
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
#include "TCastTo.hpp"
|
||||
#include "CStateManager.hpp"
|
||||
#include "CPlayer.hpp"
|
||||
#include "Particle/CGenDescription.hpp"
|
||||
|
||||
namespace urde
|
||||
{
|
||||
|
|
2
hecl
2
hecl
|
@ -1 +1 @@
|
|||
Subproject commit 2bc1c30547e891355bc99d8809f356d93c3ff7f3
|
||||
Subproject commit 5d11c53fea3e554c8c93a8c055edcc22dedaa084
|
Loading…
Reference in New Issue