From 13ac4fc9ddb3ebfddcb863dcc61fe520dfb98bc8 Mon Sep 17 00:00:00 2001 From: Vladislav Khorev Date: Mon, 4 Feb 2019 03:48:04 +0500 Subject: [PATCH] Some changes --- game/gamecode.cpp | 4 ++-- game/main_code.cpp | 17 +++++++---------- .../DoubleHitBalls-win.vcxproj | 2 +- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/game/gamecode.cpp b/game/gamecode.cpp index 48102fb..a3dc2e8 100755 --- a/game/gamecode.cpp +++ b/game/gamecode.cpp @@ -918,8 +918,8 @@ void TGameLevel::InnerDraw(int screenWidth, int screenHeight, int matrixWidth, i } // ::::::::::: - *SE::Console << BkgTexture; - *SE::Console << std::to_string(ResourceManager->TexList[BkgTexture]); + GetConsole() << BkgTexture; + GetConsole() << std::to_string(ResourceManager->TexList[BkgTexture]); glBindTexture(GL_TEXTURE_2D,ResourceManager->TexList[BkgTexture]); //Renderer->DrawRect(Vector2f(xlOffset, ylOffset), Vector2f(xlOffset+tSW, ylOffset+tSH),Vector2f(0.f, 0.f), Vector2f(1.f, 1.f)); diff --git a/game/main_code.cpp b/game/main_code.cpp index a580108..7f8768f 100755 --- a/game/main_code.cpp +++ b/game/main_code.cpp @@ -137,8 +137,8 @@ void TMyApplication::InnerInit() #ifdef TARGET_WIN32 #ifdef NDEBUG - ST::PathToResources = "resources/"; - //ST::PathToResources = "../../../assets/"; + //ST::PathToResources = "resources/"; + ST::PathToResources = "../../../assets/"; #else ST::PathToResources = "../../../assets/"; #endif @@ -152,10 +152,9 @@ void TMyApplication::InnerInit() ST::PathToResources = ""; #endif - if (Console != NULL) - { - *Console<<"APP INIT\n"; - } + + GetConsole() <<"APP INIT\n"; + srand (static_cast(time(NULL))); GameState = CONST_GAMESTATE_PRELOADING; StateTimer = 0.f; @@ -222,10 +221,8 @@ void TMyApplication::InnerDeinit() { Inited = false; Loaded = false; - if (Console != NULL) - { - *Console<<"APP DEINIT\n"; - } + GetConsole() <<"APP DEINIT\n"; + OnTapUpSignal.disconnect(boost::bind(&TGameLevel::OnTapUp, boost::ref(GameLevel), _1)); OnTapUpSignal.disconnect(boost::bind(&TGameMenu::OnTapUp, boost::ref(Menu), _1)); diff --git a/windows/DoubleHitBalls-win/DoubleHitBalls-win/DoubleHitBalls-win.vcxproj b/windows/DoubleHitBalls-win/DoubleHitBalls-win/DoubleHitBalls-win.vcxproj index 35c00b3..d0c1dbb 100755 --- a/windows/DoubleHitBalls-win/DoubleHitBalls-win/DoubleHitBalls-win.vcxproj +++ b/windows/DoubleHitBalls-win/DoubleHitBalls-win/DoubleHitBalls-win.vcxproj @@ -22,7 +22,7 @@ {1CC98EEE-BBCB-4D79-B6D7-8511789172C5} Win32Proj DoubleHitBallswin - 10.0.16299.0 + 10.0.17134.0