summaryrefslogtreecommitdiff
path: root/library/Core.cpp
diff options
context:
space:
mode:
authorPetr Mrázek2012-03-15 14:43:05 +0100
committerPetr Mrázek2012-03-15 14:43:05 +0100
commit1ac8025025a2368d7a6b0e1b74ab7babd8c932bc (patch)
tree50ce39883b7bd193f512334237a72194e06036b3 /library/Core.cpp
parent03e648b3a1c6b8de60629fd45c8d19c59a143607 (diff)
parent605ee9669a5cd4d2f69ca8adcbe96c9e62671b87 (diff)
downloaddfhack-1ac8025025a2368d7a6b0e1b74ab7babd8c932bc.tar.gz
dfhack-1ac8025025a2368d7a6b0e1b74ab7babd8c932bc.tar.bz2
dfhack-1ac8025025a2368d7a6b0e1b74ab7babd8c932bc.tar.xz
Merge https://github.com/angavrilov/dfhack
Conflicts: plugins/workflow.cpp
Diffstat (limited to 'library/Core.cpp')
-rw-r--r--library/Core.cpp24
1 files changed, 17 insertions, 7 deletions
diff --git a/library/Core.cpp b/library/Core.cpp
index 1439d39b..c374e9f1 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -48,6 +48,7 @@ using namespace std;
#include "modules/World.h"
#include "modules/Graphic.h"
#include "modules/Windows.h"
+#include "RemoteServer.h"
using namespace DFHack;
#include "df/ui.h"
@@ -170,7 +171,7 @@ void fHKthread(void * iodata)
string first = args[0];
args.erase(args.begin());
- command_result cr = plug_mgr->InvokeCommand(out, first, args, false);
+ command_result cr = plug_mgr->InvokeCommand(out, first, args);
if(cr == CR_WOULD_BREAK)
{
@@ -277,7 +278,7 @@ static void runInteractiveCommand(Core *core, PluginManager *plug_mgr, int &clue
for(size_t i = 0; i < plug_mgr->size();i++)
{
Plugin * plug = (plug_mgr->operator[](i));
- plug->load();
+ plug->load(con);
}
}
else
@@ -289,7 +290,7 @@ static void runInteractiveCommand(Core *core, PluginManager *plug_mgr, int &clue
}
else
{
- plug->load();
+ plug->load(con);
}
}
}
@@ -304,7 +305,7 @@ static void runInteractiveCommand(Core *core, PluginManager *plug_mgr, int &clue
for(size_t i = 0; i < plug_mgr->size();i++)
{
Plugin * plug = (plug_mgr->operator[](i));
- plug->reload();
+ plug->reload(con);
}
}
else
@@ -316,7 +317,7 @@ static void runInteractiveCommand(Core *core, PluginManager *plug_mgr, int &clue
}
else
{
- plug->reload();
+ plug->reload(con);
}
}
}
@@ -331,7 +332,7 @@ static void runInteractiveCommand(Core *core, PluginManager *plug_mgr, int &clue
for(size_t i = 0; i < plug_mgr->size();i++)
{
Plugin * plug = (plug_mgr->operator[](i));
- plug->unload();
+ plug->unload(con);
}
}
else
@@ -343,7 +344,7 @@ static void runInteractiveCommand(Core *core, PluginManager *plug_mgr, int &clue
}
else
{
- plug->unload();
+ plug->unload(con);
}
}
}
@@ -596,6 +597,9 @@ Core::Core()
last_world_data_ptr = NULL;
top_viewscreen = NULL;
screen_window = NULL;
+ server = NULL;
+
+ color_ostream::log_errors_to_stderr = true;
};
void Core::fatal (std::string output, bool deactivate)
@@ -704,6 +708,12 @@ bool Core::Init()
screen_window = new Windows::top_level_window();
screen_window->addChild(new Windows::dfhack_dummy(5,10));
started = true;
+
+ cerr << "Starting the TCP listener.\n";
+ server = new ServerMain();
+ if (!server->listen(RemoteClient::GetDefaultPort()))
+ cerr << "TCP listen failed.\n";
+
cerr << "DFHack is running.\n";
return true;
}