* More NAEV -> Naev.

AUTHORS

@@ -40,7 +40,7 @@ Contributions
    Amir Taaki <genjix@gmail.com>
    Rob Loach <http://robloach.net>
       * SDL_collide
-    Although we don't use the SDL_collide library itself, it was inspirational for NAEV's own collision routines.
+    Although we don't use the SDL_collide library itself, it was inspirational for Naev's own collision routines.
 
    Pete Shinners <pete@shinners.org>
       * SavePNG
@@ -56,7 +56,7 @@ Contributions
 
    J.C. Wilk
       * Turbulence noise
-    After the horrible failure of our own plasma fractal attempt, TCOD's turbulence noise seemed to do everything perfectly where we screwed up. With heavy optimization the code was introduced to NAEV.
+    After the horrible failure of our own plasma fractal attempt, TCOD's turbulence noise seemed to do everything perfectly where we screwed up. With heavy optimization the code was introduced to Naev.
 
    Jordi Pegueroles Queralt "pegue" <j.pegueroles.queralt@gmail.com>
       * Mace Rocket model
@@ -67,11 +67,11 @@ Contributions
 
    Camilo Polymeris <cpolymeris@gmx.net>
       * Art and code
-    Great to see someone else working on NAEV code and Lua documentation.
+    Great to see someone else working on Naev code and Lua documentation.
 
    Dimitry Marakasov
       * FreeBSD port and CMake
-    Talented coder who did the first official port of NAEV.
+    Talented coder who did the first official port of Naev.
 
    Elderman
       * Many cool missions
@@ -89,7 +89,7 @@ Contributions
       * Sped up nebula generation by a lot
 
    Unavowed <unavowed@vexillium.org>
-      * Ported NAEV's build system to autotools.
+      * Ported Naev's build system to autotools.
     Probably the cleanest autotools implementation I've ever seen.
 
    Felix Schneider "Scaatis" <fsfuenf@gmail.com>

dat/event.xml

@@ -120,7 +120,7 @@
    <unique />
   </flags>
  </event>
- <event name="NAEV Needs You!">
+ <event name="Naev Needs You!">
   <lua>naev_needs_YOU</lua>
   <trigger>land</trigger>
   <chance>8</chance>

dat/events/naev_needs_YOU.lua

