mirror/SpaghettiKart
1
0
Fork 0
mirror of https://github.com/HarbourMasters/SpaghettiKart synced 2026-07-11 07:25:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updates

Browse Source
This commit is contained in:
MegaMech
2025-03-21 20:38:02 -06:00
parent 4f0014bfd3
commit 1dee7001f6
58 changed files with 610 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/BombKart.cpp
+5 -5
View File
@@ -29,7 +29,7 @@ extern s8 gPlayerCount;
size_t OBombKart::_count = 0;
OBombKart::OBombKart(Vec3f pos, TrackWaypoint* waypoint, uint16_t waypointIndex, uint16_t state, f32 unk_3C) {
OBombKart::OBombKart(FVector pos, TrackWaypoint* waypoint, uint16_t waypointIndex, uint16_t state, f32 unk_3C) {
Name = "Bomb Kart";
_idx = _count;
Vec3f _pos = {0, 0, 0};
@@ -42,10 +42,10 @@ OBombKart::OBombKart(Vec3f pos, TrackWaypoint* waypoint, uint16_t waypointIndex,
// Set height to the default value of 2000.0f unless Pos[1] is higher.
// This allows placing these on very high surfaces.
f32 height = (pos[1] > 2000.0f) ? pos[1] : 2000.0f;
_pos[0] = pos[0];
_pos[1] = spawn_actor_on_surface(pos[0], height, pos[2]);
_pos[2] = pos[2];
f32 height = (pos.y > 2000.0f) ? pos.y : 2000.0f;
_pos[0] = pos.x;
_pos[1] = spawn_actor_on_surface(pos.x, height, pos.z);
_pos[2] = pos.z;
}
WaypointIndex = waypointIndex;
src/engine/objects/BombKart.h
+1 -1
View File
@@ -50,7 +50,7 @@ public:
Collision _Collision;
// Set waypoint to NULL if using a spawn position and not a waypoint.
explicit OBombKart(Vec3f pos, TrackWaypoint* waypoint, uint16_t waypointIndex, uint16_t state, f32 unk_3C);
explicit OBombKart(FVector pos, TrackWaypoint* waypoint, uint16_t waypointIndex, uint16_t state, f32 unk_3C);
~OBombKart() {
_count--;
src/engine/objects/Penguin.cpp
+4 -4
View File
@@ -34,7 +34,7 @@ extern s8 gPlayerCount;
}
OPenguin::OPenguin(Vec3f pos, u16 direction, PenguinType type, Behaviour behaviour) {
OPenguin::OPenguin(FVector pos, u16 direction, PenguinType type, Behaviour behaviour) {
Name = "Penguin";
_type = type;
_bhv = behaviour;
@@ -44,9 +44,9 @@ OPenguin::OPenguin(Vec3f pos, u16 direction, PenguinType type, Behaviour behavio
init_object(_objectIndex, 0);
Object *object = &gObjectList[_objectIndex];
object->origin_pos[0] = pos[0] * xOrientation;
object->origin_pos[1] = pos[1];
object->origin_pos[2] = pos[2];
object->origin_pos[0] = pos.x * xOrientation;
object->origin_pos[1] = pos.y;
object->origin_pos[2] = pos.z;
object->unk_0C6 = direction;
switch(type) {
src/engine/objects/Penguin.h
+1 -1
View File
@@ -38,7 +38,7 @@ public:
f32 Diameter = 0.0f; // Waddle in a circle around the spawn point at this diameter.
uint16_t MirrorModeAngleOffset;
explicit OPenguin(Vec3f pos, u16 direction, PenguinType type, Behaviour behaviour);
explicit OPenguin(FVector pos, u16 direction, PenguinType type, Behaviour behaviour);
virtual void Tick() override;
virtual void Draw(s32 cameraId) override;