summaryrefslogtreecommitdiff
path: root/src/code/game.c
diff options
context:
space:
mode:
authorZelllll <56516451+Zelllll@users.noreply.github.com>2021-08-15 18:15:58 -0500
committerGitHub <noreply@github.com>2021-08-15 19:15:58 -0400
commit7551dc2b71f7c6587f96c498cbd62cfd05aa292c (patch)
tree423a519beef068e0d1ec17a0a315f90a5b504e7f /src/code/game.c
parent1890e751b99c2915360178c46bcfbc2cd1695a82 (diff)
Global Context And General Cleanup (#863)
* door context * renames * done * fix unintended change * all nb gone * more nb gone * merge fishing * fix size commentX * door changes suggested by dragorn * fix accidental semicolon * another * change all texture pointers to void* * error fix and format * Update src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl> * fix ostime * correct mistake in SkyboxContext * probably fix nonmatching * Update include/z64.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * roman's suggestions, fix incorrect type definition in z64scene.h * typo in struct * make typedef use u8 array * forgot one * pull in master and format.sh Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Diffstat (limited to 'src/code/game.c')
-rw-r--r--src/code/game.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/code/game.c b/src/code/game.c
index 3f4f063f7..0fbf1a155 100644
--- a/src/code/game.c
+++ b/src/code/game.c
@@ -377,8 +377,8 @@ void GameState_Realloc(GameState* gameState, size_t size) {
}
void GameState_Init(GameState* gameState, GameStateFunc init, GraphicsContext* gfxCtx) {
- u64 startTime;
- u64 endTime;
+ OSTime startTime;
+ OSTime endTime;
// game constructor start
osSyncPrintf("game コンストラクタ開始\n");