Diffusion 0 A.D. Public Repository rP20528

Delete GetCivData from MapGeneratorWorker.cpp which is redundant with the…
rP20528
Actions

Tags

None

Subscribers

None

Description

Delete GetCivData from MapGeneratorWorker.cpp which is redundant with the ReadJSONFile from rP20129.
Unify civ file loading from gui/common/functions_civinfo.js and rmgen/library.js in globalscripts/Templates.js.
Delete the two forgotton headers in rP20507.

Refs #4868, #4804, D900.
Differential Revision: https://code.wildfiregames.com/D1062
Discussed with: leper

Details

Committed

Nov 26 2017, 2:30 PM

Differential Revision

D1062: Delete CMapGeneratorWorker::GetCivData, badly located JS rmgen civ data parsing code and gui/common/functions_civinfo.js

Parents

rP20527: Fix Builder test following rP20521, refs #4870.

Branches

Unknown

Tags

Unknown

Build Status

Buildable 3827
Build 6656: Trigger Windows Autobuild
Build 6655: Post-Commit Build	Jenkins

Changes (14)

Path

Size

ps/

trunk/

binaries/

data/

mods/

public/

globalscripts/

gui/

civinfo/

common/

functions_civinfo.js

functions_utility.js

gamesetup/

reference/

structree/

replaymenu/

replay_menu.xml

savedgames/

session/

summary/

maps/

random/

rmgen/

source/

graphics/

MapGenerator.cpp

rP20528

ps/trunk/binaries/data/mods/public/globalscripts/Templates.js

Loading...

ps/trunk/binaries/data/mods/public/gui/civinfo/civinfo.xml

Loading...

ps/trunk/binaries/data/mods/public/gui/common/functions_civinfo.js

Loading...

ps/trunk/binaries/data/mods/public/gui/common/functions_utility.js

Loading...

ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.xml

Loading...

ps/trunk/binaries/data/mods/public/gui/reference/structree/structree.xml

Loading...

ps/trunk/binaries/data/mods/public/gui/replaymenu/replay_menu.xml

Loading...

ps/trunk/binaries/data/mods/public/gui/savedgames/load.xml

Loading...

ps/trunk/binaries/data/mods/public/gui/session/session.xml

Loading...

ps/trunk/binaries/data/mods/public/gui/summary/summary.xml

Loading...

ps/trunk/binaries/data/mods/public/maps/random/rmgen/library.js

Loading...

ps/trunk/binaries/data/mods/public/maps/random/rmgen/mapgen.js

Loading...

ps/trunk/source/graphics/MapGenerator.cpp

Loading...

ps/trunk/source/graphics/MapGenerator.h

Loading...