[Stratagus-CVS] stratagus/data/ccl buttons.lua stratagus.lua hu...

[Jimmy Salmon]

CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     Jimmy Salmon <address@hidden>   03/11/19 19:13:48

Modified files:
        data/ccl       : buttons.lua stratagus.lua 
        data/ccl/human : buttons.lua 

Log message:
        Fixed extensions

Patches:
Index: stratagus/data/ccl/buttons.lua
diff -u stratagus/data/ccl/buttons.lua:1.1 stratagus/data/ccl/buttons.lua:1.2
--- stratagus/data/ccl/buttons.lua:1.1  Wed Nov 19 16:01:47 2003
+++ stratagus/data/ccl/buttons.lua      Wed Nov 19 19:13:47 2003
@@ -26,7 +26,7 @@
 --      along with this program; if not, write to the Free Software
 --      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  
USA
 --
---     $Id: buttons.lua,v 1.1 2003/11/19 21:01:47 jsalmon3 Exp $
+--     $Id: buttons.lua,v 1.2 2003/11/20 00:13:47 jsalmon3 Exp $
 
 -- Load the buttons of all races
 
@@ -42,18 +42,20 @@
 
 -- neutral --------------------------------------------------------------------
 
---(if extensions
+if (extensions) then
 DefineButton("pos", 1, "level", 0, "icon", "icon-circle-of-power",
   "action", "cast-spell", "value", "spell-circle-of-power",
   "allowed", "check-true",
   "key", "d", "hint", "SET ~!DESTINATION",
-  "for-unit", {"unit-dark-portal"}) --)
+  "for-unit", {"unit-dark-portal"})
+end
 
---(if extensions
+if (extensions) then
 DefineButton("pos", 2, "level", 0, "icon", "icon-daemon",
   "action", "train-unit", "value", "unit-daemon",
   "key", "d", "hint", "SUMMON ~!DAEMON",
-  "for-unit", {"unit-dark-portal"}) --)
+  "for-unit", {"unit-dark-portal"})
+end
 
 -- general cancel button ------------------------------------------------------
 
Index: stratagus/data/ccl/human/buttons.lua
diff -u stratagus/data/ccl/human/buttons.lua:1.1 
stratagus/data/ccl/human/buttons.lua:1.2
--- stratagus/data/ccl/human/buttons.lua:1.1    Wed Nov 19 17:41:50 2003
+++ stratagus/data/ccl/human/buttons.lua        Wed Nov 19 19:13:48 2003
@@ -26,7 +26,7 @@
 --      along with this program; if not, write to the Free Software
 --      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  
USA
 --
---     $Id: buttons.lua,v 1.1 2003/11/19 22:41:50 jsalmon3 Exp $
+--     $Id: buttons.lua,v 1.2 2003/11/20 00:13:48 jsalmon3 Exp $
 
 ------------------------------------------------------------------------------
 --     Define", "unit-button.
@@ -117,7 +117,7 @@
   "key", "a", "hint", "~!ATTACK",
   "for-unit", {"unit-archer", "unit-ranger", "unit-female-hero"})
 
---(if extensions
+if (extensions) then
 DefineButton("pos", 4, "level", 0, "icon", "icon-alliance-patrol-land",
   "action", "patrol",
   "key", "p", "hint", "~!PATROL",
@@ -126,13 +126,15 @@
     "unit-flying-angle", "unit-arthor-literios", "unit-knight-rider", 
"unit-wise-man",
     "unit-man-of-light", "unit-gryphon-rider human-group",
     "unit-balloon"})
+else
 DefineButton("pos", 4, "level", 0, "icon", "icon-alliance-patrol-land",
   "action", "patrol",
   "key", "p", "hint", "~!PATROL",
   "for-unit", {"unit-footman", "unit-knight", "unit-archer", "unit-paladin",
     "unit-dwarves", "unit-ranger", "unit-ballista", "unit-female-hero",
     "unit-flying-angle", "unit-arthor-literios", "unit-knight-rider", 
"unit-wise-man",
-    "unit-man-of-light", "unit-gryphon-rider human-group"}) --)
+    "unit-man-of-light", "unit-gryphon-rider human-group"})
+end
 
 DefineButton("pos", 5, "level", 0, "icon", "icon-alliance-stand-ground",
   "action", "stand-ground",
@@ -260,12 +262,13 @@
   "key", "v", "hint", "BUILD AD~!VANCED STRUCTURE",
   "for-unit", {"unit-peasant"})
 
---(if extensions
+if (extensions) then
 DefineButton("pos", 9, "level", 0, "icon", "icon-build-advanced",
   "action", "button", "value", 3,
   "allowed", "check-units-and", "allow-arg", {"unit-castle", 
"unit-mage-tower", "unit-church"},
   "key", "e", "hint", "BUILD SP~!ECIAL STRUCTURE",
-  "for-unit", {"unit-peasant"}) --)
+  "for-unit", {"unit-peasant"})
+end
 
 -- simple buildings human -----------------------------------------------------
 
