Strange, I can not remember having conflicts in italian.txt. Are you sure, you had a clean trunk? I just produced a new patch for 12933 from my local git repository and attached it to the top post (just to be sure nothing broke).Anunnaki wrote: EDIT:
I finaly did it, here is version which is compatible with SVN OpenTTD_r12933 (i mean merging withouth errors). Fixed:
1. in italian.txt line 177,178,179 (from SVN 12933)
2. saveload.cpp changed line: -extern const uint16 SAVEGAME_VERSION = 94; to -extern const uint16 SAVEGAME_VERSION = 95;
3. openttd.cpp right placing block of code (no change, only new text block position in SVN openttd.cpp code)
(PS: it is my first update/change, so please be patient, i was starting only 4 hours ago with "learning")
[Patch] More realistic loans system [Update: r14536]
Moderator: OpenTTD Developers
-
- Chairman
- Posts: 776
- Joined: 20 Jan 2007 12:08
- Location: Germany
Re: [Patch] More realistic loans system [Update: r12841]
"The bigger the island of our knowledge, the longer the shore of our ignorance" - John A. Wheeler, Physicist, 1911-2008
Re: [Patch] More realistic loans system [Update: r12841]
EDIT2:
There was and is nothing wrong with italian.txt file. File is OK, but Tortoise SVN GUI WIN klient cant open this file, because he is opening him like non-UTF8 format. So my fault, you was right with italian.txt.
There was and is nothing wrong with italian.txt file. File is OK, but Tortoise SVN GUI WIN klient cant open this file, because he is opening him like non-UTF8 format. So my fault, you was right with italian.txt.
Re: [Patch] More realistic loans system [Update: r12933]
New updated patch file, compatible with OpenTTD r12997:
The previous (old) patch file (for comparing):
-
- Chairman
- Posts: 776
- Joined: 20 Jan 2007 12:08
- Location: Germany
Re: [Patch] More realistic loans system [Update: r14536]
After a long time, I converted my patch to a Mercurial Queue internally and adopted it to current trunk at the same time.
So, you'll find an updated version in the top post. No new features.
So, you'll find an updated version in the top post. No new features.
"The bigger the island of our knowledge, the longer the shore of our ignorance" - John A. Wheeler, Physicist, 1911-2008
Re: [Patch] More realistic loans system [Update: r14536]
Oops - Wrong Topic!!
Who is online
Users browsing this forum: No registered users and 9 guests