Merge branch 'dev' of https://github.com/WhyIsEvery4thYearAlwaysBad/V…

…oicemenuGenerator into master

compile.cmd

@@ -1,5 +1,11 @@
 @echo off
-cls
-pushd src
-g++ binds.cpp page.cpp launchoptions.cpp compiler.cpp tokens.cpp main.cpp -o ../cvm_generate.exe -std=c++2a -Wall
+pushd C:\Users\Owner\Documents\Projects\VoicemenuGenerator\src
+g++ -m32 binds.cpp page.cpp launchoptions.cpp compiler.cpp tokens.cpp main.cpp -o ../cvm_generate_x32.exe -std=c++2a -Wall
+if NOT %%ERRORLEVEL%% EQU 0 (
+pause
+)
+g++ -m64 binds.cpp page.cpp launchoptions.cpp compiler.cpp tokens.cpp main.cpp -o ../cvm_generate_x64.exe -std=c++2a -Wall
+if NOT %%ERRORLEVEL%% EQU 0 (
+pause
+)
 popd

compile.sh

@@ -1,3 +1,4 @@
 pushd src
-g++ binds.cpp page.cpp launchoptions.cpp compiler.cpp tokens.cpp main.cpp -o ../cvm_generate.exe -std=c++2a -Wall
+g++ -m64 binds.cpp page.cpp launchoptions.cpp compiler.cpp tokens.cpp main.cpp -o ../cvm_generate_x64.exe -std=c++2a -Wall
+g++ -m32 binds.cpp page.cpp launchoptions.cpp compiler.cpp tokens.cpp main.cpp -o ../cvm_generate_x32.exe -std=c++2a -Wall
 popd

src/main.cpp

@@ -57,10 +57,10 @@ int main(int argc, char** argv) {
 	// Console mode makes the Voicemenu use the console for displaying binds, instead of captions.
 	bool consolemode=(keymap["consolemode"].find("true")!=std::string::npos);
 	if (consolemode) {
-		exec<<R"(alias _cvm.nullkeys "alias _cvm.1 ; alias _cvm.2 ; alias _cvm.3 ; alias _cvm.4 ; alias _cvm.5 ; alias _cvm.6 ; alias _cvm.7 ; alias _cvm.8 ; alias _cvm.9"
+		exec<<R"(alias _cvm.nullkeys "alias _cvm.1 ; alias _cvm.2 ; alias _cvm.3 ; alias _cvm.4 ; alias _cvm.5 ; alias _cvm.6 ; alias _cvm.7 ; alias _cvm.8 ; alias _cvm.9 ; alias _cvm.0"
 alias cvm.exitmenu "developer 0; )"<<keymap["resetkeys"]<<"; cvm.on_exitmenu\"";
 		exec<<R"(
-alias _cvm.menusettings "developer 1; clear; bind 1 _cvm.1; bind 2 _cvm.2; bind 3 _cvm.3; bind 4 _cvm.4; bind 5 _cvm.5; bind 6 _cvm.6; bind 7 _cvm.7; bind 8 _cvm.8; bind 9 _cvm.9"
+alias _cvm.menusettings "developer 1; clear; bind 1 _cvm.1; bind 2 _cvm.2; bind 3 _cvm.3; bind 4 _cvm.4; bind 5 _cvm.5; bind 6 _cvm.6; bind 7 _cvm.7; bind 8 _cvm.8; bind 9 _cvm.9; bind 0 _cvm.0"
 cvm.exitmenu
 alias cvm.on_exitmenu ;
 alias cvm.on_page_exit ;
@@ -96,10 +96,10 @@ alias cvm.on_page_exit ;
 	else {
 	exec<<R"(closecaption 1
 cc_lang customvoicemenu
-alias _cvm.nullkeys "alias _cvm.1 ; alias _cvm.2 ; alias _cvm.3 ; alias _cvm.4 ; alias _cvm.5 ; alias _cvm.6 ; alias _cvm.7 ; alias _cvm.8 ; alias _cvm.9"
+alias _cvm.nullkeys "alias _cvm.1 ; alias _cvm.2 ; alias _cvm.3 ; alias _cvm.4 ; alias _cvm.5 ; alias _cvm.6 ; alias _cvm.7 ; alias _cvm.8 ; alias _cvm.9; alias _cvm.0"
 alias cvm.exitmenu "cc_emit _#cvm.clear_screen; )"<<keymap["resetkeys"]<<"; cc_linger_time "<<keymap["linger_time"]<<"; cc_predisplay_time "<<keymap["predisplay_time"]<<"; cvm.on_exitmenu\"";
 	exec<<R"(
-alias _cvm.menusettings "cc_linger_time 10000; cc_predisplay_time 0; bind 1 _cvm.1; bind 2 _cvm.2; bind 3 _cvm.3; bind 4 _cvm.4; bind 5 _cvm.5; bind 6 _cvm.6; bind 7 _cvm.7; bind 8 _cvm.8; bind 9 _cvm.9"
+alias _cvm.menusettings "cc_linger_time 10000; cc_predisplay_time 0; bind 1 _cvm.1; bind 2 _cvm.2; bind 3 _cvm.3; bind 4 _cvm.4; bind 5 _cvm.5; bind 6 _cvm.6; bind 7 _cvm.7; bind 8 _cvm.8; bind 9 _cvm.9; bind 0 _cvm.0"
 cvm.exitmenu
 alias cvm.on_exitmenu ;
 alias cvm.on_page_exit ;