Page MenuHomeWildfire Games
Differential D5263

[maps] placement options alternative 2/2
Needs ReviewPublic
Actions

Authored by real_tabasco_sauce on May 5 2024, 4:43 AM.
This revision needs review, but there are no reviewers specified.

Details

Reviewers
None
Summary

This patch enables the version of placement options introduced with D5262
any maps you would recommend I add? I am planning on adding unknown, probably in another patch.

Test Plan

test generation of all of them

Diff Detail

Event Timeline

real_tabasco_sauce created this revision.May 5 2024, 4:43 AM
Vulcan added a comment.May 5 2024, 4:44 AM

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

Debug:
    11>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(23): error C2084: function 'CFsmEvent::CFsmEvent(unsigned int,void *)' already has a body [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(29): error C2600: 'CFsmEvent::~CFsmEvent': cannot define a compiler-generated special member function (must be declared in the class first) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(33): error C2955: 'CFsm': use of class template requires template argument list [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(35): error C2509: 'AddTransition': member function not declared in 'CFsm' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(39): error C2955: 'CFsm': use of class template requires template argument list [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(40): error C2509: 'SetFirstState': member function not declared in 'CFsm' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(44): error C2955: 'CFsm': use of class template requires template argument list [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(45): error C2509: 'SetCurrState': member function not declared in 'CFsm' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(49): error C2955: 'CFsm': use of class template requires template argument list [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(50): error C2509: 'IsFirstTime': member function not declared in 'CFsm' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(54): error C2955: 'CFsm': use of class template requires template argument list [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(55): error C2509: 'Update': member function not declared in 'CFsm' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(81): error C2955: 'CFsm': use of class template requires template argument list [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
    11>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(82): error C2509: 'IsDone': member function not declared in 'CFsm' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]

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

Vulcan added a comment.May 5 2024, 4:45 AM

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

builderr-debug-macos.txt
../../../source/network/FSM.cpp:22:12: error: redefinition of 'CFsmEvent'
CFsmEvent::CFsmEvent(unsigned int type, void* pParam)
           ^
../../../source/network/FSM.h:35:2: note: previous definition is here
        CFsmEvent(unsigned int type, void* pParam) :
        ^
../../../source/network/FSM.cpp:28:12: error: definition of implicitly declared destructor
CFsmEvent::~CFsmEvent()
           ^
../../../source/network/FSM.cpp:33:6: error: 'CFsm' is not a class, namespace, or enumeration
void CFsm::AddTransition(unsigned int state, unsigned int eventType, unsigned int nextState,
     ^
../../../source/network/FSM.h:67:7: note: 'CFsm' declared here
class CFsm
      ^
../../../source/network/FSM.cpp:34:2: error: unknown type name 'Action'
        Action* pAction /* = nullptr */, void* pContext /* = nullptr*/)
        ^
../../../source/network/FSM.cpp:39:6: error: 'CFsm' is not a class, namespace, or enumeration
void CFsm::SetFirstState(unsigned int firstState)
     ^
../../../source/network/FSM.h:67:7: note: 'CFsm' declared here
class CFsm
      ^
../../../source/network/FSM.cpp:44:6: error: 'CFsm' is not a class, namespace, or enumeration
void CFsm::SetCurrState(unsigned int state)
     ^
../../../source/network/FSM.h:67:7: note: 'CFsm' declared here
class CFsm
      ^
../../../source/network/FSM.cpp:49:6: error: 'CFsm' is not a class, namespace, or enumeration
bool CFsm::IsFirstTime() const
     ^
../../../source/network/FSM.h:67:7: note: 'CFsm' declared here
class CFsm
      ^
../../../source/network/FSM.cpp:54:6: error: 'CFsm' is not a class, namespace, or enumeration
bool CFsm::Update(unsigned int eventType, void* pEventParam)
     ^
../../../source/network/FSM.h:67:7: note: 'CFsm' declared here
class CFsm
      ^
../../../source/network/FSM.cpp:81:6: error: 'CFsm' is not a class, namespace, or enumeration
bool CFsm::IsDone() const
     ^
../../../source/network/FSM.h:67:7: note: 'CFsm' declared here
class CFsm
      ^
9 errors generated.
make[1]: *** [obj/network_Debug/FSM.o] Error 1
make: *** [network] Error 2

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

real_tabasco_sauce retitled this revision from [maps] enable team placement options to [maps] alternative patch to enable placement options for more random maps.May 5 2024, 5:18 AM
Harbormaster completed remote builds in B22915: Diff 22920.May 5 2024, 6:15 AM
real_tabasco_sauce requested review of this revision.May 5 2024, 6:15 AM
real_tabasco_sauce updated this revision to Diff 22921.May 5 2024, 6:26 AM

fix missing files

Vulcan added a comment.May 5 2024, 6:27 AM

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

Debug:
     8>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(23): error C2084: function 'CFsmEvent::CFsmEvent(unsigned int,void *)' already has a body [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
     8>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(29): error C2600: 'CFsmEvent::~CFsmEvent': cannot define a compiler-generated special member function (must be declared in the class first) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
     8>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(33): error C2955: 'CFsm': use of class template requires template argument list [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
     8>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(35): error C2509: 'AddTransition': member function not declared in 'CFsm' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
     8>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(39): error C2955: 'CFsm': use of class template requires template argument list [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
     8>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(40): error C2509: 'SetFirstState': member function not declared in 'CFsm' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
     8>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(44): error C2955: 'CFsm': use of class template requires template argument list [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
     8>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(45): error C2509: 'SetCurrState': member function not declared in 'CFsm' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
     8>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(49): error C2955: 'CFsm': use of class template requires template argument list [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
     8>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(50): error C2509: 'IsFirstTime': member function not declared in 'CFsm' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
     8>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(54): error C2955: 'CFsm': use of class template requires template argument list [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
     8>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(55): error C2509: 'Update': member function not declared in 'CFsm' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
     8>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(81): error C2955: 'CFsm': use of class template requires template argument list [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
     8>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(82): error C2509: 'IsDone': member function not declared in 'CFsm' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]

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

real_tabasco_sauce edited the summary of this revision. (Show Details)May 5 2024, 6:27 AM
Harbormaster completed remote builds in B22916: Diff 22921.May 5 2024, 6:37 AM
Vulcan added a comment.May 5 2024, 6:37 AM

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

builderr-debug-macos.txt
../../../source/network/FSM.cpp:22:12: error: redefinition of 'CFsmEvent'
CFsmEvent::CFsmEvent(unsigned int type, void* pParam)
           ^
../../../source/network/FSM.h:35:2: note: previous definition is here
        CFsmEvent(unsigned int type, void* pParam) :
        ^
../../../source/network/FSM.cpp:28:12: error: definition of implicitly declared destructor
CFsmEvent::~CFsmEvent()
           ^
../../../source/network/FSM.cpp:33:6: error: 'CFsm' is not a class, namespace, or enumeration
void CFsm::AddTransition(unsigned int state, unsigned int eventType, unsigned int nextState,
     ^
../../../source/network/FSM.h:67:7: note: 'CFsm' declared here
class CFsm
      ^
../../../source/network/FSM.cpp:34:2: error: unknown type name 'Action'
        Action* pAction /* = nullptr */, void* pContext /* = nullptr*/)
        ^
../../../source/network/FSM.cpp:39:6: error: 'CFsm' is not a class, namespace, or enumeration
void CFsm::SetFirstState(unsigned int firstState)
     ^
../../../source/network/FSM.h:67:7: note: 'CFsm' declared here
class CFsm
      ^
../../../source/network/FSM.cpp:44:6: error: 'CFsm' is not a class, namespace, or enumeration
void CFsm::SetCurrState(unsigned int state)
     ^
../../../source/network/FSM.h:67:7: note: 'CFsm' declared here
class CFsm
      ^
../../../source/network/FSM.cpp:49:6: error: 'CFsm' is not a class, namespace, or enumeration
bool CFsm::IsFirstTime() const
     ^
../../../source/network/FSM.h:67:7: note: 'CFsm' declared here
class CFsm
      ^
../../../source/network/FSM.cpp:54:6: error: 'CFsm' is not a class, namespace, or enumeration
bool CFsm::Update(unsigned int eventType, void* pEventParam)
     ^
../../../source/network/FSM.h:67:7: note: 'CFsm' declared here
class CFsm
      ^
../../../source/network/FSM.cpp:81:6: error: 'CFsm' is not a class, namespace, or enumeration
bool CFsm::IsDone() const
     ^
../../../source/network/FSM.h:67:7: note: 'CFsm' declared here
class CFsm
      ^
9 errors generated.
make[1]: *** [obj/network_Debug/FSM.o] Error 1
make: *** [network] Error 2

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

real_tabasco_sauce retitled this revision from [maps] alternative patch to enable placement options for more random maps to [maps] placement options alternative 1/2.Tue, May 7, 7:10 AM
real_tabasco_sauce retitled this revision from [maps] placement options alternative 1/2 to [maps] placement options alternative 2/2.
real_tabasco_sauce removed a reviewer: Restricted Owners Package.Tue, May 7, 9:46 PM

Revision Contents
Changeset List

Diff 22921

View Options

binaries/data/mods/public/maps/random/african_plains.js

Loading...
View Options

binaries/data/mods/public/maps/random/african_plains.json

Loading...
View Options

binaries/data/mods/public/maps/random/alpine_lakes.js

Loading...
View Options

binaries/data/mods/public/maps/random/alpine_lakes.json

Loading...
View Options

binaries/data/mods/public/maps/random/ambush.js

Loading...
View Options

binaries/data/mods/public/maps/random/ambush.json

Loading...
View Options

binaries/data/mods/public/maps/random/anatolian_plateau.js

Loading...
View Options

binaries/data/mods/public/maps/random/anatolian_plateau.json

Loading...
View Options

binaries/data/mods/public/maps/random/archipelago.js

Loading...
View Options

binaries/data/mods/public/maps/random/archipelago.json

Loading...
View Options

binaries/data/mods/public/maps/random/arctic_summer.js

Loading...
View Options

binaries/data/mods/public/maps/random/arctic_summer.json

Loading...
View Options

binaries/data/mods/public/maps/random/ardennes_forest.js

Loading...
View Options

binaries/data/mods/public/maps/random/ardennes_forest.json

Loading...
View Options

binaries/data/mods/public/maps/random/atlas_mountains.js

Loading...
View Options

binaries/data/mods/public/maps/random/atlas_mountains.json

Loading...
View Options

binaries/data/mods/public/maps/random/botswanan_haven.js

Loading...
View Options

binaries/data/mods/public/maps/random/botswanan_haven.json

Loading...
View Options

binaries/data/mods/public/maps/random/continent.js

Loading...
View Options

binaries/data/mods/public/maps/random/continent.json

Loading...
View Options

binaries/data/mods/public/maps/random/flood.json

Loading...
View Options

binaries/data/mods/public/maps/random/frontier.js

Loading...
View Options

binaries/data/mods/public/maps/random/frontier.json

Loading...
View Options

binaries/data/mods/public/maps/random/harbor.js

Loading...
View Options

binaries/data/mods/public/maps/random/harbor.json

Loading...
View Options

binaries/data/mods/public/maps/random/hells_pass.js

Loading...
View Options

binaries/data/mods/public/maps/random/india.js

Loading...
View Options

binaries/data/mods/public/maps/random/india.json

Loading...
View Options

binaries/data/mods/public/maps/random/lake.js

Loading...
View Options

binaries/data/mods/public/maps/random/lake.json

Loading...
View Options

binaries/data/mods/public/maps/random/lions_den.js

Loading...
View Options

binaries/data/mods/public/maps/random/mainland.js

Loading...
View Options

binaries/data/mods/public/maps/random/mainland.json

Loading...
View Options

binaries/data/mods/public/maps/random/neareastern_badlands.js

Loading...
View Options

binaries/data/mods/public/maps/random/neareastern_badlands.json

Loading...
View Options

binaries/data/mods/public/maps/random/rhine_marshlands.js

Loading...
View Options

binaries/data/mods/public/maps/random/rhine_marshlands.json

Loading...
View Options

binaries/data/mods/public/maps/random/sahel.js

Loading...
View Options

binaries/data/mods/public/maps/random/sahel.json

Loading...
View Options

binaries/data/mods/public/maps/random/volcanic_lands.js

Loading...
View Options

binaries/data/mods/public/maps/random/volcanic_lands.json

Loading...
Wildfire Games · Phabricator