Skip to content

Adds volume control and move some fields outside of Update() #9

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

Open
rakisaionji wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Adds volume control and move some fields outside of Update() #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
145077f
Adds volume control and move some fields outside of Update()
rakisaionji Mar 10, 2019
97c39f7
Disable jittering Temporal AA thingy (by @lybxlpsv)
rakisaionji Mar 10, 2019
5e01edf
Adds ability to control default PV sorting in song select
rakisaionji Mar 10, 2019
bf666a3
Reverted to first commit of SE volume setting feature proposal
rakisaionji Mar 11, 2019
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
7 changes: 6 additions & 1 deletion DivaHook/rom/playerdata.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,9 @@ module_equip[1] = 0
skin_equip = 0

# IDs defined in rom/gm_btn_se_tbl/gm_btn_se_id.bin
btn_se_equip = -1
btn_se_equip = -1

# Volume for buttons sound (from 0 to 100)
act_toggle = 1
act_vol = 100
hp_vol = 100
19 changes: 13 additions & 6 deletions DivaHook/src/Components/PlayerDataManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ namespace DivaHook::Components

setIfNotEqual(&playerData->level, customPlayerData->Level, 1);
setIfNotEqual(&playerData->level_plate_id, customPlayerData->LevelPlateId, 0);
setIfNotEqual(&playerData->vocaloid_point, customPlayerData->VocaloidPoint, 0);
// setIfNotEqual(&playerData->vocaloid_point, customPlayerData->VocaloidPoint, 0);
setIfNotEqual(&playerData->skin_equip, customPlayerData->SkinEquip, 0);
setIfNotEqual(&playerData->btn_se_equip, customPlayerData->BtnSeEquip, -1);

Expand All @@ -63,11 +63,11 @@ namespace DivaHook::Components
playerData->level_name = (char*)customPlayerData->LevelName->c_str();
}

if (false && Input::Keyboard::GetInstance()->IsTapped(VK_F12))
{
printf("PlayerDataManager::Update(): Loading config...\n");
LoadConfig();
}
// if (false && Input::Keyboard::GetInstance()->IsTapped(VK_F12))
// {
// printf("PlayerDataManager::Update(): Loading config...\n");
// LoadConfig();
// }
}

void PlayerDataManager::LoadConfig()
Expand Down Expand Up @@ -107,5 +107,12 @@ namespace DivaHook::Components
customPlayerData->ModuleEquip[1] = parseInt("module_equip[1]");
customPlayerData->SkinEquip = parseInt("skin_equip");
customPlayerData->BtnSeEquip = parseInt("btn_se_equip");

// These values should not be overwritten
// And also can be saved and loaded if implemented
playerData->hp_vol = parseInt("hp_vol");
playerData->act_vol = parseInt("act_vol");
playerData->act_toggle = parseInt("act_toggle");
playerData->vocaloid_point = parseInt("vocaloid_point");
}
}