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

Renamed Glest namespace to ZetaGlest

Browse Source
This commit is contained in:
mathusummut
2018-11-02 19:51:40 +01:00
parent 3280d02db9
commit f652f88784
182 changed files with 208 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/g3d_viewer/main.cpp
View File

@@ -60,7 +60,6 @@ using namespace Shared::Util;
using namespace Shared::Xml;
using namespace std;
using namespace Glest::Game;
#ifdef _WIN32
const char *folderDelimiter = "\\";
@@ -74,7 +73,7 @@ const char *folderDelimiter = "/";
// Because g3d should always support alpha transparency
string fileFormat = "png";
namespace Glest {
namespace ZetaGlest {
namespace Game {
string getGameReadWritePath(const string &lookupKey) {
@@ -1403,7 +1402,7 @@ namespace Shared {
}
} catch (std::runtime_error &e) {
std::cout << e.what() << std::endl;
wxMessageDialog(NULL, ToUnicode(e.what()), ToUnicode("Not a Mega-Glest particle XML file, or broken"), wxOK | wxICON_ERROR).ShowModal();
wxMessageDialog(NULL, ToUnicode(e.what()), ToUnicode("Not a valid particle XML file, or broken"), wxOK | wxICON_ERROR).ShowModal();
}
if (timer) timer->Start(100);
}

2
source/g3d_viewer/main.h
View File

@@ -38,7 +38,7 @@
#include "unit_particle_type.h"
using std::string;
using namespace Glest::Game;
using namespace ZetaGlest::Game;
namespace Shared {
namespace G3dViewer {

2
source/g3d_viewer/renderer.cpp
View File

@@ -27,7 +27,7 @@
using namespace Shared::Graphics;
using namespace Shared::Graphics::Gl;
using namespace Glest::Game;
using namespace ZetaGlest::Game;
using namespace Shared::Util;
namespace Shared {