Skip to content

Y
ygopro
Commit f1fa18b1 authored by edo9300's avatar edo9300
Browse files
Options

Merge remote-tracking branch 'refs/remotes/Fluorohydride/master'

parents 149e0bfb 6344b48c
Show whitespace changes
Inline Side-by-side
Showing with 33 additions and 49 deletions
gframe/data_manager.cpp
View file @ f1fa18b1
...@@ -305,38 +305,22 @@ const wchar_t* DataManager::FormatSetName(unsigned long long setcode) { ...@@ -305,38 +305,22 @@ const wchar_t* DataManager::FormatSetName(unsigned long long setcode) {
} }
const wchar_t* DataManager::FormatLinkMarker(int link_marker) { const wchar_t* DataManager::FormatLinkMarker(int link_marker) {
wchar_t* p = lmBuffer; wchar_t* p = lmBuffer;
if(link_marker & LINK_MARKER_TOP_LEFT) { if(link_marker & LINK_MARKER_TOP_LEFT)
BufferIO::CopyWStrRef(L"[ ]", p, 4); BufferIO::CopyWStrRef(L"[\u2196]", p, 4);
*(p - 2) = 0x2196; if(link_marker & LINK_MARKER_TOP)
} BufferIO::CopyWStrRef(L"[\u2191]", p, 4);
if(link_marker & LINK_MARKER_TOP) { if(link_marker & LINK_MARKER_TOP_RIGHT)
BufferIO::CopyWStrRef(L"[ ]", p, 4); BufferIO::CopyWStrRef(L"[\u2197]", p, 4);
*(p - 2) = 0x2191; if(link_marker & LINK_MARKER_LEFT)
} BufferIO::CopyWStrRef(L"[\u2190]", p, 4);
if(link_marker & LINK_MARKER_TOP_RIGHT) { if(link_marker & LINK_MARKER_RIGHT)
BufferIO::CopyWStrRef(L"[ ]", p, 4); BufferIO::CopyWStrRef(L"[\u2192]", p, 4);
*(p - 2) = 0x2197; if(link_marker & LINK_MARKER_BOTTOM_LEFT)
} BufferIO::CopyWStrRef(L"[\u2199]", p, 4);
if(link_marker & LINK_MARKER_LEFT) { if(link_marker & LINK_MARKER_BOTTOM)
BufferIO::CopyWStrRef(L"[ ]", p, 4); BufferIO::CopyWStrRef(L"[\u2193]", p, 4);
*(p - 2) = 0x2190; if(link_marker & LINK_MARKER_BOTTOM_RIGHT)
} BufferIO::CopyWStrRef(L"[\u2198]", p, 4);
if(link_marker & LINK_MARKER_RIGHT) {
BufferIO::CopyWStrRef(L"[ ]", p, 4);
*(p - 2) = 0x2192;
}
if(link_marker & LINK_MARKER_BOTTOM_LEFT) {
BufferIO::CopyWStrRef(L"[ ]", p, 4);
*(p - 2) = 0x2199;
}
if(link_marker & LINK_MARKER_BOTTOM) {
BufferIO::CopyWStrRef(L"[ ]", p, 4);
*(p - 2) = 0x2193;
}
if(link_marker & LINK_MARKER_BOTTOM_RIGHT) {
BufferIO::CopyWStrRef(L"[ ]", p, 4);
*(p - 2) = 0x2198;
}
return lmBuffer; return lmBuffer;
} }
int DataManager::CardReader(int code, void* pData) { int DataManager::CardReader(int code, void* pData) {
......
gframe/drawing.cpp
View file @ f1fa18b1
...@@ -1095,8 +1095,8 @@ void Game::DrawDeckBd() { ...@@ -1095,8 +1095,8 @@ void Game::DrawDeckBd() {
driver->draw2DRectangle(0x80000000, mainGame->Resize(806, 164 + i * 66, 1019, 230 + i * 66)); driver->draw2DRectangle(0x80000000, mainGame->Resize(806, 164 + i * 66, 1019, 230 + i * 66));
DrawThumb(ptr, position2di(810, 165 + i * 66), deckBuilder.filterList); DrawThumb(ptr, position2di(810, 165 + i * 66), deckBuilder.filterList);
if(ptr->second.type & TYPE_MONSTER) { if(ptr->second.type & TYPE_MONSTER) {
int form = 0x2605; wchar_t* form = L"\u2605";
if(ptr->second.type & TYPE_XYZ) ++form; if (ptr->second.type & TYPE_XYZ) form = L"\u2606";
myswprintf(textBuffer, L"%ls", dataManager.GetName(ptr->first)); myswprintf(textBuffer, L"%ls", dataManager.GetName(ptr->first));
textFont->draw(textBuffer, mainGame->Resize(859, 164 + i * 66, 955, 185 + i * 66), 0xff000000, false, false); textFont->draw(textBuffer, mainGame->Resize(859, 164 + i * 66, 955, 185 + i * 66), 0xff000000, false, false);
textFont->draw(textBuffer, mainGame->Resize(860, 165 + i * 66, 955, 185 + i * 66), 0xffffffff, false, false); textFont->draw(textBuffer, mainGame->Resize(860, 165 + i * 66, 955, 185 + i * 66), 0xffffffff, false, false);
...@@ -1110,7 +1110,7 @@ void Game::DrawDeckBd() { ...@@ -1110,7 +1110,7 @@ void Game::DrawDeckBd() {
myswprintf(textBuffer, L"%d/Link %d", ptr->second.attack, ptr->second.level); myswprintf(textBuffer, L"%d/Link %d", ptr->second.attack, ptr->second.level);
} }
else { else {
myswprintf(textBuffer, L"%ls/%ls %c%d", dataManager.FormatAttribute(ptr->second.attribute), dataManager.FormatRace(ptr->second.race), form, ptr->second.level); myswprintf(textBuffer, L"%ls/%ls %ls%d", dataManager.FormatAttribute(ptr->second.attribute), dataManager.FormatRace(ptr->second.race), form, ptr->second.level);
textFont->draw(textBuffer, mainGame->Resize(859, 186 + i * 66, 955, 207 + i * 66), 0xff000000, false, false); textFont->draw(textBuffer, mainGame->Resize(859, 186 + i * 66, 955, 207 + i * 66), 0xff000000, false, false);
textFont->draw(textBuffer, mainGame->Resize(860, 187 + i * 66, 955, 207 + i * 66), 0xffffffff, false, false); textFont->draw(textBuffer, mainGame->Resize(860, 187 + i * 66, 955, 207 + i * 66), 0xffffffff, false, false);
if (ptr->second.attack < 0 && ptr->second.defense < 0) if (ptr->second.attack < 0 && ptr->second.defense < 0)
......
gframe/event_handler.cpp
View file @ f1fa18b1
...@@ -1822,9 +1822,9 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -1822,9 +1822,9 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
}else{ }else{
myswprintf(formatBuffer, L"\n%ls/%ls", mcard->atkstring, mcard->defstring); myswprintf(formatBuffer, L"\n%ls/%ls", mcard->atkstring, mcard->defstring);
str.append(formatBuffer); str.append(formatBuffer);
int form = 0x2605; wchar_t* form = L"\u2605";
if (mcard->rank) ++form; if (mcard->rank) form = L"\u2606";
myswprintf(formatBuffer, L"\n%c%d %ls/%ls", form, (mcard->level ? mcard->level : mcard->rank), dataManager.FormatRace(mcard->race), dataManager.FormatAttribute(mcard->attribute)); myswprintf(formatBuffer, L"\n%ls%d %ls/%ls", form, (mcard->level ? mcard->level : mcard->rank), dataManager.FormatRace(mcard->race), dataManager.FormatAttribute(mcard->attribute));
str.append(formatBuffer); str.append(formatBuffer);
} }
if(mcard->location == LOCATION_HAND && (mcard->type & TYPE_PENDULUM)) { if(mcard->location == LOCATION_HAND && (mcard->type & TYPE_PENDULUM)) {
......
gframe/game.cpp
View file @ f1fa18b1
...@@ -546,14 +546,14 @@ bool Game::Initialize() { ...@@ -546,14 +546,14 @@ bool Game::Initialize() {
wLinkMarks->setDraggable(false); wLinkMarks->setDraggable(false);
wLinkMarks->setVisible(false); wLinkMarks->setVisible(false);
btnMarksOK = env->addButton(recti(45, 45, 75, 75), wLinkMarks, BUTTON_MARKERS_OK, dataManager.GetSysString(1211)); btnMarksOK = env->addButton(recti(45, 45, 75, 75), wLinkMarks, BUTTON_MARKERS_OK, dataManager.GetSysString(1211));
btnMark[0] = env->addButton(recti(10, 10, 40, 40), wLinkMarks, -1, L"\x2196"); btnMark[0] = env->addButton(recti(10, 10, 40, 40), wLinkMarks, -1, L"\u2196");
btnMark[1] = env->addButton(recti(45, 10, 75, 40), wLinkMarks, -1, L"\x2191"); btnMark[1] = env->addButton(recti(45, 10, 75, 40), wLinkMarks, -1, L"\u2191");
btnMark[2] = env->addButton(recti(80, 10, 110, 40), wLinkMarks, -1, L"\x2197"); btnMark[2] = env->addButton(recti(80, 10, 110, 40), wLinkMarks, -1, L"\u2197");
btnMark[3] = env->addButton(recti(10, 45, 40, 75), wLinkMarks, -1, L"\x2190"); btnMark[3] = env->addButton(recti(10, 45, 40, 75), wLinkMarks, -1, L"\u2190");
btnMark[4] = env->addButton(recti(80, 45, 110, 75), wLinkMarks, -1, L"\x2192"); btnMark[4] = env->addButton(recti(80, 45, 110, 75), wLinkMarks, -1, L"\u2192");
btnMark[5] = env->addButton(recti(10, 80, 40, 110), wLinkMarks, -1, L"\x2199"); btnMark[5] = env->addButton(recti(10, 80, 40, 110), wLinkMarks, -1, L"\u2199");
btnMark[6] = env->addButton(recti(45, 80, 75, 110), wLinkMarks, -1, L"\x2193"); btnMark[6] = env->addButton(recti(45, 80, 75, 110), wLinkMarks, -1, L"\u2193");
btnMark[7] = env->addButton(recti(80, 80, 110, 110), wLinkMarks, -1, L"\x2198"); btnMark[7] = env->addButton(recti(80, 80, 110, 110), wLinkMarks, -1, L"\u2198");
for(int i=0;i<8;i++) for(int i=0;i<8;i++)
btnMark[i]->setIsPushButton(true); btnMark[i]->setIsPushButton(true);
//replay window //replay window
...@@ -1208,9 +1208,9 @@ void Game::ShowCardInfo(int code) { ...@@ -1208,9 +1208,9 @@ void Game::ShowCardInfo(int code) {
wcscat(formatBuffer, dataManager.FormatLinkMarker(cd.link_marker)); wcscat(formatBuffer, dataManager.FormatLinkMarker(cd.link_marker));
} }
else { else {
int form = 0x2605; wchar_t* form = L"\u2605";
if(cd.type & TYPE_XYZ) ++form; if(cd.type & TYPE_XYZ) form = L"\u2606";
myswprintf(formatBuffer, L"[%c%d] ", form, cd.level); myswprintf(formatBuffer, L"[%ls%d] ", form, cd.level);
wchar_t adBuffer[16]; wchar_t adBuffer[16];
if (cd.attack < 0 && cd.defense < 0) if (cd.attack < 0 && cd.defense < 0)
myswprintf(adBuffer, L"?/?"); myswprintf(adBuffer, L"?/?");
......
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