Enhanced viewport: zoom out, overlays & tooltips (r53_27127)

Forum for technical discussions regarding development. If you have a general suggestion, problem or comment, please use one of the other forums.

Moderator: OpenTTD Developers

MJP
Engineer
Engineer
Posts: 116
Joined: 12 Mar 2011 19:01

Re: Enhanced viewport: zoom out, overlays & tooltips (r44_26

Post by MJP »

pi1985 wrote:This makes crash when no plans made (plans_gui.cpp):
Thanks, this is corrected in r45.
pi1985 wrote:Another querstion. Is it possible to make stopover mark size larger?
Stopover Size.png
It should be good for the height, but not for the width... I write that just remember I forgot a bug in dimension calculation :(
I'll reupload a fixed r45 asap.
Now, r45 is OK.

EDIT: I uploaded r46 3 or 4 times... Finally got it working... Be sure to get the last one.
pi1985
Engineer
Engineer
Posts: 107
Joined: 16 May 2013 08:22
Location: Ukraine

Re: Enhanced viewport: zoom out, overlays & tooltips (r49_26

Post by pi1985 »

I have a crash in ViewportMapGetColour function.

Here is crashlog:

Code: Select all

*** OpenTTD Crash Report ***

Crash at: Fri Mar  7 20:18:30 2014
In game date: 1920-02-16 (66)

Crash reason:
 Signal:  Aborted (6)
 Message: Assertion failed at line 79 of /home/vanya/Документы/OpenTTD/2.1.143/src/water_map.h: IsTileType(t, MP_WATER)

OpenTTD version:
 Version:    Spring 2013 Patchpack v2.1.143 Full (0)
 NewGRF ver: 14006711
 Bits:       64
 Endian:     little
 Dedicated:  no
 Build date: Mar  7 2014 07:45:11

Stacktrace:
 [00] ./openttd(_ZNK12CrashLogUnix13LogStacktraceEPcPKc+0x37) [0x711e67]
 [01] ./openttd(_ZNK8CrashLog12FillCrashLogEPcPKc+0xeb) [0x5d58eb]
 [02] ./openttd(_ZNK8CrashLog12MakeCrashLogEv+0x7c) [0x5d5b7c]
 [03] ./openttd() [0x711dd5]
 [04] /lib64/libc.so.6(+0x353e0) [0x7f2f79c693e0]
 [05] /lib64/libc.so.6(gsignal+0x35) [0x7f2f79c69365]
 [06] /lib64/libc.so.6(abort+0x148) [0x7f2f79c6a7e8]
 [07] ./openttd() [0x6fb74f]
 [08] ./openttd(_Z20ViewportMapGetColourILb1ELb1EEjPK8ViewPortjjj+0x3ae) [0x88688e]
 [09] ./openttd(_Z15ViewportMapDrawILb1ELb1EEvPK8ViewPort+0x15d) [0x8872dd]
 [10] ./openttd(_Z14ViewportDoDrawPK8ViewPortiiii+0x173c) [0x885acc]
 [11] ./openttd(_ZNK6Window12DrawViewportEv+0x78) [0x886388]
 [12] ./openttd(_ZN15NWidgetViewport4DrawEPK6Window+0x78) [0x895958]
 [13] ./openttd(_ZN19NWidgetPIPContainer4DrawEPK6Window+0x24) [0x894b24]
 [14] ./openttd(_ZNK6Window11DrawWidgetsEv+0x1e) [0x897b9e]
 [15] ./openttd(_ZN10MainWindow7OnPaintEv+0x12) [0x675fb2]
 [16] ./openttd() [0x89cf6d]
 [17] ./openttd() [0x89cf92]
 [18] ./openttd(_Z26DrawOverlappedWindowForAlliiii+0x8d) [0x89e43d]
 [19] ./openttd(_Z16RedrawScreenRectiiii+0x60) [0x630210]
 [20] ./openttd(_Z15DrawDirtyBlocksv+0x189) [0x630439]
 [21] ./openttd(_Z13UpdateWindowsv+0xb9) [0x8a0299]
 [22] ./openttd(_ZN15VideoDriver_SDL8MainLoopEv+0x22d) [0x87e3bd]
 [23] ./openttd(_Z12openttd_mainiPPc+0x14b3) [0x6fd003]
 [24] /lib64/libc.so.6(__libc_start_main+0xf5) [0x7f2f79c55ad5]
 [25] ./openttd() [0x514d61]

Operating system:
 Name:     Linux
 Release:  3.10.29-std-def-alt1
 Version:  #1 SMP Fri Feb 7 09:09:24 UTC 2014
 Machine:  x86_64
 Compiler: GCC 4.7.2 "4.7.2 20121109 (ALT Linux 4.7.2-alt7)"

Configuration:
 Blitter:      32bpp-sse4-anim
 Graphics set: zBase (251)
 Language:     /home/vanya/Документы/OpenTTD/net test/client/lang/russian_old.lng
 Music driver: extmidi
 Music set:    NoMusic (0)
 Network:      client
 Sound driver: sdl
 Sound set:    NoSound (2)
 Video driver: sdl

Fonts:
 Small:  DejaVu Sans
 Medium: DejaVu Sans
 Large:  DejaVu Sans
 Mono:   sprite

AI Configuration (local: 0):
  0: Human

Libraries:
 FontConfig: 2.11.0
 FreeType:   2.4.11
 LZMA:       5.0.4
 LZO:        2.06
 PNG:        1.5.13
 SDL:        1.2.14
 Zlib:       1.2.8

---- gamelog start ----
Tick 0: new game started
     Revision text changed to Spring 2013 Pa, savegame version 219, not modified, _openttd_newgrf_version = 0x140062f9
     New game mode: 2 landscape: 1
     Added NewGRF: GRF ID 4D656F91, checksum 945EFBE06B03EC2AC3598EA578B969C0, filename: ECSTown.grf (md5sum matches)
     Added NewGRF: GRF ID 4D656F95, checksum 6F5472D7F2F3F9236AAFE7A81DF9AE84, filename: ECSWood.grf (md5sum matches)
     Added NewGRF: GRF ID 4D656F94, checksum 003905A6734B7395F2A60A977F0DD887, filename: ECSMach.grf (md5sum matches)
     Added NewGRF: GRF ID 4D656F9D, checksum 7C6864163BB6CC6178EBDC5550F1C622, filename: ECSHouse.grf (md5sum matches)
     Added NewGRF: GRF ID 4D656F9C, checksum 833CD4C1C7E2C0E9AABA35FCE7B6A9BB, filename: ECSChem2.grf (md5sum matches)
     Added NewGRF: GRF ID 4D656F9F, checksum 357601291B0DD95B8FEF49A6A7A7F9DE, filename: ECSBas2.grf (md5sum matches)
     Added NewGRF: GRF ID 4D656F97, checksum B73EA6BCD8DCAE4151EEC0C93DBF3073, filename: ECSAgri.grf (md5sum matches)
     Added NewGRF: GRF ID 414B4108, checksum 384D036FD20F8DB880AFA03909A745BD, filename: xussr/xussr.grf (matches GRFID only)
     Added NewGRF: GRF ID 4A430002, checksum 5B3099331C55626E6B4057A9477993A2, filename: industrial_stations_renewal-0.9.1/indstatr.grf (md5sum matches)
     Added NewGRF: GRF ID 56430001, checksum 2AD089EE6B73F25D79F286AD43765914, filename: total_town_replacement_set-3.14/ttrs3w.grf (md5sum matches)
     Added NewGRF: GRF ID 74677462, checksum 1D2A4E03D9F30922788C166254C27619, filename: total_bridge_renewal_set-1.2/total_bridges.grf (md5sum matches)
     Added NewGRF: GRF ID 01420000, checksum 6A4131923AD315E2ACA4B5EC043D7167, filename: xUSSRbus.GRF (md5sum matches)
     Added NewGRF: GRF ID 47541002, checksum E63EF034F9A6D850F6BD0A0497DDA4BD, filename: xussrplanesottd2u.grf (md5sum matches)
     Added NewGRF: GRF ID 32323322, checksum 6BBCBE145B67F3BD6484B49A24F86A00, filename: russian_town_names-4/rusnames.grf (md5sum matches)
     Added NewGRF: GRF ID 47450B0C, checksum EFFC33B7A39A5C49E64D335BC9B88295, filename: ussrplanesbackupw.GRF (md5sum matches)
     Added NewGRF: GRF ID 41501202, checksum 7FD3A30F749BFA5D5E1DF61326AD9B08, filename: heqs_heavy_equipment_set-1.5.1/heqs.grf (md5sum matches)
     Added NewGRF: GRF ID 52571203, checksum DEE3FEBD0D9F5F45191C05620F581655, filename: egrvts2-175/egrvts2.grf (md5sum matches)
     Added NewGRF: GRF ID 43415000, checksum 8F77143D9432C52206D1730F9EEDFAE1, filename: opengfx_airports-0.4.1/ogfx-airports.grf (md5sum matches)
     Added NewGRF: GRF ID 54560301, checksum ED22416EE087725E4B5A9AF8F0357F29, unknown GRF
Tick 1280: game loaded
     Revision text changed to rM, savegame version 219, modified, _openttd_newgrf_version = 0x14000000
Tick 1280: settings changed
     Setting changed: vehicle.improved_breakdowns : 0 -> 1
Tick 1280: settings changed
     Setting changed: vehicle.never_expire_vehicles : 1 -> 0
Tick 1280: settings changed
     Setting changed: economy.station_noise_level : 0 -> 1
Tick 1280: GRF config changed
     Added NewGRF: GRF ID 4D560000, checksum A420B01EE556C4C8EC7E8A59E4CC05DB, filename: ikarus_set-6beta/testfilew.grf (md5sum matches)
     Removed NewGRF: GRF ID 54560301, unknown GRF
Tick 1280: game loaded
     Revision text changed to Spring 2013 Pa, savegame version 219, not modified, _openttd_newgrf_version = 0x140062f9
Tick 1280: GRF config changed
     Added NewGRF: GRF ID 4A530A70, checksum 8E8EB158A4DEF483DE473B48FF92CC64, filename: ecs_industry_addon-2012.12.26/ecsadd.grf (md5sum matches)
Tick 1280: game loaded
     Revision text changed to Spring 2013 Pa, savegame version 219, not modified, _openttd_newgrf_version = 0x140062f9
Tick 1280: GRF config changed
     Added NewGRF: GRF ID 504A0103, checksum F4056FECA93218E2B1FC015B0C7844A2, filename: isrstyle_dock-1.3/isrdock_v1_3.grf (md5sum matches)
Tick 1280: GRF config changed
     Added NewGRF: GRF ID 414E0201, checksum EE80A47E18E58151F33423B5DE41ED8C, filename: fish_2-alpha4/fish.grf (md5sum matches)
Tick 1280: game loaded
     Revision text changed to Spring 2013 Pa, savegame version 219, not modified, _openttd_newgrf_version = 0x140062f9
     New game mode: 1 landscape: 1
     Compatible NewGRF loaded: GRF ID 414B4108, checksum BC0007225F01652EDA478995440F0AB0, filename: xussr/xussr.grf (matches GRFID only)
Tick 20149: game loaded
     Revision text changed to Spring 2013 co, savegame version 220, not modified, _openttd_newgrf_version = 0x140062f9
     Compatible NewGRF loaded: GRF ID 414B4108, checksum A51D40439226CDF01446945180567BBD, filename: xussr/xussr.grf (md5sum matches)
Tick 20149: game loaded
     Revision text changed to Spring 2013 Pa, savegame version 221, not modified, _openttd_newgrf_version = 0x14000071
Tick 20149: game loaded
     Revision text changed to Spring 2013 Pa, savegame version 221, not modified, _openttd_newgrf_version = 0x14006711
Tick 20149: game loaded
     Revision text changed to Spring 2013 Pa, savegame version 221, not modified, _openttd_newgrf_version = 0x14006711
---- gamelog end ----

*** End of OpenTTD Crash Report ***
Also translate comment from Russian forum about route lines and stopovers (google translate, original message):
forums.ttdrussia.net wrote: there was a problem with the graphic display of the route . If the route is displayed even before the line , now this line has become displayed as if from a small vertical lines . In principle, it is not as important as what is happening fast relief image of the route over a short period of time ( which was not in previous builds ) . First began to think that this is due to a pop-up news reports . But then it turned out that no message line disappears . If you create a route of 6 or more points , the line is visible on the first 4-5 points and then disappears , although the addition of new quests route points continues. Pressing the Preview window transport route appears completely new point is added , but not for long . Ie if in the course of the game you need to track adding new points to the route, then it becomes problematic. Earlier image of the route disappeared only when the window is closed transport.
Image
Image
Image.
MJP
Engineer
Engineer
Posts: 116
Joined: 12 Mar 2011 19:01

Re: Enhanced viewport: zoom out, overlays & tooltips (r49_26

Post by MJP »

pi1985 wrote:I have a crash in ViewportMapGetColour function.
Thanks for the report, pi1985. The assert() problem was trigged in
ViewportMapGetColourIndustries() which is now fixed.
pi1985 wrote:Also translate comment from Russian forum about route lines and stopovers (google translate, original message):
forums.ttdrussia.net wrote: there was a problem with the graphic display of the route . If the route is displayed even before the line , now this line has become displayed as if from a small vertical lines . In principle, it is not as important as what is happening fast relief image of the route over a short period of time ( which was not in previous builds ) . First began to think that this is due to a pop-up news reports . But then it turned out that no message line disappears . If you create a route of 6 or more points , the line is visible on the first 4-5 points and then disappears , although the addition of new quests route points continues. Pressing the Preview window transport route appears completely new point is added , but not for long . Ie if in the course of the game you need to track adding new points to the route, then it becomes problematic. Earlier image of the route disappeared only when the window is closed transport.
I'm sorry but I do not understand very well.

Anyway, I see that your patchpack v2.1.143 relies on r46, I fixed some refresh
problems related to route steps and path in r49. Could you test with r50?
pi1985
Engineer
Engineer
Posts: 107
Joined: 16 May 2013 08:22
Location: Ukraine

Re: Enhanced viewport: zoom out, overlays & tooltips (r50_26

Post by pi1985 »

I'm sorry, I was busy few last days.
I updated patch to r50.
Route lines hides when scrolling viewport by mouse (maybe vehicle's window lost focus) or when industry tooltip are shown (this wasn't in older versions).
Plans window: Hide all button do nothing when all plans hidden. Maybe better will be when it became Show all or simply deactiveted.
Little bug with text align:
Киевъ ЖД, 1995-04-14.png
Киевъ ЖД, 1995-04-14.png (19.19 KiB) Viewed 6463 times
Lines for route paths in older versions was more eye-candy than now because of dash (this is what the author of that message had in mind). Selected plan line will be more eye-candy without dash too I think:

Code: Select all

static void ViewportMapDrawVehicleRoutePath(const ViewPort *vp)
{
...
				GfxDrawLine(from_x, from_y, to_x, to_y, PC_BLACK, 3);
				GfxDrawLine(from_x, from_y, to_x, to_y, (final_order == order) ? PC_WHITE : PC_YELLOW, 2);
...
}
...
void ViewportDrawPlans(const ViewPort *vp)
{
...
				GfxDrawLine(from_x, from_y, to_x, to_y, PC_BLACK, 3);
				if (pl->focused) {
					GfxDrawLine(from_x, from_y, to_x, to_y, PC_RED, 1);
				} else {
					GfxDrawLine(from_x, from_y, to_x, to_y, PC_WHITE, 1);
				}
...
}
Also I think than plan lines will be more careful when they only indicate the nodal point of the line (like route paths), and not all tiles as when drawing by hand.
Image
Image
Image.
MJP
Engineer
Engineer
Posts: 116
Joined: 12 Mar 2011 19:01

Re: Enhanced viewport: zoom out, overlays & tooltips (r50_26

Post by MJP »

pi1985 wrote:I'm sorry, I was busy few last days.
There is no hurry :)
pi1985 wrote:Route lines hides when scrolling viewport by mouse (maybe vehicle's window lost focus) or when industry tooltip are shown (this wasn't in older versions).
I do not have the problem with industry tooltips.
(in 07_vehicle-route-steps.patch, check the first chunk concerning window.cpp)
I modified things related to focusing window but it is not thoroughly tested yet.
pi1985 wrote:Little bug with text align:
Indeed! Fixed.
pi1985 wrote:Lines for route paths in older versions was more eye-candy than now because of dash (this is what the author of that message had in mind). Selected plan line will be more eye-candy without dash too I think:
Visually, I prefer the dashed lines but tastes are not to be discussed.
I shall make that an option in the advanced settings.
pi1985 wrote:Also I think than plan lines will be more careful when they only indicate the nodal point of the line (like route paths), and not all tiles as when drawing by hand.
Plans are not intended to do anything else than quick mock-ups. Their purpose is
to prevent long explanations (something I find to be annoying even with the help
of a voice chat system). For simple cases, I use signs.

But maybe this little modification is what you want?
plans-2-drawing-ways.png
plans-2-drawing-ways.png (26.7 KiB) Viewed 6431 times
Attachments
r50-to-r51pre.diff
(3.41 KiB) Downloaded 167 times
pi1985
Engineer
Engineer
Posts: 107
Joined: 16 May 2013 08:22
Location: Ukraine

Re: Enhanced viewport: zoom out, overlays & tooltips (r50_26

Post by pi1985 »

Checked out latest trunk source and patched it with r50 and pre51.
There no problems with industry tootips, maybe problem in patchpack.
MJP wrote:maybe this little modification is what you want?
Yes! This is it! :D

I found a bug. When opening vehicle's window, closing it and trying to drag map with right button (scrolling with keyboard works fine) game crashes:

Code: Select all

Crash encountered, generating crash log...
*** OpenTTD Crash Report ***

Crash at: Tue Mar 11 22:03:09 2014
In game date: 1995-04-14 (53)

Crash reason:
 Signal:  Segmentation fault (11)
 Message: <none>

OpenTTD version:
 Version:    r26397M (2)
 NewGRF ver: 1400671d
 Bits:       64
 Endian:     little
 Dedicated:  no
 Build date: Mar 11 2014 23:44:47

Stacktrace:
 [00] bin/openttd(_ZNK12CrashLogUnix13LogStacktraceEPcPKc+0x37) [0x6e9827]
 [01] bin/openttd(_ZNK8CrashLog12FillCrashLogEPcPKc+0xeb) [0x5bc14b]
 [02] bin/openttd(_ZNK8CrashLog12MakeCrashLogEv+0x7c) [0x5bc3dc]
 [03] bin/openttd() [0x6e9795]
 [04] /lib64/libc.so.6(+0x353e0) [0x7fa09493e3e0]
 [05] bin/openttd(_Z22UpdateViewportPositionP6Window+0x297) [0x82edf7]
 [06] bin/openttd(_Z13UpdateWindowsv+0xf5) [0x84cd65]
 [07] bin/openttd(_ZN15VideoDriver_SDL8MainLoopEv+0x22d) [0x82b6dd]
 [08] bin/openttd(_Z12openttd_mainiPPc+0x14b3) [0x6d6463]
 [09] /lib64/libc.so.6(__libc_start_main+0xf5) [0x7fa09492aad5]
 [10] bin/openttd() [0x508981]

Operating system:
 Name:     Linux
 Release:  3.10.29-std-def-alt1
 Version:  #1 SMP Fri Feb 7 09:09:24 UTC 2014
 Machine:  x86_64
 Compiler: GCC 4.7.2 "4.7.2 20121109 (ALT Linux 4.7.2-alt7)"

Configuration:
 Blitter:      32bpp-sse4-anim
 Graphics set: zBase (251)
 Language:     /home/vanya/Документы/OpenTTD/trunk/bin/lang/english.lng
 Music driver: extmidi
 Music set:    NoMusic (0)
 Network:      no
 Sound driver: sdl
 Sound set:    NoSound (2)
 Video driver: sdl

Fonts:
 Small:  DejaVu Sans
 Medium: DejaVu Sans
 Large:  DejaVu Sans
 Mono:   sprite

AI Configuration (local: 0):
  0: Human
  1: AdmiralAI (v25)

Libraries:
 FontConfig: 2.11.0
 FreeType:   2.4.11
 LZMA:       5.0.4
 LZO:        2.06
 PNG:        1.5.13
 SDL:        1.2.14
 Zlib:       1.2.8

---- gamelog start ----
Tick 0: new game started
     Revision text changed to 1.2.0-RC4, savegame version 174, not modified, _openttd_newgrf_version = 0x12005e14
     New game mode: 1 landscape: 0
     Added NewGRF: GRF ID CF6F0000, checksum D4A07FD09EA013E83D3DB388A3F2043B, filename: ukrainian_town_names.1.0/ukrainian_townnames.grf (md5sum matches)
     Added NewGRF: GRF ID 54560301, checksum ED22416EE087725E4B5A9AF8F0357F29, filename: trolleybus_set-0.2/trolley.grf (md5sum matches)
     Added NewGRF: GRF ID 5245F0F0, checksum 02538A8208D8816284B0079764783534, filename: newtree-2010.08.29/newtree.grf (md5sum matches)
     Added NewGRF: GRF ID 535A0901, checksum BECE0FB994E34EBDF6DB76EC3B566914, filename: purno_s_new_railway_fence.1/fencew.grf (md5sum matches)
     Added NewGRF: GRF ID 32323322, checksum 6BBCBE145B67F3BD6484B49A24F86A00, filename: russian_town_names-4/rusnames.grf (md5sum matches)
     Added NewGRF: GRF ID 444A5901, checksum 23CEC795D97265752C21EA8F02564A61, filename: vacuum_tube_train-0.22/vactrain.grf (md5sum matches)
     Added NewGRF: GRF ID 444A5902, checksum 10CE0195D8ABED8FD93E539FD990AF03, filename: vacuum_vehicle_wagon_and_train-0.22/vactrain.grf (md5sum matches)
Tick 65442: game loaded
     Revision text changed to 1.2.0, savegame version 174, not modified, _openttd_newgrf_version = 0x12085e36
Tick 22362: game loaded
     Revision text changed to 1.2.1-RC1, savegame version 174, not modified, _openttd_newgrf_version = 0x12105ec3
Tick 54056: game loaded
     Revision text changed to 1.2.0, savegame version 174, not modified, _openttd_newgrf_version = 0x12085e36
Tick 64761: game loaded
     Revision text changed to 1.2.1, savegame version 174, not modified, _openttd_newgrf_version = 0x12185ef2
Tick 36504: game loaded
     Revision text changed to 1.2.2, savegame version 174, not modified, _openttd_newgrf_version = 0x12285f9c
Tick 55183: game loaded
     Revision text changed to 1.3.0-beta1, savegame version 179, not modified, _openttd_newgrf_version = 0x13006113
Tick 55183: settings changed
     Setting changed: economy.station_noise_level : 0 -> 1
Tick 56807: settings changed
     Setting changed: vehicle.plane_speed : 4 -> 3
Tick 56807: settings changed
     Setting changed: vehicle.plane_speed : 3 -> 2
Tick 56807: settings changed
     Setting changed: vehicle.plane_speed : 2 -> 1
Tick 60573: game loaded
     Revision text changed to r26397M, savegame version 189, modified, _openttd_newgrf_version = 0x1400671d
---- gamelog end ----

*** End of OpenTTD Crash Report ***

Crash log generated.

Writing crash log to disk...
Crash log written to /home/vanya/.openttd/crash.log. Please add this file to any bug reports.

Writing crash savegame...
Crash savegame written to /home/vanya/.openttd/crash.sav. Please add this file and the last (auto)save to any bug reports.

Writing crash screenshot...
Crash screenshot written to /home/vanya/.openttd/crash.png. Please add this file to any bug reports.

Аварийный останов
Solution:

Code: Select all

void UpdateViewportPosition(Window *w)
{
...
-const bool must_update_maps = _scrolling_viewport && _settings_client.gui.show_scrolling_viewport_on_map && _focused_window->viewport == vp;
+const bool must_update_maps = _scrolling_viewport && _settings_client.gui.show_scrolling_viewport_on_map;
...
}
Image
Image
Image.
MJP
Engineer
Engineer
Posts: 116
Joined: 12 Mar 2011 19:01

Re: Enhanced viewport: zoom out, overlays & tooltips (r50_26

Post by MJP »

pi1985 wrote:I found a bug. When opening vehicle's window, closing it and trying to drag map with right button (scrolling with keyboard works fine) game crashes:
Good point!
pi1985 wrote:Solution:

Code: Select all

void UpdateViewportPosition(Window *w)
{
...
-const bool must_update_maps = _scrolling_viewport && _settings_client.gui.show_scrolling_viewport_on_map && _focused_window->viewport == vp;
+const bool must_update_maps = _scrolling_viewport && _settings_client.gui.show_scrolling_viewport_on_map;
...
}
This solution implies useless redraws for not scrolled viewports. So I prefer
to transform _scrolling_viewport from bool into a Window* so we know directly
what is scrolled without refering to _focused_window.

I do not remember if a scrolled main viewport was shown in an extra viewport in
map mode but now it is.

So... Add a dashed line option, make a separate diff for _scrolling_viewport
changes, check gcc happiness, update other diffs... That should make a fine r51.
Attachments
r50-to-r51pre2.diff
(9.37 KiB) Downloaded 153 times
Myhorta
Engineer
Engineer
Posts: 8
Joined: 13 Jan 2012 21:07

Re: Enhanced viewport: zoom out, overlays & tooltips (r51_26

Post by Myhorta »

Hi. enhvp_r51_02_industry-tooltips.patch when applied to 1.4.0 crashes with the following error:

Code: Select all

Error: String 0x85E0 is invalid. You are probably using an old version of the .lng file.
Steps to reproduce: Put your mouse over an industry; Don't move your mouse and wait until it crashes.
Attachments
crash.png
(215.95 KiB) Downloaded 6 times
crash_log.txt
(2.98 KiB) Downloaded 152 times
bt_full_with_debug_symbols.txt
(16.66 KiB) Downloaded 148 times
MJP
Engineer
Engineer
Posts: 116
Joined: 12 Mar 2011 19:01

Re: Enhanced viewport: zoom out, overlays & tooltips (r51_26

Post by MJP »

Myhorta wrote:Hi. enhvp_r51_02_industry-tooltips.patch when applied to 1.4.0 crashes with the following error:

Code: Select all

Error: String 0x85E0 is invalid. You are probably using an old version of the .lng file.
Steps to reproduce: Put your mouse over an industry; Don't move your mouse and wait until it crashes.
Did you apply enhvp_r51_01_tooltip-data-persistence.patch too?
(as it is required to prevent crash-on-refresh)
Myhorta
Engineer
Engineer
Posts: 8
Joined: 13 Jan 2012 21:07

Re: Enhanced viewport: zoom out, overlays & tooltips (r51_26

Post by Myhorta »

MJP wrote:
Myhorta wrote:Hi. enhvp_r51_02_industry-tooltips.patch when applied to 1.4.0 crashes with the following error:

Code: Select all

Error: String 0x85E0 is invalid. You are probably using an old version of the .lng file.
Steps to reproduce: Put your mouse over an industry; Don't move your mouse and wait until it crashes.
Did you apply enhvp_r51_01_tooltip-data-persistence.patch too?
(as it is required to prevent crash-on-refresh)
Thank you! It fixes the issue.
I thought every patch was independent but after reading every post I reached the conclusion they aren't:
MJP wrote:In the zip archive I provide in the first post, I agree there is an all-in-one diff. But all main features are also provided as a patch sequence composed of 8 independent parts (well, almost: partX+1 won't be happy without partX previously applied).
I think you should point it more clearly. Either in a README file inclued in the zip or in the first post.
MJP
Engineer
Engineer
Posts: 116
Joined: 12 Mar 2011 19:01

Re: Enhanced viewport: zoom out, overlays & tooltips (r51_26

Post by MJP »

Myhorta wrote:I think you should point it more clearly. Either in a README file inclued in the zip or in the first post.
I've updated the dependency graph I did for r42.
I'll include it to the next releases.
Cherry picking should be easier now :)
Attachments
enhvp-r51-patch-dependencies.png
(74.66 KiB) Downloaded 5 times
User avatar
FLHerne
Tycoon
Tycoon
Posts: 1543
Joined: 12 Jul 2011 12:09
Location: St Ives, Cambs, UK

Re: Enhanced viewport: zoom out, overlays & tooltips (r51_26

Post by FLHerne »

Applying patch 14 fails if 09 hasn't been applied, contrary to your diagram. Nothing in it actually uses MarkAllRouteStepsDirty, but the diff uses it as part of the context.

Awesome features though! :bow:
Temporary Permanent signature filling text. Content coming soon delayed indefinitely! Oh, and I have had a screenshot thread.
Linux user (XMonad DWM/KDE, Arch), IRC obsessive and rail enthusiast. No longer building robots; now I ring church bells.
Author of an incredibly boring stickied post about NewGRFs.
MJP
Engineer
Engineer
Posts: 116
Joined: 12 Mar 2011 19:01

Re: Enhanced viewport: zoom out, overlays & tooltips (r51_26

Post by MJP »

FLHerne wrote:Applying patch 14 fails if 09 hasn't been applied, contrary to your diagram. Nothing in it actually uses MarkAllRouteStepsDirty, but the diff uses it as part of the context.
I said easier, not easy ;)
FLHerne wrote:Awesome features though! :bow:
Thanks!
Myhorta
Engineer
Engineer
Posts: 8
Joined: 13 Jan 2012 21:07

Re: Enhanced viewport: zoom out, overlays & tooltips (r51_26

Post by Myhorta »

I applied the patch for industry tooltips (both the 1st and 2nd patch) and I found a bug that causes the game to crash.
Steps to reproduce:
1. Build a depot.
2. Build any vehicle.
3. Right-click in the vehicle, the game will crash.
MJP
Engineer
Engineer
Posts: 116
Joined: 12 Mar 2011 19:01

Re: Enhanced viewport: zoom out, overlays & tooltips (r51_26

Post by MJP »

Myhorta wrote:I applied the patch for industry tooltips (both the 1st and 2nd patch) and I found a bug that causes the game to crash.
Steps to reproduce:
1. Build a depot.
2. Build any vehicle.
3. Right-click in the vehicle, the game will crash.
OK, a right click on the vehicle in the depot list leads to a crash.
Fixed in r52.
Thanks for reporting!
minexew
Engineer
Engineer
Posts: 11
Joined: 28 Jul 2014 11:17
Location: CZ

Re: Enhanced viewport: zoom out, overlays & tooltips (r53_27

Post by minexew »

Why is this still not in trunk? :shock:
User avatar
PikkaBird
Graphics Moderator
Graphics Moderator
Posts: 5601
Joined: 13 Sep 2004 13:21
Location: The Moon

Re: Enhanced viewport: zoom out, overlays & tooltips (r53_27

Post by PikkaBird »

minexew wrote:Why is this still not in trunk? :shock:
I can think of a few reasons, but the fact that the creator hasn't posted in 9 months and when he did he was still fixing such trivial crash conditions as "right clicking on a vehicle" might be a place to start...
minexew
Engineer
Engineer
Posts: 11
Joined: 28 Jul 2014 11:17
Location: CZ

Re: Enhanced viewport: zoom out, overlays & tooltips (r53_27

Post by minexew »

PikkaBird wrote:
minexew wrote:Why is this still not in trunk? :shock:
I can think of a few reasons, but the fact that the creator hasn't posted in 9 months and when he did he was still fixing such trivial crash conditions as "right clicking on a vehicle" might be a place to start...
Oh well.
I wanted to get this working in the current SVN version, but the patches I tried didn't apply even in r27127, so I gave up pretty quickly.
MJP
Engineer
Engineer
Posts: 116
Joined: 12 Mar 2011 19:01

Re: Enhanced viewport: zoom out, overlays & tooltips (r53_27

Post by MJP »

s/9 months/4 months/
I just edit main post unless I have something to reply.

I'm not playing much these days.

I usually update every ~200 commits but last time I tried to sync with trunk, hg said "pulling from https://hg.openttd.org/openttd/trunk.hg/ / searching for changes / sampling from both directions / abort: repository is unrelated". I did nothing to get things up and running again. I can't think of trying before at least next month. Might be never as well, don't know, will see.
Eddi
Tycoon
Tycoon
Posts: 8258
Joined: 17 Jan 2007 00:14

Re: Enhanced viewport: zoom out, overlays & tooltips (r53_27

Post by Eddi »

the repo had to be rebuilt from scratch, you need to make a new clone and transfer your patches.
Post Reply

Return to “OpenTTD Development”

Who is online

Users browsing this forum: No registered users and 10 guests