Skip to content

Commit f60132f

Browse files
committed
small fixes
1 parent 021e233 commit f60132f

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

bin/data/audio/highlight.wav

6.09 KB
Binary file not shown.

src/MenuState.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ MenuState :: MenuState(
2727
m_pResources(engine->resources()),
2828
m_pRoot(make_shared<Node>()),
2929
m_pCanvas(make_shared<Canvas>(
30-
m_pQor->window()->size().x, m_pQor->window()->size().y
30+
engine->window()->size().x, engine->window()->size().y
3131
)),
3232
m_pMenuGUI(make_shared<MenuGUI>(
33-
m_pQor->session()->profile(0)->controller().get(),
33+
engine->session()->profile(0)->controller().get(),
3434
&m_MenuContext,
3535
&m_MainMenu,
3636
m_pPipeline->partitioner(),
@@ -51,7 +51,7 @@ void MenuState :: preload()
5151
m_pCamera->listen(true);
5252

5353
//try{
54-
// m_pScene = m_pResources->cache_as<Scene>("menu.json");
54+
// m_pScene = m_pResources->cache_cast<Scene>("menu.json");
5555
//}catch(const std::exception& e){
5656
// ERRORf(GENERAL, "scene problem: %s", e.what());
5757
//}
@@ -69,7 +69,7 @@ void MenuState :: preload()
6969
logo->add_modifier(make_shared<Wrap>(Prefab::quad_wrap(
7070
glm::vec2(0.0f, 1.0f), glm::vec2(1.0f, 0.0f)
7171
)));
72-
auto tex = m_pResources->cache_as<ITexture>("qorpse.png");
72+
auto tex = m_pResources->cache_cast<ITexture>("qorpse.png");
7373
logo->material(make_shared<MeshMaterial>(tex));
7474
logo->move(vec3(
7575
win->center().x,
@@ -169,13 +169,13 @@ void MenuState :: enter()
169169
//m_MainMenu.name("Qorpse");
170170
m_MainMenu.options().emplace_back("New Game", [this]{
171171
m_pDone = make_shared<std::function<void()>>([this]{
172-
m_pQor->change_state(m_pQor->states().class_id("game"));
172+
m_pQor->change_state("game");
173173
});
174174
m_pMenuGUI->pause();
175175
});
176176
m_MainMenu.options().emplace_back("Continue", [this]{
177177
m_pDone = make_shared<std::function<void()>>([this]{
178-
m_pQor->change_state(m_pQor->states().class_id("game"));
178+
m_pQor->change_state("game");
179179
});
180180
m_pMenuGUI->pause();
181181
});

src/TextScroller.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ void TextScroller :: load_portrait()
146146
) * Pango::SCALE);
147147

148148
//m_pPortraitNode->swap_modifier<MeshMaterial>(
149-
// m_pResources->cache_as<ITexture>(
149+
// m_pResources->cache_cast<ITexture>(
150150
// msg.portrait
151151
// );
152152
//);

0 commit comments

Comments
 (0)