gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-09 15:41:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r27166) -Codechange: Optimise ScriptList by making use of iterators instead of looking up map-items multiple times per API call.

Browse Source
This commit is contained in:
frosch 2015-02-22 23:04:02 +00:00
parent df0ad888e0
commit fece468d96
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/script/api/script_list.cpp
View File

@ -440,24 +440,25 @@ void ScriptList::AddItem(int64 item, int64 value)
if (this->HasItem(item)) return; if (this->HasItem(item)) return;
this->items[item] = 0; this->items[item] = value;
this->buckets[0].insert(item); this->buckets[value].insert(item);
this->SetValue(item, value);
} }
void ScriptList::RemoveItem(int64 item) void ScriptList::RemoveItem(int64 item)
{ {
this->modifications++; this->modifications++;
if (!this->HasItem(item)) return; ScriptListMap::iterator item_iter = this->items.find(item);
if (item_iter == this->items.end()) return;
int64 value = this->GetValue(item); int64 value = item_iter->second;
this->sorter->Remove(item); this->sorter->Remove(item);
this->buckets[value].erase(item); ScriptListBucket::iterator bucket_iter = this->buckets.find(value);
if (this->buckets[value].empty()) this->buckets.erase(value); assert(bucket_iter != this->buckets.end());
this->items.erase(item); bucket_iter->second.erase(item);
if (bucket_iter->second.empty()) this->buckets.erase(bucket_iter);
this->items.erase(item_iter);
} }
int64 ScriptList::Begin() int64 ScriptList::Begin()
@ -496,24 +497,26 @@ int32 ScriptList::Count()
int64 ScriptList::GetValue(int64 item) int64 ScriptList::GetValue(int64 item)
{ {
if (!this->HasItem(item)) return 0; ScriptListMap::const_iterator item_iter = this->items.find(item);
return item_iter == this->items.end() ? 0 : item_iter->second;
return this->items[item];
} }
bool ScriptList::SetValue(int64 item, int64 value) bool ScriptList::SetValue(int64 item, int64 value)
{ {
this->modifications++; this->modifications++;
if (!this->HasItem(item)) return false; ScriptListMap::iterator item_iter = this->items.find(item);
if (item_iter == this->items.end()) return false;
int64 value_old = this->GetValue(item); int64 value_old = item_iter->second;
if (value_old == value) return true; if (value_old == value) return true;
this->sorter->Remove(item); this->sorter->Remove(item);
this->buckets[value_old].erase(item); ScriptListBucket::iterator bucket_iter = this->buckets.find(value_old);
if (this->buckets[value_old].empty()) this->buckets.erase(value_old); assert(bucket_iter != this->buckets.end());
this->items[item] = value; bucket_iter->second.erase(item);
if (bucket_iter->second.empty()) this->buckets.erase(bucket_iter);
item_iter->second = value;
this->buckets[value].insert(item); this->buckets[value].insert(item);
return true; return true;
@ -772,9 +775,10 @@ SQInteger ScriptList::_get(HSQUIRRELVM vm)
SQInteger idx; SQInteger idx;
sq_getinteger(vm, 2, &idx); sq_getinteger(vm, 2, &idx);
if (!this->HasItem(idx)) return SQ_ERROR; ScriptListMap::const_iterator item_iter = this->items.find(idx);
if (item_iter == this->items.end()) return SQ_ERROR;
sq_pushinteger(vm, this->GetValue(idx)); sq_pushinteger(vm, item_iter->second);
return 1; return 1;
} }