summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsmatz <smatz@openttd.org>2009-12-26 13:49:14 +0000
committersmatz <smatz@openttd.org>2009-12-26 13:49:14 +0000
commitce08aebde703d81f424c13a6176ffd9e83f4309f (patch)
treea196b69ce043ed26e7c6ea6fe0d6988391358932
parent9574371e53aec0d25cbb50d52b1bd0cb8ff8c379 (diff)
downloadopenttd-ce08aebde703d81f424c13a6176ffd9e83f4309f.tar.xz
(svn r18640) -Fix (r18633): don't assert when accessing first invalid item, it's used quite often in the code
-Revert (r18637): it's not needed any more
-rw-r--r--src/core/smallvec_type.hpp6
-rw-r--r--src/network/network_content_gui.cpp3
2 files changed, 4 insertions, 5 deletions
diff --git a/src/core/smallvec_type.hpp b/src/core/smallvec_type.hpp
index 38fa6fe6e..5e4e17365 100644
--- a/src/core/smallvec_type.hpp
+++ b/src/core/smallvec_type.hpp
@@ -225,7 +225,8 @@ public:
*/
FORCEINLINE const T *Get(uint index) const
{
- assert(index < this->items);
+ /* Allow access to the 'first invalid' item */
+ assert(index <= this->items);
return &this->data[index];
}
@@ -237,7 +238,8 @@ public:
*/
FORCEINLINE T *Get(uint index)
{
- assert(index < this->items);
+ /* Allow access to the 'first invalid' item */
+ assert(index <= this->items);
return &this->data[index];
}
diff --git a/src/network/network_content_gui.cpp b/src/network/network_content_gui.cpp
index b179e2091..7d3c223db 100644
--- a/src/network/network_content_gui.cpp
+++ b/src/network/network_content_gui.cpp
@@ -435,9 +435,6 @@ public:
void DrawMatrix(const Rect &r) const
{
- /* Is there something to do? */
- if (this->content.Length() == 0) return;
-
const NWidgetBase *nwi_checkbox = this->GetWidget<NWidgetBase>(NCLWW_CHECKBOX);
const NWidgetBase *nwi_name = this->GetWidget<NWidgetBase>(NCLWW_NAME);
const NWidgetBase *nwi_type = this->GetWidget<NWidgetBase>(NCLWW_TYPE);