Skip to content

zGoo: Unextern static data #544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JoshSanch merged 1 commit into from
May 15, 2025
Merged

zGoo: Unextern static data #544

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 9 additions & 13 deletions src/SB/Game/zGoo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,16 @@

#include "xEvent.h"

extern F32 _742_2;
extern F32 _780_1;

struct zGooParams
{
F32 depth;
F32 orig_depth;
xEnt* goo_ent;
};

extern zGooParams* zgoo_gps;
extern S32 zgoo_ngps;
extern S32 zgoo_nused;
static zGooParams* zgoo_gps;
static S32 zgoo_ngps;
static S32 zgoo_nused;

void zGooInit(S32 nobj)
{
Expand Down Expand Up @@ -110,10 +107,9 @@ void zGooCollsBegin()
if (gooey->transl)
{
// non-matching: instruction order

change.x = _742_2;
change.x = 0.0f;
change.y = -zgoo_gps[i].depth;
change.z = _742_2;
change.z = 0.0f;

gooey->transl(gooey, &change, NULL);
}
Expand All @@ -132,9 +128,9 @@ void zGooCollsEnd()

if (gooey->transl)
{
change.x = _742_2;
change.x = 0.0f;
change.y = zgoo_gps[i].depth;
change.z = _742_2;
change.z = 0.0f;

gooey->transl(gooey, &change, NULL);
}
Expand All @@ -147,7 +143,7 @@ void zGooStopTide()

for (i = 0; i < zgoo_nused; i++)
{
zEntEvent(zgoo_gps[i].goo_ent, eEventPlatPause, _742_2, _742_2, _742_2, _742_2);
zEntEvent(zgoo_gps[i].goo_ent, eEventPlatPause, 0.0f, 0.0f, 0.0f, 0.0f);
}
}

Expand All @@ -162,7 +158,7 @@ void zGooMeltFinished(RpAtomic* atomic)

if (gooey->model->Data == atomic)
{
zEntEvent(gooey, eEventPlatUnpause, _780_1, _742_2, _742_2, _742_2);
zEntEvent(gooey, eEventPlatUnpause, 0.25f, 0.0f, 0.0f, 0.0f);
}
}
}