alysbrooks-public/games/isometric-park-fna Commit - r461:195b2dcc9f2d

alysbrooks-public » games » isometric-park-fna

Commit `r461:195b2dcc9f2d` public

parent | child

Description:

Unpause when dialog ends.

Commit status:

[Not Reviewed]

References:

m5-events

Diff options:

| |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r461:195b2dcc9f2d - Wed, 17 Nov 2021 08:58:38

isometric-park-fna/Engines/ImGuiWindowBridgeEngine.cs ¶ +10 -1

                     typeof(SelectMessage),
                     typeof(JumpCameraMessage),
                     typeof(GameStateMessage),
-                    typeof(GameStateMessage),
+                    typeof(GameRateMessage),
                     typeof(SetResolutionMessage),
                     typeof(SetFontMessage),
                     typeof(SetTrespassingPolicyMessage),
                     public List<SetDialogMessage> setDialogMessages;
                     public List<DialogChoiceMessage> dialogChoiceMessages;
                     public List<SetOptionMessage> setOptionMessages;
+                    public List<GameRateMessage> gameRateMessages;
                     bool showBudget { get; }
                     bool showForest { get; }
                         this.setDialogMessages = new List<SetDialogMessage>();
                         this.dialogChoiceMessages = new List<DialogChoiceMessage>();
                         this.setOptionMessages = new List<SetOptionMessage>();
+            			this.gameRateMessages = new List<GameRateMessage>();
                         this.windowStatuses = new Dictionary<Window, bool>();
                         this.showContractIndicator = false;
                             SendMessage(message);
                         }
+            			foreach (var message in this.gameRateMessages)
+            			{
+            					SendMessage(message);
+            			}
                         foreach (var message in this.setOptionMessages)
                         {
                             foreach (var entity in ReadEntities<OptionsComponent>())
                         this.setTextVariableMessages.Clear();
                         this.setDialogMessages.Clear();
                         this.dialogChoiceMessages.Clear();
+            			this.gameRateMessages.Clear();
                         this.setOptionMessages.Clear();
                     }
                 }

isometric-park-fna/Renderers/ImGuiWindowRenderer.cs ¶ +3 -5

             			    NewGameWindow.Render(this.BridgeEngine.font, this.BridgeEngine.italicFont, this.BridgeEngine);
             			    break;
             			case Window.Dialog:
+            			    dialog_count++;
-                            dialog_count++;
             			    if (HasComponent<ImageComponent>(entity))
             			    {
-            			    image_index = GetComponent<ImageComponent>(entity).ImageIndex;
+            				    image_index = GetComponent<ImageComponent>(entity).ImageIndex;
             			    }
             			    else
             			    {
             	    if (dialogNode.Hydrated)
             	    {
             		    var show = true;
-            		    var paused = true;
+            		    DialogInterface.RenderDialog(dialogEntity, this.BridgeEngine, ref show, this.BridgeEngine.font, dialogNode, image_index);
-            		    DialogInterface.RenderDialog(dialogEntity, this.BridgeEngine, ref show, ref paused, this.BridgeEngine.font, dialogNode, image_index);
                         dialog_open = true;
             	    }
                         Logging.Trace(String.Format("{0} dialogs (open? {1}).", dialog_count, dialog_open));

isometric-park-fna/UI/Dialog.cs ¶ +7 -1

                     }
                     public static void RenderDialog(Entity entity,
-                                    ImGuiWindowBridgeEngine bridgeEngine, ref bool show, ref bool paused, ImFontPtr font, DialogComponent dialogComponent, int imageIndex)
+                                    ImGuiWindowBridgeEngine bridgeEngine, ref bool show, ImFontPtr font, DialogComponent dialogComponent, int imageIndex)
                     {
+                            var paused = true;
                         if (show)
                         {
                             ImGui.PushFont(font);
                             StyleSets.defaultSet.pop();
                             ImGui.PopFont();
                         }
+                        if (!paused)
+                        {
+                        bridgeEngine.gameRateMessages.Add(new GameRateMessage{
+                                        paused = paused});
+                        }
                     }
                 }
             }

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r461:195b2dcc9f2d - Wed, 17 Nov 2021 08:58:38

Sign in to your account

Commit r461:195b2dcc9f2d public

Author

r461:195b2dcc9f2d - Wed, 17 Nov 2021 08:58:38

Commit `r461:195b2dcc9f2d` public