Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-04-28 15:57:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

conversion error

Browse source
This commit is contained in:
davidmarr 2024-11-24 13:17:53 +01:00
parent 7643d19082
commit f811117458
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TombEngine/Game/control/event.h
View file

@ -8,7 +8,7 @@ namespace TEN::Control::Volumes
{ {
using Activator = std::variant< using Activator = std::variant<
std::nullptr_t, std::nullptr_t,
short, int,
MESH_INFO*, MESH_INFO*,
CAMERA_INFO*>; CAMERA_INFO*>;

4
TombEngine/Scripting/Internal/TEN/Objects/Moveable/MoveableObject.cpp
View file

@ -525,9 +525,9 @@ void SetLevelFuncCallback(const TypeOrNil<LevelFunc>& cb, const std::string& cal
} }
short Moveable::GetIndex() const int Moveable::GetIndex() const
{ {
return m_num; return (int)m_num;
} }
void Moveable::SetOnHit(const TypeOrNil<LevelFunc>& cb) void Moveable::SetOnHit(const TypeOrNil<LevelFunc>& cb)

2
TombEngine/Scripting/Internal/TEN/Objects/Moveable/MoveableObject.h
View file

@ -136,7 +136,7 @@ public:
friend bool operator ==(const Moveable&, const Moveable&); friend bool operator ==(const Moveable&, const Moveable&);
friend void SetLevelFuncCallback(const TypeOrNil<LevelFunc>& cb, const std::string& callerName, Moveable& mov, std::string& toModify); friend void SetLevelFuncCallback(const TypeOrNil<LevelFunc>& cb, const std::string& callerName, Moveable& mov, std::string& toModify);
short GetIndex() const; int GetIndex() const;
protected: protected:
ItemInfo* m_item; ItemInfo* m_item;