aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2012-07-27 14:52:29 +0300
committerPerttu Ahola <celeron55@gmail.com>2012-07-27 14:52:29 +0300
commit7ef0a13250dfd0e153d485e8b3a8084327a81f52 (patch)
tree89eb84baf24ff79f99b9f53dcb14fe3f7bbbfc5c /src
parent0de3fb786daf6d332b4022d18177d1ca0316532e (diff)
downloadminetest-7ef0a13250dfd0e153d485e8b3a8084327a81f52.tar.gz
minetest-7ef0a13250dfd0e153d485e8b3a8084327a81f52.tar.bz2
minetest-7ef0a13250dfd0e153d485e8b3a8084327a81f52.zip
Tweak rollback stuff
Diffstat (limited to 'src')
-rw-r--r--src/map.cpp4
-rw-r--r--src/rollback.cpp13
-rw-r--r--src/rollback.h3
-rw-r--r--src/rollback_interface.h3
4 files changed, 15 insertions, 8 deletions
diff --git a/src/map.cpp b/src/map.cpp
index f8f0d017f..8ddc4006e 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -1828,8 +1828,8 @@ void Map::transformLiquids(core::map<v3s16, MapBlock*> & modified_blocks)
// Find out whether there is a suspect for this action
std::string suspect;
if(m_gamedef->rollback()){
- // Max. 5 seconds ago
- suspect = m_gamedef->rollback()->getSuspect(p0, 5);
+ // Max. 5 seconds ago, shortcut at 98 points
+ suspect = m_gamedef->rollback()->getSuspect(p0, 5, 95);
}
if(!suspect.empty()){
diff --git a/src/rollback.cpp b/src/rollback.cpp
index 14b8839ea..9cbcb6c25 100644
--- a/src/rollback.cpp
+++ b/src/rollback.cpp
@@ -43,8 +43,8 @@ static float getSuspectNearness(bool is_guess, v3s16 suspect_p, int suspect_t,
return 0; // 0 = cannot be
// Start from 100
int f = 100;
- // Distance (1 node = +1 point)
- f += 1.0 * intToFloat(suspect_p, 1).getDistanceFrom(intToFloat(action_p, 1));
+ // Distance (1 node = -1 point)
+ f -= 1.0 * intToFloat(suspect_p, 1).getDistanceFrom(intToFloat(action_p, 1));
// Time (1 second = -1 point)
f -= 1.0 * (action_t - suspect_t);
// If is a guess, halve the points
@@ -76,7 +76,8 @@ public:
v3s16 p;
if(!action.getPosition(&p))
return;
- action.actor = getSuspect(p, 30); // 30s timeframe
+ // 60s default timeframe, 95 points shortcut
+ action.actor = getSuspect(p, 60, 95);
if(action.actor.empty())
return;
action.actor_is_guess = true;
@@ -102,7 +103,7 @@ public:
m_current_actor = actor;
m_current_actor_is_guess = is_guess;
}
- std::string getSuspect(v3s16 p, int max_time)
+ std::string getSuspect(v3s16 p, int max_time, float nearness_shortcut)
{
if(m_current_actor != "")
return m_current_actor;
@@ -116,6 +117,8 @@ public:
{
if(i->unix_time < first_time)
break;
+ if(i->actor == "")
+ continue;
// Find position of suspect or continue
v3s16 suspect_p;
if(!i->getPosition(&suspect_p))
@@ -125,6 +128,8 @@ public:
if(f > likely_suspect_nearness){
likely_suspect_nearness = f;
likely_suspect = *i;
+ if(likely_suspect_nearness >= nearness_shortcut)
+ break;
}
}
// No likely suspect was found
diff --git a/src/rollback.h b/src/rollback.h
index 59db122e3..0ae80c51d 100644
--- a/src/rollback.h
+++ b/src/rollback.h
@@ -35,7 +35,8 @@ public:
virtual std::string getActor() = 0;
virtual bool isActorGuess() = 0;
virtual void setActor(const std::string &actor, bool is_guess) = 0;
- virtual std::string getSuspect(v3s16 p, int max_time) = 0;
+ // nearness_shortcut: 100 = same second, same node; 90 = 10s or 10 nodes
+ virtual std::string getSuspect(v3s16 p, int max_time, float nearness_shortcut) = 0;
virtual ~IRollbackManager(){}
virtual void flush() = 0;
diff --git a/src/rollback_interface.h b/src/rollback_interface.h
index ac8368f4e..119379ae7 100644
--- a/src/rollback_interface.h
+++ b/src/rollback_interface.h
@@ -124,7 +124,8 @@ public:
virtual std::string getActor() = 0;
virtual bool isActorGuess() = 0;
virtual void setActor(const std::string &actor, bool is_guess) = 0;
- virtual std::string getSuspect(v3s16 p, int max_time) = 0;
+ // nearness_shortcut: 100 = same second, same node; 90 = 10s or 10 nodes
+ virtual std::string getSuspect(v3s16 p, int max_time, float nearness_shortcut=98) = 0;
};
class RollbackScopeActor