Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix spelling of "Divider" that shows in map editor 

also changed the corresponding variable names
This commit is contained in:
andy5995 2017-02-15 13:47:53 -06:00
parent 4818612404
commit 9534943a9c
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/glest_map_editor/main.cpp
View File

@ -108,7 +108,7 @@ MainWindow::MainWindow(string appPath)
randomWithReset=true; randomWithReset=true;
randomMinimumHeight=-300; randomMinimumHeight=-300;
randomMaximumHeight=400; randomMaximumHeight=400;
randomChanceDevider=30; randomChanceDivider=30;
randomRecursions=3; randomRecursions=3;
this->appPath = appPath; this->appPath = appPath;
@ -1031,7 +1031,7 @@ void MainWindow::onMenuEditRandomizeHeights(wxCommandEvent &event) {
simpleDialog.addValue("Initial Reset", boolToStr(randomWithReset),"(1 = true, 0 = false) If set to '0' no height reset is done before calculating"); simpleDialog.addValue("Initial Reset", boolToStr(randomWithReset),"(1 = true, 0 = false) If set to '0' no height reset is done before calculating");
simpleDialog.addValue("Min Height", intToStr(randomMinimumHeight),"Lowest random height. example: -300 or below if you want water , 0 if you don't want water."); simpleDialog.addValue("Min Height", intToStr(randomMinimumHeight),"Lowest random height. example: -300 or below if you want water , 0 if you don't want water.");
simpleDialog.addValue("Max Height", intToStr(randomMaximumHeight),"Max random height. A good value is 400"); simpleDialog.addValue("Max Height", intToStr(randomMaximumHeight),"Max random height. A good value is 400");
simpleDialog.addValue("Chance Devider", intToStr(randomChanceDevider),"Defines how often you get a hill or hole default is 30. Bigger number, less hills/holes."); simpleDialog.addValue("Chance Divider", intToStr(randomChanceDivider),"Defines how often you get a hill or hole default is 30. Bigger number, less hills/holes.");
simpleDialog.addValue("Smooth Recursions", intToStr(randomRecursions),"Number of recursions cycles to smooth the hills and holes. 0<x<50 default is 3."); simpleDialog.addValue("Smooth Recursions", intToStr(randomRecursions),"Number of recursions cycles to smooth the hills and holes. 0<x<50 default is 3.");
if (!simpleDialog.show("Randomize Height")) return; if (!simpleDialog.show("Randomize Height")) return;
@ -1045,19 +1045,19 @@ void MainWindow::onMenuEditRandomizeHeights(wxCommandEvent &event) {
} }
randomMinimumHeight=strToInt(simpleDialog.getValue("Min Height")); randomMinimumHeight=strToInt(simpleDialog.getValue("Min Height"));
randomMaximumHeight=strToInt(simpleDialog.getValue("Max Height")); randomMaximumHeight=strToInt(simpleDialog.getValue("Max Height"));
randomChanceDevider=strToInt(simpleDialog.getValue("Chance Devider")); randomChanceDivider=strToInt(simpleDialog.getValue("Chance Divider"));
randomRecursions=strToInt(simpleDialog.getValue("Smooth Recursions")); randomRecursions=strToInt(simpleDialog.getValue("Smooth Recursions"));
// set insane inputs to something that does not crash // set insane inputs to something that does not crash
if(randomMinimumHeight>=randomMaximumHeight) randomMinimumHeight=randomMaximumHeight-1; if(randomMinimumHeight>=randomMaximumHeight) randomMinimumHeight=randomMaximumHeight-1;
if(randomChanceDevider<1) randomChanceDevider=1; if(randomChanceDivider<1) randomChanceDivider=1;
// set randomRecursions to something useful // set randomRecursions to something useful
if(randomRecursions<0) randomRecursions=0; if(randomRecursions<0) randomRecursions=0;
if(randomRecursions>50) randomRecursions=50; if(randomRecursions>50) randomRecursions=50;
program->randomizeMapHeights(randomWithReset, randomMinimumHeight, randomMaximumHeight, program->randomizeMapHeights(randomWithReset, randomMinimumHeight, randomMaximumHeight,
randomChanceDevider, randomRecursions); randomChanceDivider, randomRecursions);
} }
catch (const exception &e) { catch (const exception &e) {
MsgDialog(this, ToUnicode(e.what()), wxT("Exception"), wxOK | wxICON_ERROR).ShowModal(); MsgDialog(this, ToUnicode(e.what()), wxT("Exception"), wxOK | wxICON_ERROR).ShowModal();
@ -1470,7 +1470,7 @@ BEGIN_EVENT_TABLE(MainWindow, wxFrame)
EVT_MENU(miViewResetZoomAndPos, MainWindow::onMenuViewResetZoomAndPos) EVT_MENU(miViewResetZoomAndPos, MainWindow::onMenuViewResetZoomAndPos)
EVT_MENU(miViewGrid, MainWindow::onMenuViewGrid) EVT_MENU(miViewGrid, MainWindow::onMenuViewGrid)
EVT_MENU(miViewHeightMap, MainWindow::onMenuViewHeightMap) EVT_MENU(miViewHeightMap, MainWindow::onMenuViewHeightMap)
EVT_MENU(miHideWater, MainWindow::onMenuHideWater) EVT_MENU(miHideWater, MainWindow::onMenuHideWater)
EVT_MENU(miViewAbout, MainWindow::onMenuViewAbout) EVT_MENU(miViewAbout, MainWindow::onMenuViewAbout)
EVT_MENU(miViewHelp, MainWindow::onMenuViewHelp) EVT_MENU(miViewHelp, MainWindow::onMenuViewHelp)
@ -1518,7 +1518,7 @@ void GlCanvas::setCurrentGLContext() {
} }
#endif #endif
if(this->context) { if(this->context) {
this->SetCurrent(*this->context); this->SetCurrent(*this->context);
} }
#else #else
@ -1657,7 +1657,7 @@ bool App::OnInit() {
//#if defined(__MINGW32__) //#if defined(__MINGW32__)
const wxWX2MBbuf tmp_buf = wxConvCurrent->cWX2MB(argv[1]); const wxWX2MBbuf tmp_buf = wxConvCurrent->cWX2MB(argv[1]);
fileparam = tmp_buf; fileparam = tmp_buf;
#ifdef WIN32 #ifdef WIN32
auto_ptr<wchar_t> wstr(Ansi2WideString(fileparam.c_str())); auto_ptr<wchar_t> wstr(Ansi2WideString(fileparam.c_str()));
fileparam = utf8_encode(wstr.get()); fileparam = utf8_encode(wstr.get());

4
source/glest_map_editor/main.h
View File

@ -86,7 +86,7 @@ private:
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
public: public:
MainToolBar(wxWindow *parent, MainToolBar(wxWindow *parent,
wxWindowID id) : wxToolBar(parent,id) {} wxWindowID id) : wxToolBar(parent,id) {}
@ -200,7 +200,7 @@ private:
bool randomWithReset; bool randomWithReset;
int randomMinimumHeight; int randomMinimumHeight;
int randomMaximumHeight; int randomMaximumHeight;
int randomChanceDevider; int randomChanceDivider;
int randomRecursions; int randomRecursions;
ChangeType enabledGroup; ChangeType enabledGroup;

4
source/glest_map_editor/program.cpp
View File

@ -561,8 +561,8 @@ void Program::shiftDown() {
} }
void Program::randomizeMapHeights(bool withReset,int minimumHeight, int maximumHeight, int chanceDevider, int smoothRecursions) { void Program::randomizeMapHeights(bool withReset,int minimumHeight, int maximumHeight, int chanceDivider, int smoothRecursions) {
if(map) map->randomizeHeights(withReset, minimumHeight, maximumHeight, chanceDevider, smoothRecursions); if(map) map->randomizeHeights(withReset, minimumHeight, maximumHeight, chanceDivider, smoothRecursions);
} }
void Program::randomizeFactions() { void Program::randomizeFactions() {

2
source/glest_map_editor/program.h
View File

@ -151,7 +151,7 @@ public:
void shiftUp(); void shiftUp();
void shiftDown(); void shiftDown();
void randomizeMapHeights(bool withReset, int minimumHeight, int maximumHeight, int chanceDevider, int smoothRecursions);; void randomizeMapHeights(bool withReset, int minimumHeight, int maximumHeight, int chanceDivider, int smoothRecursions);;
void randomizeFactions(); void randomizeFactions();
void switchMapSurfaces(int surf1, int surf2); void switchMapSurfaces(int surf1, int surf2);
void loadMap(const string &path); void loadMap(const string &path);