# HG changeset patch # User sheepluva # Date 1412203225 -7200 # Node ID 87e47843018ebc91edca7f205a214aa19a0e1c42 # Parent e19a864e2fab38c3f9526147d1777f0a63143d20 use constants for mapgen, expose those to lua diff -r e19a864e2fab -r 87e47843018e hedgewars/uConsts.pas --- a/hedgewars/uConsts.pas Thu Oct 02 00:06:59 2014 +0200 +++ b/hedgewars/uConsts.pas Thu Oct 02 00:40:25 2014 +0200 @@ -316,6 +316,12 @@ cMinPlayWidth = 200; + // MapGen + mgRandom = 0; + mgMaze = 1; + mgPerlin = 2; + mgDrawn = 3; + implementation end. diff -r e19a864e2fab -r 87e47843018e hedgewars/uLand.pas --- a/hedgewars/uLand.pas Thu Oct 02 00:06:59 2014 +0200 +++ b/hedgewars/uLand.pas Thu Oct 02 00:40:25 2014 +0200 @@ -545,10 +545,10 @@ begin WriteLnToConsole('Generating land...'); case cMapGen of - 0: GenTemplated(EdgeTemplates[SelectTemplate]); - 1: begin ResizeLand(4096,2048); GenMaze; end; - 2: begin ResizeLand(4096,2048); GenPerlin; end; - 3: GenDrawnMap; + mgRandom: GenTemplated(EdgeTemplates[SelectTemplate]); + mgMaze : begin ResizeLand(4096,2048); GenMaze; end; + mgPerlin: begin ResizeLand(4096,2048); GenPerlin; end; + mgDrawn : GenDrawnMap; else OutError('Unknown mapgen', true); end; diff -r e19a864e2fab -r 87e47843018e hedgewars/uScript.pas --- a/hedgewars/uScript.pas Thu Oct 02 00:06:59 2014 +0200 +++ b/hedgewars/uScript.pas Thu Oct 02 00:40:25 2014 +0200 @@ -2751,8 +2751,14 @@ // land flags ScriptSetInteger('lfIndestructible', lfIndestructible); -ScriptSetInteger('lfIce', lfIce); -ScriptSetInteger('lfBouncy', lfBouncy); +ScriptSetInteger('lfIce' , lfIce); +ScriptSetInteger('lfBouncy' , lfBouncy); + +// mapgen +ScriptSetInteger('mgRandom', mgRandom); +ScriptSetInteger('mgMaze' , mgMaze); +ScriptSetInteger('mgPerlin', mgPerlin); +ScriptSetInteger('mgDrawn' , mgDrawn); // register functions lua_register(luaState, _P'HideHog', @lc_hidehog); diff -r e19a864e2fab -r 87e47843018e tests/lua/drillrockets_boom.lua --- a/tests/lua/drillrockets_boom.lua Thu Oct 02 00:06:59 2014 +0200 +++ b/tests/lua/drillrockets_boom.lua Thu Oct 02 00:40:25 2014 +0200 @@ -71,7 +71,7 @@ -- The base number for the random number generator Seed = 1 -- The map to be played - MapGen = 2 + MapGen = mgDrawn -- The theme to be used Theme = "Bamboo" -- Game settings and rules diff -r e19a864e2fab -r 87e47843018e tests/lua/drillrockets_drill.lua --- a/tests/lua/drillrockets_drill.lua Thu Oct 02 00:06:59 2014 +0200 +++ b/tests/lua/drillrockets_drill.lua Thu Oct 02 00:40:25 2014 +0200 @@ -65,7 +65,7 @@ -- The base number for the random number generator Seed = 1 -- The map to be played - MapGen = 2 + MapGen = mgDrawn -- The theme to be used Theme = "Bamboo" -- Game settings and rules diff -r e19a864e2fab -r 87e47843018e tests/lua/hellfire_burns.lua --- a/tests/lua/hellfire_burns.lua Thu Oct 02 00:06:59 2014 +0200 +++ b/tests/lua/hellfire_burns.lua Thu Oct 02 00:40:25 2014 +0200 @@ -62,7 +62,7 @@ -- The base number for the random number generator Seed = 1 -- The map to be played - MapGen = 2 + MapGen = mgDrawn -- The theme to be used Theme = "Bamboo" -- Game settings and rules