Skip to content

Commit

Permalink
Minor tweaks/cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
TheOnlyZac authored Nov 25, 2024
1 parent b9ee04b commit a9577f0
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 9 deletions.
18 changes: 9 additions & 9 deletions include/game.h
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,9 @@ struct LS
int sceneVars[2][4]; // Scene variables
int cclue; // Count of clues collected
unsigned int fclue; // Clue collected flags
int unk_field_0x6c;
int unk_field_0x70;
char *unk_field_0x74;
int unk_field_0x6c; // Unknown
int unk_field_0x70; // Unknown
char *unk_field_0x74; // Unknown
};

/**
Expand Down Expand Up @@ -218,7 +218,7 @@ enum WID

struct GAME
{
undefined4 field_0x0; // vtgame pointer?
VTGAME *pvtgame;
int cAlarmsTriggered;
int fTimedChallenge;
float dtChallenge;
Expand Down Expand Up @@ -262,12 +262,12 @@ uint get_level_completion_by_id(int level_id);
/**
* @brief Tally the completion of a world.
*
* @param world_id World ID.
* @param qty_keys Result of the tally of keys.
* @param qty_vaults Result of the tally of vaults.
* @param qty_mts Result of the tally of Master Thief Sprints
* @param wid World ID.
* @param ckey Result of the tally of keys.
* @param cvault Result of the tally of vaults.
* @param cmts Result of the tally of Master Thief Sprints
*/
void tally_world_completion(int world_id, int *qty_keys, int *qty_vaults, int *qty_mts);
void tally_world_completion(int wid, int *ckey, int *cvault, int *cmts);

/**
* @brief Get the game completion flags based on the current game state.
Expand Down
22 changes: 22 additions & 0 deletions include/vtables.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@

struct BLOT;

/**
* @brief VT for generic blots.
*/
struct VTBLOT
{
void (*pfnInitBlot)(BLOT *);
Expand All @@ -31,6 +34,9 @@ struct VTBLOT
int (*pfnFIncludeBlotForPeg)(BLOT *);
};

/**
* @brief VT for the note blot.
*/
struct VTNOTE
{
void (*pfnInitBlot)(BLOT *);
Expand All @@ -54,6 +60,9 @@ struct VTNOTE
int (*pfnFIncludeBlotForPeg)(BLOT *);
};

/**
* @brief VT for the binoc blot.
*/
struct VTBINOC
{
void (*pfnInitBinoc)(BLOT *);
Expand All @@ -77,6 +86,9 @@ struct VTBINOC
int (*pfnFIncludeBlotForPeg)(BLOT *);
};

/**
* @brief VT for the timer blot.
*/
struct VTTIMER
{
void (*pfnInitBlot)(BLOT *);
Expand All @@ -100,4 +112,14 @@ struct VTTIMER
int (*pfnFIncludeBlotForPeg)(BLOT *);
};

struct GAME;

/**
* @brief VT for the game struct.
*/
struct VTGAME
{
// ...
};

#endif // VTABLES_H

0 comments on commit a9577f0

Please sign in to comment.