mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-02-24 03:32:35 +01:00
Code Issues Projects Releases Wiki Activity

fix windows build and --help output

Browse Source
This commit is contained in:
titiger 2015-02-11 00:26:03 +01:00
parent 4c5440f78c
commit 82bc650372
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/glest_map_editor/main.cpp
View File

@ -487,8 +487,8 @@ void MainWindow::onClose(wxCloseEvent &event) {
}
void MainWindow::setupStartupSettings() {
program = new Program(glCanvas->GetClientSize().x, glCanvas->GetClientSize().y);
string playerName = Config::getInstance().getString("NetPlayerName","");
program = new Program(glCanvas->GetClientSize().x, glCanvas->GetClientSize().y, playerName);
fileName = "New (unsaved) Map";
//printf("#0 file load [%s]\n",currentFile.c_str());
@ -1616,17 +1616,13 @@ bool App::OnInit() {
SystemFlags::VERBOSE_MODE_ENABLED = false;
SystemFlags::ENABLE_THREADED_LOGGING = false;
#if defined(wxMAJOR_VERSION) && defined(wxMINOR_VERSION) && defined(wxRELEASE_NUMBER) && defined(wxSUBRELEASE_NUMBER)
printf("Using wxWidgets version [%d.%d.%d.%d]\n",wxMAJOR_VERSION,wxMINOR_VERSION,wxRELEASE_NUMBER,wxSUBRELEASE_NUMBER);
#endif
string fileparam;
if(argc==2){
if(argv[1][0]=='-') { // any flag gives help and exits program.
std::cout << "MegaGlest map editor " << mapeditorVersionString << " [Using " << (const char *)wxConvCurrent->cWX2MB(wxVERSION_STRING) << "]" << std::endl << std::endl;
std::cout << "glest_map_editor [MGM FILE]" << std::endl << std::endl;
std::cout << "Creates or edits glest/megaglest maps." << std::endl;
std::cout << "Draw with left mouse button (select what and how large area in menu or toolbar)" << std::endl;
std::cout << "Draw with left mouse button" << std::endl;
std::cout << "Move map with right mouse button" << std::endl;
std::cout << "Zoom with middle mouse button or mousewheel" << std::endl;
@ -1634,7 +1630,6 @@ bool App::OnInit() {
std::cout << std::endl;
exit (0);
}
//#if defined(__MINGW32__)
const wxWX2MBbuf tmp_buf = wxConvCurrent->cWX2MB(argv[1]);
fileparam = tmp_buf;
@ -1649,6 +1644,10 @@ bool App::OnInit() {
//#endif
}
#if defined(wxMAJOR_VERSION) && defined(wxMINOR_VERSION) && defined(wxRELEASE_NUMBER) && defined(wxSUBRELEASE_NUMBER)
printf("Using wxWidgets version [%d.%d.%d.%d]\n",wxMAJOR_VERSION,wxMINOR_VERSION,wxRELEASE_NUMBER,wxSUBRELEASE_NUMBER);
#endif
wxString exe_path = wxStandardPaths::Get().GetExecutablePath();
//wxString path_separator = wxFileName::GetPathSeparator();
//exe_path = exe_path.BeforeLast(path_separator[0]);

7
source/glest_map_editor/program.cpp
View File

@ -14,10 +14,8 @@
#include "util.h"
#include <iostream>
#include "platform_util.h"
#include "config.h"
using namespace Shared::Util;
using namespace Glest::Game;
namespace MapEditor {
@ -146,7 +144,7 @@ void UndoPoint::revert() {
MapPreview *Program::map = NULL;
Program::Program(int w, int h) {
Program::Program(int w, int h, string playerName) {
cellSize = 5;
grid=false;
heightmap=false;
@ -157,9 +155,6 @@ Program::Program(int w, int h) {
map = new MapPreview();
resetFactions(8);
renderer.initMapSurface(w, h);
Config &config = Config::getInstance();
// set player name as default author
string playerName = config.getString("NetPlayerName","");
map->setAuthor(playerName);
}

2
source/glest_map_editor/program.h
View File

@ -107,7 +107,7 @@ private:
void init();
public:
Program(int w, int h);
Program(int w, int h, string playerName);
~Program();
Program(const Program& obj) {