Merge branch 'dev' into master

WhyIsEvery4thYearAlwaysBad · Apr 11, 2021 · 4d5948f · 4d5948f
2 parents 4f5e757 + a70338c
commit 4d5948f
Show file tree

Hide file tree

Showing 13 changed files with 504 additions and 391 deletions.
diff --git a/compile.cmd b/compile.cmd
@@ -1,5 +1,5 @@
 @echo off
-pushd C:\Users\Owner\Documents\Projects\VoicemenuGenerator\src
+pushd C:\Users\Owner\Documents\Projects\CmdMenuGenerator\src
 g++ -m32 binds.cpp commandmenu.cpp launchoptions.cpp compiler.cpp tokens.cpp main.cpp -o ../cvm_generate_x32.exe -std=c++2a -Wall
 if NOT %%ERRORLEVEL%% EQU 0 (
 pause

diff --git a/compile.sh b/compile.sh
@@ -1,10 +1,10 @@
-pushd src
-g++ -m32 binds.cpp commandmenu.cpp launchoptions.cpp compiler.cpp tokens.cpp main.cpp -o ../cvm_generate_x32.exe -std=c++2a -Wall
+pushd C:/Users/Owner/Documents/Projects/CmdMenuGenerator/src
+g++ -g -m32 * -o ../cmg-x32.exe -std=c++2a -Wall
 if [ ! $? -eq 0 ]
 then
 	read -n1 -r -p "Error(s) have occurred here! Press a key to continue."
 fi
-g++ -m64 binds.cpp commandmenu.cpp launchoptions.cpp compiler.cpp tokens.cpp main.cpp -o ../cvm_generate_x64.exe -std=c++2a -Wall
+g++ -g -m64 * -o ../cmg-x64.exe -std=c++2a -Wall
 if [ ! $? -eq 0 ]
 then
 	read -n1 -r -p "Error(s) have occurred here! Press a key to continue."

diff --git a/src/binds.cpp → src/bind.cpp b/src/binds.cpp → src/bind.cpp
@@ -1,5 +1,6 @@
-#include "binds.hpp"
+#include "bind.hpp"
 #include "compiler.hpp"
+#include "lex.hpp"
 #include <map>
 extern std::map<std::string,std::string> KVMap;
 Bind::Bind() {}
@@ -28,6 +29,7 @@ Bind::Bind(const unsigned char& p_cKey, const Parser::BindToken& p_Token)
 	if (p_Token.bNoExit==true) CmdStrContainer.push_back(p_Token.sCmdStr);
 	else CmdStrContainer.push_back("cmenu.exitmenu; cmenu.on_cmenu_exit; "+p_Token.sCmdStr);
 }
+
 Bind::Bind(const unsigned char& p_cKey, const Parser::ToggleBindToken& p_Token)
 : bToggleBind(true), cKey(p_cKey) {
 	for (unsigned short i=0; i < p_Token.ToggleStates; i++) {

diff --git a/src/binds.hpp → src/bind.hpp b/src/binds.hpp → src/bind.hpp
diff --git a/src/commandmenu.cpp b/src/commandmenu.cpp
@@ -1,12 +1,25 @@
+#include <map>
 #include "commandmenu.hpp"
 #include "compiler.hpp"
+#include "lex.hpp"
+
+extern std::map<std::string,std::string> KVMap;
 
 CommandMenu::CommandMenu() {}
 
 CommandMenu::CommandMenu(const std::string& p_sName)
-	: sRawName(formatRaw(p_sName)), sName(p_sName) {}
+: sRawName(formatRaw(p_sName)), sName(p_sName) {
+	if (KVMap["display"]=="caption") Display=CMenuDisplayType::CAPTIONS;
+	else if (KVMap["display"]=="console") Display=CMenuDisplayType::CONSOLE;
+	else if (KVMap["display"]=="none") Display=CMenuDisplayType::NONE;
+}
 
 CommandMenu::CommandMenu(const std::string& p_sRawName, const std::string& p_sName)
-: sRawName(p_sRawName), sName(p_sName) {}
+: sRawName(p_sRawName), sName(p_sName) {
+	if (KVMap["display"]=="caption") Display=CMenuDisplayType::CAPTIONS;
+	else if (KVMap["display"]=="console") Display=CMenuDisplayType::CONSOLE;
+	else if (KVMap["display"]=="none") Display=CMenuDisplayType::NONE;
+	else Display=CMenuDisplayType::CAPTIONS;
+}
 
 CommandMenu::~CommandMenu() {}
diff --git a/src/commandmenu.hpp b/src/commandmenu.hpp
@@ -1,15 +1,21 @@
-#ifndef PAGE_HPP
-#define PAGE_HPP
+#ifndef COMMANDMENU_HPP
+#define COMMANDMENU_HPP
 #include <string>
 #include <vector>
 #include <deque>
-#include "binds.hpp"
 #include "compiler.hpp"
+#include "bind.hpp"
+
+enum class CMenuDisplayType {
+	NONE=0,
+	CONSOLE,
+	CAPTIONS
+};
 
 struct CommandMenu {
 	std::string sRawName, sName;
 	std::vector<Bind> binds;
-
+	CMenuDisplayType Display;
 	CommandMenu();
 	CommandMenu(const std::string& p_sName);
 	CommandMenu(const std::string& p_sRawName, const std::string& p_sName);