@@ -1,6 +1,6 @@
 --[[
 
-EVENT TITLE: NAEV Needs You!
+EVENT TITLE: Naev Needs You!
 DESCRIPTION: 
          An event that pops up to encourage new players to contribute to the project.
 
@@ -19,7 +19,7 @@ else -- default english
 -- Stage one: something goes wrong in fabric of reality.
    title = {}
    text = {}
-   title[1] = "NAEV received SIGSEGV (address not mapped to object)!"
+   title[1] = "Naev received SIGSEGV (address not mapped to object)!"
    text[1] = [[As you step out of your ship, suddenly the sunlight flickers. In the sky, the local star turns blue, then a deep purple, and then goes dark. The whole planet plunges into darkness.
 
 Then a voice speaks, louder than an earthquake. It seems to sound inside your bones and from the very centre of the earth. "Oh crap..." it says.

dat/intro

@@ -28,7 +28,7 @@
    That was more than 10 SCU ago. You find yourself in a universe with a decaying Empire, where corruption and piracy run rampant, rattled to its core by the Incident. But where there is chaos, there is also opportunity.
 
 
-   Welcome to the universe of NAEV...
+   Welcome to the universe of Naev...
 
 
 

naev.6

@@ -1,7 +1,7 @@
 .TH NAEV 6 "2009" "NAEV" "NAEV"
 .
 .SH NAME
-NAEV \- A 2D space trading and combat game.
+Naev \- A 2D space trading and combat game.
 .
 .SH SYNOPSIS
 .
@@ -18,7 +18,7 @@ Played from a top-down perspective with isometric sprites, the player
 is free to explore the galaxy as they see fit, trading or pirating
 their way to a vast fortune.
 
-NAEV is set in a futuristic science fiction environment, in which
+Naev is set in a futuristic science fiction environment, in which
 the player finds himself in the wake of a massive galactic cataclysm
 which erupted from the Sol system and destroyed everything within
 tens of lightyears, resulting in a massive, volatile nebula.

naev.desktop

@@ -1,8 +1,8 @@
 [Desktop Entry]
 Type=Application
 Version=1.0
-Name=NAEV
-GenericName=NAEV
+Name=Naev
+GenericName=Naev
 Icon=naev
 Exec=naev
 Categories=Game;

src/Doxyfile

@@ -25,7 +25,7 @@ DOXYFILE_ENCODING      = UTF-8
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded
 # by quotes) that should identify the project.
 
-PROJECT_NAME           = NAEV
+PROJECT_NAME           = Naev
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number.
 # This could be handy for archiving the generated documentation or

src/colour.c

@@ -5,7 +5,7 @@
 /**
  * @file colour.c
  *
- * @brief Predefined colours for use with NAEV.
+ * @brief Predefined colours for use with Naev.
  */
 
 

src/equipment.c

@@ -1628,7 +1628,7 @@ void equipment_setGui( unsigned int wid, char* str )
    /* In case there are none. */
    if (guis == NULL) {
       WARN("No GUI available.");
-      dialogue_alert( "There are no GUI available, this means something went wrong somewhere. Inform the NAEV maintainer." );
+      dialogue_alert( "There are no GUI available, this means something went wrong somewhere. Inform the Naev maintainer." );
       return;
    }
 

src/faction.c

@@ -5,7 +5,7 @@
 /**
  * @file faction.c
  *
- * @brief Handles the NAEV factions.
+ * @brief Handles the Naev factions.
  */
 
 

src/input.c

@@ -43,7 +43,7 @@
 
 /* keybinding structure */
 /**
- * @brief NAEV Keybinding.
+ * @brief Naev Keybinding.
  */
 typedef struct Keybind_ {
    int disabled; /**< Whether or not it's disabled. */
@@ -605,10 +605,10 @@ const char* input_getKeybindDescription( const char *keybind )
 
 
 /**
- * @brief Translates SDL modifier to NAEV modifier.
+ * @brief Translates SDL modifier to Naev modifier.
  *
  *    @param mod SDL modifier to translate.
- *    @return NAEV modifier.
+ *    @return Naev modifier.
  */
 SDLMod input_translateMod( SDLMod mod )
 {
@@ -1072,7 +1072,7 @@ static void input_keyevent( const int event, SDLKey key, const SDLMod mod, const
    int i;
    SDLMod mod_filtered;
 
-   /* Filter to "NAEV" modifiers. */
+   /* Filter to "Naev" modifiers. */
    mod_filtered = input_translateMod(mod);
 
    for (i=0; i<input_numbinds; i++) {

src/intro.c

@@ -241,7 +241,7 @@ static void intro_fade_image_in( intro_img_t *side, intro_img_t *transition,
       */
       if (NULL != transition->tex) {
          /* Scrolling is happening faster than fading... */
-         fprintf( stderr, "NAEV error: scrolling is too fast!\n" );
+         WARN( "Intro scrolling too fast!" );
          gl_freeTexture( transition->tex );
       }
       transition->tex = gl_newImage( img_file, 0 );
@@ -421,8 +421,7 @@ int intro_display( const char *text, const char *mus )
                break;
             case 'o': /* fade out image. */
                if (NULL == side_image.tex) {
-                  fprintf( stderr, "NAEV error: %s\n",
-                           "Tried to fade out without an image.\n" );
+                  WARN("Tried to fade out without an image." );
                   break;
                }
                side_image.fade_rate = -0.1;

src/load.h

@@ -19,8 +19,8 @@ typedef struct nsave_s {
    char *name; /**< Player name. */
    char *path; /**< File path. */
 
-   /* NAEV info. */
-   char *version; /**< NAEV version. */
+   /* Naev info. */
+   char *version; /**< Naev version. */
    char *data; /**< Data name. */
 
    /* Player info. */

src/nfile.c

@@ -69,7 +69,7 @@ char* nfile_basePath (void)
       }
       snprintf( naev_base, PATH_MAX, "%s/naev/", home );
 #else
-#error "Feature needs implementation on this Operating System for NAEV to work."
+#error "Feature needs implementation on this Operating System for Naev to work."
 #endif
    }
 
@@ -157,7 +157,7 @@ int nfile_dirMakeExist( const char* path, ... )
       closedir(d);
    }
 #else
-#error "Feature needs implementation on this Operating System for NAEV to work."
+#error "Feature needs implementation on this Operating System for Naev to work."
 #endif
 
    return 0;

src/nlua.c

@@ -182,7 +182,7 @@ static int nlua_packfileLoader( lua_State* L )
 
 
 /**
- * @brief Loads the standard NAEV Lua API.
+ * @brief Loads the standard Naev Lua API.
  *
  * Loads the modules:
  *  - naev

src/nlua_gfx.c

@@ -73,7 +73,7 @@ int nlua_loadGFX( lua_State *L, int readonly )
 
 
 /**
- * @brief Lua bindings to interact with rendering and the NAEV graphical environment.
+ * @brief Lua bindings to interact with rendering and the Naev graphical environment.
  *
  * An example would be:
  * @code
@@ -86,11 +86,11 @@ int nlua_loadGFX( lua_State *L, int readonly )
 
 
 /**
- * @brief Gets the dimensions of the NAEV window.
+ * @brief Gets the dimensions of the Naev window.
  *
  * @usage screen_w, screen_h = gfx.dim()
  *
- *    @luareturn The width and height of the NAEV window.
+ *    @luareturn The width and height of the Naev window.
  * @luafunc dim()
  */
 static int gfxL_dim( lua_State *L )

src/nlua_naev.c

@@ -5,7 +5,7 @@
 /**
  * @file nlua_naev.c
  *
- * @brief Contains NAEV generic Lua bindings.
+ * @brief Contains Naev generic Lua bindings.
  */
 
 #include "nlua_naev.h"
@@ -23,7 +23,7 @@
 #include "input.h"
 
 
-/* NAEV methods. */
+/* Naev methods. */
 static int naev_lang( lua_State *L );
 static int naev_keyGet( lua_State *L );
 static int naev_keyEnable( lua_State *L );
@@ -40,11 +40,11 @@ static const luaL_reg naev_methods[] = {
    { "eventStart", naev_eventStart },
    { "missionStart", naev_missionStart },
    {0,0}
-}; /**< NAEV Lua methods. */
+}; /**< Naev Lua methods. */
 
 
 /**
- * @brief Loads the NAEV Lua library.
+ * @brief Loads the Naev Lua library.
  *
  *    @param L Lua state.
  *    @return 0 on success.
@@ -56,7 +56,7 @@ int nlua_loadNaev( lua_State *L )
 }
 
 /**
- * @brief NAEV generic Lua bindings.
+ * @brief Naev generic Lua bindings.
  *
  * An example would be:
  * @code
@@ -68,7 +68,7 @@ int nlua_loadNaev( lua_State *L )
  * @luamod naev
  */
 /**
- * @brief Gets the language NAEV is currently using.
+ * @brief Gets the language Naev is currently using.
  *
  * @usage if naev.lang() == "en" then -- Language is english
  *

src/nlua_rnd.c

@@ -5,7 +5,7 @@
 /**
  * @file nlua_rnd.c
  *
- * @brief Lua bindings for the NAEV random number generator.
+ * @brief Lua bindings for the Naev random number generator.
  */
 
 #include "nlua_rnd.h"

src/nlua_tk.c

@@ -5,7 +5,7 @@
 /**
  * @file nlua_tk.c
  *
- * @brief NAEV toolkit Lua module.
+ * @brief Naev toolkit Lua module.
  */
 
 #include "nlua_tk.h"

src/ntime.c

@@ -5,7 +5,7 @@
 /**
  * @file ntime.c
  *
- * @brief Handles the NAEV time.
+ * @brief Handles the Naev time.
  *
  * 1 SCU =  5e3 STP = 50e6 STU
  * 1 STP = 10e3 STU

src/opengl_ext.c

@@ -24,7 +24,7 @@
 /*
  * Prototypes
  */
-GLAPI void APIENTRY glGenerateMipmapNAEV( GLenum target );
+GLAPI void APIENTRY glGenerateMipmapNaev( GLenum target );
 static void* gl_extGetProc( const char *proc );
 static int gl_extVBO (void);
 static int gl_extMultitexture (void);
@@ -125,7 +125,7 @@ static int gl_extVBO (void)
 /**
  * @brief Wrapper for glGenerateMipmap around GL_SGIS_generate_mipmap
  */
-GLAPI void APIENTRY glGenerateMipmapNAEV( GLenum target )
+GLAPI void APIENTRY glGenerateMipmapNaev( GLenum target )
 {
    glHint(GL_GENERATE_MIPMAP_HINT, GL_NICEST);
    glTexParameteri(target, GL_GENERATE_MIPMAP, GL_TRUE);
@@ -149,7 +149,7 @@ static int gl_extMipmaps (void)
       nglGenerateMipmap = SDL_GL_GetProcAddress("glGenerateMipmapEXT");
    }
    else if (gl_hasExt("GL_SGIS_generate_mipmap")) {
-      nglGenerateMipmap = glGenerateMipmapNAEV;
+      nglGenerateMipmap = glGenerateMipmapNaev;
    }
    else {
       nglGenerateMipmap = NULL;

src/space.h

@@ -194,7 +194,7 @@ extern glTexture *jumppoint_gfx; /**< Jump point graphics. */
 /**
  * @brief Represents a star system.
  *
- * The star system is the basic setting in NAEV.
+ * The star system is the basic setting in Naev.
  */
 struct StarSystem_ {
    int id; /**< Star system index. */