Page MenuHomeWildfire Games
Differential D825

Atlas: Allow map to recenter during resize
ClosedPublic
Actions

Authored by Stan on Aug 22 2017, 1:10 AM.

Details

Reviewers
vladislavbelov
trompetin17
Clockwork-Muse
Commits
rP23859: Allow map to recenter during resize in Atlas. Fixes #1109.
Trac Tickets
#1109
Summary

Allows maps to have the center changed during resizing.
For maps being shrunk, this allows the desired, remaining, portion of the map to be chosen:

For maps being enlarged, this allows the user to choose where the original map data should be placed:

Test Plan

Use provided maps to verify that function chooses the correct location and decal/unit mapping.
(should be placed in binaries/data/mods/public/maps/scenarios)

position_test_medium_2.pmp641 KBDownload

position_test_medium.pmp641 KBDownload

position_test_medium_units.pmp641 KBDownload

position_test_medium_3.pmp641 KBDownload

position_test_medium_units.xml2 KBDownload

position_test_medium.xml1 KBDownload

position_test_medium_3.xml1 KBDownload

position_test_medium_2.xml1 KBDownload

Diff Detail

Repository
rP 0 A.D. Public Repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

There are a very large number of changes, so older changes are hidden. Show Older Changes
Harbormaster completed remote builds in B9632: Diff 9989.Sep 28 2019, 11:46 AM
vladislavbelov added inline comments.Oct 5 2019, 12:13 AM
source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp
402 ↗(On Diff #9856)

No, I mean to initialize them in ctor by nullptr.

Stan updated this revision to Diff 10564.Dec 11 2019, 5:25 PM

Add nullptr initialization

Owners added subscribers: Restricted Owners Package, Restricted Owners Package, Restricted Owners Package.Dec 11 2019, 5:25 PM
Vulcan added a comment.Dec 11 2019, 5:26 PM

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/1253/display/redirect

Harbormaster failed remote builds in B10278: Diff 10564!Dec 11 2019, 5:26 PM
Vulcan added a comment.Dec 11 2019, 5:26 PM

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/737/display/redirect

Stan updated this revision to Diff 10565.Dec 11 2019, 5:27 PM

nullptr

Vulcan added a comment.Dec 11 2019, 5:27 PM

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/1254/display/redirect

Harbormaster failed remote builds in B10279: Diff 10565!Dec 11 2019, 5:27 PM
Vulcan added a comment.Dec 11 2019, 5:28 PM

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/738/display/redirect

Stan updated this revision to Diff 10566.Dec 11 2019, 5:32 PM

nullptr

Vulcan added a comment.Dec 11 2019, 5:34 PM

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/1255/display/redirect

Harbormaster failed remote builds in B10280: Diff 10566!Dec 11 2019, 5:34 PM
Vulcan added a comment.Dec 11 2019, 5:40 PM

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/739/display/redirect

Stan updated this revision to Diff 10567.Dec 11 2019, 5:57 PM

Fix include.

Vulcan added a comment.Dec 11 2019, 5:57 PM

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/1256/display/redirect

Harbormaster failed remote builds in B10281: Diff 10567!Dec 11 2019, 5:57 PM
Vulcan added a comment.Dec 11 2019, 6:10 PM

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/740/display/redirect

vladislavbelov added a comment.Jan 15 2020, 4:12 PM

Years. Also it's important to have a test for the new terrain functionality. But I suggest to split the patch and change the CTerrain and tests in a separate patch.

source/graphics/Terrain.cpp
510 ↗(On Diff #10567)

I think it should be std::abs(horizontalOffset) >= (size + m_MapSizePatches) / 2 (same for vertical) if we also want to have a little piece of the source.

534 ↗(On Diff #10567)

I'm not sure that +1 is needed here.

539 ↗(On Diff #10567)

I think src[0] is better than *src as it's more explicit.

541 ↗(On Diff #10567)

src[(width * PATCH_SIZE + 1) - 1]

source/graphics/Terrain.h
103 ↗(On Diff #10567)

Different arguments types in definition and implementation. I think we need to use ssize_t, since we do most calculations using ssize_t.

source/gui/ObjectTypes/CMiniMap.cpp
77 ↗(On Diff #10567)

Is CMinimap or CCmpPathfinder present on Atlas start? Because only they add that validator.

source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/MapResizeDialog.cpp
22 ↗(On Diff #10567)

I think this empty line isn't necessary.

52 ↗(On Diff #10567)

Instead of wxString(s["Name"]) we use wxString::FromUTF8(s["Name"]) (see Map.cpp or Terrain.cpp).

53 ↗(On Diff #10567)

For size we use (*s["Tiles"]).getLong().

96 ↗(On Diff #10567)

Maybe?

wxString str = static_cast<wxStringClientData*>(evt.GetClientObject())->GetData();
m_NewSize = str.getLong();
98 ↗(On Diff #10567)

Not necessary parenthesis.

source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/MapResizeDialog.h
21 ↗(On Diff #10567)

Empty line between system and game headers.

32 ↗(On Diff #10567)

Empty line I think.

source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/PseudoMiniMapPanel.cpp
60 ↗(On Diff #10567)

Not needed line.

64 ↗(On Diff #10567)

Maybe imageBytes = std::move(*qryBackground.imageBytes)?

67 ↗(On Diff #10567)

We use new, no?

95 ↗(On Diff #10567)

We have duplication here. We need only one place to parse the size.

source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/PseudoMiniMapPanel.h
51 ↗(On Diff #10567)

I think ssize_t instead of int like in other places.

source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp
286 ↗(On Diff #10567)

std::vector<u8> imageBytes(buf_size);.

342 ↗(On Diff #10567)
msg->imageBytes = std::move(imageBytes);
391 ↗(On Diff #10567)
cResizeMap() : m_Heightmap(nullptr), m_Patches(nullptr)
{
}
Stan marked an inline comment as done.Jan 15 2020, 4:23 PM
Stan added inline comments.
source/graphics/Terrain.h
103 ↗(On Diff #10567)

I think I tried that, and it failed, so I reverted to int.

source/gui/ObjectTypes/CMiniMap.cpp
77 ↗(On Diff #10567)

Pathfinder I assume for the overlay you can enable. Minimap only if you start the simulation.

source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/MapResizeDialog.cpp
96 ↗(On Diff #10567)

Advantages?

98 ↗(On Diff #10567)

?

source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/PseudoMiniMapPanel.cpp
64 ↗(On Diff #10567)

Can you explain? I'm always struggling with this.

67 ↗(On Diff #10567)

Dunno? You're the expert.

95 ↗(On Diff #10567)

Duplication with where?

source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/PseudoMiniMapPanel.h
51 ↗(On Diff #10567)

See comment above. Or am I dumb and maybe I used size_t which is not signed hence breaking the feature?

Stan updated this revision to Diff 11050.Jan 16 2020, 1:01 PM
Stan marked 23 inline comments as done.

Fix notes

Vulcan added a comment.Jan 16 2020, 1:06 PM

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/157/display/redirect

Harbormaster failed remote builds in B10831: Diff 11050!Jan 16 2020, 1:06 PM
Vulcan added a comment.Jan 16 2020, 1:09 PM

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/1579/display/redirect

Vulcan added a comment.Jan 16 2020, 1:19 PM

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/1061/display/redirect

Stan updated this revision to Diff 11051.Jan 16 2020, 2:26 PM

Try to fix build

Vulcan added a comment.Jan 16 2020, 2:30 PM

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/158/display/redirect

Vulcan added a comment.Jan 16 2020, 2:30 PM

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/1580/display/redirect

Harbormaster failed remote builds in B10832: Diff 11051!Jan 16 2020, 2:30 PM
Vulcan added a comment.Jan 16 2020, 2:35 PM

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/1062/display/redirect

Stan updated this revision to Diff 11052.Jan 16 2020, 2:36 PM

int → ssize_t

source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/MapResizeDialog.cpp
96 ↗(On Diff #10567)

Had to tweak it.

source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/PseudoMiniMapPanel.cpp
64 ↗(On Diff #10567)

Reverted because

../../../source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/PseudoMiniMapPanel.cpp:63:36: warning: moving a temporary object prevents copy elision [-Wpessimizing-move]

        std::vector<uint8_t> imageBytes = std::move(*qryBackground.imageBytes);
Vulcan added a comment.Jan 16 2020, 2:46 PM

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/1063/display/redirect

Vulcan added a comment.Jan 16 2020, 2:51 PM

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/159/display/redirect

Vulcan added a comment.Jan 16 2020, 3:00 PM

Successful build - Chance fights ever on the side of the prudent.

Linter detected issues:
Executing section Source...

source/graphics/Terrain.h
|   1| /*·Copyright·(C)·2019·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2020" year instead of "2019"

source/graphics/Terrain.h
|  51| class·CTerrain
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'classCTerrain{' is invalid C code. Use --std or --language to configure the language.

source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.h
|   1| /*·Copyright·(C)·2019·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2020" year instead of "2019"

source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.h
|  23| {
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'classSidebar:' is invalid C code. Use --std or --language to configure the language.

source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp
|   1| /*·Copyright·(C)·2019·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2020" year instead of "2019"

source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp
| 166| BEGIN_EVENT_TABLE(TexturePreviewPanel,·wxPanel)
|    | [MAJOR] CPPCheckBear (unknownMacro):
|    | There is an unknown macro here somewhere. Configuration is required. If BEGIN_EVENT_TABLE is a macro then please configure it.

source/graphics/Terrain.cpp
|   1| /*·Copyright·(C)·2019·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2020" year instead of "2019"

source/gui/ObjectTypes/CMiniMap.h
|   1| /*·Copyright·(C)·2019·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2020" year instead of "2019"

source/gui/ObjectTypes/CMiniMap.h
|  29| class·CMiniMap·:·public·IGUIObject
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'classCMiniMap:' is invalid C code. Use --std or --language to configure the language.

source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/PseudoMiniMapPanel.h
|  25| class·PseudoMiniMapPanel·:·public·wxPanel
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'classPseudoMiniMapPanel:' is invalid C code. Use --std or --language to configure the language.

source/gui/ObjectTypes/CMiniMap.cpp
|   1| /*·Copyright·(C)·2019·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2020" year instead of "2019"

source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.h
|   1| /*·Copyright·(C)·2019·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2020" year instead of "2019"

source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.h
|  23| 
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'classSidebar:' is invalid C code. Use --std or --language to configure the language.

source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/MapResizeDialog.h
|  25| class·MapResizeDialog·:·public·wxDialog
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'classPseudoMiniMapPanel:' is invalid C code. Use --std or --language to configure the language.

source/tools/atlas/GameInterface/Messages.h
|   1| /*·Copyright·(C)·2019·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2020" year instead of "2019"

source/tools/atlas/GameInterface/Messages.h
|  25| #include·<vector>
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'namespaceAtlasMessage{' is invalid C code. Use --std or --language to configure the language.

source/tools/atlas/GameInterface/Messages.h
| 211| »   »   ((std::vector<std::string>,·data))
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Unmatched '}'. Configuration: 'MESSAGESSETUP_NOTFIRST'.

source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp
|   1| /*·Copyright·(C)·2019·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2020" year instead of "2019"

source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp
|   1| /*·Copyright·(C)·2019·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2020" year instead of "2019"

source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp
| 544| »   »   »   »   m_DeletedObjects.push_back(deleted);
|    | [MAJOR] CPPCheckBear (uninitStructMember):
|    | Uninitialized struct member: deleted.owner

source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp
| 211| »   »   cmpTerrain->ReloadTerrain();
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Unmatched '}'. Configuration: 'MESSAGESSETUP_NOTFIRST'.
Executing section JS...
Executing section cli...

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/1581/display/redirect

Harbormaster completed remote builds in B10833: Diff 11052.Jan 16 2020, 3:01 PM
vladislavbelov mentioned this in D2604: Adds tests for terrain resize.Jan 29 2020, 3:45 PM
vladislavbelov mentioned this in D2724: Splits Terrain changes from D825 and adds tests for offsets.May 6 2020, 1:30 AM
Stan updated this revision to Diff 11812.May 8 2020, 11:20 AM

Rebase after D2724

Vulcan added a comment.May 8 2020, 11:29 AM

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/670/display/redirect

Harbormaster failed remote builds in B11599: Diff 11812!May 8 2020, 11:29 AM
Stan updated this revision to Diff 11813.May 8 2020, 11:36 AM

Fix a warning introduced by D2724 / rP23639

Vulcan added a comment.May 8 2020, 11:37 AM

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/671/display/redirect

Harbormaster failed remote builds in B11600: Diff 11813!May 8 2020, 11:37 AM
Vulcan added a comment.May 8 2020, 11:40 AM

Successful build - Chance fights ever on the side of the prudent.

Linter detected issues:
Executing section Source...

source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/MapResizeDialog.h
|  25| class·MapResizeDialog·:·public·wxDialog
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'classPseudoMiniMapPanel:' is invalid C code. Use --std or --language to configure the language.

source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.h
|  23| 
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'classSidebar:' is invalid C code. Use --std or --language to configure the language.

source/gui/ObjectTypes/CMiniMap.h
|   1| /*·Copyright·(C)·2019·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2020" year instead of "2019"

source/gui/ObjectTypes/CMiniMap.h
|  29| class·CMiniMap·:·public·IGUIObject
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'classCMiniMap:' is invalid C code. Use --std or --language to configure the language.

source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp
| 166| BEGIN_EVENT_TABLE(TexturePreviewPanel,·wxPanel)
|    | [MAJOR] CPPCheckBear (unknownMacro):
|    | There is an unknown macro here somewhere. Configuration is required. If BEGIN_EVENT_TABLE is a macro then please configure it.

source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/PseudoMiniMapPanel.h
|  25| class·PseudoMiniMapPanel·:·public·wxPanel
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'classPseudoMiniMapPanel:' is invalid C code. Use --std or --language to configure the language.

source/gui/ObjectTypes/CMiniMap.cpp
|   1| /*·Copyright·(C)·2019·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2020" year instead of "2019"

source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.h
|  23| {
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'classSidebar:' is invalid C code. Use --std or --language to configure the language.

source/tools/atlas/GameInterface/Messages.h
|   1| /*·Copyright·(C)·2019·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2020" year instead of "2019"

source/tools/atlas/GameInterface/Messages.h
|  25| #include·<vector>
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'namespaceAtlasMessage{' is invalid C code. Use --std or --language to configure the language.

source/tools/atlas/GameInterface/Messages.h
| 211| »   »   ((std::vector<std::string>,·data))
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Unmatched '}'. Configuration: 'MESSAGESSETUP_NOTFIRST'.

source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp
| 545| »   »   »   »   m_DeletedObjects.push_back(deleted);
|    | [MAJOR] CPPCheckBear (uninitStructMember):
|    | Uninitialized struct member: deleted.owner

source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp
| 211| »   CmpPtr<ICmpTerrain>·cmpTerrain(*g_Game->GetSimulation2(),·SYSTEM_ENTITY);
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Unmatched '}'. Configuration: 'MESSAGESSETUP_NOTFIRST'.
Executing section JS...
Executing section cli...

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/2085/display/redirect

Vulcan added a comment.May 8 2020, 11:54 AM

Successful build - Chance fights ever on the side of the prudent.

Linter detected issues:
Executing section Source...

source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/MapResizeDialog.h
|  25| class·MapResizeDialog·:·public·wxDialog
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'classPseudoMiniMapPanel:' is invalid C code. Use --std or --language to configure the language.

source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/PseudoMiniMapPanel.h
|  25| class·PseudoMiniMapPanel·:·public·wxPanel
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'classPseudoMiniMapPanel:' is invalid C code. Use --std or --language to configure the language.

source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp
| 166| BEGIN_EVENT_TABLE(TexturePreviewPanel,·wxPanel)
|    | [MAJOR] CPPCheckBear (unknownMacro):
|    | There is an unknown macro here somewhere. Configuration is required. If BEGIN_EVENT_TABLE is a macro then please configure it.

source/tools/atlas/GameInterface/Messages.h
|   1| /*·Copyright·(C)·2019·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2020" year instead of "2019"

source/tools/atlas/GameInterface/Messages.h
|  25| #include·<vector>
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'namespaceAtlasMessage{' is invalid C code. Use --std or --language to configure the language.

source/tools/atlas/GameInterface/Messages.h
| 211| »   »   ((std::vector<std::string>,·data))
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Unmatched '}'. Configuration: 'MESSAGESSETUP_NOTFIRST'.

source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.h
|  23| {
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'classSidebar:' is invalid C code. Use --std or --language to configure the language.

source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.h
|  23| 
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'classSidebar:' is invalid C code. Use --std or --language to configure the language.

source/gui/ObjectTypes/CMiniMap.h
|   1| /*·Copyright·(C)·2019·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2020" year instead of "2019"

source/gui/ObjectTypes/CMiniMap.h
|  29| class·CMiniMap·:·public·IGUIObject
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'classCMiniMap:' is invalid C code. Use --std or --language to configure the language.

source/gui/ObjectTypes/CMiniMap.cpp
|   1| /*·Copyright·(C)·2019·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2020" year instead of "2019"

source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp
| 545| »   »   »   »   m_DeletedObjects.push_back(deleted);
|    | [MAJOR] CPPCheckBear (uninitStructMember):
|    | Uninitialized struct member: deleted.owner

source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp
| 211| »   CmpPtr<ICmpTerrain>·cmpTerrain(*g_Game->GetSimulation2(),·SYSTEM_ENTITY);
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Unmatched '}'. Configuration: 'MESSAGESSETUP_NOTFIRST'.
Executing section JS...
Executing section cli...

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/2086/display/redirect

Stan updated this revision to Diff 12589.Jul 8 2020, 9:19 AM

Rebase following rP23807

Vulcan added a comment.Jul 8 2020, 9:38 AM

Successful build - Chance fights ever on the side of the prudent.

Linter detected issues:
Executing section Source...

source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/MapResizeDialog.h
|  25| class·MapResizeDialog·:·public·wxDialog
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'classPseudoMiniMapPanel:' is invalid C code. Use --std or --language to configure the language.

source/gui/ObjectTypes/CMiniMap.h
|   1| /*·Copyright·(C)·2019·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2020" year instead of "2019"

source/gui/ObjectTypes/CMiniMap.h
|  29| class·CMiniMap·:·public·IGUIObject
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'classCMiniMap:' is invalid C code. Use --std or --language to configure the language.

source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.h
|  23| 
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'classSidebar:' is invalid C code. Use --std or --language to configure the language.

source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp
| 166| BEGIN_EVENT_TABLE(TexturePreviewPanel,·wxPanel)
|    | [MAJOR] CPPCheckBear (unknownMacro):
|    | There is an unknown macro here somewhere. Configuration is required. If BEGIN_EVENT_TABLE is a macro then please configure it.

source/tools/atlas/GameInterface/Messages.h
|   1| /*·Copyright·(C)·2019·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2020" year instead of "2019"

source/tools/atlas/GameInterface/Messages.h
|  25| #include·<vector>
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'namespaceAtlasMessage{' is invalid C code. Use --std or --language to configure the language.

source/tools/atlas/GameInterface/Messages.h
| 211| »   »   ((std::vector<std::string>,·data))
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Unmatched '}'. Configuration: 'MESSAGESSETUP_NOTFIRST'.

source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.h
|  23| {
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'classSidebar:' is invalid C code. Use --std or --language to configure the language.

source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/PseudoMiniMapPanel.h
|  25| class·PseudoMiniMapPanel·:·public·wxPanel
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'classPseudoMiniMapPanel:' is invalid C code. Use --std or --language to configure the language.

source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp
| 545| »   »   »   »   m_DeletedObjects.push_back(deleted);
|    | [MAJOR] CPPCheckBear (uninitStructMember):
|    | Uninitialized struct member: deleted.owner

source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp
| 211| »   CmpPtr<ICmpTerrain>·cmpTerrain(*g_Game->GetSimulation2(),·SYSTEM_ENTITY);
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Unmatched '}'. Configuration: 'MESSAGESSETUP_NOTFIRST'.
Executing section JS...
Executing section cli...

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/2597/display/redirect

Harbormaster completed remote builds in B12325: Diff 12589.Jul 8 2020, 9:39 AM
This revision was not accepted when it landed; it landed in state Needs Review.Jul 21 2020, 4:09 AM
Closed by commit rP23859: Allow map to recenter during resize in Atlas. Fixes #1109. (authored by vladislavbelov). · Explain Why
This revision was automatically updated to reflect the committed changes.
vladislavbelov added a commit: rP23859: Allow map to recenter during resize in Atlas. Fixes #1109..
vladislavbelov added a comment.Jul 21 2020, 4:11 AM

@Clockwork-Muse, sorry for the long review and thank you for the patch.

Revision Contents
Changeset List

PathSize
ps/
trunk/
build/
premake/
1 line
source/
gui/
ObjectTypes/
6 lines
23 lines
tools/
atlas/
AtlasUI/
CustomControls/
MapResizeDialog/
51 lines
119 lines
57 lines
232 lines
ScenarioEditor/
Sections/
Map/
11 lines
21 lines
Terrain/
4 lines
53 lines
GameInterface/
Handlers/
293 lines
13 lines

Diff 12828

View Options

ps/trunk/build/premake/premake5.lua

Loading...
View Options

ps/trunk/source/gui/ObjectTypes/CMiniMap.h

Loading...
View Options

ps/trunk/source/gui/ObjectTypes/CMiniMap.cpp

Loading...
View Options

ps/trunk/source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/MapResizeDialog.h

Loading...
View Options

ps/trunk/source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/MapResizeDialog.cpp

Loading...
View Options

ps/trunk/source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/PseudoMiniMapPanel.h

Loading...
View Options

ps/trunk/source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/PseudoMiniMapPanel.cpp

Loading...
View Options

ps/trunk/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.h

Loading...
View Options

ps/trunk/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp

Loading...
View Options

ps/trunk/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.h

Loading...
View Options

ps/trunk/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp

Loading...
View Options

ps/trunk/source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp

Loading...
View Options

ps/trunk/source/tools/atlas/GameInterface/Messages.h

Loading...
Wildfire Games · Phabricator