diff options
| author | MegaMech <MegaMech@users.noreply.github.com> | 2024-12-04 11:20:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-04 11:20:07 -0700 |
| commit | c774537ad36116909a0b43ecd28609df4ef386a8 (patch) | |
| tree | 7be65a36bffc55d43c0931c1b25d3194461ef329 /src/engine/World.h | |
| parent | d830492da94f44369dac17db88461c0e9524ccd4 (diff) | |
| parent | eb158e2abd86579d3fa3c69436c3322cffd28d59 (diff) | |
Merge branch 'modding' into modding+modding+
Diffstat (limited to 'src/engine/World.h')
| -rw-r--r-- | src/engine/World.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/engine/World.h b/src/engine/World.h index 703404c0f..b6801a668 100644 --- a/src/engine/World.h +++ b/src/engine/World.h @@ -10,6 +10,7 @@ #include "vehicles/Train.h" #include "TrainCrossing.h" #include "vehicles/OThwomp.h" +#include "vehicles/OPenguin.h" #include <memory> #include "Actor.h" @@ -146,6 +147,9 @@ public: std::vector<std::unique_ptr<OThwomp>> Thwomps; void AddThwomp(s16 x, s16 z, s16 direction, f32 scale, s16 behaviour, s16 primAlpha, u16 boundingBoxSize = 7); + std::vector<std::shared_ptr<OPenguin>> Penguins; + std::shared_ptr<OPenguin> AddPenguin(Vec3f pos, u16 direction, OPenguin::PenguinType type, OPenguin::Behaviour behaviour); + TrainCrossing* AddCrossing(Vec3f position, u32 waypointMin, u32 waypointMax, f32 approachRadius, f32 exitRadius); std::vector<std::shared_ptr<TrainCrossing>> Crossings; |
