Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-11-22 02:12:45 +01:00
Code Issues Projects Releases Activity

Revert "Disable warnings caused by register in bullet"

Browse Source 
This reverts commit 4940ae0d6b.
This commit is contained in:
Anonymous Maarten 2018-12-12 13:53:32 +01:00
parent ba913e5154
commit c066077a4c
18 changed files with 34 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rwengine/src/ai/CharacterController.cpp
View File

@ -5,12 +5,12 @@
#include <utility> #include <utility>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(disable : 4305 5033) #pragma warning(disable : 4305)
#endif #endif
#include <BulletDynamics/Character/btKinematicCharacterController.h> #include <BulletDynamics/Character/btKinematicCharacterController.h>
#include <btBulletDynamicsCommon.h> #include <btBulletDynamicsCommon.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(default : 4305 5033) #pragma warning(default : 4305)
#endif #endif
#include <glm/gtc/constants.hpp> #include <glm/gtc/constants.hpp>

4
rwengine/src/dynamics/CollisionInstance.cpp
View File

@ -5,11 +5,11 @@
#include <limits> #include <limits>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(disable : 4305 5033) #pragma warning(disable : 4305)
#endif #endif
#include <btBulletDynamicsCommon.h> #include <btBulletDynamicsCommon.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(default : 4305 5033) #pragma warning(default : 4305)
#endif #endif
#include <glm/glm.hpp> #include <glm/glm.hpp>

4
rwengine/src/dynamics/RaycastCallbacks.hpp
View File

