Transport Tycoon Forums

The place to talk about Transport Tycoon
It is currently Fri May 24, 2019 12:09 am

All times are UTC




Post new topic  Reply to topic  [ 286 posts ]  Go to page Previous 111 12 13 14 15
Author Message
PostPosted: Fri Dec 25, 2015 6:29 pm 
Offline
Engineer
Engineer

Joined: Thu May 16, 2013 8:22 am
Posts: 107
Location: Ukraine
Ok. I noticed no difference in file lists, bit difference in patch parameters: you used only -p1, I used -F0 and -p1 - install patch exactly in that place where it taken. This cause rejects. But without it some hunks applied with "fuzz = 2":
Code:
...
patching file src/lang/english.txt
Hunk #1 succeeded at 2928 with fuzz 2 (offset -3 lines).
patching file src/script/api/game/game_window.hpp.sq
Hunk #1 succeeded at 559 with fuzz 2 (offset -2 lines).
patching file src/script/api/script_window.hpp
Hunk #1 succeeded at 1428 with fuzz 2 (offset -2 lines).
...


Anyway, I can't make this because of:
Code:
[SRC] Compiling genworld.cpp
/home/vanya/Documents/Программы/OpenTTD/patches/r27474-rivers/src/genworld.cpp:383:40: error: ‘string’ is not a member of ‘std’
/home/vanya/Documents/Программы/OpenTTD/patches/r27474-rivers/src/genworld.cpp:383:53: error: ‘s’ was not declared in this scope
/home/vanya/Documents/Программы/OpenTTD/patches/r27474-rivers/src/genworld.cpp:383:56: error: expected primary-expression before ‘char’
/home/vanya/Documents/Программы/OpenTTD/patches/r27474-rivers/src/genworld.cpp:383:75: error: expected primary-expression before ‘char’
/home/vanya/Documents/Программы/OpenTTD/patches/r27474-rivers/src/genworld.cpp:383:95: error: expected primary-expression before ‘int’
/home/vanya/Documents/Программы/OpenTTD/patches/r27474-rivers/src/genworld.cpp:383:107: error: expression list treated as compound expression in initializer [-fpermissive]
/home/vanya/Documents/Программы/OpenTTD/patches/r27474-rivers/src/genworld.cpp:384:1: error: expected ‘,’ or ‘;’ before ‘{’ token
/home/vanya/Documents/Программы/OpenTTD/patches/r27474-rivers/src/genworld.cpp:383:15: warning: ‘FindMatchingCloseBracket’ defined but not used [-Wunused-variable]

Ok, in include section in genworld.cpp adding
Code:
#include <string>

But:
Code:
[SRC] Compiling genworld.cpp
In file included from /usr/lib64/gcc/x86_64-alt-linux/4.7.2/../../../../include/c++/4.7.2/string:54:0,
                 from /home/vanya/Documents/Программы/OpenTTD/patches/r27474-rivers/src/genworld.cpp:40:
/usr/lib64/gcc/x86_64-alt-linux/4.7.2/../../../../include/c++/4.7.2/bits/basic_string.h: In function ‘std::string std::to_string(int)’:
/usr/lib64/gcc/x86_64-alt-linux/4.7.2/../../../../include/c++/4.7.2/bits/basic_string.h:2864:45: error: ‘SAFEGUARD_DO_NOT_USE_THIS_METHOD’ is not a member of ‘std’
/usr/lib64/gcc/x86_64-alt-linux/4.7.2/../../../../include/c++/4.7.2/bits/basic_string.h: In function ‘std::string std::to_string(unsigned int)’:
/usr/lib64/gcc/x86_64-alt-linux/4.7.2/../../../../include/c++/4.7.2/bits/basic_string.h:2869:45: error: ‘SAFEGUARD_DO_NOT_USE_THIS_METHOD’ is not a member of ‘std’
/usr/lib64/gcc/x86_64-alt-linux/4.7.2/../../../../include/c++/4.7.2/bits/basic_string.h: In function ‘std::string std::to_string(long int)’:
/usr/lib64/gcc/x86_64-alt-linux/4.7.2/../../../../include/c++/4.7.2/bits/basic_string.h:2875:45: error: ‘SAFEGUARD_DO_NOT_USE_THIS_METHOD’ is not a member of ‘std’
/usr/lib64/gcc/x86_64-alt-linux/4.7.2/../../../../include/c++/4.7.2/bits/basic_string.h: In function ‘std::string std::to_string(long unsigned int)’:
/usr/lib64/gcc/x86_64-alt-linux/4.7.2/../../../../include/c++/4.7.2/bits/basic_string.h:2880:45: error: ‘SAFEGUARD_DO_NOT_USE_THIS_METHOD’ is not a member of ‘std’
/usr/lib64/gcc/x86_64-alt-linux/4.7.2/../../../../include/c++/4.7.2/bits/basic_string.h: In function ‘std::string std::to_string(long long int)’:
/usr/lib64/gcc/x86_64-alt-linux/4.7.2/../../../../include/c++/4.7.2/bits/basic_string.h:2886:45: error: ‘SAFEGUARD_DO_NOT_USE_THIS_METHOD’ is not a member of ‘std’
/usr/lib64/gcc/x86_64-alt-linux/4.7.2/../../../../include/c++/4.7.2/bits/basic_string.h: In function ‘std::string std::to_string(long long unsigned int)’:
/usr/lib64/gcc/x86_64-alt-linux/4.7.2/../../../../include/c++/4.7.2/bits/basic_string.h:2892:45: error: ‘SAFEGUARD_DO_NOT_USE_THIS_METHOD’ is not a member of ‘std’
/usr/lib64/gcc/x86_64-alt-linux/4.7.2/../../../../include/c++/4.7.2/bits/basic_string.h: In function ‘std::string std::to_string(float)’:
/usr/lib64/gcc/x86_64-alt-linux/4.7.2/../../../../include/c++/4.7.2/bits/basic_string.h:2901:45: error: ‘SAFEGUARD_DO_NOT_USE_THIS_METHOD’ is not a member of ‘std’
/usr/lib64/gcc/x86_64-alt-linux/4.7.2/../../../../include/c++/4.7.2/bits/basic_string.h: In function ‘std::string std::to_string(double)’:
/usr/lib64/gcc/x86_64-alt-linux/4.7.2/../../../../include/c++/4.7.2/bits/basic_string.h:2910:45: error: ‘SAFEGUARD_DO_NOT_USE_THIS_METHOD’ is not a member of ‘std’
/usr/lib64/gcc/x86_64-alt-linux/4.7.2/../../../../include/c++/4.7.2/bits/basic_string.h: In function ‘std::string std::to_string(long double)’:
/usr/lib64/gcc/x86_64-alt-linux/4.7.2/../../../../include/c++/4.7.2/bits/basic_string.h:2919:45: error: ‘SAFEGUARD_DO_NOT_USE_THIS_METHOD’ is not a member of ‘std’

What I'm doing wrong :?:

_________________
Image
Image
Image.


Top
   
PostPosted: Fri Dec 25, 2015 6:48 pm 
Offline
Director
Director
User avatar

Joined: Sat Apr 07, 2007 6:08 pm
Posts: 539
pi1985 wrote:
Ok, in include section in genworld.cpp adding
Code:
#include <string>

Where did you add this? Try placing it before any other include, and certainly before
Code:
#include "safeguards.h"

_________________
My patches: Close airports | Upgrade airports | Autoconvert depots | New map features


Top
   
PostPosted: Fri Dec 25, 2015 11:24 pm 
Offline
Engineer
Engineer

Joined: Thu May 16, 2013 8:22 am
Posts: 107
Location: Ukraine
This is it :!: Thanks. Now it works fine!
Thanks to author for this great patch!

_________________
Image
Image
Image.


Top
   
PostPosted: Fri Jan 08, 2016 3:53 am 
Offline
Engineer
Engineer

Joined: Thu May 16, 2013 8:22 am
Posts: 107
Location: Ukraine
I have been added this patch to my patchpack and I had some issues when compiling in minwg:
Code:
[SRC] Compiling genworld_gui.cpp
In file included from C:/MinGW/msys/1.0/home/vanya/2.3/src/genworld_gui.cpp:34:0:
C:/MinGW/msys/1.0/home/vanya/2.3/src/rivers_rainfall.h:248:32: sorry, unimplemented: non-static data member initializers
C:/MinGW/msys/1.0/home/vanya/2.3/src/rivers_rainfall.h:248:32: error: ISO C++ forbids in-class initialization of non-const static member 'number_of_tiles_so_far'
C:/MinGW/msys/1.0/home/vanya/2.3/src/rivers_rainfall.h:482:32: sorry, unimplemented: non-static data member initializers
C:/MinGW/msys/1.0/home/vanya/2.3/src/rivers_rainfall.h:482:32: error: ISO C++ forbids in-class initialization of non-const static member 'number_of_tiles_so_far'
C:/MinGW/msys/1.0/home/vanya/2.3/src/rivers_rainfall.h:485:42: sorry, unimplemented: non-static data member initializers
C:/MinGW/msys/1.0/home/vanya/2.3/src/rivers_rainfall.h:485:42: error: ISO C++ forbids in-class initialization of non-const static member 'number_of_generated_lake_centers'
C:/MinGW/msys/1.0/home/vanya/2.3/src/rivers_rainfall.h:886:25: sorry, unimplemented: non-static data member initializers
C:/MinGW/msys/1.0/home/vanya/2.3/src/rivers_rainfall.h:886:25: error: ISO C++ forbids in-class initialization of non-const static member 'create_lake_runs'
make[1]: *** [genworld_gui.o] Error 1
make[1]: Leaving directory `/usr/home/vanya/2.3/objs/release'
make: *** [all] Error 1

and MS VS2010:
Code:
c:\users\123\desktop\ottd_dev\2.3\src\rivers_rainfall.h(32): fatal error C1083: Cannot open include file: 'sys/time.h': No such file or directory

I made some changes to make it compile correctly.


Attachments:
windows.diff [3.93 KiB]
Downloaded 66 times

_________________
Image
Image
Image.
Top
   
PostPosted: Sun Apr 23, 2017 6:37 pm 
Offline
Director
Director

Joined: Tue Jul 17, 2007 5:56 pm
Posts: 608
A very small bugfix release - basically, I needed to fix one small reject to make the patch queue apply against current trunk.


Attachments:
rivers_v61.zip [269.08 KiB]
Downloaded 53 times
Top
   
PostPosted: Fri Apr 05, 2019 2:32 pm 
Offline
Tycoon
Tycoon
User avatar

Joined: Sat Jan 18, 2014 6:10 pm
Posts: 1161
Any chance to update patch against current version?
There is lot of rejections, and I have no clue how to fix it (for example, there is no GenerateRivers function in landscape.cpp)


Top
   
Display posts from previous:  Sort by  
Post new topic  Reply to topic  [ 286 posts ]  Go to page Previous 111 12 13 14 15

All times are UTC


Who is online

Users browsing this forum: No registered users and 3 guests


You cannot post new topics in this forum
You cannot reply to topics in this forum
You cannot edit your posts in this forum
You cannot delete your posts in this forum
You cannot post attachments in this forum

Search for:
Jump to:  
Powered by phpBB © 2000-2019 phpBB Limited

Copyright © Owen Rudge/The Transport Tycoon Forums 2001-2019.
Hosted by Zernebok Hosting.