Merge branch 'master' into outlaws

Author: luciusDXL

TheForceEngine/TFE_DarkForces/Scripting/gs_game.cpp

@@ -1,7 +1,9 @@
 #include "gs_game.h"
-#include <TFE_System/system.h>
+#include <TFE_DarkForces/hud.h>
+#include <TFE_DarkForces/random.h>
 #include <TFE_DarkForces/time.h>
-
+#include <TFE_System/system.h>
+#include <string>
 #include <angelscript.h>
 
 using namespace TFE_Jedi;
@@ -15,12 +17,24 @@ namespace TFE_DarkForces
 		return f32(s_curTick) * c_timeScale;
 	}
 
+	s32 GS_Game::scriptRandom(s32 value)
+	{
+		return random(value);
+	}
+
+	void GS_Game::text(string msg)
+	{
+		TFE_DarkForces::hud_sendTextMessage(msg.c_str(), 0, false);
+	}
+
 	bool GS_Game::scriptRegister(ScriptAPI api)
 	{
 		ScriptClassBegin("Game", "game", api);
 		{
 			// Functions
 			ScriptObjMethod("float getGameTime()", getGameTime);
+			ScriptObjMethod("int random(int)", scriptRandom);
+			ScriptObjMethod("void text(string)", text);
 		}
 		ScriptClassEnd();
 	}

TheForceEngine/TFE_DarkForces/Scripting/gs_game.h

@@ -6,6 +6,7 @@
 // in order to properly test elements in isolation without having
 // to "play" the game as intended.
 //////////////////////////////////////////////////////////////////////
+#include <string>
 #include <TFE_System/system.h>
 #include <TFE_System/types.h>
 #include <TFE_ForceScript/scriptInterface.h>
@@ -19,6 +20,8 @@ namespace TFE_DarkForces
 		bool scriptRegister(ScriptAPI api) override;
 
 		f32 getGameTime();
+		s32 scriptRandom(s32 value);
+		void text(std::string msg);
 	};
 }
 

TheForceEngine/TFE_DarkForces/Scripting/gs_level.cpp

@@ -48,6 +48,30 @@ namespace TFE_DarkForces
 		return sector;
 	}
 
+	ScriptSector GS_Level::getSectorByName(std::string name)
+	{
+		const char* sectorName = name.c_str();
+		
+		MessageAddress* msgAddr = message_getAddress(sectorName);
+		if (msgAddr)
+		{
+			u32 sectorCount = s_levelState.sectorCount;
+			for (u32 s = 0; s < sectorCount; s++)
+			{
+				RSector* sec = &s_levelState.sectors[s];
+				if (sec == msgAddr->sector)
+				{
+					ScriptSector sector(s);
+					return sector;
+				}
+			}
+		}
+
+		// Could not find the sector
+		ScriptSector sector(-1);
+		return sector;
+	}
+
 	ScriptElev GS_Level::getElevator(s32 id)
 	{
 		if (id < 0 || id >= allocator_getCount(s_infSerState.infElevators))
@@ -230,6 +254,7 @@ namespace TFE_DarkForces
 
 			// Functions
 			ScriptObjMethod("Sector getSector(int)", getSectorById);
+			ScriptObjMethod("Sector getSector(string)", getSectorByName);
 			ScriptObjMethod("Elevator getElevator(int)", getElevator);
 			ScriptObjMethod("void findConnectedSectors(Sector initSector, uint, array<Sector>&)", findConnectedSectors);
 

TheForceEngine/TFE_DarkForces/Scripting/gs_level.h

@@ -25,6 +25,7 @@ namespace TFE_DarkForces
 		bool scriptRegister(ScriptAPI api) override;
 
 		ScriptSector getSectorById(s32 id);
+		ScriptSector getSectorByName(std::string name);
 		ScriptElev   getElevator(s32 id);
 		void findConnectedSectors(ScriptSector initSector, u32 matchProp, CScriptArray& results);
 		void setGravity(s32 grav);

TheForceEngine/TFE_DarkForces/agent.cpp

@@ -6,8 +6,10 @@
 #include "hud.h"
 #include "weapon.h"
 #include <TFE_Game/igame.h>
+#include <TFE_DarkForces/mission.h>
 #include <TFE_FileSystem/fileutil.h>
 #include <TFE_FileSystem/paths.h>
+#include <TFE_Settings/settings.h>
 #include <TFE_System/system.h>
 #include <TFE_System/parser.h>
 #include <TFE_Jedi/Serialization/serialization.h>
@@ -180,12 +182,23 @@ namespace TFE_DarkForces
 	void levelEndTaskFunc(MessageType msg)
 	{
 		task_begin;
-		while (1)
+
+		// If you are using the auto end mission setting, then just wait a few seconds and end the level.
+		if (TFE_Settings::getGameSettings()->df_autoEndMission)
 		{
-			hud_sendTextMessage(461);
-			task_yield(582);			// ~4 seconds
-			hud_sendTextMessage(462);
-			task_yield(4369);			// ~30 seconds
+			task_yield(873); // ~ 6 seconds
+			mission_setExitLevel(JTRUE);
+		}
+		else 
+		{		
+			// Otherwise loop the end level message until the player exits through the escape menu.
+			while (1)
+			{
+				hud_sendTextMessage(461);
+				task_yield(582);			// ~4 seconds
+				hud_sendTextMessage(462);
+				task_yield(4369);			// ~30 seconds		
+			}	
 		}
 		task_end;
 	}
@@ -541,10 +554,19 @@ namespace TFE_DarkForces
 				}
 				else
 				{
-					// Finally generate a new one.
-					TFE_System::logWrite(LOG_WARNING, "DarkForcesMain", "Cannot find 'DARKPILO.CFG' at '%s'. Creating a new file for save data.", sourcePath);
-newpilo:
-					createDarkPilotConfig(documentsPath);
+					// Also check the remaster documents path.
+					TFE_Paths::appendPath(PATH_REMASTER_DOCS, "DARKPILO.CFG", sourcePath);
+					if (FileUtil::exists(sourcePath))
+					{
+						FileUtil::copyFile(sourcePath, documentsPath);
+					}
+					else
+					{
+						// Finally generate a new one.
+						TFE_System::logWrite(LOG_WARNING, "DarkForcesMain", "Cannot find 'DARKPILO.CFG' at '%s'. Creating a new file for save data.", sourcePath);
+					newpilo:
+						createDarkPilotConfig(documentsPath);
+					}
 				}
 			}
 		}

