Skip to content

Y
ygopro-2pick
Commit d0a99f12 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' into server

parents 1443d0a3 4f0d3d77
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
gframe/duelclient.cpp
View file @ d0a99f12
...@@ -1026,7 +1026,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -1026,7 +1026,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
break; break;
} }
//playing custom bgm //playing custom bgm
case HINT_MUSIC: { case 11: { //HINT_MUSIC
char BGMName[1024]; char BGMName[1024];
if (data) { if (data) {
myswprintf(textBuffer, L"./sound/BGM/custom/%ls.mp3", dataManager.GetDesc(data)); myswprintf(textBuffer, L"./sound/BGM/custom/%ls.mp3", dataManager.GetDesc(data));
...@@ -1038,7 +1038,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -1038,7 +1038,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
break; break;
} }
//playing custom sound effect //playing custom sound effect
case HINT_SOUND: { case 12: { //HINT_SOUND
char SoundName[1024]; char SoundName[1024];
if (data) { if (data) {
myswprintf(textBuffer, L"./sound/custom/%ls.wav", dataManager.GetDesc(data)); myswprintf(textBuffer, L"./sound/custom/%ls.wav", dataManager.GetDesc(data));
...@@ -1050,7 +1050,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -1050,7 +1050,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
break; break;
} }
//playing custom bgm in ogg format //playing custom bgm in ogg format
case HINT_MUSIC_OGG: { case 13: { //HINT_MUSIC_OGG
char BGMName[1024]; char BGMName[1024];
if (data) { if (data) {
myswprintf(textBuffer, L"./sound/BGM/custom/%ls.ogg", dataManager.GetDesc(data)); myswprintf(textBuffer, L"./sound/BGM/custom/%ls.ogg", dataManager.GetDesc(data));
......
ocgcore @ 9a2b4b4c
Subproject commit 47af86f63b9486552038c0a6e669ecf142783360 Subproject commit 9a2b4b4c9ed6ca8d697558b7b5657491f6ea99ca
script @ 8ed9d3fe
Subproject commit 92d06db327075e986288bffc95a2e0ad7096b00b Subproject commit 8ed9d3fe7be278f02eca77ae96583e5558b17343
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment