Page MenuHomeWildfire Games
Differential D825

Atlas: Allow map to recenter during resize
Needs ReviewPublic
Actions

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

Details

Reviewers
vladislavbelov
trompetin17
Clockwork-Muse
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

Event Timeline

There are a very large number of changes, so older changes are hidden. Show Older Changes
Stan commandeered this revision.Jun 22 2019, 2:40 PM
Stan added a reviewer: Clockwork-Muse.

Commandeering to rebase @Clockwork-Muse feel free to commandeer back if you want to continue working on it.

Stan updated this revision to Diff 8578.Jun 22 2019, 2:40 PM
  • Whitespace
  • Static_cast
  • spaces to tabs
  • rebase
Stan marked 2 inline comments as done and an inline comment as not done.Jun 22 2019, 2:41 PM
Stan marked 2 inline comments as done.
Vulcan added a comment.Jun 22 2019, 2:43 PM

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

Linter detected issues:
Executing section Source...

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

source/tools/atlas/GameInterface/Messages.h
| 211| »   »   ((std::vector<std::string>,·data))
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Invalid number of character '{' when these macros are defined: 'MESSAGESSETUP_NOTFIRST'.

source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp
| 211| »   »   &g_Renderer.GetPostprocManager(),
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Invalid number of character '{' when these macros are defined: 'MESSAGESSETUP_NOTFIRST'.
Executing section JS...
Executing section cli...

Link to build: https://jenkins.wildfiregames.com/job/differential/1791/display/redirect

Stan updated this revision to Diff 8585.Jun 23 2019, 6:01 PM

Try to fix the build on Linux

Vulcan added a comment.Jun 23 2019, 6:12 PM

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

Linter detected issues:
Executing section Source...

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

source/tools/atlas/GameInterface/Messages.h
| 211| »   »   ((std::vector<std::string>,·data))
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Invalid number of character '{' when these macros are defined: 'MESSAGESSETUP_NOTFIRST'.

source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp
| 211| »   »   &g_Renderer.GetPostprocManager(),
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Invalid number of character '{' when these macros are defined: 'MESSAGESSETUP_NOTFIRST'.
Executing section JS...
Executing section cli...

Link to build: https://jenkins.wildfiregames.com/job/differential/1797/display/redirect

Stan added a comment.Aug 20 2019, 7:27 AM

@vladislavbelov can you review it when you have some time ?

kenny added a subscriber: kenny.Tue, Sep 17, 7:11 PM
Stan updated this revision to Diff 9851.Thu, Sep 19, 1:01 PM

Rebase + Context

Vulcan added a comment.Thu, Sep 19, 1:05 PM

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

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

Stan updated this revision to Diff 9852.Thu, Sep 19, 1:05 PM

Add missing final newlines.

Vulcan added a comment.Thu, Sep 19, 1:07 PM

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

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

Stan updated this revision to Diff 9853.Thu, Sep 19, 1:10 PM

Fix broken indent on brace.

Vulcan added a comment.Thu, Sep 19, 1:14 PM

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

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

Vulcan added a comment.Thu, Sep 19, 1:25 PM

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

Linter detected issues:
Executing section Source...

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/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
|  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/CustomControls/MapResizeDialog/MapResizeDialog.h
|  24| 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/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
|  24| 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
| 211| 
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Unmatched '}'. Configuration: 'MESSAGESSETUP_NOTFIRST'.
Executing section JS...
Executing section cli...

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

Vulcan added a comment.Thu, Sep 19, 1:46 PM

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

Linter detected issues:
Executing section Source...

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
|  24| 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/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.h
|  23| {
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'classSidebar:' is invalid C code. Use --std or --language to configure the language.

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/CustomControls/MapResizeDialog/MapResizeDialog.h
|  24| 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
|  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
| 211| 
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Unmatched '}'. Configuration: 'MESSAGESSETUP_NOTFIRST'.
Executing section JS...
Executing section cli...

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

Angen added a subscriber: Angen.Thu, Sep 19, 1:57 PM

From Debug build

17>..\..\..\source\tools\atlas\AtlasUI\CustomControls\MapResizeDialog\PseudoMiniMapPanel.cpp(169): warning C4100: 'evt': unreferenced formal parameter [F:\Jenkins\workspace\0adtest\build\workspaces\vc2015\AtlasUI.vcxproj]
Vulcan added a comment.Thu, Sep 19, 2:07 PM

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

Linter detected issues:
Executing section Source...

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
| 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/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/PseudoMiniMapPanel.h
|  24| class·PseudoMiniMapPanel·:·public·wxPanel
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'classPseudoMiniMapPanel:' is invalid C code. Use --std or --language to configure the language.

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/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/CustomControls/MapResizeDialog/MapResizeDialog.h
|  24| 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/Handlers/MapHandlers.cpp
| 211| 
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Unmatched '}'. Configuration: 'MESSAGESSETUP_NOTFIRST'.
Executing section JS...
Executing section cli...

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

Stan updated this revision to Diff 9856.Thu, Sep 19, 2:30 PM
  • Add missing wxUnused(evt) to fix the warning reported by @Angen
  • Add a missing include to fix "There is an unknown macro here somewhere. Configuration is required. If BEGIN_EVENT_TABLE is a macro then please configure it." from CPPCHECK
Vulcan added a comment.Thu, Sep 19, 2:34 PM

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

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

Vulcan added a comment.Thu, Sep 19, 2:52 PM

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

Linter detected issues:
Executing section Source...

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/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/CustomControls/MapResizeDialog/PseudoMiniMapPanel.h
|  24| 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
|  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/CustomControls/MapResizeDialog/MapResizeDialog.h
|  24| 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/Handlers/MapHandlers.cpp
| 211| 
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Unmatched '}'. Configuration: 'MESSAGESSETUP_NOTFIRST'.
Executing section JS...
Executing section cli...

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

vladislavbelov added a comment.Thu, Sep 26, 4:25 PM

Also the code doesn't support square maps.

source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/MapResizeDialog.cpp
45

nullptr

54

We use ssize_t for map size.

source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/MapResizeDialog.h
23

Our first, empty line, libraries.

33

ssize_t.

44

ssize_t.

source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/PseudoMiniMapPanel.cpp
24

I think it's not alphabetical order.

27

<cmath> and should be together with the ones below.

66

I'd prefer to store image data in u8/uint8t_ and only cast it if needed.

68

It'd be good in future to not know how wxWidgets frees the pointer.

103

Magic numbers and I didn't figure out why we need to multiply the size instead of scaling.

source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/PseudoMiniMapPanel.h
20

Wrong case, we use it in upper case.

source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp
278–345

Misleading name, it doesn't return display. I'd suggest to call it like DrawMinimap or RasterizeMinimap.

288

That's bad, we might have a dissynchronization. I suggest to move the original code to a common static function of Minimap and reuse it here.

358–388

I suggest to rename test to position/pos.

396

A bit dangerous, these pointers aren't default initialized.

435

RestoreAll? Also suffix All, why it's used for Delete and here, but not for SetPosition? Though there are no all entities in all these cases, only passed as argument.

463

Too common name, maybe SetPositionOfMovedEntities?

source/tools/atlas/GameInterface/Messages.h
206

u8 or uint8_t.

Stan updated this revision to Diff 9975.Fri, Sep 27, 1:08 PM
Stan marked 11 inline comments as done.

Fix some comments now it crashes

Stan marked an inline comment as not done.Fri, Sep 27, 1:11 PM
Stan added inline comments.
source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp
396

How should I do that ?

Like this ?

if(m_Heightmap != nullptr)
    delete m_Heightmap;
if(m_Patches!= nullptr)
    delete m_Patches;
Vulcan added a comment.Fri, Sep 27, 1:12 PM

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

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

Vulcan added a comment.Fri, Sep 27, 1:15 PM

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

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

Stan updated this revision to Diff 9982.Fri, Sep 27, 5:41 PM
  • Fix broken code, somehow diff messed up and broke the feature.
  • Tested with Arcadia (A square map it works fine)
Vulcan added a comment.Fri, Sep 27, 5:42 PM

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

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

Vulcan added a comment.Fri, Sep 27, 5:42 PM

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

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

Stan marked 5 inline comments as done.Fri, Sep 27, 5:43 PM
Stan updated this revision to Diff 9983.Fri, Sep 27, 6:07 PM
  • Try to fix the mess git introduced
Vulcan added a comment.Fri, Sep 27, 6:13 PM

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

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

Stan updated this revision to Diff 9984.Fri, Sep 27, 6:14 PM
  • Remove autoformat
Stan updated this revision to Diff 9985.Fri, Sep 27, 6:16 PM
  • last one
Vulcan added a comment.Fri, Sep 27, 6:20 PM

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

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

Vulcan added a comment.Fri, Sep 27, 6:23 PM

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

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

Vulcan added a comment.Fri, Sep 27, 6:26 PM

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

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

Vulcan added a comment.Fri, Sep 27, 6:39 PM

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

Linter detected issues:
Executing section Source...

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/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/CustomControls/MapResizeDialog/PseudoMiniMapPanel.h
|  24| 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/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/MapResizeDialog.h
|  24| 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/Handlers/MapHandlers.cpp
| 550| »   »   »   »   m_DeletedObjects.push_back(deleted);
|    | [MAJOR] CPPCheckBear (uninitStructMember):
|    | Uninitialized struct member: deleted.owner

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

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

Vulcan added a comment.Fri, Sep 27, 7:00 PM

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

Linter detected issues:
Executing section Source...

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.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
|  24| 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/CustomControls/MapResizeDialog/MapResizeDialog.h
|  24| 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
|  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.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.h
|  51| class·CTerrain
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'classCTerrain{' is invalid C code. Use --std or --language to configure the language.

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

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

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

Stan updated this revision to Diff 9988.Sat, Sep 28, 11:00 AM
  • Remove minimap duplication
Stan marked an inline comment as done.Sat, Sep 28, 11:01 AM
Vulcan added a comment.Sat, Sep 28, 11:04 AM

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

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

Stan updated this revision to Diff 9989.Sat, Sep 28, 11:13 AM
Stan marked an inline comment as done.

Replace DeleteAll and UndeleteAll by DeleteObjects and Restore Objects

Stan marked an inline comment as done.Sat, Sep 28, 11:14 AM
Vulcan added a comment.Sat, Sep 28, 11:17 AM

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

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

nani awarded a token.Sat, Sep 28, 11:21 AM
Vulcan added a comment.Sat, Sep 28, 11:25 AM

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

Linter detected issues:
Executing section Source...

source/tools/atlas/AtlasUI/CustomControls/MapResizeDialog/PseudoMiniMapPanel.h
|  24| 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/Map/Map.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
|  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/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/CustomControls/MapResizeDialog/MapResizeDialog.h
|  24| 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/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
| 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/gui/MiniMap.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/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/852/display/redirect

Vulcan added a comment.Sat, Sep 28, 11:46 AM

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

Linter detected issues:
Executing section Source...

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/MapResizeDialog.h
|  24| 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/MiniMap.h
|  29| class·CMiniMap·:·public·IGUIObject
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'classCMiniMap:' is invalid C code. Use --std or --language to configure the language.

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/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.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
|  24| 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
| 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/853/display/redirect

vladislavbelov added inline comments.Sat, Oct 5, 12:13 AM
source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp
396

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

Revision Contents
Changeset List

Diff 9989

View Options

build/premake/premake5.lua

Loading...
View Options

source/graphics/Terrain.h

Loading...
View Options

source/graphics/Terrain.cpp

Loading...
View Options

source/gui/MiniMap.h

Loading...
View Options

source/gui/MiniMap.cpp

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

source/tools/atlas/GameInterface/Messages.h

Loading...
Wildfire Games · Phabricator