Page 2 of 9
Re: Gremnon's Patch Pack (GPP, r17680)
Posted: 05 Oct 2009 11:47
by Gremnon
2007Alain2007 wrote:Hi petert
Is this also added to the code site for this patch pack
also post the code changes you did
I uploaded it to the code site. The actual changes required for it, though, aren't.
If they're posted though, I'll include it in the next release of the pack.
Re: Gremnon's Patch Pack (GPP, r17680)
Posted: 05 Oct 2009 18:43
by petert
I didn't change anything, I just used the regular diff to make it, and changed the version number.
Edit: If you want to, you can add me as a developer on google code, and I can manage the win32 binaries.
Re: Gremnon's Patch Pack (GPP, r17680)
Posted: 07 Oct 2009 20:33
by sulai
GPP update against r17736
+ updated "better profit rating"
+ savegame compatibility to current trunk (and backwards)
Also savegames done with GPP3 are fine, but I'm not sure about other versions of GPP.
Re: Gremnon's Patch Pack (GPP, r17680)
Posted: 07 Oct 2009 20:45
by Gremnon
Thanks sulai
If it helps, we can add you to the Google Code pages, and you can upload directly to there, for patches, issues to be fixed, binaries, and so on.
Edit: Your patch is missing the new files in src that some of the other patches introduce
Re: Gremnon's Patch Pack (GPP, r17736)
Posted: 07 Oct 2009 23:05
by petert
Can I be part of the Google Code team? Strictly for win32 binaires.
Re: Gremnon's Patch Pack (GPP, r17680)
Posted: 07 Oct 2009 23:42
by sulai
Gremnon wrote:Thanks sulai
If it helps, we can add you to the Google Code pages,...
Thanks for asking, but I fear I'm going to have some time problems in near future
I found another bug: road vehicle yapf penalty is not working, this hunk has yet to be applied.
Code: Select all
Index: src/yapf/yapf_road.cpp
===================================================================
--- src/yapf/yapf_road.cpp (revision 17533)
+++ src/yapf/yapf_road.cpp (working copy)
@@ -83,6 +84,10 @@
/* non-diagonal trackdir */
cost = YAPF_TILE_CORNER_LENGTH + Yapf().PfGetSettings().road_curve_penalty;
}
+
+ /* Check for vehicles on the same path */
+ if (!EnsureNoRoadVehWithTrackdir(tile, trackdir)) cost += Yapf().PfGetSettings().road_vehicle_penalty;
+
return cost;
}
Re: Gremnon's Patch Pack (GPP, r17633)
Posted: 08 Oct 2009 00:44
by Ammler
Gremnon wrote:I'd like to, but I don't think IS will make it in - to my knowledge, it's not been updated for a while (Could be wrong)
IS is updated in around monthly basis:
http://dev.openttdcoop.org/projects/is2/activity (last merge with r17583)
Don't know many other patches that are maintained that well.
Greets
Ammler
Re: Gremnon's Patch Pack (GPP, r17736)
Posted: 08 Oct 2009 13:35
by Gremnon
sulai - I'll have a look into that one, the YAPF Vehicle Penalty patch always causes trouble somehow for me.
Ammler - I completly forgot about their repo until after I made that post. The issue I have though is that I can't figure out how to turn it into a patch against trunk. I'd rather apply to trunk, rather than have one folder for IS+GPP and another for trunk+GPP
On the other hand, I may have to do it that way, but I'd prefer not to, my folder for all source code projects, not just OpenTTD, is getting rather full.
Re: Gremnon's Patch Pack (GPP, r17736)
Posted: 08 Oct 2009 17:43
by Ammler
I have added a script which does create new patches, if needed:
http://bundles.openttdcoop.org/is2/trunk-patches/
(as a Mercurial diff, it needs p1, but that should be ok?)
Re: Gremnon's Patch Pack (GPP, r17736)
Posted: 08 Oct 2009 17:45
by Gremnon
p1 is fine, it's just I find it easier to apply patches to one copy of trunk, than several copies for neatness.
With the update to AutoLoad faces, it'll be making a return to the pack soon too.
Re: Gremnon's Patch Pack (GPP, r17736)
Posted: 09 Oct 2009 12:50
by sulai
Hi there,
my latest version of GPP, this time all necessary files should be included. It features:
Gremnons_PP_17680
+ savegame compatibility
+ updated "better profit rating"
+ fixed "yapf road vehicle penalty"
against r17736.
Have fun
Re: Gremnon's Patch Pack (GPP, r17633)
Posted: 09 Oct 2009 21:59
by bokkie
Gremnon wrote:Improved Timetable Management - Now included by request. And while before I never used timetables, I'll admit that this patch has made me think again.
(...)
And finally, a note from Isaac (read back a few posts if you've missed finding out who).
CargoDist is looking possible, with an unusually small number of issues, but it won't be out this week. Stay tuned though.
Maybe this week?
Would surely make me happy
Re: Gremnon's Patch Pack (GPP, r17736)
Posted: 09 Oct 2009 22:12
by Gremnon
I'll pester Isaac again.
I've suggested he register on here himself, he keeps putting it off... but hopefully he'll have one for us soon.
Re: Gremnon's Patch Pack (GPP, r17736)
Posted: 16 Oct 2009 12:30
by zar_igor
Hi Gremnon!
Would it be possible to add the these two patches?
- disable tree growth
- prevent towns from building ANY roads
Bye, Mike
Re: Gremnon's Patch Pack (GPP, r17736)
Posted: 16 Oct 2009 12:39
by Gremnon
At the moment real life is taking a lot of my time (hence no update from me lately)
I'll have a look when I get some more time to dive into the source code again.
Re: Gremnon's Patch Pack (GPP, r17736)
Posted: 16 Oct 2009 13:15
by 2007Alain2007
hi Gremnon i only need the src/statusbar_gui.cpp i have added in r17765_reduced_tree_growth
but cant test befor the main update has beed added
also the prevent towns from building ANY roads i cant find what patch you want for that
Code: Select all
Index: src/statusbar_gui.cpp
===================================================================
--- src/statusbar_gui.cpp (revision 17680)
+++ src/statusbar_gui.cpp (working copy)
@@ -104,8 +104,18 @@
const Company *c = (_local_company == COMPANY_SPECTATOR) ? NULL : Company::Get(_local_company);
this->DrawWidgets();
- SetDParam(0, _date);
- DrawString(this->widget[SBW_LEFT].left + 1, this->widget[SBW_LEFT].right - 1, 1, (_pause_mode || _settings_client.gui.status_long_date) ? STR_WHITE_DATE_LONG : STR_WHITE_DATE_SHORT, TC_FROMSTRING, SA_CENTER);
+ if (_settings_client.gui.status_virtual_time) {
+ if (_virtual_time == INVALID_TIME) _virtual_time = DateToTime(_date, _date_fract);
+ SetDParam(0, (_pause_mode || _settings_client.gui.status_long_date) ? STR_WHITE_DATE_LONG : STR_WHITE_DATE_SHORT);
+ SetDParam(1, _date);
+ SetDParam(2, (_settings_client.gui.status_virtual_time == 1) ?
+ STR_STATUS_TIME_12 : STR_STATUS_TIME_24);
+ SetDParam(3, _virtual_time);
+ DrawString(this->widget[SBW_LEFT].left + 1, this->widget[SBW_LEFT].right - 1, 1, STR_STATUS_TIME, TC_FROMSTRING, SA_CENTER);
+ } else {
+ SetDParam(0, _date);
+ DrawString(this->widget[SBW_LEFT].left + 1, this->widget[SBW_LEFT].right - 1, 1, (_pause_mode || _settings_client.gui.status_long_date) ? STR_WHITE_DATE_LONG : STR_WHITE_DATE_SHORT, TC_FROMSTRING, SA_CENTER);
+ }
if (c != NULL) {
/* Draw company money */
Re: Gremnon's Patch Pack (GPP, r17736)
Posted: 16 Oct 2009 14:23
by Gremnon
2007Alain2007 wrote:but cant test befor the main update has beed added
At the moment, there isn't an update - the copy of the patch I have needs work, and time to do that in, something I'm missing right now.
Perhaps use the current latest one that sulai posted? (Note - I haven't checked that patch yet, so I don't know if it works or not.)
Re: Gremnon's Patch Pack (GPP, r17736)
Posted: 16 Oct 2009 17:21
by Terkhen
zar_igor wrote:- prevent towns from building ANY roads
There is already an option in OpenTTD that allows this. You can find it at Advanced settings -> Economy -> Towns -> Towns are allowed to build roads.
Re: Gremnon's Patch Pack (GPP, r17736)
Posted: 16 Oct 2009 17:38
by Gremnon
Isn't that force-disabled in the editor, or did that get changed while I wasn't paying attention again?
Re: Gremnon's Patch Pack (GPP, r17736)
Posted: 16 Oct 2009 22:33
by 2007Alain2007
Hi zar_igor
I have added in the r17765_reduced_tree_growth patch so but this isnt an update to trunk
this is been added to the patch pack from the
http://code.google.com/p/ppfottd/
NOT sulai GPP5.diff that has some big probles in
but all in all i hope you like this
ottd-gpp-r17680 + r17765_reduced_tree_growth.patch