Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement "Game State" interface and several implementations #2332

Merged
merged 10 commits into from
Mar 3, 2024
Merged

Implement "Game State" interface and several implementations #2332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a7d0018
Engine: renamed class GameState to GamePlayState
ivan-mogilko Jan 29, 2024
8d5525b
Engine: adjust DialogOptions to GameState interface
ivan-mogilko Jan 29, 2024
2fdd890
Engine: reorganized starting code from DialogOptions ctor and Show()
ivan-mogilko Jan 29, 2024
5efe41d
Engine: adjust InventoryScreen to GameState interface
ivan-mogilko Jan 29, 2024
7c97744
Engine: reimplement screen transitions as GameStates
ivan-mogilko Jan 30, 2024
3ab558f
Engine: make display message funcs use arguments instead of global vars
ivan-mogilko Feb 5, 2024
088dad4
Engine: implemented DisplayMessageState
ivan-mogilko Feb 5, 2024
21d6ef5
Engine: implemented GameLoopUntilState
ivan-mogilko Feb 6, 2024
2cc78bc
Engine: in blocking ShakeScreen use proper WaitForNextFrame()
ivan-mogilko Apr 2, 2023
7e777b6
Engine: implement ShakeScreenState
ivan-mogilko Mar 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions Common/ac/gamestructdefines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,15 @@
#define PORTRAIT_XPOSITION 3

// Room transition style
#define FADE_NORMAL 0
#define FADE_INSTANT 1
#define FADE_DISSOLVE 2
#define FADE_BOXOUT 3
#define FADE_CROSSFADE 4
#define FADE_LAST 4 // this should equal the last one
enum ScreenTransitionStyle
{
kScrTran_Fade = 0,
kScrTran_Instant = 1,
kScrTran_Dissolve = 2,
kScrTran_Boxout = 3,
kScrTran_Crossfade = 4,
kNumScrTransitions
};

// Legacy font flags
//#define FFLG_LEGACY_NOSCALE 0x01 // TODO: is this from legacy format, ever used?
Expand Down
1 change: 0 additions & 1 deletion Engine/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,6 @@ target_sources(engine
ac/textbox.h
ac/timer.cpp
ac/timer.h
ac/topbarsettings.h
ac/translation.cpp
ac/translation.h
ac/viewframe.cpp
Expand Down
1 change: 0 additions & 1 deletion Engine/ac/audiochannel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
using namespace AGS::Common;

extern GameSetupStruct game;
extern GameState play;
extern RoomStruct thisroom;
extern CCAudioClip ccDynamicAudioClip;

Expand Down
2 changes: 1 addition & 1 deletion Engine/ac/character.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2886,7 +2886,7 @@ void _displayspeech(const char*texx, int aschar, int xx, int yy, int widd, int i
char_thinking = aschar;

set_our_eip(155);
display_main(tdxp, tdyp, bwidth, texx, DISPLAYTEXT_SPEECH, FONT_SPEECH, textcol, isThought, allowShrink, overlayPositionFixed);
display_main(tdxp, tdyp, bwidth, texx, nullptr, DISPLAYTEXT_SPEECH, FONT_SPEECH, textcol, isThought, allowShrink, overlayPositionFixed);
set_our_eip(156);
if ((play.in_conversation > 0) && (game.options[OPT_SPEECHTYPE] == 3))
closeupface = nullptr;
Expand Down
1 change: 0 additions & 1 deletion Engine/ac/characterinfo_engine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ using namespace AGS::Common;
extern std::vector<ViewStruct> views;
extern GameSetupStruct game;
extern int displayed_room;
extern GameState play;
extern int char_speaking;
extern RoomStruct thisroom;
extern unsigned int loopcounter;
Expand Down
Loading
Loading