Skip to content

Commit cba0835

Browse files
committed
update external libs
1 parent b36289e commit cba0835

File tree

5 files changed

+8
-5
lines changed

5 files changed

+8
-5
lines changed

did/buildnumber.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#pragma once
2-
#define BUILDNUMBER 4990
3-
#define BUILDNUMBER_STR "4990"
2+
#define BUILDNUMBER 4991
3+
#define BUILDNUMBER_STR "4991"
-883 KB
Binary file not shown.

osgc.sln

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ Global
6767
{F610E0C3-725E-4FAB-9BF0-AB9310715B78}.StandAlone|x86.ActiveCfg = StandAlone|Win32
6868
{F610E0C3-725E-4FAB-9BF0-AB9310715B78}.StandAlone|x86.Build.0 = StandAlone|Win32
6969
{E932802A-6053-40AE-A61D-065443E7C269}.Debug|x64.ActiveCfg = Debug|x64
70+
{E932802A-6053-40AE-A61D-065443E7C269}.Debug|x64.Build.0 = Debug|x64
7071
{E932802A-6053-40AE-A61D-065443E7C269}.Debug|x86.ActiveCfg = Debug|Win32
7172
{E932802A-6053-40AE-A61D-065443E7C269}.Debug|x86.Build.0 = Debug|Win32
7273
{E932802A-6053-40AE-A61D-065443E7C269}.Release|x64.ActiveCfg = Release|x64
@@ -80,6 +81,7 @@ Global
8081
{E932802A-6053-40AE-A61D-065443E7C269}.StandAlone|x86.ActiveCfg = StandAlone|Win32
8182
{E932802A-6053-40AE-A61D-065443E7C269}.StandAlone|x86.Build.0 = StandAlone|Win32
8283
{0AD9DD92-BCAA-4B37-8D93-454BB009CBD7}.Debug|x64.ActiveCfg = Debug|x64
84+
{0AD9DD92-BCAA-4B37-8D93-454BB009CBD7}.Debug|x64.Build.0 = Debug|x64
8385
{0AD9DD92-BCAA-4B37-8D93-454BB009CBD7}.Debug|x86.ActiveCfg = Debug|Win32
8486
{0AD9DD92-BCAA-4B37-8D93-454BB009CBD7}.Debug|x86.Build.0 = Debug|Win32
8587
{0AD9DD92-BCAA-4B37-8D93-454BB009CBD7}.Release|x64.ActiveCfg = Release|x64
@@ -93,6 +95,7 @@ Global
9395
{0AD9DD92-BCAA-4B37-8D93-454BB009CBD7}.StandAlone|x86.ActiveCfg = StandAlone|Win32
9496
{0AD9DD92-BCAA-4B37-8D93-454BB009CBD7}.StandAlone|x86.Build.0 = StandAlone|Win32
9597
{6DC2B774-386F-4990-B58A-D8DAD3941368}.Debug|x64.ActiveCfg = Debug|x64
98+
{6DC2B774-386F-4990-B58A-D8DAD3941368}.Debug|x64.Build.0 = Debug|x64
9699
{6DC2B774-386F-4990-B58A-D8DAD3941368}.Debug|x86.ActiveCfg = Debug|Win32
97100
{6DC2B774-386F-4990-B58A-D8DAD3941368}.Debug|x86.Build.0 = Debug|Win32
98101
{6DC2B774-386F-4990-B58A-D8DAD3941368}.Release|x64.ActiveCfg = Release|x64

platformer/src/EntryPoint.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ int begin(xy::StateStack* ss, SharedStateData* sharedData)
6969
#ifdef XY_DEBUG
7070
//return StateID::Ending;
7171
//return StateID::Game;
72-
//return StateID::MainMenu;
73-
return StateID::Editor;
72+
return StateID::MainMenu;
73+
//return StateID::Editor;
7474
#else
7575
return StateID::MainMenu;
7676
#endif //XY_DEBUG

platformer/src/GameState.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1101,7 +1101,7 @@ void GameState::buildUI()
11011101
std::stringstream se;
11021102
se << "x " << std::setw(2) << std::setfill('0') << m_sharedData.inventory.ammo;
11031103
entity = createText(se.str());
1104-
entity.addComponent<xy::Transform>().setPosition(xy::DefaultSceneSize.x / 2.f, GameConst::UI::BottomRow);
1104+
entity.getComponent<xy::Transform>().setPosition(xy::DefaultSceneSize.x / 2.f, GameConst::UI::BottomRow);
11051105
entity.addComponent<xy::CommandTarget>().ID = CommandID::UI::AmmoText;
11061106

11071107
//lives

0 commit comments

Comments
 (0)