From 06f328207fa0a3e606992d3569b061b335eb0f48 Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Wed, 4 Mar 2015 16:58:04 +0100
Subject: ABMHandler and player_collisions use sequential read/write. Switch
 from std::list to std::vector * Also remove dead code Map::unloadUnusedData
 which is dead since a long time

---
 src/localplayer.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/localplayer.cpp')

diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 69d4ec7ef..cb183947a 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -67,7 +67,7 @@ LocalPlayer::~LocalPlayer()
 }
 
 void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d,
-		std::list<CollisionInfo> *collision_info)
+		std::vector<CollisionInfo> *collision_info)
 {
 	Map *map = &env->getMap();
 	INodeDefManager *nodemgr = m_gamedef->ndef();
@@ -323,9 +323,8 @@ void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d,
 	*/
 	bool bouncy_jump = false;
 	// Dont report if flying
-	if(collision_info && !(g_settings->getBool("free_move") && fly_allowed))
-	{
-		for(size_t i=0; i<result.collisions.size(); i++){
+	if(collision_info && !(g_settings->getBool("free_move") && fly_allowed)) {
+		for(size_t i=0; i<result.collisions.size(); i++) {
 			const CollisionInfo &info = result.collisions[i];
 			collision_info->push_back(info);
 			if(info.new_speed.Y - info.old_speed.Y > 0.1*BS &&
-- 
cgit v1.2.3