Re: Patch: The Rainfall River Generator
Posted: 25 Dec 2015 18:29
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":
Anyway, I can't make this because of:
Ok, in include section in genworld.cpp adding
But:
What I'm doing wrong
Code: Select all
...
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).
...
Code: Select all
[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]
Code: Select all
#include <string>
Code: Select all
[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’