Integrated Version ChrisIN-Final-1 [2008/03/12] *r11485*
Moderator: OpenTTD Developers
Re: Integrated Version ChrisIN-r11060 [08/09/2007]
A very quick scan of the Subversion documentation says that I was asking a very obvious question and that I can specify the revision number with the -r command line option.
I'll give both a try tonight, see if I can compile the latest ChrisIN source and then try and apply the r11069 patch as to the SVN trunk for that revision as well.
Thanks for all your help!
I'll give both a try tonight, see if I can compile the latest ChrisIN source and then try and apply the r11069 patch as to the SVN trunk for that revision as well.
Thanks for all your help!
Matt
- "If you do things right, people won't be sure you've done anything at all"
- "If you do things right, people won't be sure you've done anything at all"
-
- Route Supervisor
- Posts: 415
- Joined: 07 Oct 2004 10:05
Re: Integrated Version ChrisIN-r11060 [08/09/2007]
If you mean the r11069 build from my server that's a test build only! Just a warning
Right now I have a weird problem with making the routemarkers dropdown working after vehicle speed tab was added. See what happens...
Right now I have a weird problem with making the routemarkers dropdown working after vehicle speed tab was added. See what happens...
- Attachments
-
- routemarker_speedtabbug.png (72.87 KiB) Viewed 2913 times
Re: Integrated Version ChrisIN-r11060 [08/09/2007]
That's interesting I'll stick to 11060 for now then.
Matt
- "If you do things right, people won't be sure you've done anything at all"
- "If you do things right, people won't be sure you've done anything at all"
Re: Integrated Version ChrisIN-r11060 [08/09/2007]
Thanks for all your help with my inexperience of svn and patching, Chris. Have successfully applied your r11060 patch to svn r11060 source, compiled and run - hooray!
Re: Integrated Version ChrisIN-r11060 [08/09/2007]
Check the widget index.chrissicom wrote:If you mean the r11069 build from my server that's a test build only! Just a warning
Right now I have a weird problem with making the routemarkers dropdown working after vehicle speed tab was added. See what happens...
-
- Traffic Manager
- Posts: 141
- Joined: 30 Apr 2007 10:26
Re: Integrated Version ChrisIN-r11060 [08/09/2007]
beat me to it! i was going to say a duplicate widget or typo!
-
- Route Supervisor
- Posts: 415
- Joined: 07 Oct 2004 10:05
Re: Integrated Version ChrisIN-r11060 [08/09/2007]
Thanks for the tip Rubidium said the same on Mirc and after some head breaking I found a magic number somewhere in the routemarkers gui code which was wrong
I attached the .diff for the current test only build of ChrisIN-r11091. I have the problem that after adding the grass growth on unused tracks patch that the patch grows routemarkers instead of grass . As I can't find any conflicts between these patches I'd like to know if anyone has an idea or might want to look at the code if I just didn't find the conflict.
I attached the .diff for the current test only build of ChrisIN-r11091. I have the problem that after adding the grass growth on unused tracks patch that the patch grows routemarkers instead of grass . As I can't find any conflicts between these patches I'd like to know if anyone has an idea or might want to look at the code if I just didn't find the conflict.
- Attachments
-
- r11091-ChrisIN.diff
- TEST ONLY build!
- (502.19 KiB) Downloaded 70 times
Re: Integrated Version ChrisIN-r11060 [08/09/2007]
The ChrisIN version is a great work !
Do you have in plan to add the subsidiaries patch sometimes ?
Do you have in plan to add the subsidiaries patch sometimes ?
-
- Traffic Manager
- Posts: 141
- Joined: 30 Apr 2007 10:26
Re: Integrated Version ChrisIN-r11060 [08/09/2007]
Thought that was funniest thing in the world!chrissicom wrote: I have the problem that after adding the grass growth on unused tracks patch that the patch grows routemarkers instead of grass .
Could it be a sprite problem, eg both use sprite number 2341 etc
-
- Route Supervisor
- Posts: 415
- Joined: 07 Oct 2004 10:05
Re: Integrated Version ChrisIN-r11060 [08/09/2007]
As soon as there is a satisfyingly working versionMeTo wrote:The ChrisIN version is a great work !
Do you have in plan to add the subsidiaries patch sometimes ?
The sprites shouldn't be the problem, when I look at sprites.h the two patches integrate perfectly fine and don't influence each other from what I can see.
-
- Engineer
- Posts: 105
- Joined: 30 Jun 2006 04:22
Re: Integrated Version ChrisIN-r11060 [08/09/2007]
As long as someone is asking for new patches to be integrated into ChrisIN , could i suggest adding the passengers with destination patch too !!!! Its an amazing patch which will go nicely with vehicle separation patch.MeTo wrote:The ChrisIN version is a great work !
Do you have in plan to add the subsidiaries patch sometimes ?
- Sir A. Boey
- Transport Coordinator
- Posts: 299
- Joined: 17 Nov 2006 17:40
- Location: Everywhere and nowhere
Re: Integrated Version ChrisIN-r11060 [08/09/2007]
@ Chrissicom
Could you take a look at this because I have a problem and I think it's related to the ChrisIN but I posted in a thread that I posted before...
thanks...
see last post & second last post
Could you take a look at this because I have a problem and I think it's related to the ChrisIN but I posted in a thread that I posted before...
thanks...
see last post & second last post
_____________# If you believe in it, you can achieve it" # ____________
__________________# Check out My Closed Platform #___________________
-
- Route Supervisor
- Posts: 415
- Joined: 07 Oct 2004 10:05
Re: Integrated Version ChrisIN-r11060 [08/09/2007]
Oh my gosh how did you actually create this town I wasn't aware that you can even make such huge towns lol. I highly doubt that it is a bug that these towns shrink. The game is not meant to start with such large towns and towns would never grow to such huge cities without a big amount of transports in and around them. In your screenshot there is nearly no transport to be seen in that huge city and therefore I assume the shrinking is right. I don't know how the town growth algorithm works though so maybe a dev can shed some light into this.
- Sir A. Boey
- Transport Coordinator
- Posts: 299
- Joined: 17 Nov 2006 17:40
- Location: Everywhere and nowhere
Re: Integrated Version ChrisIN-r11060 [08/09/2007]
hmmm I post the responce in the other thread ok?
_____________# If you believe in it, you can achieve it" # ____________
__________________# Check out My Closed Platform #___________________
Re: Integrated Version ChrisIN-r11060 [08/09/2007]
I was asked to look at a linking error when compiling this on OSX and I found a solution for it.
The problem is that GetCurrentLocale() is already defined in src/os/macosx/macos.mm, so defining it in src/strings.cpp is not a good idea. Solution:
GetCurrentLocale() is insideChange this to(updating the comments might be a good idea as well, but is naturally not needed for making it link correctly).
This will produce a binary. However I think it has way too many warnings for my liking.
The problem is that GetCurrentLocale() is already defined in src/os/macosx/macos.mm, so defining it in src/strings.cpp is not a good idea. Solution:
GetCurrentLocale() is inside
Code: Select all
#ifndef WIN32
Code: Select all
#if !defined(WIN32) && !defined(__APPLE__)
This will produce a binary. However I think it has way too many warnings for my liking.
Re: Integrated Version ChrisIN-r11060 [08/09/2007]
Thanks for your help Bjarni. Got it to compile as an Intel binary OK.
I've created a zip file of the r11060-ChrisIN for Mac OS X Intel if anyone is interested and would like a copy.
I've created a zip file of the r11060-ChrisIN for Mac OS X Intel if anyone is interested and would like a copy.
Matt
- "If you do things right, people won't be sure you've done anything at all"
- "If you do things right, people won't be sure you've done anything at all"
-
- Route Supervisor
- Posts: 415
- Joined: 07 Oct 2004 10:05
Re: Integrated Version ChrisIN-r11060 [08/09/2007]
If you attach the .zip to this thread I can also upload the file to my version archive on the server also the same goes for a linux binary if someone wants to provide one!ukdmbfan wrote:Thanks for your help Bjarni. Got it to compile as an Intel binary OK.
I've created a zip file of the r11060-ChrisIN for Mac OS X Intel if anyone is interested and would like a copy.
Thanks Bjarni for pointing this out I will update the code. Maybe when you have time you can send me the warnings you get as I don't have any warnings on Vista with MSVC
Re: Integrated Version ChrisIN-r11060 [08/09/2007]
No problem. If Bjarni doesn't get back to you I'll PM you the warnings I get during Mac compile when I get home this evening. A lot of it seems to be instantiation errors when compiling the yapf code, not sure what patch has altered that as it compiles with no warnings for the standard r11060.
Matt
- "If you do things right, people won't be sure you've done anything at all"
- "If you do things right, people won't be sure you've done anything at all"
-
- Route Supervisor
- Posts: 415
- Joined: 07 Oct 2004 10:05
Re: Integrated Version ChrisIN-r11060 [08/09/2007]
Except for routemarkers no patch influences the YAPF code. But I have modified the routemarkers patch quite a bit for the next ChrisIN build, so maybe that is a solution already I can't test the changes to routemarkers right now because the grass growth patch is still growing routemarkes all over the track making the use of them as intended not easyukdmbfan wrote:No problem. If Bjarni doesn't get back to you I'll PM you the warnings I get during Mac compile when I get home this evening. A lot of it seems to be instantiation errors when compiling the yapf code, not sure what patch has altered that as it compiles with no warnings for the standard r11060.
-
- Traffic Manager
- Posts: 141
- Joined: 30 Apr 2007 10:26
Re: Integrated Version ChrisIN-r11060 [08/09/2007]
....this still cracks me up!chrissicom wrote: I can't test the changes to routemarkers right now because the grass growth patch is still growing routemarkes all over the track making the use of them as intended not easy
Who is online
Users browsing this forum: No registered users and 38 guests