Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-17 21:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r26743) -Codechange: Simplify ScriptList iterators.

Browse Source
This commit is contained in:
frosch 2014-08-16 21:11:26 +00:00
parent 98c4648d20
commit 63047e51b1
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,13 +175,13 @@ public:
this->has_no_more_items = false; this->has_no_more_items = false;
/* Go to the end of the bucket-list */ /* Go to the end of the bucket-list */
this->bucket_iter = this->list->buckets.begin(); this->bucket_iter = this->list->buckets.end();
for (size_t i = this->list->buckets.size(); i > 1; i--) this->bucket_iter++; --this->bucket_iter;
this->bucket_list = &(*this->bucket_iter).second; this->bucket_list = &(*this->bucket_iter).second;
/* Go to the end of the items in the bucket */ /* Go to the end of the items in the bucket */
this->bucket_list_iter = this->bucket_list->begin(); this->bucket_list_iter = this->bucket_list->end();
for (size_t i = this->bucket_list->size(); i > 1; i--) this->bucket_list_iter++; --this->bucket_list_iter;
this->item_next = *this->bucket_list_iter; this->item_next = *this->bucket_list_iter;
int32 item_current = this->item_next; int32 item_current = this->item_next;
@ -214,8 +214,8 @@ public:
this->bucket_iter--; this->bucket_iter--;
this->bucket_list = &(*this->bucket_iter).second; this->bucket_list = &(*this->bucket_iter).second;
/* Go to the end of the items in the bucket */ /* Go to the end of the items in the bucket */
this->bucket_list_iter = this->bucket_list->begin(); this->bucket_list_iter = this->bucket_list->end();
for (size_t i = this->bucket_list->size(); i > 1; i--) this->bucket_list_iter++; --this->bucket_list_iter;
} else { } else {
this->bucket_list_iter--; this->bucket_list_iter--;
} }
@ -339,8 +339,8 @@ public:
if (this->list->items.empty()) return 0; if (this->list->items.empty()) return 0;
this->has_no_more_items = false; this->has_no_more_items = false;
this->item_iter = this->list->items.begin(); this->item_iter = this->list->items.end();
for (size_t i = this->list->items.size(); i > 1; i--) this->item_iter++; --this->item_iter;
this->item_next = (*this->item_iter).first; this->item_next = (*this->item_iter).first;
int32 item_current = this->item_next; int32 item_current = this->item_next;