Skip to content

Commit

Permalink
Closes #187 Display map with chapter intro text (#188)
Browse files Browse the repository at this point in the history
When loading a game (or transitioning to next chapter),
display the full map with player position and chapter
intro text.
  • Loading branch information
xavieran authored Jun 23, 2024
1 parent 08e2641 commit 5deacd8
Show file tree
Hide file tree
Showing 17 changed files with 761 additions and 540 deletions.
5 changes: 1 addition & 4 deletions app/main3d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -264,10 +264,7 @@ int main(int argc, char** argv)
{
bool guiHandled = root.OnMouseEvent(
Gui::LeftMousePress{guiScaleInv * clickPos});
// i.e. only MainView is present
// should really formalise this with some sort of
// GuiManager state, interacting with 2d or 3d world..?
if (!guiHandled && guiManager.mScreenStack.size() == 1)
if (!guiHandled && guiManager.InMainView())
{
glDisable(GL_BLEND);
glDisable(GL_MULTISAMPLE);
Expand Down
4 changes: 1 addition & 3 deletions bak/chapterTransitions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ void TransitionToChapter(Chapter chapter, GameState& gs)
}
const auto startLocation = LoadChapterStartLocation(chapter);
gs.SetLocation(startLocation.mLocation);
// gs.SetMapLocation(startLocation.mMapLocation);
gs.SetMapLocation(startLocation.mMapLocation);

// mov eax, [bp+currentGold]
// add partyGold, eax
Expand All @@ -55,8 +55,6 @@ void TransitionToChapter(Chapter chapter, GameState& gs)
gs.Apply(State::SetEventFlagFalse, 0x190 + i);
}

//gs.ClearActiveSpells();

switch (chapter.mValue)
{
case 1:[[fallthrough]];
Expand Down
Loading

0 comments on commit 5deacd8

Please sign in to comment.