Merge branch 'enhanced_viewport_overlay' into jgrpp

2018-03-11 22:21:39 +00:00
parent cb2077edd5 864d94d2c5
commit 385a2552e9
107 changed files with 395 additions and 333 deletions
--- a/src/newgrf_town.cpp
+++ b/src/newgrf_town.cpp
@@ -16,18 +16,6 @@

 #include "safeguards.h"

-/**
- * Resolver of a town scope.
- * @param ro Surrounding resolver.
- * @param t %Town of the scope.
- * @param readonly Scope may change persistent storage of the town.
- */
-TownScopeResolver::TownScopeResolver(ResolverObject &ro, Town *t, bool readonly) : ScopeResolver(ro)
-{
-	this->t = t;
-	this->readonly = readonly;
-}
-
 /* virtual */ uint32 TownScopeResolver::GetVariable(byte variable, uint32 parameter, bool *available) const
 {
 	switch (variable) {