Merge branch 'main' into stable

afwbkbc · Feb 15, 2025 · ffe61ce · ffe61ce
2 parents 4571c93 + 6248772
commit ffe61ce
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/GLSMAC_data/default/main_legacy.gls.js b/GLSMAC_data/default/main_legacy.gls.js
@@ -11,8 +11,6 @@ return ((gm) => {
 
 	gm.on('start', (e) => {
 
-		#print('GM ON START');
-
 		let players = [];
 		let players_sz = 0;
 		let random_player = () => {
@@ -48,8 +46,6 @@ return ((gm) => {
 
 		e.game.on('configure', (e) => {
 
-			#print('E GAME ON CONFIGURE');
-
 			units.configure(e.game);
 			resources.configure(e.game.rm);
 

diff --git a/GLSMAC_data/default/resources.gls.js b/GLSMAC_data/default/resources.gls.js
@@ -26,8 +26,6 @@ const result = {
 
 	configure: (rm) => {
 
-		#print('CONFIGURING RM');
-
 		define(rm, 'Nutrients', 304, 13);
 		define(rm, 'Minerals', 345, 36);
 		define(rm, 'Energy', 386, 59);

diff --git a/src/gse/context/GlobalContext.cpp b/src/gse/context/GlobalContext.cpp
@@ -40,8 +40,10 @@ const std::string& GlobalContext::GetSourceLine( const size_t line_num ) const {
 	return m_source_lines.at( line_num - 1 );
 }
 
+static const si_t s_empty_si = {};
 const si_t& GlobalContext::GetSI() const {
-	THROW( "global contexts are not supposed to have si" );
+	//THROW( "global contexts are not supposed to have si" ); // for some reason this gets thrown at Release builds but not Debug
+	return s_empty_si;
 }
 
 const Context::script_info_t& GlobalContext::GetScriptInfo() const {