vrmiguel
/
sm64pc
mirror of https://github.com/sm64pc/sm64pc.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Tweak a few things

This commit is contained in:
Colton Rushton 2021-02-12 09:05:41 -04:00
parent 84512c4335
commit 4306918071
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/dxsdk/d3dx12.h
View File

@ -2171,8 +2171,6 @@ struct CD3DX12_RT_FORMAT_ARRAY : public D3D12_RT_FORMAT_ARRAY
struct DefaultSampleMask { operator UINT() { return UINT_MAX; } };
struct DefaultSampleDesc { operator DXGI_SAMPLE_DESC() { return DXGI_SAMPLE_DESC{1, 0}; } };
//#pragma warning(push)
//#pragma warning(disable : 4324)
template <typename InnerStructType, D3D12_PIPELINE_STATE_SUBOBJECT_TYPE Type, typename DefaultArg = InnerStructType>
class alignas(void*) CD3DX12_PIPELINE_STATE_STREAM_SUBOBJECT
{
@ -2188,7 +2186,6 @@ public:
InnerStructType* operator&() { return &_Inner; }
InnerStructType const* operator&() const { return &_Inner; }
};
//#pragma warning(pop)
typedef CD3DX12_PIPELINE_STATE_STREAM_SUBOBJECT< D3D12_PIPELINE_STATE_FLAGS, D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_FLAGS> CD3DX12_PIPELINE_STATE_STREAM_FLAGS;
typedef CD3DX12_PIPELINE_STATE_STREAM_SUBOBJECT< UINT, D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_NODE_MASK> CD3DX12_PIPELINE_STATE_STREAM_NODE_MASK;
typedef CD3DX12_PIPELINE_STATE_STREAM_SUBOBJECT< ID3D12RootSignature*, D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_ROOT_SIGNATURE> CD3DX12_PIPELINE_STATE_STREAM_ROOT_SIGNATURE;

2
src/game/envfx_bubbles.c
View File

@ -352,11 +352,13 @@ s32 envfx_init_bubble(s32 mode) {
//! Dead code
if (0) {
}
#endif
for (i = 0; i < sBubbleParticleCount; i++) {
(gEnvFxBuffer + i)->animFrame = random_float() * 7.0f;
}
#ifndef QOL_FIXES
if (0) {
}
#endif

10
src/game/ingame_menu.c
View File

@ -386,7 +386,10 @@ void render_multi_text_string(s16 *xPos, s16 *yPos, s8 multiTextID)
* In JP/EU a IA1 texture is used but in US a IA4 texture is used.
*/
void print_generic_string(s16 x, s16 y, const u8 *str) {
// get rid of this unused variable when both VERSION_EU and QOL_FIXES
#if !defined(VERSION_EU) && !defined(QOL_FIXES)
UNUSED s8 mark = DIALOG_MARK_NONE; // unused in EU
#endif
s32 strPos = 0;
u8 lineNum = 1;
#ifdef VERSION_EU
@ -534,8 +537,10 @@ void print_generic_string(s16 x, s16 y, const u8 *str) {
create_dl_translation_matrix(MENU_MTX_NOPUSH, 10.0f, 0.0f, 0.0f);
#else
create_dl_translation_matrix(MENU_MTX_NOPUSH, (f32)(gDialogCharWidths[str[strPos]]), 0.0f, 0.0f);
#if !defined(VERSION_JP) || !(VERSION_SH) || !defined(QOL_FIXES)
break; // what an odd difference. US added a useless break here.
#endif
#endif
#endif
}
@ -604,7 +609,7 @@ void print_hud_lut_string(s8 hudLUT, s16 x, s16 y, const u8 *str) {
break;
default:
#endif
#if defined(VERSION_US) || defined(VERSION_SH) || !defined(QOL_FIXES)
#if defined(VERSION_US) || defined(VERSION_SH)
if (str[strPos] == GLOBAL_CHAR_SPACE) {
if (0) //! dead code
{
@ -778,8 +783,7 @@ void handle_menu_scrolling(s8 scrollDirection, s8 *currentIndex, s8 minIndex, s8
currentIndex[0]++;
}
#else
// It makes more sense for this if statement to have > instead of >= here
if (currentIndex[0] > maxIndex) {
if (currentIndex[0] >= maxIndex) {
play_sound(SOUND_MENU_CHANGE_SELECT, gDefaultSoundArgs);
currentIndex[0]++;
}

6
src/game/level_update.c
View File

@ -1097,6 +1097,7 @@ s32 play_mode_change_area(void) {
sTransitionUpdate(&sTransitionTimer);
}
// set sTransitionTimer to decrement to -1 instead of 0 using this statement in QOL_FIXES
#ifndef QOL_FIXES
if (sTransitionTimer > 0) {
#else
@ -1150,7 +1151,12 @@ s32 play_mode_change_level(void) {
* Unused play mode. Doesn't call transition update and doesn't reset transition at the end.
*/
static s32 play_mode_unused(void) {
#ifndef QOL_FIXES
//! If sTransitionTimer is -1, this will miss.
if (--sTransitionTimer == -1) {
#else
if (sTransitionTimer <= -1) {
#endif
gHudDisplay.flags = HUD_DISPLAY_NONE;
if (sWarpDest.type != WARP_TYPE_NOT_WARPING) {