Skip to content

Commit aec2446

Browse files
committed
Improve zScene matchingness
1 parent 2c68e9a commit aec2446

File tree

1 file changed

+2
-16
lines changed

1 file changed

+2
-16
lines changed

src/SB/Game/zScene.cpp

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ static S32 neededFiles;
110110
static F32 offsetx;
111111
static F32 offsety;
112112
static U32 enableScreenAdj;
113-
static F32 oldOffsetx;
114-
static F32 oldOffsety;
113+
volatile static F32 oldOffsetx;
114+
volatile static F32 oldOffsety;
115115
static S32 sMemDepthSceneStart = -1;
116116
static S32 sMemDepthJustHIPStart = -1;
117117
_zEnv* gCurEnv;
@@ -270,21 +270,7 @@ namespace
270270
{ "hud:text", eBaseTypeHUD_text, sizeof(xBase) + sizeof(xhud::text_widget), false, xhud::text_widget::load },
271271
{ "game_object:bungee_hook", eBaseTypeBungeeHook, sizeof(bungee_state::hook_type), false, bungee_state::load },
272272
{ "game_object:Flythrough", eBaseTypeCameraFly, sizeof(zCameraFly), false, zCameraFly_Init },
273-
#if 1 // include the rest of the strings here until their parent functions are decomped
274-
{ "game_object:Camera_Tweak\0"
275-
"... scene preload ...\n\0"
276-
"... scene loading ...\n\0"
277-
"... scene asset queue ...\n\0"
278-
"...initializing scene - sound\n\0"
279-
"...initializing scene - base types\n\0"
280-
"PAREMIT_FIREWORKS_TRAIL\0"
281-
"PAREMIT_FIREWORKS1\0"
282-
"PAREMIT_FIREWORKS2\0"
283-
"Fireworks_explode\0"
284-
"Fireworks_trail", eBaseTypeCameraTweak, sizeof(zCameraTweak), false, zCameraTweak_Init }
285-
#else
286273
{ "game_object:Camera_Tweak", eBaseTypeCameraTweak, sizeof(zCameraTweak), false, zCameraTweak_Init }
287-
#endif
288274
};
289275
// clang-format on
290276

0 commit comments

Comments
 (0)