Skip to content

zFX: find_popper abysmal progress #503

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

Closed
JoshSanch wants to merge 1 commit into from
Closed

zFX: find_popper abysmal progress #503

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
62 changes: 40 additions & 22 deletions src/SB/Game/zFX.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,22 +127,12 @@ void zFXUpdate(F32 dt)

namespace
{
void add_popper_tweaks()
{
}
void add_entrail_tweaks()
{
}

S32 count_faces(xModelInstance* mdl)
enum state_enum
{
int i = 0;
for (; mdl != NULL; mdl = mdl->Next)
{
i += mdl->Data->geometry->numTriangles;
}
return i;
}
STATE_NONE,
STATE_OFF,
STATE_ON
};

struct entrail_data
{
Expand All @@ -157,13 +147,6 @@ namespace
void update(F32);
};

enum state_enum
{
STATE_NONE,
STATE_OFF,
STATE_ON
};

struct popper_data
{
state_enum state;
Expand Down Expand Up @@ -192,6 +175,41 @@ namespace
entrail_data* entrails;
U32 entrails_size;

// FIXME: This is not close to correct but I need something to trigger CI
popper_data* find_popper(xEnt* ent)
{
popper_data* puVar1;

puVar1 = poppers;
while (puVar1->ent == ent)
{
if (puVar1 == &poppers[8])
{
return NULL;
}

puVar1 = puVar1 + sizeof(popper_data) / 8;
}
return puVar1;
}

void add_popper_tweaks()
{
}
void add_entrail_tweaks()
{
}

S32 count_faces(xModelInstance* mdl)
{
int i = 0;
for (; mdl != NULL; mdl = mdl->Next)
{
i += mdl->Data->geometry->numTriangles;
}
return i;
}

void entrail_data::reset()
{
flags = 0;
Expand Down