MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix more MSVC fail, make console recognize 'man' command.

develop
Petr Mrázek 2012-02-22 19:54:07 +01:00
parent a9c9ac98fe
commit 58e3813d56
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/Core.cpp
Unescape Escape View File

@ -195,7 +195,7 @@ static void runInteractiveCommand(Core *core, PluginManager *plug_mgr, int &clue
cerr << "Invoking: " << command << endl; cerr << "Invoking: " << command << endl;
// let's see what we actually got // let's see what we actually got
if(first=="help" || first == "?") if(first=="help" || first == "?" || first == "man")
{ {
if(!parts.size()) if(!parts.size())
{ {
@ -205,7 +205,7 @@ static void runInteractiveCommand(Core *core, PluginManager *plug_mgr, int &clue
"On Windows, you may have to resize your console window. The appropriate menu is accessible\n" "On Windows, you may have to resize your console window. The appropriate menu is accessible\n"
"by clicking on the program icon in the top bar of the window.\n\n" "by clicking on the program icon in the top bar of the window.\n\n"
"Basic commands:\n" "Basic commands:\n"
" help|? - This text.\n" " help|?|man - This text.\n"
" help COMMAND - Usage help for the given command.\n" " help COMMAND - Usage help for the given command.\n"
" ls|dir [PLUGIN] - List available commands. Optionally for single plugin.\n" " ls|dir [PLUGIN] - List available commands. Optionally for single plugin.\n"
" cls - Clear the console.\n" " cls - Clear the console.\n"
@ -350,7 +350,7 @@ static void runInteractiveCommand(Core *core, PluginManager *plug_mgr, int &clue
{ {
con.print( con.print(
"builtin:\n" "builtin:\n"
" help|? - This text or help specific to a plugin.\n" " help|?|man - This text or help specific to a plugin.\n"
" ls [PLUGIN] - List available commands. Optionally for single plugin.\n" " ls [PLUGIN] - List available commands. Optionally for single plugin.\n"
" cls - Clear the console.\n" " cls - Clear the console.\n"
" fpause - Force DF to pause.\n" " fpause - Force DF to pause.\n"

4
library/include/Export.h
Unescape Escape View File

@ -47,5 +47,5 @@ distribution.
#define DFhackDataExport __attribute__ ((visibility("default"))) #define DFhackDataExport __attribute__ ((visibility("default")))
#else #else
#define DFhackCExport extern "C" __declspec(dllexport) #define DFhackCExport extern "C" __declspec(dllexport)
#define DFhackDataExport __declspec(dllexport) #define DFhackDataExport extern "C" __declspec(dllexport)
#endif #endif