0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Made python ais work again. They were broken when they were moved to

Browse source 
data/ai/python from data/ais.
This commit is contained in:
Sergey Popov 2008-10-26 10:28:17 +00:00
parent 6e09a9f586
commit 54fa8f0d94
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ai.cpp
View file

@ -206,7 +206,7 @@ static std::vector<std::string> get_available_py_scripts()
const std::vector<std::string>& paths = get_binary_paths("data");
for(std::vector<std::string>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
std::vector<std::string> files;
get_files_in_dir(*i + "ais", &files, NULL, ENTIRE_FILE_PATH);
get_files_in_dir(*i + "ai/python", &files, NULL, ENTIRE_FILE_PATH);
for(std::vector<std::string>::const_iterator j = files.begin(); j != files.end(); ++j) {
// file ends with .py
if (j->substr(j->length() - 3) == ".py") {

8
src/ai_python.cpp
View file

@ -2084,7 +2084,7 @@ void python_ai::invoke(std::string name)
python_code +=
"import sys\n"
"backup = sys.path[:]\n"
"sys.path.append(\"" + game_config::path + "/data/ais\")\n"
"sys.path.append(\"" + game_config::path + "/data/ai/python\")\n"
"sys.path.append(\"" + game_config::path + "/data/tools/wesnoth\")\n"
"try:\n"
"\timport " + name + "\n"
@ -2132,7 +2132,7 @@ void python_ai::play_turn()
std::cerr << "\"" << script_name << "\" is not a valid script name.\n";
return;
}
std::string script = get_binary_file_location("data", "ais/" + script_name);
std::string script = get_binary_file_location("data", "ai/python" + script_name);
PyErr_Clear();
@ -2142,7 +2142,7 @@ void python_ai::play_turn()
std::string path(".");
if (!game_config::path.empty()) path = game_config::path;
LOG_AI << "Executing Python script \"" << script << "\".\n";
LOG_AI << "Python path: \"" << path << "/data/ais" << "\"\n";
LOG_AI << "Python path: \"" << path << "/data/ai/python" << "\"\n";
// Run the python script. We actually execute a short inline python script,
// which sets up the module search path to the data path,
// runs the script, and then resets the path.
@ -2157,7 +2157,7 @@ void python_ai::play_turn()
"\texcept IOError:\n"
"\t\tsys.stderr.write(\"Python: Could not create pyerr.txt in current directory.\\n\")\n"
"\tbackup = sys.path[:]\n"
"\tsys.path.append(\"" + path + "/data/ais\")\n"
"\tsys.path.append(\"" + path + "/data/ai/python\")\n"
"\tsys.path.append(\"data/ais\")\n"
"\ttry:\n"
"\t\timport parse, safe\n"