Merge branch 'master' of github.com:lubosz/ArxFatalis into std_string

Conflicts: src/animation/Animation.h src/animation/AnimationRender.cpp src/animation/Cinematic.cpp src/animation/CinematicKeyframer.cpp src/animation/Intro.cpp src/core/Application.cpp src/core/Time.cpp src/game/Damage.cpp src/game/Equipment.cpp src/game/Player.h src/graphics/data/CinematicTexture.cpp src/graphics/data/Texture.h src/graphics/effects/CinematicEffects.cpp src/graphics/effects/SpellEffects.cpp src/gui/Interface.h src/gui/Menu.h src/gui/MenuPublic.cpp src/gui/MenuWidgets.cpp src/gui/Speech.cpp src/io/CinematicLoad.cpp src/io/IO.h src/io/Logger.cpp src/io/Screenshot.cpp src/scene/CinematicSound.cpp src/scene/Interactive.h src/scene/Scene.cpp src/scripting/Script.cpp src/scripting/Script.h
arx · Jan 30, 2011 · aa262e4 · aa262e4
2 parents 6397609 + 51c70c6
commit aa262e4
Show file tree

Hide file tree

Showing 217 changed files with 1,153 additions and 1,174 deletions.
diff --git a/src/core/Minos_Common.h → src/ai/PathCommon.h b/src/core/Minos_Common.h → src/ai/PathCommon.h
@@ -27,7 +27,7 @@ ZeniMax Media Inc., Suite 120, Rockville, Maryland 20850 USA.
 
 #define __MINOS_COMMON_VERSION__ "0000"
 