@@ -378,11 +381,12 @@
 
 -- buildings commands ---------------------------------------------------------
 
---(if extensions
+if (extensions) then
 DefineButton("pos", 1, "level", 0, "icon", "icon-critter",
   "action", "train-unit", "value", "unit-critter",
   "key", "c", "hint", "TRAIN ~!CRITTER",
-  "for-unit", {"unit-farm"}) --)
+  "for-unit", {"unit-farm"})
+end
 
 DefineButton("pos", 1, "level", 0, "icon", "icon-peasant",
   "action", "train-unit", "value", "unit-peasant",
@@ -404,7 +408,8 @@
   "key", "c", "hint", "UPGRADE TO ~!CASTLE",
   "for-unit", {"unit-keep"})
 
---(if extensions (begin
+if (extensions) then
+do
 DefineButton("pos", 5, "level", 0, "icon", "icon-harvest",
   "action", "harvest",
   "key", "h", "hint", "SET ~!HARVEST LUMBER/MINE GOLD",
@@ -426,7 +431,9 @@
   "action", "attack",
   "key", "e", "hint", "S~!ET ATTACK",
   "for-unit", {"unit-town-hall", "unit-keep", "unit-castle", 
"unit-alliance-barracks",
-    "unit-mage-tower", "unit-gryphon-aviary", "unit-inventor"}) --))
+    "unit-mage-tower", "unit-gryphon-aviary", "unit-inventor"})
+end
+end
 
 DefineButton("pos", 1, "level", 0, "icon", "icon-footman",
   "action", "train-unit", "value", "unit-footman",
@@ -503,14 +510,14 @@
   "key", "b", "hint", "BUILD ~!BATTLESHIP",
   "for-unit", {"unit-alliance-shipyard"})
 
---(if extensions (begin
+if (extensions) then
 -----------------------------------------------------
 DefineButton("pos", 6, "level", 0, "icon", "icon-alliance-ship-haul-oil",
   "action", "harvest",
   "key", "h", "hint", "SET ~!HAUL OIL",
   "for-unit", {"unit-alliance-shipyard"})
 -----------------------------------------------------
---  "})
+end
 
 DefineButton("pos", 1, "level", 0, "icon", "icon-alliance-guard-tower",
   "action", "upgrade-to", "value", "unit-alliance-guard-tower",
@@ -580,7 +587,8 @@
   "key", "p", "hint", "~!PATROL",
   "for-unit", {"unit-alliance-submarine", "unit-battleship", 
"unit-alliance-destroyer"})
 
---(if extensions (begin
+if (extensions) then
+do
 DefineButton("pos", 7, "level", 0, "icon", "icon-alliance-ship-move",
   "action", "move",
   "key", "m", "hint", "SET ~!MOVE",
@@ -594,7 +602,9 @@
 DefineButton("pos", 9, "level", 0, "icon", "icon-alliance-ship-cannon1",
   "action", "attack",
   "key", "e", "hint", "S~!ET ATTACK",
-  "for-unit", {"unit-alliance-shipyard"}) --))
+  "for-unit", {"unit-alliance-shipyard"})
+end
+end
 
 -- upgrades -------------------------------------------------------------------
 
@@ -688,13 +698,13 @@
   "key", "e", "hint", "RESEARCH ~!EXORCISM",
   "for-unit", {"unit-church"})
 
---(if extensions
+if (extensions) then
 DefineButton("pos", 5, "level", 0, "icon", "icon-heal",
   "action", "research", "value", "upgrade-area-healing",
   "allowed", "check-single-research",
   "key", "l", "hint", "RESEARCH AREA HEA~!LING",
   "for-unit", {"unit-church"})
---)
+end
 
 DefineButton("pos", 2, "level", 0, "icon", "icon-slow",
   "action", "research", "value", "upgrade-slow",
Index: stratagus/data/ccl/stratagus.lua
diff -u stratagus/data/ccl/stratagus.lua:1.1 
stratagus/data/ccl/stratagus.lua:1.2
--- stratagus/data/ccl/stratagus.lua:1.1        Wed Nov 19 17:24:01 2003
+++ stratagus/data/ccl/stratagus.lua    Wed Nov 19 19:13:47 2003
@@ -26,7 +26,7 @@
 --      along with this program; if not, write to the Free Software
 --      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  
USA
 --
---     $Id: stratagus.lua,v 1.1 2003/11/19 22:24:01 jsalmon3 Exp $
+--     $Id: stratagus.lua,v 1.2 2003/11/20 00:13:47 jsalmon3 Exp $
 
 -- For documentation see stratagus/doc/ccl/ccl.html
 --[[
@@ -210,8 +210,8 @@
 
 --     Edit this to enable/disable extended features.
 --             Currently enables some additional buttons.
---(define extensions #t)
---(define extensions #f)
+extensions = true
+--extensions = false
 
 --     Edit this to enable/disable the training queues.
 SetTrainingQueue(true)