Fix non matching declarations

arx · Jul 15, 2016 · 9e8b3a3 · 9e8b3a3
1 parent a95ab12
commit 9e8b3a3
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 7 deletions.
diff --git a/src/core/Core.cpp b/src/core/Core.cpp
@@ -165,7 +165,7 @@ class TextManager;
 Image savegame_thumbnail;
 
 extern TextManager	*pTextManage;
-extern unsigned long FORCE_TIME_RESTORE;
+extern ArxInstant FORCE_TIME_RESTORE;
 
 extern long		DONT_WANT_PLAYER_INZONE;
 extern size_t		TOTPDL;
@@ -349,8 +349,6 @@ static void PlayerLaunchArrow_Test(float aimratio, float poisonous, const Vec3f
 	ARX_THROWN_OBJECT_Throw(PlayerEntityHandle, position, vect, quat, velocity, damages, poisonous);
 }
 
-extern unsigned long LAST_JUMP_ENDTIME;
-
 //*************************************************************************************
 // Switches from/to Game Mode/Editor Mode
 //*************************************************************************************

diff --git a/src/game/Player.cpp b/src/game/Player.cpp
@@ -134,8 +134,6 @@ extern bool		GLOBAL_MAGIC_MODE;
 
 extern ParticleManager * pParticleManager;
 
-extern ArxInstant LAST_JUMP_ENDTIME;
-
 static const float WORLD_GRAVITY = 0.1f;
 static const float JUMP_GRAVITY = 0.02f;
 static const float STEP_DISTANCE = 120.f;

diff --git a/src/game/Player.h b/src/game/Player.h
@@ -423,6 +423,7 @@ extern std::vector<KEYRING_SLOT> Keyring;
 extern bool BLOCK_PLAYER_CONTROLS;
 extern bool USE_PLAYERCOLLISIONS;
 extern bool WILLRETURNTOCOMBATMODE;
+extern ArxInstant LAST_JUMP_ENDTIME;
 
 void ARX_PLAYER_MakeSpHero();
 void ARX_PLAYER_LoadHeroAnimsAndMesh();

diff --git a/src/gui/Cursor.cpp b/src/gui/Cursor.cpp
@@ -313,7 +313,7 @@ bool Manage3DCursor(Entity * io, bool simulate) {
 }
 
 extern long LOOKING_FOR_SPELL_TARGET;
-extern unsigned long LOOKING_FOR_SPELL_TARGET_TIME;
+extern ArxInstant LOOKING_FOR_SPELL_TARGET_TIME;
 extern bool PLAYER_INTERFACE_HIDE_COUNT;
 extern long lCursorRedistValue;
 

diff --git a/src/scene/LoadLevel.cpp b/src/scene/LoadLevel.cpp
@@ -947,7 +947,6 @@ bool DanaeLoadLevel(const res::path & file, bool loadEntities) {
 
 long FAST_RELEASE = 0;
 extern Entity * FlyingOverIO;
-extern unsigned long LAST_JUMP_ENDTIME;
 
 extern long JUST_RELOADED;