-#include "core/ARX_Common.h"
+#include "core/Common.h"
 
 namespace MINOS
 {

diff --git a/src/core/Minos_PathFinder.cpp → src/ai/PathFinder.cpp b/src/core/Minos_PathFinder.cpp → src/ai/PathFinder.cpp
@@ -24,7 +24,7 @@ ZeniMax Media Inc., Suite 120, Rockville, Maryland 20850 USA.
 */
 
 #include <time.h>
-#include "core/Minos_PathFinder.h"
+#include "ai/PathFinder.h"
 
 const Float MIN_RADIUS(110.F);
 

diff --git a/src/core/Minos_PathFinder.h → src/ai/PathFinder.h b/src/core/Minos_PathFinder.h → src/ai/PathFinder.h
@@ -29,10 +29,10 @@ ZeniMax Media Inc., Suite 120, Rockville, Maryland 20850 USA.
 
 #include <malloc.h>
 #include <string.h>
-#include "Minos_Common.h"
-#include "Minos_List.h"
-#include "renderer/EERIEMath.h"
-#include "renderer/EERIEPoly.h"
+#include "ai/PathCommon.h"
+#include "ai/PathList.h"
+#include "graphics/Math.h"
+#include "graphics/data/Mesh.h"
 
 using namespace MINOS;
 

diff --git a/src/renderer/EERIEPathfinder.cpp → src/ai/PathFinderManager.cpp b/src/renderer/EERIEPathfinder.cpp → src/ai/PathFinderManager.cpp
@@ -54,11 +54,11 @@ ZeniMax Media Inc., Suite 120, Rockville, Maryland 20850 USA.
 //
 // Copyright (c) 1999-2001 ARKANE Studios SA. All rights reserved
 ///////////////////////////////////////////////////////////////////////////////
-#include "renderer/EERIEPathfinder.h"
-#include "renderer/EERIELight.h"
+#include "ai/PathFinderManager.h"
+#include "scene/Light.h"
 
-#include "io/HERMESMain.h"
-#include "core/Minos_PathFinder.h"
+#include "io/IO.h"
+#include "ai/PathFinder.h"
 
 static const float PATHFINDER_HEURISTIC_MIN(0.2F);
 static const float PATHFINDER_HEURISTIC_MAX(MINOS_HEURISTIC_MAX);

diff --git a/src/renderer/EERIEPathfinder.h → src/ai/PathFinderManager.h b/src/renderer/EERIEPathfinder.h → src/ai/PathFinderManager.h
@@ -57,7 +57,7 @@ ZeniMax Media Inc., Suite 120, Rockville, Maryland 20850 USA.
 #ifndef EERIEPATHFINDER_H
 #define EERIEPATHFINDER_H
 
-#include "EERIEPoly.h"
+#include "graphics/data/Mesh.h"
 
 typedef struct
 {

diff --git a/src/core/Minos_List.h → src/ai/PathList.h b/src/core/Minos_List.h → src/ai/PathList.h
@@ -28,7 +28,7 @@ ZeniMax Media Inc., Suite 120, Rockville, Maryland 20850 USA.
 
 #define __MINOS_LIST_VERSION__ "0000"
 
-#include "Minos_Common.h"
+#include "ai/PathCommon.h"
 
 using namespace MINOS;
 

diff --git a/src/core/ARX_Paths.cpp → src/ai/Paths.cpp b/src/core/ARX_Paths.cpp → src/ai/Paths.cpp
@@ -55,29 +55,29 @@ ZeniMax Media Inc., Suite 120, Rockville, Maryland 20850 USA.
 // Copyright (c) 1999-2000 ARKANE Studios SA. All rights reserved
 //////////////////////////////////////////////////////////////////////////////////////
 
-#include "core/ARX_Paths.h"
+#include "ai/Paths.h"
 
 #include <cstdio>
 
-#include "core/ARX_GlobalMods.h"
-#include "core/ARX_Sound.h"
-#include "core/ARX_Collisions.h"
-#include "core/ARX_Time.h"
-#include "core/ARX_NPC.h"
-#include "core/ARX_CSpellFx.h"
-#include "core/ARX_Interactive.h"
-#include "core/ARX_Player.h"
-#include "core/ARX_Script.h"
-#include "core/ARX_Particles.h"
-#include "core/ARX_Damages.h"
-#include "core/ARX_Equipment.h"
-#include "core/DanaeDlg.h"
-
-#include "renderer/EERIELight.h"
-#include "renderer/EERIEDraw.h"
-#include "renderer/EERIEPhysicsBox.h"
-
-#include "io/HERMESMain.h"
+#include "graphics/GraphicsModes.h"
+#include "scene/GameSound.h"
+#include "physics/Collisions.h"
+#include "core/Time.h"
+#include "game/NPC.h"
+#include "graphics/effects/SpellEffects.h"
+#include "scene/Interactive.h"
+#include "game/Player.h"
+#include "scripting/Script.h"
+#include "graphics/particle/ParticleEffects.h"
+#include "game/Damage.h"
+#include "game/Equipment.h"
+#include "core/Dialog.h"
+
+#include "scene/Light.h"
+#include "graphics/Draw.h"
+#include "physics/Box.h"
+
+#include "io/IO.h"
 
 using std::min;
 using std::max;

diff --git a/src/core/ARX_Paths.h → src/ai/Paths.h b/src/core/ARX_Paths.h → src/ai/Paths.h
@@ -57,8 +57,8 @@ ZeniMax Media Inc., Suite 120, Rockville, Maryland 20850 USA.
 #ifndef ARX_PATHS_H
 #define ARX_PATHS_H
 
-#include "renderer/EERIETypes.h"
-#include "renderer/EERIEPoly.h"
+#include "graphics/GraphicsTypes.h"
+#include "graphics/data/Mesh.h"
 
 class CRuban;
 

diff --git a/src/renderer/EERIEAnim.cpp → src/animation/Animation.cpp b/src/renderer/EERIEAnim.cpp → src/animation/Animation.cpp
@@ -55,7 +55,7 @@ ZeniMax Media Inc., Suite 120, Rockville, Maryland 20850 USA.
 // Copyright (c) 1999-2001 ARKANE Studios SA. All rights reserved
 //////////////////////////////////////////////////////////////////////////////////////
 
-#include "renderer/EERIEAnim.h"
+#include "animation/Animation.h"
 
 #include <cstdio>
 #include <iostream>
@@ -65,24 +65,24 @@ ZeniMax Media Inc., Suite 120, Rockville, Maryland 20850 USA.
 #include <vector>
 using std::sprintf;
 
-#include "renderer/EERIEClothes.h"
-#include "renderer/EERIEObject.h"
-#include "renderer/EERIEMath.h"
-#include "renderer/EERIELight.h"
-#include "renderer/EERIEPoly.h"
-#include "renderer/EERIEDraw.h"
-
-#include "core/ARX_Sound.h"
-#include "core/ARX_Damages.h"
-#include "core/ARX_Particles.h"
-#include "core/ARX_NPC.h"
-#include "core/ARX_Collisions.h"
-#include "core/ARX_Scene.h"
-#include "core/ARX_Time.h"
-#include "core/Danae.h"
-#include "core/ARX_Cedric.h"
-
-#include "io/HERMESMain.h"
+#include "physics/Clothes.h"
+#include "scene/Object.h"
+#include "graphics/Math.h"
+#include "scene/Light.h"
+#include "graphics/data/Mesh.h"
+#include "graphics/Draw.h"
+
+#include "scene/GameSound.h"
+#include "game/Damage.h"
+#include "graphics/particle/ParticleEffects.h"
+#include "game/NPC.h"
+#include "physics/Collisions.h"
+#include "scene/Scene.h"
+#include "core/Time.h"
+#include "core/Core.h"
+#include "animation/AnimationRender.h"
+
+#include "io/IO.h"
 #include "io/PakManager.h"
 
 using std::min;

diff --git a/src/renderer/EERIEAnim.h → src/animation/Animation.h b/src/renderer/EERIEAnim.h → src/animation/Animation.h
@@ -40,8 +40,8 @@ ZeniMax Media Inc., Suite 120, Rockville, Maryland 20850 USA.
 
 #include <string>
 
-#include "EERIETypes.h"
-#include "EERIEPoly.h"
+#include "graphics/GraphicsTypes.h"
+#include "graphics/data/Mesh.h"
 
 //-----------------------------------------------------------------------------
 #define HALOMAX 2000

diff --git a/src/core/ARX_Cedric.cpp → src/animation/AnimationRender.cpp b/src/core/ARX_Cedric.cpp → src/animation/AnimationRender.cpp
@@ -23,34 +23,34 @@ ZeniMax Media Inc., Suite 120, Rockville, Maryland 20850 USA.
 ===========================================================================
 */
 
-#include "core/ARX_Cedric.h"
+#include "animation/AnimationRender.h"
 
 #include <dinput.h>
 
-#include <algorithm>
+/*#include <algorithm>
 #include <string>
 #include <vector>
-
-#include "io/HERMESMain.h"
-
-#include "renderer/EERIEAnim.h"
-#include "renderer/EERIEClothes.h"
-#include "renderer/EERIEObject.h"
-#include "renderer/EERIEMath.h"
-#include "renderer/EERIELight.h"
-#include "renderer/EERIEPoly.h"
-#include "renderer/EERIEDraw.h"
-
-#include "core/ARX_Collisions.h"
-#include "core/ARX_Sound.h"
-#include "core/ARX_Scene.h"
-#include "core/ARX_Equipment.h"
-#include "core/ARX_Damages.h"
-#include "core/ARX_Particles.h"
-#include "core/ARX_NPC.h"
-#include "core/ARX_Time.h"
-#include "core/Danae.h"
-#include "core/ARX_Menu2.h"
+*/
+#include "io/IO.h"
+
+#include "animation/Animation.h"
+#include "physics/Clothes.h"
+#include "scene/Object.h"
+#include "graphics/Math.h"
+#include "scene/Light.h"
+#include "graphics/data/Mesh.h"
+#include "graphics/Draw.h"
+
+#include "physics/Collisions.h"
+#include "scene/GameSound.h"
+#include "scene/Scene.h"
+#include "game/Equipment.h"
+#include "game/Damage.h"
+#include "graphics/particle/ParticleEffects.h"
+#include "game/NPC.h"
+#include "core/Time.h"
+#include "core/Core.h"
+#include "gui/MenuWidgets.h"
 
 using std::min;
 using std::max;

diff --git a/src/core/ARX_Cedric.h → src/animation/AnimationRender.h b/src/core/ARX_Cedric.h → src/animation/AnimationRender.h
@@ -24,7 +24,7 @@ ZeniMax Media Inc., Suite 120, Rockville, Maryland 20850 USA.
 */
 #ifndef ARX_CEDRIC_H
 #define ARX_CEDRIC_H
-#include "Danae.h"
+#include "core/Core.h"
 
 
 #define		CEDRIC				1

diff --git a/src/core/ARX_C_cinematique.cpp → src/animation/Cinematic.cpp b/src/core/ARX_C_cinematique.cpp → src/animation/Cinematic.cpp
@@ -24,14 +24,15 @@ ZeniMax Media Inc., Suite 120, Rockville, Maryland 20850 USA.
 */
 #include <stdlib.h>
 
-#include <algorithm>
+// TODO Remove if not needed
+/*#include <algorithm>
 #include <fstream>
 #include <sstream>
 #include <vector>
-
-#include "core/Danae.h"
-#include "core/ARX_CCinematique.h"
-#include "renderer/EERIEUtil.h"
+*/
+#include "core/Core.h"
+#include "animation/Cinematic.h"
+#include "graphics/GraphicsUtility.h"
 
 #define ADJUSTX(a) (((((a)-(LARGEURS>>1))*((float)LargeurRender/(float)LARGEURS))+(LARGEURS>>1)))*(640.f/(float)LargeurRender) //*((float)LARGEURS/(float)LargeurRender)
 #define ADJUSTY(a) (((((a)-(HAUTEURS>>1))*((float)HauteurRender/(float)HAUTEURS))+(HAUTEURS>>1)))*(480.f/(float)HauteurRender)  //*((float)HAUTEURS/(float)HauteurRender)

diff --git a/src/core/ARX_CCinematique.h → src/animation/Cinematic.h b/src/core/ARX_CCinematique.h → src/animation/Cinematic.h
@@ -25,8 +25,8 @@ ZeniMax Media Inc., Suite 120, Rockville, Maryland 20850 USA.
 #ifndef CINEMATIQUE_H
 #define CINEMATIQUE_H
 
-#include "renderer/EERIEApp.h"
-#include "renderer/EERIEDraw.h"
+#include "core/Application.h"
+#include "graphics/Draw.h"
 
 /*-----------------------------------------------------------*/
 #define		VERSION		((1<<16)|76)

diff --git a/src/core/ARX_C_keyframer.cpp → src/animation/CinematicKeyframer.cpp b/src/core/ARX_C_keyframer.cpp → src/animation/CinematicKeyframer.cpp
@@ -23,14 +23,14 @@ ZeniMax Media Inc., Suite 120, Rockville, Maryland 20850 USA.
 ===========================================================================
 */
 #include <stdlib.h>
-
+/*
 #include <algorithm>
 #include <fstream>
 #include <sstream>
 #include <vector>
-
-#include "core/ARX_CCinematique.h"
-#include "core/ARX_Time.h"
+*/
+#include "animation/Cinematic.h"
+#include "core/Time.h"
 
 /*----------------------------------------------------------------------*/
 //undo/redo

diff --git a/src/core/ARX_Intro.cpp → src/animation/Intro.cpp b/src/core/ARX_Intro.cpp → src/animation/Intro.cpp
@@ -22,22 +22,23 @@ If you have questions concerning this license or the applicable additional terms
 ZeniMax Media Inc., Suite 120, Rockville, Maryland 20850 USA.
 ===========================================================================
 */
-
+/*
 #include <algorithm>
 #include <fstream>
 #include <sstream>
 #include <vector>
+*/
 
-#include "core/ARX_Interface.h"
-#include "core/ARX_Levels.h"
-#include "core/ARX_Menu.h"
-#include "core/ARX_Sound.h"
-#include "core/ARX_Time.h"
+#include "gui/Interface.h"
+#include "game/Levels.h"
+#include "gui/Menu.h"
+#include "scene/GameSound.h"
+#include "core/Time.h"
 
-#include "renderer/d3dwrapper.h"
-#include "renderer/EERIEDraw.h"
-#include "renderer/EERIEMath.h"
-#include "renderer/EERIETexture.h"
+#include "graphics/d3dwrapper.h"
+#include "graphics/Draw.h"
+#include "graphics/Math.h"
+#include "graphics/data/Texture.h"
 
 using std::min;
 using std::max;

diff --git a/src/audio/Athena_Ambiance.cpp → src/audio/Ambient.cpp b/src/audio/Athena_Ambiance.cpp → src/audio/Ambient.cpp
@@ -27,9 +27,9 @@ ZeniMax Media Inc., Suite 120, Rockville, Maryland 20850 USA.
 #include <cstdlib>
 #include <cstring>
 
-#include "audio/Athena_Global.h"
-#include "audio/Athena_Sample.h"
-#include "audio/Athena_Ambiance.h"
+#include "audio/AudioGlobal.h"
+#include "audio/Sample.h"
+#include "audio/Ambient.h"
 
 #include "io/PakManager.h"
 

diff --git a/src/audio/Athena_Ambiance.h → src/audio/Ambient.h b/src/audio/Athena_Ambiance.h → src/audio/Ambient.h
@@ -25,8 +25,8 @@ ZeniMax Media Inc., Suite 120, Rockville, Maryland 20850 USA.
 #ifndef __ATHENA_AMBIANCE_H__
 #define __ATHENA_AMBIANCE_H__
 
-#include "Athena_Types.h"
-#include "Athena_Resource.h"
+#include "AudioTypes.h"
+#include "AudioResource.h"
 
 namespace ATHENA
 {

diff --git a/src/audio/Athena.cpp → src/audio/Audio.cpp b/src/audio/Athena.cpp → src/audio/Audio.cpp
@@ -40,14 +40,14 @@ ZeniMax Media Inc., Suite 120, Rockville, Maryland 20850 USA.
 #include <math.h>
 #include <cstring>
 
-#include "audio/Athena.h"
-#include "audio/Athena_Resource.h"
-#include "audio/Athena_Mixer.h"
-#include "audio/Athena_Sample.h"
-#include "audio/Athena_Ambiance.h"
-#include "audio/Athena_Instance.h"
-#include "audio/Athena_Global.h"
-#include "audio/Athena_Stream.h"
+#include "audio/Audio.h"
+#include "audio/AudioResource.h"
+#include "audio/Mixer.h"
+#include "audio/Sample.h"
+#include "audio/Ambient.h"
+#include "audio/AudioInstance.h"
+#include "audio/AudioGlobal.h"
+#include "audio/Stream.h"
 #include "audio/eax.h"
 #include "io/Logger.h"
 

diff --git a/src/audio/Athena.h → src/audio/Audio.h b/src/audio/Athena.h → src/audio/Audio.h
@@ -27,7 +27,7 @@ ZeniMax Media Inc., Suite 120, Rockville, Maryland 20850 USA.
 
 #define __ATHENA_VERSION__ "0000"
 
-#include "Athena_Types.h"
+#include "AudioTypes.h"
 
 //#ifdef _WIN32
 //#ifndef AAL_APIDLL