Skip to content

Y
ygopro
Commit 27dd3d9d authored by Chen Bill's avatar Chen Bill Committed by GitHub
Browse files
Options

class Game: fix member access (#2518)

parent 1cee0ba9
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
gframe/game.cpp
View file @ 27dd3d9d
...@@ -783,7 +783,7 @@ bool Game::Initialize() { ...@@ -783,7 +783,7 @@ bool Game::Initialize() {
btnCategoryOK = env->addButton(rect<s32>(150, 210, 250, 235), wCategories, BUTTON_CATEGORY_OK, dataManager.GetSysString(1211)); btnCategoryOK = env->addButton(rect<s32>(150, 210, 250, 235), wCategories, BUTTON_CATEGORY_OK, dataManager.GetSysString(1211));
int catewidth = 0; int catewidth = 0;
for(int i = 0; i < 32; ++i) { for(int i = 0; i < 32; ++i) {
irr::core::dimension2d<unsigned int> dtxt = mainGame->guiFont->getDimension(dataManager.GetSysString(1100 + i)); irr::core::dimension2d<unsigned int> dtxt = guiFont->getDimension(dataManager.GetSysString(1100 + i));
if((int)dtxt.Width + 40 > catewidth) if((int)dtxt.Width + 40 > catewidth)
catewidth = dtxt.Width + 40; catewidth = dtxt.Width + 40;
} }
...@@ -1556,7 +1556,7 @@ void Game::ShowCardInfo(int code, bool resize) { ...@@ -1556,7 +1556,7 @@ void Game::ShowCardInfo(int code, bool resize) {
myswprintf(formatBuffer, L"[%ls] %ls/%ls", dataManager.FormatType(cd.type), dataManager.FormatRace(cd.race), dataManager.FormatAttribute(cd.attribute)); myswprintf(formatBuffer, L"[%ls] %ls/%ls", dataManager.FormatType(cd.type), dataManager.FormatRace(cd.race), dataManager.FormatAttribute(cd.attribute));
stInfo->setText(formatBuffer); stInfo->setText(formatBuffer);
int offset_info = 0; int offset_info = 0;
irr::core::dimension2d<unsigned int> dtxt = mainGame->guiFont->getDimension(formatBuffer); irr::core::dimension2d<unsigned int> dtxt = guiFont->getDimension(formatBuffer);
if(dtxt.Width > (300 * xScale - 13) - 15) if(dtxt.Width > (300 * xScale - 13) - 15)
offset_info = 15; offset_info = 15;
if(!(cd.type & TYPE_LINK)) { if(!(cd.type & TYPE_LINK)) {
...@@ -1590,7 +1590,7 @@ void Game::ShowCardInfo(int code, bool resize) { ...@@ -1590,7 +1590,7 @@ void Game::ShowCardInfo(int code, bool resize) {
} }
stDataInfo->setText(formatBuffer); stDataInfo->setText(formatBuffer);
int offset_arrows = offset_info; int offset_arrows = offset_info;
dtxt = mainGame->guiFont->getDimension(formatBuffer); dtxt = guiFont->getDimension(formatBuffer);
if(dtxt.Width > (300 * xScale - 13) - 15) if(dtxt.Width > (300 * xScale - 13) - 15)
offset_arrows += 15; offset_arrows += 15;
stInfo->setRelativePosition(rect<s32>(15, 37, 300 * xScale - 13, (60 + offset_info))); stInfo->setRelativePosition(rect<s32>(15, 37, 300 * xScale - 13, (60 + offset_info)));
...@@ -1920,8 +1920,8 @@ void Game::OnResize() { ...@@ -1920,8 +1920,8 @@ void Game::OnResize() {
scrTabSystem->setVisible(false); scrTabSystem->setVisible(false);
if(gameConf.resize_popup_menu) { if(gameConf.resize_popup_menu) {
int width = 100 * mainGame->xScale; int width = 100 * xScale;
int height = (mainGame->yScale >= 0.666) ? 21 * mainGame->yScale : 14; int height = (yScale >= 0.666) ? 21 * yScale : 14;
wCmdMenu->setRelativePosition(recti(1, 1, width + 1, 1)); wCmdMenu->setRelativePosition(recti(1, 1, width + 1, 1));
btnActivate->setRelativePosition(recti(1, 1, width, height)); btnActivate->setRelativePosition(recti(1, 1, width, height));
btnSummon->setRelativePosition(recti(1, 1, width, height)); btnSummon->setRelativePosition(recti(1, 1, width, height));
...@@ -2101,7 +2101,7 @@ void Game::FlashWindow() { ...@@ -2101,7 +2101,7 @@ void Game::FlashWindow() {
#endif #endif
} }
void Game::SetCursor(ECURSOR_ICON icon) { void Game::SetCursor(ECURSOR_ICON icon) {
ICursorControl* cursor = mainGame->device->getCursorControl(); ICursorControl* cursor = device->getCursorControl();
if(cursor->getActiveIcon() != icon) { if(cursor->getActiveIcon() != icon) {
cursor->setActiveIcon(icon); cursor->setActiveIcon(icon);
} }
......
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