Move termutil to a globally accessible area.

develop
Petr Mrázek 2011-05-17 08:36:38 +02:00
parent 61dea59e29
commit 909cd8b60b
25 changed files with 29 additions and 25 deletions

@ -7,7 +7,7 @@
#include <ctime> #include <ctime>
using namespace std; using namespace std;
#include <DFHack.h> #include <DFHack.h>
#include "termutil.h" #include <dfhack/extra/termutil.h>
int main (void) int main (void)
{ {

@ -11,7 +11,7 @@ using namespace std;
#include <DFHack.h> #include <DFHack.h>
#include <dfhack/DFVector.h> #include <dfhack/DFVector.h>
#include <dfhack/extra/MapExtras.h> // map cache for the win. #include <dfhack/extra/MapExtras.h> // map cache for the win.
#include "termutil.h" #include <dfhack/extra/termutil.h>
using namespace DFHack; using namespace DFHack;
using MapExtras::Block; using MapExtras::Block;
using MapExtras::MapCache; using MapExtras::MapCache;

@ -7,7 +7,7 @@
using namespace std; using namespace std;
#include <DFHack.h> #include <DFHack.h>
#include "termutil.h" #include <dfhack/extra/termutil.h>
int main (int argc, char** argv) int main (int argc, char** argv)
{ {

@ -13,7 +13,7 @@ using namespace std;
#include <DFHack.h> #include <DFHack.h>
#include <dfhack/DFVector.h> #include <dfhack/DFVector.h>
#include <dfhack/DFTypes.h> #include <dfhack/DFTypes.h>
#include "termutil.h" #include <dfhack/extra/termutil.h>
int main (int argc, char *argv[]) int main (int argc, char *argv[])
{ {

@ -11,7 +11,7 @@ using namespace std;
#include <DFHack.h> #include <DFHack.h>
#include <dfhack/DFVector.h> #include <dfhack/DFVector.h>
#include <dfhack/DFTypes.h> #include <dfhack/DFTypes.h>
#include "termutil.h" #include <dfhack/extra/termutil.h>
int main () int main ()
{ {

@ -10,7 +10,7 @@ using namespace std;
#include <DFHack.h> #include <DFHack.h>
#include <dfhack/DFTileTypes.h> #include <dfhack/DFTileTypes.h>
#include "termutil.h" #include <dfhack/extra/termutil.h>
int main (void) int main (void)
{ {

@ -10,7 +10,7 @@ using namespace std;
#include <DFHack.h> #include <DFHack.h>
#include <dfhack/DFTileTypes.h> #include <dfhack/DFTileTypes.h>
#include "termutil.h" #include <dfhack/extra/termutil.h>
int main (void) int main (void)
{ {

@ -10,7 +10,7 @@ using namespace std;
#include <DFHack.h> #include <DFHack.h>
#include <dfhack/VersionInfoFactory.h> #include <dfhack/VersionInfoFactory.h>
using namespace DFHack; using namespace DFHack;
#include "termutil.h" #include <dfhack/extra/termutil.h>
int main (int numargs, const char ** args) int main (int numargs, const char ** args)
{ {

@ -9,7 +9,7 @@
using namespace std; using namespace std;
#include <DFHack.h> #include <DFHack.h>
#include "termutil.h" #include <dfhack/extra/termutil.h>
void print_progress (int current, int total) void print_progress (int current, int total)
{ {
if(total < 100) if(total < 100)

@ -5,7 +5,7 @@
using namespace std; using namespace std;
#include <DFHack.h> #include <DFHack.h>
#include "termutil.h" #include <dfhack/extra/termutil.h>
int main (void) int main (void)
{ {
bool temporary_terminal = TemporaryTerminal(); bool temporary_terminal = TemporaryTerminal();

@ -7,7 +7,7 @@ using namespace std;
#include <DFHack.h> #include <DFHack.h>
#include <dfhack/modules/Gui.h> #include <dfhack/modules/Gui.h>
#include "termutil.h" #include <dfhack/extra/termutil.h>
int main (int argc, char** argv) int main (int argc, char** argv)
{ {

@ -10,7 +10,7 @@ using namespace std;
#include <xgetopt.h> #include <xgetopt.h>
#include <time.h> #include <time.h>
#include <stdlib.h> #include <stdlib.h>
#include "termutil.h" #include <dfhack/extra/termutil.h>
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {

@ -7,10 +7,11 @@
using namespace std; using namespace std;
#include <DFHack.h> #include <DFHack.h>
#include <dfhack/extra/MapExtras.h> #include <dfhack/extra/MapExtras.h>
#include <dfhack/extra/termutil.h>
#include <xgetopt.h> #include <xgetopt.h>
#include <time.h> #include <time.h>
#include <stdlib.h> #include <stdlib.h>
#include "termutil.h"
bool parseOptions(int argc, char **argv, bool parseOptions(int argc, char **argv,
bool &trees, bool &shrubs, bool &immolate) bool &trees, bool &shrubs, bool &immolate)

@ -5,7 +5,7 @@
#include <map> #include <map>
using namespace std; using namespace std;
#include <DFHack.h> #include <DFHack.h>
#include "termutil.h" #include <dfhack/extra/termutil.h>
int main (void) int main (void)
{ {

@ -1,15 +1,18 @@
#include <iostream> #include <iostream>
#include <vector> #include <vector>
#include <map> #include <map>
#include <set>
#include <cstdlib> #include <cstdlib>
using namespace std; using namespace std;
#include <DFHack.h> #include <DFHack.h>
#include <dfhack/extra/MapExtras.h> #include <dfhack/extra/MapExtras.h>
#include <set>
using namespace MapExtras; using namespace MapExtras;
#include <dfhack/extra/termutil.h>
#include "termutil.h"
typedef vector <DFHack::DFCoord> coord_vec; typedef vector <DFHack::DFCoord> coord_vec;

@ -7,7 +7,7 @@
using namespace std; using namespace std;
#include <DFHack.h> #include <DFHack.h>
#include "termutil.h" #include <dfhack/extra/termutil.h>
std::ostream &operator<<(std::ostream &stream, DFHack::t_gamemodes funzies) std::ostream &operator<<(std::ostream &stream, DFHack::t_gamemodes funzies)
{ {
const char * gm[]= const char * gm[]=

@ -13,7 +13,7 @@ using namespace std;
#define DFHACK_WANT_TILETYPES 1 #define DFHACK_WANT_TILETYPES 1
#include <DFHack.h> #include <DFHack.h>
#include <dfhack/extra/MapExtras.h> #include <dfhack/extra/MapExtras.h>
#include "termutil.h" #include <dfhack/extra/termutil.h>
using namespace DFHack; using namespace DFHack;
int main (int numargs, const char ** args) int main (int numargs, const char ** args)

@ -16,7 +16,7 @@ using namespace std;
#include <DFHack.h> #include <DFHack.h>
#include <dfhack/extra/MapExtras.h> #include <dfhack/extra/MapExtras.h>
#include <xgetopt.h> #include <xgetopt.h>
#include "termutil.h" #include <dfhack/extra/termutil.h>
typedef std::map<int16_t, unsigned int> MatMap; typedef std::map<int16_t, unsigned int> MatMap;
typedef std::vector< pair<int16_t, unsigned int> > MatSorter; typedef std::vector< pair<int16_t, unsigned int> > MatSorter;

@ -21,7 +21,7 @@ void waitmsec (int delay)
Sleep(delay); Sleep(delay);
} }
#endif #endif
#include "termutil.h" #include <dfhack/extra/termutil.h>
struct hideblock struct hideblock
{ {

@ -8,7 +8,7 @@
using namespace std; using namespace std;
#include <DFHack.h> #include <DFHack.h>
#include "termutil.h" #include <dfhack/extra/termutil.h>
int main (void) int main (void)
{ {

@ -9,7 +9,7 @@
using namespace std; using namespace std;
#include <DFHack.h> #include <DFHack.h>
#include <dfhack/extra/MapExtras.h> #include <dfhack/extra/MapExtras.h>
#include "termutil.h" #include <dfhack/extra/termutil.h>
void tolower(std::string &str) void tolower(std::string &str)
{ {

@ -12,7 +12,7 @@ using namespace std;
#include <dfhack/extra/MapExtras.h> #include <dfhack/extra/MapExtras.h>
using namespace MapExtras; using namespace MapExtras;
using namespace DFHack; using namespace DFHack;
#include "termutil.h" #include <dfhack/extra/termutil.h>
int main (int argc, char* argv[]) int main (int argc, char* argv[])
{ {

@ -8,7 +8,7 @@
using namespace std; using namespace std;
#include <DFHack.h> #include <DFHack.h>
#include "termutil.h" #include <dfhack/extra/termutil.h>
int main (void) int main (void)
{ {
bool temporary_terminal = TemporaryTerminal(); bool temporary_terminal = TemporaryTerminal();

@ -10,7 +10,7 @@ using namespace std;
#include <DFHack.h> #include <DFHack.h>
#include <dfhack/extra/MapExtras.h> #include <dfhack/extra/MapExtras.h>
#include "termutil.h" #include <dfhack/extra/termutil.h>
using namespace MapExtras; using namespace MapExtras;
int main (int argc, char* argv[]) int main (int argc, char* argv[])