diff --git a/source/g3d_viewer/renderer.cpp b/source/g3d_viewer/renderer.cpp index 983fef05..825f11a8 100644 --- a/source/g3d_viewer/renderer.cpp +++ b/source/g3d_viewer/renderer.cpp @@ -118,7 +118,7 @@ void Renderer::checkGlCaps(){ message += "Your system supports OpenGL version \""; message += getGlVersion() + string("\"\n"); - message += "Glest needs at least version 1.3 to work\n"; + message += "MegaGlest needs at least version 1.3 to work\n"; message += "You may solve this problem by installing your latest video card drivers"; throw runtime_error(message.c_str()); @@ -126,7 +126,7 @@ void Renderer::checkGlCaps(){ //opengl 1.4 or extension if(!isGlVersionSupported(1, 4, 0)){ - checkExtension("GL_ARB_texture_env_crossbar", "Glest"); + checkExtension("GL_ARB_texture_env_crossbar", "MegaGlest"); } } diff --git a/source/glest_game/ai/ai_interface.cpp b/source/glest_game/ai/ai_interface.cpp index 65cccbb0..f92f449a 100644 --- a/source/glest_game/ai/ai_interface.cpp +++ b/source/glest_game/ai/ai_interface.cpp @@ -56,7 +56,7 @@ AiInterface::AiInterface(Game &game, int factionIndex, int teamIndex, int useSta if(f==NULL){ throw runtime_error("Can't open file: "+getLogFilename()); } - fprintf(f, "%s", "Glest AI log file\n\n"); + fprintf(f, "%s", "MegaGlest AI log file\n\n"); fclose(f); } SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); diff --git a/source/glest_game/facilities/game_util.cpp b/source/glest_game/facilities/game_util.cpp index 47e119f9..3e30a4be 100644 --- a/source/glest_game/facilities/game_util.cpp +++ b/source/glest_game/facilities/game_util.cpp @@ -1,7 +1,7 @@ // ============================================================== // This file is part of Glest (www.glest.org) // -// Copyright (C) 2001-2008 Martiño Figueroa +// Copyright (C) 2001-2008 Marti�o Figueroa // // You can redistribute this code and/or modify it under // the terms of the GNU General Public License as published @@ -26,7 +26,7 @@ using namespace Shared::Platform; namespace Glest { namespace Game { -const string mailString = "contact_game@glest.org"; +const string mailString = "contact@megaglest.org"; const string glestVersionString = "v3.4.0-dev"; #if defined(SVNVERSION) const string SVN_Rev = string("Rev: ") + string(SVNVERSION); @@ -35,7 +35,7 @@ const string SVN_Rev = "$Rev$"; #endif string getCrashDumpFileName(){ - return "glest" + glestVersionString + ".dmp"; + return "megaglest" + glestVersionString + ".dmp"; } string getPlatformNameString() { @@ -125,16 +125,16 @@ string getNetworkPlatformFreeVersionString() { string getAboutString1(int i) { switch(i){ - case 0: return "Glest " + glestVersionString + " (" + "Shared Library " + sharedLibVersionString + ")"; + case 0: return "MegaGlest " + glestVersionString + " (" + "Shared Library " + sharedLibVersionString + ")"; case 1: return "Built: " + string(__DATE__) + " " + SVN_Rev; - case 2: return "Copyright 2001-2010 The Mega-Glest Team"; + case 2: return "Copyright 2001-2010 The MegaGlest Team"; } return ""; } string getAboutString2(int i){ switch(i){ - case 0: return "Web: http://sourceforge.net/projects/megaglest http://glest.org"; + case 0: return "Web: http://www.megaglest.org http://glest.org"; case 1: return "Mail: " + mailString; case 2: return "Irc: irc://irc.freenode.net/glest"; } @@ -143,11 +143,11 @@ string getAboutString2(int i){ string getTeammateName(int i) { switch(i) { - case 0: return "Martiño Figueroa"; - case 1: return "José Luis González"; - case 2: return "Tucho Fernández"; - case 3: return "José Zanni"; - case 4: return "Félix Menéndez"; + case 0: return "Marti�o Figueroa"; + case 1: return "Jos� Luis Gonz�lez"; + case 2: return "Tucho Fern�ndez"; + case 3: return "Jos� Zanni"; + case 4: return "F�lix Men�ndez"; case 5: return "Marcos Caruncho"; case 6: return "Matthias Braun"; case 7: return "Titus Tscharntke"; diff --git a/source/glest_game/graphics/renderer.cpp b/source/glest_game/graphics/renderer.cpp index 5b623d5a..b68ab5a2 100644 --- a/source/glest_game/graphics/renderer.cpp +++ b/source/glest_game/graphics/renderer.cpp @@ -189,6 +189,8 @@ Renderer::Renderer() { particleManager[i]= graphicsFactory->newParticleManager(); fontManager[i]= graphicsFactory->newFontManager(); } + + //SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 1); saveScreenShotThread = new SimpleTaskThread(this,0,25); saveScreenShotThread->setUniqueID(__FILE__); @@ -1626,7 +1628,6 @@ void Renderer::renderObjects(const int renderFps) { } glActiveTexture(baseTexUnit); - glEnable(GL_COLOR_MATERIAL); glAlphaFunc(GL_GREATER, 0.5f); @@ -3432,7 +3433,7 @@ void Renderer::checkGlCaps() { message += "Your system supports OpenGL version \""; message += getGlVersion() + string("\"\n"); - message += "Glest needs at least version 1.3 to work\n"; + message += "MegaGlest needs at least version 1.3 to work\n"; message += "You may solve this problem by installing your latest video card drivers"; throw runtime_error(message.c_str()); @@ -3440,7 +3441,7 @@ void Renderer::checkGlCaps() { //opengl 1.4 or extension if(!isGlVersionSupported(1, 4, 0)){ - checkExtension("GL_ARB_texture_env_crossbar", "Glest"); + checkExtension("GL_ARB_texture_env_crossbar", "MegaGlest"); } } diff --git a/source/glest_game/main/program.cpp b/source/glest_game/main/program.cpp index 6e56ba5e..909b8e84 100644 --- a/source/glest_game/main/program.cpp +++ b/source/glest_game/main/program.cpp @@ -477,7 +477,7 @@ void Program::init(WindowGl *window, bool initSound, bool toggleFullScreen){ SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); //window - window->setText("Glest"); + window->setText("MegaGlest"); window->setStyle(config.getBool("Windowed")? wsWindowedFixed: wsFullscreen); window->setPos(0, 0); window->setSize(config.getInt("ScreenWidth"), config.getInt("ScreenHeight")); diff --git a/source/glest_map_editor/main.cpp b/source/glest_map_editor/main.cpp index 1b638499..4baeb032 100755 --- a/source/glest_map_editor/main.cpp +++ b/source/glest_map_editor/main.cpp @@ -25,7 +25,7 @@ namespace MapEditor { const string mapeditorVersionString = "v1.5.1"; -const string MainWindow::winHeader = "Glest Map Editor " + mapeditorVersionString; +const string MainWindow::winHeader = "MegaGlest Map Editor " + mapeditorVersionString; // =============================================== // class Global functions @@ -514,7 +514,7 @@ void MainWindow::onMenuFileSave(wxCommandEvent &event) { void MainWindow::onMenuFileSaveAs(wxCommandEvent &event) { wxFileDialog fileDialog(this, wxT("Select file"), wxT(""), wxT(""), wxT("*.gbm|*.mgm"), wxSAVE); - fileDialog.SetWildcard(wxT("Glest Map (*.gbm)|*.gbm|Mega Map (*.mgm)|*.mgm")); + fileDialog.SetWildcard(wxT("Glest Map (*.gbm)|*.gbm|MegaGlest Map (*.mgm)|*.mgm")); if (fileDialog.ShowModal() == wxID_OK) { currentFile = fileDialog.GetPath().ToAscii(); setExtension(); @@ -1165,7 +1165,7 @@ bool App::OnInit() { string fileparam; if(argc==2){ if(argv[1][0]=='-') { // any flag gives help and exits program. - std::cout << "Glest map editor " << mapeditorVersionString << std::endl << std::endl; + std::cout << "MegaGlest map editor " << mapeditorVersionString << std::endl << std::endl; std::cout << "glest_map_editor [GBM OR 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;