Merge branch 'master' into jgrpp

2020-05-27 20:47:54 +01:00
parent df0f9193da 71e9c2a71b
commit 14e7d43c62
27 changed files with 1185 additions and 106 deletions
--- a/src/command_type.h
+++ b/src/command_type.h
@@ -341,6 +341,7 @@ enum Commands {
 	CMD_REMOVE_STORY_PAGE,            ///< remove a story page
 	CMD_REMOVE_STORY_PAGE_ELEMENT,    ///< remove a story page element
 	CMD_SCROLL_VIEWPORT,              ///< scroll main viewport of players
+	CMD_STORY_PAGE_BUTTON,            ///< selection via story page button

 	CMD_LEVEL_LAND,                   ///< level land