Skip to content
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

Correct fix for issue #3 #40

Merged
merged 3 commits into from
Nov 16, 2024
Merged

Correct fix for issue #3 #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bec9833
Update gamestart.c
zaphod77 Nov 16, 2024
94585e5
Update tomoyo.c
zaphod77 Nov 16, 2024
4c9a956
Update gamestart.c
zaphod77 Nov 16, 2024
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
10 changes: 5 additions & 5 deletions src/game/gamestart.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3395,7 +3395,7 @@ void versusInit(int32_t player) {
// re-initialize start_nextc
start_nextc[player]=0; // continuing sets start_nextc to stage_nextc. this undoes this to avoid breaking the FOLLOWING replay.
// tomoyoのパターン #1.60c7l9
if( ((gameMode[player] == 6) && (!randommode[player])) || (nextblock ==11)|| ((p_nextblock ==11)&&(gameMode[player] == 5))) {
if( (!getPushState(player, BTN_B) && (gameMode[player] == 6) && (!randommode[player])) || (nextblock ==11)|| ((p_nextblock ==11)&&(gameMode[player] == 5))) {
if(start_stage[player] < 100){ //通常
// use sakura bag.
len = YGS2kStrLen(nextb_list);
Expand Down Expand Up @@ -5250,7 +5250,7 @@ void statSelectMode(int32_t player) {
gameMode[player] = 3;
if(gameMode[player] == 8)
gameMode[player] = 7;
versusInit(player);
// versusInit(player); //fix is wrong
}
// その他
if(statusc[player * 10 + 2] == 2) {
Expand Down Expand Up @@ -5281,7 +5281,7 @@ void statSelectMode(int32_t player) {
gameMode[player] = 6;
if(gameMode[player] == 8)
gameMode[player] = 9;
versusInit(player);
// versusInit(player); // wrong fix to bug
}
// その他
if(statusc[player * 10 + 2] == 2) {
Expand Down Expand Up @@ -5331,7 +5331,7 @@ void statSelectMode(int32_t player) {
ori_opt[player]--;
if(ori_opt[player] < 0)
ori_opt[player] = 3;
versusInit(player);
// versusInit(player); // fix is wrong
}
if(statusc[player * 10 + 2] == 2) {
if(statusc[player * 10 + 3] == 0) {
Expand Down Expand Up @@ -5389,7 +5389,7 @@ void statSelectMode(int32_t player) {
ori_opt[player]++;
if(ori_opt[player] > 3)
ori_opt[player] = 0;
versusInit(player);
// versusInit(player); fix is wrong
}
if(statusc[player * 10 + 2] == 2) {
if(statusc[player * 10 + 3] == 0) {
Expand Down
1 change: 1 addition & 0 deletions src/script/tomoyo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -920,6 +920,7 @@ void statTomoyoSelect(int32_t player) {
status[player] = 2; // SOLO MODEモードセレクト
statusc[player * 10] = 0; // ステータスカウンタを0に
statusc[player * 10 + 1] = 0; //
versusInit(player); // CORRECT fix for backing out of mini select.
}

// HOLDボタンでnextcを0に戻す
Expand Down
Loading