Re: Chill's patchpack v14_7
Posted: 21 Aug 2013 22:30
Sad to hear
The place to talk about Transport Tycoon
https://www.tt-forums.net/
And suggestions too ofcourse.ChillCore wrote: @ All,
yes I still apreciate savegames and bugreports very much,
However, at the moment I can not promise that your issues will be dealt with in a timely manner.
I am very sorry about that, I'll do my best, but that is the way it is atm.
That is nice thing to hear. Looking forward to see moreheightlevels patch in trunkChillCore wrote: For now I want to concentrate on the moreheightlevels patch alone and on that other patch that is in a rather unfinished state still.
Code: Select all
--- a/src/core/multimap.hpp Fri Jan 11 18:00:00 2013 +0100
+++ b/src/core/multimap.hpp Thu Sep 26 00:22:12 2013 +0100
@@ -225,7 +225,7 @@
std::pair<iterator, iterator> equal_range(const KEY &key)
{
- MapIterator begin(lower_bound(key));
+ MapIterator begin(this->lower_bound(key));
if (begin != Map::end() && begin->first == key) {
MapIterator end = begin;
return std::make_pair(begin, ++end);
@@ -236,7 +236,7 @@
std::pair<const_iterator, const_iterator> equal_range(const KEY &key) const
{
- ConstMapIterator begin(lower_bound(key));
+ ConstMapIterator begin(this->lower_bound(key));
if (begin != Map::end() && begin->first == key) {
ConstMapIterator end = begin;
return std::make_pair(begin, ++end);
Code: Select all
--- a/src/currency.cpp Fri Jan 11 18:00:00 2013 +0100
+++ b/src/currency.cpp Thu Sep 26 00:22:12 2013 +0100
@@ -28,30 +28,30 @@
{ 2, "", CF_NOEURO, "$", "", 0, STR_GAME_OPTIONS_CURRENCY_USD }, ///< us dollars
{ 2, "", CF_ISEURO, "\xE2\x82\xAC", "", 0, STR_GAME_OPTIONS_CURRENCY_EUR }, ///< Euro
{ 220, "", CF_NOEURO, "\xC2\xA5", "", 0, STR_GAME_OPTIONS_CURRENCY_YEN }, ///< yen
- { 20, "", 2002, "", NBSP"S.", 1, STR_GAME_OPTIONS_CURRENCY_ATS }, ///< austrian schilling
- { 59, "", 2002, "BEF"NBSP, "", 0, STR_GAME_OPTIONS_CURRENCY_BEF }, ///< belgian franc
- { 2, "", CF_NOEURO, "CHF"NBSP, "", 0, STR_GAME_OPTIONS_CURRENCY_CHF }, ///< swiss franc
- { 41, "", CF_NOEURO, "", NBSP"K\xC4\x8D", 1, STR_GAME_OPTIONS_CURRENCY_CZK }, ///< czech koruna
- { 3, "", 2002, "DM"NBSP, "", 0, STR_GAME_OPTIONS_CURRENCY_DEM }, ///< deutsche mark
- { 11, "", CF_NOEURO, "", NBSP"kr", 1, STR_GAME_OPTIONS_CURRENCY_DKK }, ///< danish krone
- { 245, "", 2002, "Pts"NBSP, "", 0, STR_GAME_OPTIONS_CURRENCY_ESP }, ///< spanish pesetas
- { 9, "", 2002, "", NBSP"mk", 1, STR_GAME_OPTIONS_CURRENCY_FIM }, ///< finnish markka
- { 10, "", 2002, "FF"NBSP, "", 0, STR_GAME_OPTIONS_CURRENCY_FRF }, ///< french francs
+ { 20, "", 2002, "", NBSP "S.", 1, STR_GAME_OPTIONS_CURRENCY_ATS }, ///< austrian schilling
+ { 59, "", 2002, "BEF" NBSP, "", 0, STR_GAME_OPTIONS_CURRENCY_BEF }, ///< belgian franc
+ { 2, "", CF_NOEURO, "CHF" NBSP, "", 0, STR_GAME_OPTIONS_CURRENCY_CHF }, ///< swiss franc
+ { 41, "", CF_NOEURO, "", NBSP "K\xC4\x8D", 1, STR_GAME_OPTIONS_CURRENCY_CZK }, ///< czech koruna
+ { 3, "", 2002, "DM" NBSP, "", 0, STR_GAME_OPTIONS_CURRENCY_DEM }, ///< deutsche mark
+ { 11, "", CF_NOEURO, "", NBSP "kr", 1, STR_GAME_OPTIONS_CURRENCY_DKK }, ///< danish krone
+ { 245, "", 2002, "Pts" NBSP, "", 0, STR_GAME_OPTIONS_CURRENCY_ESP }, ///< spanish pesetas
+ { 9, "", 2002, "", NBSP "mk", 1, STR_GAME_OPTIONS_CURRENCY_FIM }, ///< finnish markka
+ { 10, "", 2002, "FF" NBSP, "", 0, STR_GAME_OPTIONS_CURRENCY_FRF }, ///< french francs
{ 500, "", 2002, "", "Dr.", 1, STR_GAME_OPTIONS_CURRENCY_GRD }, ///< greek drachma
- { 378, "", CF_NOEURO, "", NBSP"Ft", 1, STR_GAME_OPTIONS_CURRENCY_HUF }, ///< hungarian forint
- { 130, "", CF_NOEURO, "", NBSP"Kr", 1, STR_GAME_OPTIONS_CURRENCY_ISK }, ///< icelandic krona
- { 2850, "", 2002, "", NBSP"L.", 1, STR_GAME_OPTIONS_CURRENCY_ITL }, ///< italian lira
- { 3, "", 2002, "NLG"NBSP, "", 0, STR_GAME_OPTIONS_CURRENCY_NLG }, ///< dutch gulden
- { 12, "", CF_NOEURO, "", NBSP"Kr", 1, STR_GAME_OPTIONS_CURRENCY_NOK }, ///< norwegian krone
- { 6, "", CF_NOEURO, "", NBSP"z\xC5\x82", 1, STR_GAME_OPTIONS_CURRENCY_PLN }, ///< polish zloty
- { 5, "", CF_NOEURO, "", NBSP"Lei", 1, STR_GAME_OPTIONS_CURRENCY_RON }, ///< romanian Lei
- { 50, "", CF_NOEURO, "", NBSP"p", 1, STR_GAME_OPTIONS_CURRENCY_RUR }, ///< russian rouble
- { 352, "", 2007, "", NBSP"SIT", 1, STR_GAME_OPTIONS_CURRENCY_SIT }, ///< slovenian tolar
- { 13, "", CF_NOEURO, "", NBSP"Kr", 1, STR_GAME_OPTIONS_CURRENCY_SEK }, ///< swedish krona
- { 3, "", CF_NOEURO, "", NBSP"TL", 1, STR_GAME_OPTIONS_CURRENCY_TRY }, ///< turkish lira
- { 52, "", 2009, "", NBSP"Sk", 1, STR_GAME_OPTIONS_CURRENCY_SKK }, ///< slovak koruna
- { 4, "", CF_NOEURO, "R$"NBSP, "", 0, STR_GAME_OPTIONS_CURRENCY_BRL }, ///< brazil real
- { 20, "", 2011, "", NBSP"EEK", 1, STR_GAME_OPTIONS_CURRENCY_EEK }, ///< estonian krooni
+ { 378, "", CF_NOEURO, "", NBSP "Ft", 1, STR_GAME_OPTIONS_CURRENCY_HUF }, ///< hungarian forint
+ { 130, "", CF_NOEURO, "", NBSP "Kr", 1, STR_GAME_OPTIONS_CURRENCY_ISK }, ///< icelandic krona
+ { 2850, "", 2002, "", NBSP "L.", 1, STR_GAME_OPTIONS_CURRENCY_ITL }, ///< italian lira
+ { 3, "", 2002, "NLG" NBSP, "", 0, STR_GAME_OPTIONS_CURRENCY_NLG }, ///< dutch gulden
+ { 12, "", CF_NOEURO, "", NBSP "Kr", 1, STR_GAME_OPTIONS_CURRENCY_NOK }, ///< norwegian krone
+ { 6, "", CF_NOEURO, "", NBSP "z\xC5\x82", 1, STR_GAME_OPTIONS_CURRENCY_PLN }, ///< polish zloty
+ { 5, "", CF_NOEURO, "", NBSP "Lei", 1, STR_GAME_OPTIONS_CURRENCY_RON }, ///< romanian Lei
+ { 50, "", CF_NOEURO, "", NBSP "p", 1, STR_GAME_OPTIONS_CURRENCY_RUR }, ///< russian rouble
+ { 352, "", 2007, "", NBSP "SIT", 1, STR_GAME_OPTIONS_CURRENCY_SIT }, ///< slovenian tolar
+ { 13, "", CF_NOEURO, "", NBSP "Kr", 1, STR_GAME_OPTIONS_CURRENCY_SEK }, ///< swedish krona
+ { 3, "", CF_NOEURO, "", NBSP "TL", 1, STR_GAME_OPTIONS_CURRENCY_TRY }, ///< turkish lira
+ { 52, "", 2009, "", NBSP "Sk", 1, STR_GAME_OPTIONS_CURRENCY_SKK }, ///< slovak koruna
+ { 4, "", CF_NOEURO, "R$" NBSP, "", 0, STR_GAME_OPTIONS_CURRENCY_BRL }, ///< brazil real
+ { 20, "", 2011, "", NBSP "EEK", 1, STR_GAME_OPTIONS_CURRENCY_EEK }, ///< estonian krooni
{ 1, "", CF_NOEURO, "", "", 2, STR_GAME_OPTIONS_CURRENCY_CUSTOM }, ///< custom currency
};
Code: Select all
--- a/src/fileio.cpp Fri Jan 11 18:00:00 2013 +0100
+++ b/src/fileio.cpp Thu Sep 26 00:22:12 2013 +0100
@@ -22,9 +22,9 @@
#include <Path.h>
#include <storage/FindDirectory.h>
#else
-#if defined(OPENBSD) || defined(DOS)
+//#if defined(OPENBSD) || defined(DOS)
#include <unistd.h>
-#endif
+//#endif
#include <pwd.h>
#endif
#include <sys/stat.h>
At the moment the repo and the patch/binary in the first post are still exactly the same.JGR wrote: For the sake of documentation I'll list them here (for all I know they may or may not have since fixed somewhere else).
Happy to hear that.JGR wrote: That said, I'd be happy to commit those if need be, in case anyone else ends up trying to compile it on Linux/gcc 4.7.
Not strictly no but it would be useful if you decide to continue committing, not that I expect you to do so.I don't think that you strictly need the compile farm in this instance. The output (baked in revision numbers aside perhaps) after the above changes will be identical to existing builds.
I'm not planning to continue committing. I have various other personal coding projects of my own in mid-flow which I've been somewhat neglecting, and don't intend take on any more at the moment.ChillCore wrote:Not strictly no but it would be useful if you decide to continue committing, not that I expect you to do so.
Besides windows binaries it also provides OSX binaries, patches and ready to compile sources so more people would be inclined to test, resulting in more feedback then you would otherwise get.
Maybe nice to know for a project of your own later.
Binary vs ascii downloads is only an issue for FTP and a few other legacy protocols, it's very likely not the issue here.kamnet wrote:Make sure you've transferred the file via binary, not ASCII. Make sure that your version of 7-Zip is up-to-date.