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

Fix Sherbet (#558)

Browse Source 
* Update Game.cpp

* Update Penguin.cpp
This commit is contained in:
MegaMech
2025-11-09 20:40:09 -07:00
committed by GitHub
parent de9c5d5101
commit fb7bd7ba11
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/Penguin.cpp
+4 -1
View File
@@ -48,7 +48,10 @@ OPenguin::OPenguin(const SpawnParams& params) : OObject(params) {
object->origin_pos[2] = pos.z;
object->unk_0C6 = params.Rotation.value_or(IRotator(0, 0, 0)).yaw;
switch(static_cast<PenguinType>(Type)) {
Type = static_cast<PenguinType>(params.Type.value_or(0));
SpawnBhv = static_cast<OPenguin::Behaviour>(params.Behaviour.value_or(0));
switch(Type) {
case PenguinType::CHICK:
object->surfaceHeight = 5.0f;
object->sizeScaling = 0.04f;
src/port/Game.cpp
+4 -2
View File
@@ -704,8 +704,10 @@ void CM_ActorBeginPlay(struct Actor* actor) {
void CM_ActorGenerateCollision(struct Actor* actor) {
AActor* act = gWorldInstance.ConvertActorToAActor(actor);
if (act->Triangles.size() == 0) {
Editor::GenerateCollisionMesh(act, (Gfx*)LOAD_ASSET_RAW(act->Model), 1.0f);
if ((nullptr != act->Model) && (act->Model[0] != '\0')) {
if (act->Triangles.size() == 0) {
Editor::GenerateCollisionMesh(act, (Gfx*)LOAD_ASSET_RAW(act->Model), 1.0f);
}
}
}