Migrated engine to using dlmalloc through eng::
This commit is contained in:
@@ -100,7 +100,7 @@ public:
|
||||
void send_lua_source(const util::LuaSourceVec &sv) {
|
||||
StreamBuffer serial;
|
||||
SourceDB::serialize_source(sv, &serial);
|
||||
std::string sstr = serial.read_entire_contents();
|
||||
eng::string sstr = serial.read_entire_contents();
|
||||
Invocation inv(Invocation::KIND_LUA_SOURCE, actor_id_, actor_id_, sstr);
|
||||
send_invocation(inv);
|
||||
}
|
||||
@@ -131,7 +131,7 @@ public:
|
||||
}
|
||||
|
||||
void do_choose_command(const StringVec &cmd) {
|
||||
std::string action = gui_.get_action(util::strtoint(cmd[1], -1));
|
||||
eng::string action = gui_.get_action(util::strtoint(cmd[1], -1));
|
||||
if (action == "") {
|
||||
stdostream() << "Invalid menu item #" << std::endl;
|
||||
return;
|
||||
@@ -252,7 +252,7 @@ public:
|
||||
|
||||
// Check for keyboard input on stdin.
|
||||
while (true) {
|
||||
std::string line = get_stdio_channel()->in()->readline();
|
||||
eng::string line = get_stdio_channel()->in()->readline();
|
||||
if (line == "") break;
|
||||
console_.add(line);
|
||||
get_stdio_channel()->set_prompt(console_.get_prompt());
|
||||
|
||||
Reference in New Issue
Block a user