From 4fb48b4748ae9607bbefdcfd02a5f7e199da2ac9 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Mon, 22 Sep 2014 16:38:22 +0300 Subject: [PATCH] client: Remove config.polycode_path --- src/client/app.cpp | 5 ----- src/client/config.cpp | 6 ------ src/client/config.h | 1 - src/client/main.cpp | 7 +------ 4 files changed, 1 insertion(+), 18 deletions(-) diff --git a/src/client/app.cpp b/src/client/app.cpp index 288bff6..7cfb272 100644 --- a/src/client/app.cpp +++ b/src/client/app.cpp @@ -240,11 +240,6 @@ struct CApp: public App, public u3d::Application lua_pushlstring(L, path.c_str(), path.size()); return 1; } - if(name == "polycode"){ - ss_ path = g_client_config.polycode_path; - lua_pushlstring(L, path.c_str(), path.size()); - return 1; - } log_w(MODULE, "Unknown named path: \"%s\"", cs(name)); return 0; } diff --git a/src/client/config.cpp b/src/client/config.cpp index 919ffb7..07894d4 100644 --- a/src/client/config.cpp +++ b/src/client/config.cpp @@ -30,12 +30,6 @@ bool Config::check_paths() { bool fail = false; - if(!check_file_readable(polycode_path+"/Core/Contents/Include/Polycode.h")){ - log_e(MODULE, "Polycode doesn't seem to exist in polycode_path=\"%s\"", - cs(polycode_path)); - fail = true; - } - if(!check_file_readable(share_path+"/extensions/test/init.lua")){ log_e(MODULE, "Static files don't seem to exist in share_path=\"%s\"", cs(share_path)); diff --git a/src/client/config.h b/src/client/config.h index ff58836..a2db5fb 100644 --- a/src/client/config.h +++ b/src/client/config.h @@ -8,7 +8,6 @@ namespace client struct Config { ss_ server_address; - ss_ polycode_path = "../../polycode"; ss_ share_path = ".."; ss_ cache_path = "../cache"; diff --git a/src/client/main.cpp b/src/client/main.cpp index 20ae714..f189d9d 100644 --- a/src/client/main.cpp +++ b/src/client/main.cpp @@ -50,12 +50,11 @@ int main(int argc, char *argv[]) client::Config &config = g_client_config; - const char opts[100] = "hs:p:P:C:l:"; + const char opts[100] = "hs:P:C:l:"; const char usagefmt[1000] = "Usage: %s [OPTION]...\n" " -h Show this help\n" " -s [address] Specify server address\n" - " -p [polycode_path] Specify polycode path\n" " -P [share_path] Specify share/ path\n" " -C [cache_path] Specify cache/ path\n" " -l [integer] Set maximum log level (0...5)\n" @@ -73,10 +72,6 @@ int main(int argc, char *argv[]) fprintf(stderr, "INFO: config.server_address: %s\n", c55_optarg); config.server_address = c55_optarg; break; - case 'p': - fprintf(stderr, "INFO: config.polycode_path: %s\n", c55_optarg); - config.polycode_path = c55_optarg; - break; case 'P': fprintf(stderr, "INFO: config.share_path: %s\n", c55_optarg); config.share_path = c55_optarg;