mdiluz/ttrts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More refactoring of functionality into seperate files, with stubs for server and client

Browse source
This commit is contained in:
mdiluzio 2015-01-02 15:03:29 +00:00
parent 8835bfb82a
commit 2281bcb6cd
7 changed files with 101 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

48
source/client/main.cpp
View file

@ -1,11 +1,9 @@
#include "game.h"
#include "filesystem.h"
#include "server.h"
#include "client.h"
#include <iostream>
#include <unistd.h>
#define STRINGIFY(x) _STRINGIFY(x)
#define _STRINGIFY(x) #x
static const char* sk_usage =
#include "usage.h"
@ -22,44 +20,18 @@ int main(int argc, char* argv[])
}
// Attempt to open the game file
std::string gameFile = argv[1];
std::string arg1 = argv[1];
// Default for maps
std::string ttrts_maps_dir = STRINGIFY(TTRTS_MAPS);
if( getenv("TTRTS_MAPS") )
if( arg1 == "client" )
{
ttrts_maps_dir = getenv("TTRTS_MAPS");
// Additional trailing slash
if( ttrts_maps_dir.back() != '/' )
ttrts_maps_dir += "/";
if( argc == 3 )
return runClient(argv[2]);
}
// Default for games
std::string ttrts_games_dir = STRINGIFY(TTRTS_GAMES);
if( getenv("TTRTS_GAMES") )
else if ( arg1 == "server" )
{
ttrts_games_dir = getenv("TTRTS_GAMES");
// Additional trailing slash
if( ttrts_games_dir.back() != '/' )
ttrts_games_dir += "/";
return runServer();
}
// If file path is not local path and file doesn't exist
if( gameFile.find("/") == std::string::npos
&& access( gameFile.c_str(), F_OK ) == -1 )
{
gameFile = ttrts_maps_dir + gameFile;
}
// If still not good
if( access( gameFile.c_str(), F_OK ) == -1 )
{
std::cerr<<"Error: "<<gameFile<<" file not found"<<std::endl;
return -1;
}
return runFromFilesystem(ttrts_games_dir, gameFile);
else
return runFromFilesystem(arg1);
};