TheForceEngine/TFE_DarkForces/mission.cpp

@@ -518,6 +518,11 @@ namespace TFE_DarkForces
 		s_exitLevel = JTRUE;
 	}
 
+	void mission_setExitLevel(JBool exitLevel)
+	{
+		s_exitLevel = exitLevel;
+	}
+
 	void mission_render(s32 rendererIndex, bool forceTextureUpdate)
 	{
 		if (task_getCount() > 1 && s_missionMode == MISSION_MODE_MAIN)

TheForceEngine/TFE_DarkForces/mission.h

@@ -26,6 +26,7 @@ namespace TFE_DarkForces
 	void mission_startTaskFunc(MessageType msg);
 	void mission_setLoadMissionTask(Task* task);
 	void mission_exitLevel();
+	void mission_setExitLevel(JBool exitLevel);
 	void mission_pause(JBool pause);
 
 	void setScreenFxLevels(s32 healthFx, s32 shieldFx, s32 flashFx);

TheForceEngine/TFE_FileSystem/paths-posix.cpp

@@ -3,6 +3,7 @@
 #include "paths.h"
 #include "fileutil.h"
 #include "filestream.h"
+#include <TFE_Settings/gameSourceData.h>
 #include <TFE_System/system.h>
 #include <TFE_Archive/archive.h>
 #include <algorithm>
@@ -130,6 +131,34 @@ namespace TFE_Paths
 		return true;
 	}
 
+	// There is no official remaster support on linux
+	// Lets approximate proton save locations. 
+	bool setRemasterDocsPath(GameID game)
+	{
+		if (isPortableInstall())
+		{
+			s_paths[PATH_REMASTER_DOCS] = s_paths[PATH_PROGRAM];
+			return true;
+		}
+		string strId = to_string((int)TFE_Settings::c_steamRemasterProductId[game]);
+		string append = "~/.steam/steam/steamapps/compatdata/" + strId + "/pfx/drive_c/users/steamuser/Saved Games/Nightdive Studios";
+
+		if (game == Game_Dark_Forces)
+		{
+			append += "/Dark Forces Remaster/";
+		}
+		else if (game == Game_Outlaws)
+		{
+			append += "/Outlaws Remaster/";
+		}
+		else
+		{
+			return false;
+		}
+		s_paths[PATH_REMASTER_DOCS] = append;
+		return !s_paths[PATH_REMASTER_DOCS].empty();
+	}
+
 	bool setProgramPath(void)
 	{
 		char p[TFE_MAX_PATH];

TheForceEngine/TFE_FileSystem/paths.cpp

@@ -123,6 +123,35 @@ namespace TFE_Paths
 		return false;
 	}
 
+	// This is the path to the Remaster documents folder.
+	bool setRemasterDocsPath(GameID game)	
+	{
+	#ifdef _WIN32
+		char path[TFE_MAX_PATH];
+		
+		if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_PROFILE, NULL, 0, path)))
+		{
+			// Append product-specific path
+			if (game == Game_Dark_Forces)
+			{
+				PathAppend(path, "Saved Games\\Nightdive Studios\\Dark Forces Remaster");
+			}
+			else if (game == Game_Outlaws)
+			{
+				PathAppend(path, "Saved Games\\Nightdive Studios\\Outlaws Remaster");
+			}
+			else
+			{
+				return false;
+			}
+			s_paths[PATH_REMASTER_DOCS] = path;
+			s_paths[PATH_REMASTER_DOCS] += "\\";
+		}
+		return !s_paths[PATH_REMASTER_DOCS].empty();
+	#endif
+		return false;
+	}
+
 	bool setProgramPath()
 	{
 		char path[TFE_MAX_PATH];

TheForceEngine/TFE_FileSystem/paths.h

@@ -1,6 +1,7 @@
 #pragma once
 #include "fileutil.h"
 #include <TFE_System/types.h>
+#include <TFE_Settings/gameSourceData.h>
 
 enum TFE_PathType
 {
@@ -10,6 +11,7 @@ enum TFE_PathType
 	PATH_SOURCE_DATA,		// This is the location of the source data, such as maps, textures, etc.
 	PATH_EMULATOR,			// Path to the dosbox exe (for the editor).
 	PATH_MOD,				// Use this to reference mods.
+	PATH_REMASTER_DOCS,     // Path for Remaster Document Folder. 
 	PATH_COUNT
 };
 
@@ -34,6 +36,7 @@ namespace TFE_Paths
 	bool setProgramDataPath(const char* append);
 	bool setUserDocumentsPath(const char* append);
 	// Platform specific executable path.
+	bool setRemasterDocsPath(GameID game);
 	bool setProgramPath();
 	// find a relative path in a TFE system directory. true if mapping was done.
 	bool mapSystemPath(char *path);