Commit b891f85c authored by Chen Bill's avatar Chen Bill

fix namespace irr::core

parent 8b374484
......@@ -74,7 +74,6 @@ inline FILE* mywfopen(const wchar_t* filename, const char* mode) {
#include <irrlicht.h>
using namespace irr;
using namespace core;
extern const unsigned short PRO_VERSION;
extern unsigned int enable_log;
......
......@@ -1134,7 +1134,7 @@ void Game::DrawThumb(code_pointer cp, irr::core::vector2di pos, const LFList* lf
irr::video::ITexture* img = imageManager.GetTextureThumb(code);
if(img == nullptr)
return; //nullptr->getSize() will cause a crash
dimension2d<u32> size = img->getOriginalSize();
irr::core::dimension2d<u32> size = img->getOriginalSize();
irr::core::recti dragloc = mainGame->Resize(pos.X, pos.Y, pos.X + CARD_THUMB_WIDTH, pos.Y + CARD_THUMB_HEIGHT);
irr::core::recti limitloc = mainGame->Resize(pos.X, pos.Y, pos.X + 20, pos.Y + 20);
irr::core::recti otloc = Resize(pos.X + 7, pos.Y + 50, pos.X + 37, pos.Y + 65);
......
......@@ -975,7 +975,7 @@ bool Game::Initialize() {
col.setAlpha(224);
env->getSkin()->setColor((irr::gui::EGUI_DEFAULT_COLOR)i, col);
}
dimension2du size = driver->getScreenSize();
auto size = driver->getScreenSize();
if(window_size != size) {
window_size = size;
xScale = window_size.Width / 1024.0;
......@@ -1002,7 +1002,7 @@ void Game::MainLoop() {
int fps = 0;
int cur_time = 0;
while(device->run()) {
dimension2du size = driver->getScreenSize();
auto size = driver->getScreenSize();
if(window_size != size) {
window_size = size;
xScale = window_size.Width / 1024.0;
......
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