games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-31 00:07:39 +02:00
Code Issues Releases Activity

[programming challenge] Logs go to logs fodler.

Browse Source
This commit is contained in:
Michał W. Urbańczyk
2011-11-14 17:52:09 +00:00
parent 8b6f0f699d
commit 3fbaaac6d9
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Odpalarka/main.cpp
View File

@@ -32,7 +32,7 @@ int main(int argc, char **argv)
("aiLeft,l", po::value<std::string>()->default_value("StupidAI"), "Left AI path") ("aiLeft,l", po::value<std::string>()->default_value("StupidAI"), "Left AI path")
("aiRight,r", po::value<std::string>()->default_value("StupidAI"), "Right AI path") ("aiRight,r", po::value<std::string>()->default_value("StupidAI"), "Right AI path")
("battle,b", po::value<std::string>()->default_value("b1.json"), "Duel file path") ("battle,b", po::value<std::string>()->default_value("b1.json"), "Duel file path")
("resultsOut,o", po::value<std::string>()->default_value("./results.json"), "Output file when results will be appended") ("resultsOut,o", po::value<std::string>()->default_value("./results.txt"), "Output file when results will be appended")
("logsDir,d", po::value<std::string>()->default_value("."), "Directory where log files will be created") ("logsDir,d", po::value<std::string>()->default_value("."), "Directory where log files will be created")
("visualization,v", "Runs a client to display a visualization of battle"); ("visualization,v", "Runs a client to display a visualization of battle");

4
server/CGameHandler.cpp
View File

@@ -60,7 +60,7 @@ CondSh<BattleResult *> battleResult(NULL);
std::ptrdiff_t randomizer (ptrdiff_t i) {return rand();} std::ptrdiff_t randomizer (ptrdiff_t i) {return rand();}
std::ptrdiff_t (*p_myrandom)(std::ptrdiff_t) = randomizer; std::ptrdiff_t (*p_myrandom)(std::ptrdiff_t) = randomizer;
extern std::string RESULTS_PATH; extern std::string RESULTS_PATH, LOGS_DIR;
template <typename T> class CApplyOnGH; template <typename T> class CApplyOnGH;
@@ -461,7 +461,7 @@ void CGameHandler::endBattle(int3 tile, const CGHeroInstance *hero1, const CGHer
if(duel) if(duel)
{ {
CSaveFile resultFile("result.vdrst"); CSaveFile resultFile(LOGS_DIR + "/result.vdrst");
resultFile << *battleResult.data; resultFile << *battleResult.data;
int casualtiesPoints = 0; int casualtiesPoints = 0;

2
server/CVCMIServer.cpp
View File

@@ -642,7 +642,7 @@ void CVCMIServer::startDuel(const std::string &battle, const std::string &leftAI
testMem.set(true); testMem.set(true);
boost::thread* memMon = new boost::thread(boost::bind(memoryMonitor, PIDs[0], PIDs[1], PIDs[2])); boost::thread* memMon = new boost::thread(boost::bind(memoryMonitor, PIDs[0], PIDs[1], PIDs[2]));
std::string logFName = "duel_log.vdat"; std::string logFName = LOGS_DIR + "/duel_log.vdat";
tlog0 << "Logging battle activities (for replay possibility) in " << logFName << std::endl; tlog0 << "Logging battle activities (for replay possibility) in " << logFName << std::endl;
gh->gameLog = new CSaveFile(logFName); gh->gameLog = new CSaveFile(logFName);
gh->gameLog->smartPointerSerialization = false; gh->gameLog->smartPointerSerialization = false;

9
vcmiinstall.sh
View File

@@ -1,5 +1,11 @@
#!/bin/bash #!/bin/bash
hash make 2>&- || { echo >&2 "I require make but it's not installed. Aborting."; exit 1; }
hash autoreconf 2>&- || { echo >&2 "I require aureconf but it's not installed. Aborting."; exit 1; }
hash unzip 2>&- || { echo >&2 "I require unzip but it's not installed. Aborting."; exit 1; }
hash svn 2>&- || { echo >&2 "I require svn but it's not installed. Aborting."; exit 1; }
function errorcheck(){ function errorcheck(){
if [ "$?" -gt 0 ]; then if [ "$?" -gt 0 ]; then
echo "Error during $1" echo "Error during $1"
@@ -53,6 +59,7 @@ if [ "$1" == "--install" ]; then
fi fi
autoreconf -f autoreconf -f
errorcheck "autoreconf -f" errorcheck "autoreconf -f"
wget http://sourceforge.net/apps/trac/vcmi/export/2443/branches/programmingChallenge/vcmipack.zip
cd .. cd ..
vcmi/configure --datadir=`pwd` --bindir=`pwd`vcmi --libdir=`pwd` vcmi/configure --datadir=`pwd` --bindir=`pwd`vcmi --libdir=`pwd`
errorcheck "configure" errorcheck "configure"
@@ -83,4 +90,4 @@ elif [ "$1" = "--help" ]; then
echo "--install micro unpacks vcmipack.zip and makes appropriate symbolic links." echo "--install micro unpacks vcmipack.zip and makes appropriate symbolic links."
else else
incusage incusage
fi fi