@ -2,11 +2,11 @@
#define _RWENGINE_RAYCASTCALLBACKS_HPP_ #define _RWENGINE_RAYCASTCALLBACKS_HPP_
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(disable : 4305 5033) #pragma warning(disable : 4305)
#endif #endif
#include <btBulletDynamicsCommon.h> #include <btBulletDynamicsCommon.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(default : 4305 5033) #pragma warning(default : 4305)
#endif #endif
/** /**

4
rwengine/src/engine/GameWorld.cpp
View File

@ -1,12 +1,12 @@
#include "engine/GameWorld.hpp" #include "engine/GameWorld.hpp"
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(disable : 4305 5033) #pragma warning(disable : 4305)
#endif #endif
#include <BulletCollision/CollisionDispatch/btGhostObject.h> #include <BulletCollision/CollisionDispatch/btGhostObject.h>
#include <btBulletDynamicsCommon.h> #include <btBulletDynamicsCommon.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(default : 4305 5033) #pragma warning(default : 4305)
#endif #endif
#include <glm/gtx/norm.hpp> #include <glm/gtx/norm.hpp>

4
rwengine/src/engine/GameWorld.hpp
View File

@ -10,11 +10,11 @@
#include <vector> #include <vector>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(disable : 4305 5033) #pragma warning(disable : 4305)
#endif #endif
#include <LinearMath/btScalar.h> #include <LinearMath/btScalar.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(default : 4305 5033) #pragma warning(default : 4305)
#endif #endif
#include <glm/glm.hpp> #include <glm/glm.hpp>

4
rwengine/src/engine/Garage.cpp
View File

@ -1,11 +1,11 @@
#include "Garage.hpp" #include "Garage.hpp"
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(disable : 4305 5033) #pragma warning(disable : 4305)
#endif #endif
#include <btBulletDynamicsCommon.h> #include <btBulletDynamicsCommon.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(default : 4305 5033) #pragma warning(default : 4305)
#endif #endif
#include <glm/gtx/quaternion.hpp> #include <glm/gtx/quaternion.hpp>

4
rwengine/src/objects/CharacterObject.cpp
View File

@ -6,13 +6,13 @@
#include <memory> #include <memory>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(disable : 4305 5033) #pragma warning(disable : 4305)
#endif #endif
#include <BulletCollision/CollisionDispatch/btGhostObject.h> #include <BulletCollision/CollisionDispatch/btGhostObject.h>
#include <BulletDynamics/Character/btKinematicCharacterController.h> #include <BulletDynamics/Character/btKinematicCharacterController.h>
#include <btBulletDynamicsCommon.h> #include <btBulletDynamicsCommon.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(default : 4305 5033) #pragma warning(default : 4305)
#endif #endif
#include <rw/debug.hpp> #include <rw/debug.hpp>

4
rwengine/src/objects/InstanceObject.cpp
View File

@ -4,12 +4,12 @@
#include <string> #include <string>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(disable : 4305 5033) #pragma warning(disable : 4305)
#endif #endif
#include <btBulletDynamicsCommon.h> #include <btBulletDynamicsCommon.h>
#include <glm/gtc/quaternion.hpp> #include <glm/gtc/quaternion.hpp>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(default : 4305 5033) #pragma warning(default : 4305)
#endif #endif
#include <rw/types.hpp> #include <rw/types.hpp>

4
rwengine/src/objects/PickupObject.cpp
View File

@ -3,12 +3,12 @@
#include <cmath> #include <cmath>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(disable : 4305 5033) #pragma warning(disable : 4305)
#endif #endif
#include <BulletCollision/CollisionDispatch/btGhostObject.h> #include <BulletCollision/CollisionDispatch/btGhostObject.h>
#include <btBulletDynamicsCommon.h> #include <btBulletDynamicsCommon.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(default : 4305 5033) #pragma warning(default : 4305)
#endif #endif
#include <glm/gtc/quaternion.hpp> #include <glm/gtc/quaternion.hpp>

4
rwengine/src/objects/ProjectileObject.cpp
View File

@ -1,12 +1,12 @@
#include "objects/ProjectileObject.hpp" #include "objects/ProjectileObject.hpp"
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(disable : 4305 5033) #pragma warning(disable : 4305)
#endif #endif
#include <BulletCollision/CollisionDispatch/btGhostObject.h> #include <BulletCollision/CollisionDispatch/btGhostObject.h>
#include <btBulletDynamicsCommon.h> #include <btBulletDynamicsCommon.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(default : 4305 5033) #pragma warning(default : 4305)
#endif #endif
#include <glm/gtc/quaternion.hpp> #include <glm/gtc/quaternion.hpp>

4
rwengine/src/objects/VehicleObject.cpp
View File

@ -6,12 +6,12 @@
#include <limits> #include <limits>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(disable : 4305 5033) #pragma warning(disable : 4305)
#endif #endif
#include <BulletDynamics/Vehicle/btRaycastVehicle.h> #include <BulletDynamics/Vehicle/btRaycastVehicle.h>
#include <btBulletDynamicsCommon.h> #include <btBulletDynamicsCommon.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(default : 4305 5033) #pragma warning(default : 4305)
#endif #endif
#include <glm/gtx/quaternion.hpp> #include <glm/gtx/quaternion.hpp>

4
rwengine/src/objects/VehicleObject.hpp
View File

@ -8,12 +8,12 @@
#include <unordered_map> #include <unordered_map>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(disable : 4305 5033) #pragma warning(disable : 4305)
#endif #endif
#include <btBulletDynamicsCommon.h> #include <btBulletDynamicsCommon.h>
#include <LinearMath/btScalar.h> #include <LinearMath/btScalar.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(default : 4305 5033) #pragma warning(default : 4305)
#endif #endif
#include <glm/glm.hpp> #include <glm/glm.hpp>

4
rwengine/src/render/DebugDraw.cpp
View File

@ -5,11 +5,11 @@
#include <glm/glm.hpp> #include <glm/glm.hpp>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(disable : 4305 5033) #pragma warning(disable : 4305)
#endif #endif
#include <LinearMath/btVector3.h> #include <LinearMath/btVector3.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(default : 4305 5033) #pragma warning(default : 4305)
#endif #endif
#include <data/Clump.hpp> #include <data/Clump.hpp>

4
rwengine/src/render/DebugDraw.hpp
View File

@ -5,12 +5,12 @@
#include <vector> #include <vector>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(disable : 4305 5033) #pragma warning(disable : 4305)
#endif #endif
#include <LinearMath/btIDebugDraw.h> #include <LinearMath/btIDebugDraw.h>
#include <LinearMath/btScalar.h> #include <LinearMath/btScalar.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(default : 4305 5033) #pragma warning(default : 4305)
#endif #endif
#include <data/Clump.hpp> #include <data/Clump.hpp>

6
rwengine/src/render/ObjectRenderer.cpp
View File

@ -2,13 +2,7 @@
#include <cstdint> #include <cstdint>
#ifdef _MSC_VER
#pragma warning(disable : 5033)
#endif
#include <BulletDynamics/Vehicle/btRaycastVehicle.h> #include <BulletDynamics/Vehicle/btRaycastVehicle.h>
#ifdef _MSC_VER
#pragma warning(default : 5033)
#endif
#include <glm/gtc/type_ptr.hpp> #include <glm/gtc/type_ptr.hpp>
#include <data/Clump.hpp> #include <data/Clump.hpp>

4
rwgame/RWGame.hpp
View File

@ -8,12 +8,12 @@
#include "StateManager.hpp" #include "StateManager.hpp"
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(disable : 4305 5033) #pragma warning(disable : 4305)
#endif #endif
// FIXME: should be in rwengine, deeply hidden // FIXME: should be in rwengine, deeply hidden
#include <BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h> #include <BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(default : 4305 5033) #pragma warning(default : 4305)
#endif #endif
#include <engine/GameData.hpp> #include <engine/GameData.hpp>

4
rwgame/states/IngameState.cpp
View File

@ -22,11 +22,11 @@
#include <glm/gtx/norm.hpp> #include <glm/gtx/norm.hpp>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(disable : 4305 5033) #pragma warning(disable : 4305)
#endif #endif
#include <BulletCollision/CollisionDispatch/btGhostObject.h> #include <BulletCollision/CollisionDispatch/btGhostObject.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(default : 4305 5033) #pragma warning(default : 4305)
#endif #endif

4
tests/test_Globals.hpp
View File

@ -2,11 +2,11 @@
#define _TESTGLOBALS_HPP_ #define _TESTGLOBALS_HPP_
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(disable : 4305 5033) #pragma warning(disable : 4305)
#endif #endif
#include <btBulletDynamicsCommon.h> #include <btBulletDynamicsCommon.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(default : 4305 5033) #pragma warning(default : 4305)
#endif #endif
#include <SDL.h> #include <SDL.h>