Use argc and argv passed down

source/client/client.cpp

@@ -1,7 +1,7 @@
 #include "client.h"
 
 
-int runClient( const std::string& host_address )
+int runClient(int argc, char* argv[])
 {
     return 0;
 }

source/client/client.h

@@ -3,6 +3,6 @@
 
 #include <string>
 
-int runClient( const std::string& host_address );
+int runClient(int argc, char* argv[]);
 
 #endif

source/client/filesystem.cpp

@@ -80,9 +80,9 @@ std::string getGamesDir()
 }
 
 // =====================================================================================================================
-int runFromFilesystem( const std::string& gamestring )
+int runFromFilesystem(int argc, char* argv[])
 {
-    std::string gamefile = gamestring;
+    std::string gamefile = argv[1];
 
     // Default for maps
     std::string ttrts_maps_dir = getMapsDir();

source/client/filesystem.h

@@ -13,11 +13,11 @@ bool FileExists( const std::string& name );
 
 void WaitForFile( const std::string& name, const std::chrono::milliseconds& time );
 
-int runFromFilesystem( const std::string& gamefile );
-
 bool OutputGameStateFile(CTTRTSGame &game, const std::string &gameDir);
 
 std::string getMapsDir();
 std::string getGamesDir();
 
+int runFromFilesystem(int argc, char* argv[]);
+
 #endif

source/client/main.cpp

@@ -22,16 +22,12 @@ int main(int argc, char* argv[])
 	// Attempt to open the game file
 	std::string arg1 = argv[1];
 
+	// Either run the client, the server, or from local filesystem
 	if( arg1 == "client" )
-	{
+		return runClient(argc,argv+1);
-		if( argc == 3 )
-			return runClient(argv[2]);
-	}
 	else if ( arg1 == "server" )
-	{
+		return runServer(argc,argv+1);
-		return runServer();
-	}
 	else
-		return runFromFilesystem(arg1);
+		return runFromFilesystem(argc,argv);
 
 };

source/client/server.cpp

@@ -1,6 +1,6 @@
 #include "server.h"
 
-int runServer()
+int runServer(int argc, char* argv[])
 {
-
+    return 0;
 }

source/client/server.h

@@ -1,6 +1,6 @@
 #ifndef _TTRTS_SERVER_H_
 #define _TTRTS_SERVER_H_
 
-int runServer();
+int runServer(int argc, char* argv[]);
 
 #endif