Rebranding TME to Aethyra

9 files changed, 45 insertions, 45 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d7dcbc7a..e6ee7405 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,7 +8,7 @@ FIND_PACKAGE(PhysFS REQUIRED)
 FIND_PACKAGE(PNG REQUIRED)
 
 SET(FLAGS "-DPACKAGE_VERSION=\\\"${VERSION}\\\"")
-SET(FLAGS "${FLAGS} -DTME_DATADIR=\\\"${PKG_DATADIR}/\\\"")
+SET(FLAGS "${FLAGS} -DAETHYRA_DATADIR=\\\"${PKG_DATADIR}/\\\"")
 
 SET(GUICHAN_COMPONENTS "SDL")
 IF (WITH_OPENGL)
@@ -339,9 +339,9 @@ SET(SRCS
     vector.h
     )
 
-ADD_EXECUTABLE(tme ${SRCS})
+ADD_EXECUTABLE(aethyra ${SRCS})
 
-TARGET_LINK_LIBRARIES(tme
+TARGET_LINK_LIBRARIES(aethyra
     ${SDL_LIBRARY}
     ${SDLIMAGE_LIBRARY}
     ${SDLMIXER_LIBRARY}
@@ -354,6 +354,6 @@ TARGET_LINK_LIBRARIES(tme
     ${OPENGL_LIBRARIES}
     )
 
-INSTALL(TARGETS tme RUNTIME DESTINATION ${PKG_BINDIR})
+INSTALL(TARGETS aethyra RUNTIME DESTINATION ${PKG_BINDIR})
 
-SET_TARGET_PROPERTIES(tme PROPERTIES COMPILE_FLAGS "${FLAGS}")
+SET_TARGET_PROPERTIES(aethyra PROPERTIES COMPILE_FLAGS "${FLAGS}")
diff --git a/src/Makefile.am b/src/Makefile.am
index e750e214..7cd233b7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
-bin_PROGRAMS = tme
-tme_SOURCES = gui/widgets/dropdown.cpp \
+bin_PROGRAMS = aethyra
+aethyra_SOURCES = gui/widgets/dropdown.cpp \
               gui/widgets/dropdown.h \
               gui/widgets/resizegrip.cpp \
 	      gui/widgets/resizegrip.h \
@@ -311,10 +311,10 @@ tme_SOURCES = gui/widgets/dropdown.cpp \
 # set the include path found by configure
 INCLUDES =					\
 	$(all_includes)				\
-	-DTME_DATADIR=\""$(pkgdatadir)/"\"
+	-DAETHYRA_DATADIR=\""$(pkgdatadir)/"\"
 
 # the library search path.
-tme_LDFLAGS = $(all_libraries) $(LIBSDL_RPATH) `pkg-config --libs libxml-2.0`
-tme_CXXFLAGS = -Wall $(LIBSDL_CFLAGS) `pkg-config --cflags libxml-2.0` $(CURL_CFLAGS)
-tme_LDADD = $(LIBSDL_LIBS) -lguichan_sdl $(CURL_LIBS)
-tme_TARGET = tme
+aethyra_LDFLAGS = $(all_libraries) $(LIBSDL_RPATH) `pkg-config --libs libxml-2.0`
+aethyra_CXXFLAGS = -Wall $(LIBSDL_CFLAGS) `pkg-config --cflags libxml-2.0` $(CURL_CFLAGS)
+aethyra_LDADD = $(LIBSDL_LIBS) -lguichan_sdl $(CURL_LIBS)
+aethyra_TARGET = aethyra
diff --git a/src/tme.rc b/src/aethyra.rc
index 495d0675..f35c547d 100644
--- a/src/tme.rc
+++ b/src/aethyra.rc
@@ -2,7 +2,7 @@
 

 #include "winver.h"

 

-A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "data/icons/tme.ico"

+A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "data/icons/aethyra.ico"

 

 1 VERSIONINFO

 FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD

@@ -10,12 +10,12 @@ PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
 FILETYPE VFT_APP {

     BLOCK "StringFileInfo" {

         BLOCK "040904E4" {

-            VALUE "CompanyName", "The Mana Experiment Development Team"

+            VALUE "CompanyName", "Aethyra Development Team"

             VALUE "FileVersion", PACKAGE_VERSION

-            VALUE "FileDescription", "The Mana Experiment"

+            VALUE "FileDescription", "Aethyra Experiment"

             VALUE "LegalCopyright", "2008 (C)"

-            VALUE "OriginalFilename", "tme.exe"

-            VALUE "ProductName", "The Mana Experiment MMORPG"

+            VALUE "OriginalFilename", "aethyra.exe"

+            VALUE "ProductName", "Aethyra MMORPG"

             VALUE "ProductVersion", PACKAGE_VERSION

         }

     }

diff --git a/src/game.cpp b/src/game.cpp
index 2522c6e5..261fa157 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -357,11 +357,11 @@ bool saveScreenshot(SDL_Surface *screenshot)
     screenshotCount++;
     filename.str("");
 #if (defined __USE_UNIX98 || defined __FreeBSD__)
-    filename << PHYSFS_getUserDir() << ".tme/";
+    filename << PHYSFS_getUserDir() << ".aethyra/";
 #elif defined __APPLE__
     filename << PHYSFS_getUserDir() << "Desktop/";
 #endif
-    filename << "TMW_Screenshot_" << screenshotCount << ".png";
+    filename << "Aethyra_Screenshot_" << screenshotCount << ".png";
     testExists.open(filename.str().c_str(), std::ios::in);
     found = !testExists.is_open();
     testExists.close();
diff --git a/src/main.cpp b/src/main.cpp
index cc30ec0a..92e18906 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -198,18 +198,18 @@ void setUpdatesDir()
  */
 void init_engine(const Options &options)
 {
-    homeDir = std::string(PHYSFS_getUserDir()) + "/.tme";
+    homeDir = std::string(PHYSFS_getUserDir()) + "/.aethyra";
 #if defined WIN32
     if (!CreateDirectory(homeDir.c_str(), 0) &&
             GetLastError() != ERROR_ALREADY_EXISTS)
 #elif defined __APPLE__
-    // Use Application Directory instead of .tme
+    // Use Application Directory instead of .aethyra
     homeDir = std::string(PHYSFS_getUserDir()) +
-        "/Library/Application Support/The Mana Experiment";
+        "/Library/Application Support/Aethyra";
     if ((mkdir(homeDir.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0) &&
             (errno != EEXIST))
 #else
-    // Checking if /home/user/.tme folder exists.
+    // Checking if /home/user/.Aethyra folder exists.
     if ((mkdir(homeDir.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0) &&
             (errno != EEXIST))
 #endif
@@ -221,12 +221,12 @@ void init_engine(const Options &options)
     }
 
     // Set log file
-    logger->setLogFile(homeDir + std::string("/tme.log"));
+    logger->setLogFile(homeDir + std::string("/aethyra.log"));
 
     #ifdef PACKAGE_VERSION
-        logger->log("Starting The Mana Experiment Version %s", PACKAGE_VERSION);
+        logger->log("Starting Aethyra Version %s", PACKAGE_VERSION);
     #else
-        logger->log("Starting The Mana Experiment - Version not defined");
+        logger->log("Starting Aethyra - Version not defined");
     #endif
 
     // Initialize SDL
@@ -268,7 +268,7 @@ void init_engine(const Options &options)
     strncat(path, "/data", PATH_MAX - 1);
     resman->addToSearchPath(path, true);
 #else
-    resman->addToSearchPath(TME_DATADIR "data", true);
+    resman->addToSearchPath(AETHYRA_DATADIR "data", true);
 #endif
 
     // Fill configuration with defaults
@@ -294,28 +294,28 @@ void init_engine(const Options &options)
 
     // Checking if the configuration file exists... otherwise creates it with
     // default options !
-    FILE *tmeFile = 0;
+    FILE *aethyraFile = 0;
     std::string configPath = options.configPath;
 
     if (configPath.empty())
         configPath = homeDir + "/config.xml";
 
-    tmeFile = fopen(configPath.c_str(), "r");
+    aethyraFile = fopen(configPath.c_str(), "r");
 
     // If we can't read it, it doesn't exist !
-    if (tmeFile == NULL) {
+    if (aethyraFile == NULL) {
         // We reopen the file in write mode and we create it
-        tmeFile = fopen(configPath.c_str(), "wt");
+        aethyraFile = fopen(configPath.c_str(), "wt");
     }
-    if (tmeFile == NULL) {
+    if (aethyraFile == NULL) {
         std::cout << "Can't create " << configPath << ". "
             "Using Defaults." << std::endl;
     } else {
-        fclose(tmeFile);
+        fclose(aethyraFile);
         config.init(configPath);
     }
 
-    SDL_WM_SetCaption("The Mana Experiment", NULL);
+    SDL_WM_SetCaption("Aethyra", NULL);
 #ifdef WIN32
     static SDL_SysWMinfo pInfo;
     SDL_GetWMInfo(&pInfo);
@@ -325,7 +325,7 @@ void init_engine(const Options &options)
         SetClassLong(pInfo.window, GCL_HICON, (LONG) icon);
     }
 #else
-    SDL_Surface *icon = IMG_Load(TME_DATADIR "data/icons/tme.png");
+    SDL_Surface *icon = IMG_Load(AETHYRA_DATADIR "data/icons/aethyra.png");
     if (icon)
     {
         SDL_SetAlpha(icon, SDL_SRCALPHA, SDL_ALPHA_OPAQUE);
@@ -422,7 +422,7 @@ void exit_engine()
 void printHelp()
 {
     std::cout
-        << "tme" << std::endl << std::endl
+        << "aethyra" << std::endl << std::endl
         << "Options: " << std::endl
         << "  -h --help       : Display this help" << std::endl
         << "  -v --version    : Display the version" << std::endl
@@ -439,10 +439,10 @@ void printHelp()
 void printVersion()
 {
 #ifdef PACKAGE_VERSION
-    std::cout << "The Mana Experiment version " << PACKAGE_VERSION <<
+    std::cout << "Aethyra version " << PACKAGE_VERSION <<
         std::endl;
 #else
-    std::cout << "The Mana Experiment version " <<
+    std::cout << "Aethyra version " <<
              "(local build?, PACKAGE_VERSION is not defined)" << std::endl;
 #endif
 }
diff --git a/src/main.h b/src/main.h
index 1f9aa9d0..8dfc51cf 100644
--- a/src/main.h
+++ b/src/main.h
@@ -32,8 +32,8 @@
 #include "winver.h"
 #endif
 
-#ifndef TME_DATADIR
-#define TME_DATADIR ""
+#ifndef AETHYRA_DATADIR
+#define AETHYRA_DATADIR ""
 #endif
 
 /*
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index ae255144..16a2c470 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -219,7 +219,7 @@ ResourceManager::getPath(const std::string &file)
     else
     {
         // if not found in search path return the default path
-        path = std::string(TME_DATADIR) + std::string("data") + "/" + file;
+        path = std::string(AETHYRA_DATADIR) + std::string("data") + "/" + file;
     }
 
     return path;
diff --git a/src/text.h b/src/text.h
index 04b213b3..19d75018 100644
--- a/src/text.h
+++ b/src/text.h
@@ -19,8 +19,8 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _TME_TEXT_H
-#define _TME_TEXT_H
+#ifndef _AETHYRA_TEXT_H
+#define _AETHYRA_TEXT_H
 
 #include "graphics.h"
 
diff --git a/src/textmanager.h b/src/textmanager.h
index 53419240..5b21ba81 100644
--- a/src/textmanager.h
+++ b/src/textmanager.h
@@ -19,8 +19,8 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _TME_TEXTMANAGER_H
-#define _TME_TEXTMANAGER_H
+#ifndef _AETHYRA_TEXTMANAGER_H
+#define _AETHYRA_TEXTMANAGER_H
 
 #include <list>