summary refs log tree commit diff stats
path: root/fractal.cpp
diff options
context:
space:
mode:
authorKelly Rauchenberger <fefferburbia@gmail.com>2016-12-13 19:24:06 -0500
committerKelly Rauchenberger <fefferburbia@gmail.com>2016-12-13 19:24:06 -0500
commitd5c32fc3f885a7b8f719c9f27dbba36e287222f0 (patch)
treee95be7b21d6daab0bad47fc0ff6127f21288c3ff /fractal.cpp
parent5413c1c0dc40b24fd0932e3b8f7fdfa3a596859f (diff)
downloadinfinite-d5c32fc3f885a7b8f719c9f27dbba36e287222f0.tar.gz
infinite-d5c32fc3f885a7b8f719c9f27dbba36e287222f0.tar.bz2
infinite-d5c32fc3f885a7b8f719c9f27dbba36e287222f0.zip
Bot now takes path to config file as argument
That config file now also has to contain the paths to the verbly datafile, the forms file, the fonts directory, and the color palettes file.
Diffstat (limited to 'fractal.cpp')
-rw-r--r--fractal.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/fractal.cpp b/fractal.cpp index 145886a..a911177 100644 --- a/fractal.cpp +++ b/fractal.cpp
@@ -508,7 +508,7 @@ int Fractal::load(const char* filename, Fractal& fractal)
508 return 0; 508 return 0;
509} 509}
510 510
511Fractal Fractal::random() 511Fractal Fractal::random(std::string colorsfile)
512{ 512{
513 Fractal fractal; 513 Fractal fractal;
514 514
@@ -577,10 +577,10 @@ Fractal Fractal::random()
577 } 577 }
578 578
579 std::vector<std::string> colors; 579 std::vector<std::string> colors;
580 std::ifstream colorfile("colors.txt"); 580 std::ifstream colorfile(colorsfile);
581 if (!colorfile.is_open()) 581 if (!colorfile.is_open())
582 { 582 {
583 std::cout << "Could not find colors.txt" << std::endl; 583 std::cout << "Could not find colors file" << std::endl;
584 exit(-1); 584 exit(-1);
585 } 585 }
586 586