Vantha/0ad
1
1
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix 64-bit build. Avoid using variable-sized types in Atlas message interface.

Browse Source 
This was SVN commit r9251.
This commit is contained in:
Ykkrosh 2011-04-14 14:27:42 +00:00
parent d3c00a4c61
commit 57e6980465
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp
View File

@ -86,10 +86,10 @@ QUERYHANDLER(GenerateMap)
CScriptValRooted settings;
scriptInterface.Eval("({})", settings);
scriptInterface.SetProperty(settings.get(), "Size", (size_t)msg->size);
scriptInterface.SetProperty(settings.get(), "Seed", (size_t)msg->seed);
scriptInterface.SetProperty(settings.get(), "Size", (int)msg->size);
scriptInterface.SetProperty(settings.get(), "Seed", (int)msg->seed);
scriptInterface.SetProperty(settings.get(), "BaseTerrain", std::vector<std::wstring>(*msg->terrain));
scriptInterface.SetProperty(settings.get(), "BaseHeight", (size_t)msg->height);
scriptInterface.SetProperty(settings.get(), "BaseHeight", (int)msg->height);
scriptInterface.SetProperty(settings.get(), "CircularMap", true); // now default to circular map
CScriptValRooted pData = scriptInterface.ParseJSON(*msg->playerData);

6
source/tools/atlas/GameInterface/Messages.h
View File

@ -134,10 +134,10 @@ MESSAGE(ResizeScreen,
QUERY(GenerateMap,
((std::wstring, script)) // name of script
((size_t, size)) // size in number of patches
((size_t, seed)) // seed for rng
((int, size)) // size in number of patches
((int, seed)) // seed for rng
((std::vector<std::wstring>, terrain)) // base terrain(s)
((size_t, height)) // base height
((int, height)) // base height
((std::string, playerData)) // JSON player data
,
((int, status)) // Status code, 0 for success, or < 0 for failure