# HG changeset patch # User unc0rr # Date 1353098490 -14400 # Node ID da083f8d95e661b40110025a7a8db5fc479f185b # Parent 448d61778ca75881eb0384fecb3f1032c92a7cd7 We need custom script loading function in lua now diff -r 448d61778ca7 -r da083f8d95e6 CMakeLists.txt --- a/CMakeLists.txt Sat Nov 17 00:15:30 2012 +0400 +++ b/CMakeLists.txt Sat Nov 17 00:41:30 2012 +0400 @@ -241,7 +241,6 @@ add_subdirectory(misc/liblua) #linking with liblua.a requires system readline -- this works everywhere, right? set(pascal_flags "-k${EXECUTABLE_OUTPUT_PATH}/lib${LUA_LIBRARY}.a" "-k-lreadline" ${pascal_flags}) - add_dependencies(physfsrwops lua) endif() diff -r 448d61778ca7 -r da083f8d95e6 hedgewars/uScript.pas --- a/hedgewars/uScript.pas Sat Nov 17 00:15:30 2012 +0400 +++ b/hedgewars/uScript.pas Sat Nov 17 00:41:30 2012 +0400 @@ -1794,6 +1794,18 @@ lc_setaihintsongear:= 0 end; + +function lc_hedgewarsscriptload(L : Plua_State) : LongInt; Cdecl; +begin + if lua_gettop(L) <> 1 then + begin + LuaError('Lua: Wrong number of parameters passed to HedgewarsScriptLoad!'); + lua_pushnil(L) + end + else + ScriptLoad(lua_tostring(L, 1)); + lc_hedgewarsscriptload:= 0; +end; /////////////////// procedure ScriptPrintStack; @@ -2407,6 +2419,7 @@ lua_register(luaState, _P'TestRectForObstacle', @lc_testrectforobstacle); lua_register(luaState, _P'SetGearAIHints', @lc_setaihintsongear); +lua_register(luaState, _P'HedgewarsScriptLoad', @lc_hedgewarsscriptload); ScriptClearStack; // just to be sure stack is empty diff -r 448d61778ca7 -r da083f8d95e6 misc/physfs/extras/CMakeLists.txt --- a/misc/physfs/extras/CMakeLists.txt Sat Nov 17 00:15:30 2012 +0400 +++ b/misc/physfs/extras/CMakeLists.txt Sat Nov 17 00:41:30 2012 +0400 @@ -5,3 +5,5 @@ include_directories(${CMAKE_SOURCE_DIR}/misc/physfs/src) add_library(physfsrwops STATIC physfsrwops.c physfslualoader.c) + +add_dependencies(physfsrwops lua) diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/backstab.lua --- a/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/backstab.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/backstab.lua Sat Nov 17 00:41:30 2012 +0400 @@ -1,5 +1,5 @@ -loadfile(GetDataPath() .. "Scripts/Locale.lua")() -loadfile(GetDataPath() .. "Scripts/Animate.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") +HedgewarsScriptLoad("/Scripts/Animate.lua") -----------------------------Constants--------------------------------- choiceAccepted = 1 diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/dragon.lua --- a/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/dragon.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/dragon.lua Sat Nov 17 00:41:30 2012 +0400 @@ -1,5 +1,5 @@ -loadfile(GetDataPath() .. "Scripts/Locale.lua")() -loadfile(GetDataPath() .. "Scripts/Animate.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") +HedgewarsScriptLoad("/Scripts/Animate.lua") -----------------------------Map-------------------------------------- local map = diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/enemy.lua --- a/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/enemy.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/enemy.lua Sat Nov 17 00:41:30 2012 +0400 @@ -1,5 +1,5 @@ -loadfile(GetDataPath() .. "Scripts/Locale.lua")() -loadfile(GetDataPath() .. "Scripts/Animate.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") +HedgewarsScriptLoad("/Scripts/Animate.lua") --------------------------------------------Constants------------------------------------ diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/epil.lua --- a/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/epil.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/epil.lua Sat Nov 17 00:41:30 2012 +0400 @@ -1,5 +1,5 @@ -loadfile(GetDataPath() .. "Scripts/Locale.lua")() -loadfile(GetDataPath() .. "Scripts/Animate.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") +HedgewarsScriptLoad("/Scripts/Animate.lua") -----------------------------Constants--------------------------------- leaksNum = 1 diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/family.lua --- a/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/family.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/family.lua Sat Nov 17 00:41:30 2012 +0400 @@ -1,5 +1,5 @@ -loadfile(GetDataPath() .. "Scripts/Locale.lua")() -loadfile(GetDataPath() .. "Scripts/Animate.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") +HedgewarsScriptLoad("/Scripts/Animate.lua") -----------------------------Map-------------------------------------- local map = diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/first_blood.lua --- a/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/first_blood.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/first_blood.lua Sat Nov 17 00:41:30 2012 +0400 @@ -1,5 +1,5 @@ -loadfile(GetDataPath() .. "Scripts/Locale.lua")() -loadfile(GetDataPath() .. "Scripts/Animate.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") +HedgewarsScriptLoad("/Scripts/Animate.lua") -----------------------------Variables--------------------------------- startDialogue = {} diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/journey.lua --- a/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/journey.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/journey.lua Sat Nov 17 00:41:30 2012 +0400 @@ -1,5 +1,5 @@ -loadfile(GetDataPath() .. "Scripts/Locale.lua")() -loadfile(GetDataPath() .. "Scripts/Animate.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") +HedgewarsScriptLoad("/Scripts/Animate.lua") --///////////////////////////////CONSTANTS/////////////////////////// diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/queen.lua --- a/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/queen.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/queen.lua Sat Nov 17 00:41:30 2012 +0400 @@ -1,5 +1,5 @@ -loadfile(GetDataPath() .. "Scripts/Locale.lua")() -loadfile(GetDataPath() .. "Scripts/Animate.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") +HedgewarsScriptLoad("/Scripts/Animate.lua") -----------------------------Map-------------------------------------- diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/shadow.lua --- a/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/shadow.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/shadow.lua Sat Nov 17 00:41:30 2012 +0400 @@ -1,5 +1,5 @@ -loadfile(GetDataPath() .. "Scripts/Locale.lua")() -loadfile(GetDataPath() .. "Scripts/Animate.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") +HedgewarsScriptLoad("/Scripts/Animate.lua") -----------------------------Constants--------------------------------- startStage = 0 diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/united.lua --- a/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/united.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/united.lua Sat Nov 17 00:41:30 2012 +0400 @@ -1,5 +1,5 @@ -loadfile(GetDataPath() .. "Scripts/Locale.lua")() -loadfile(GetDataPath() .. "Scripts/Animate.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") +HedgewarsScriptLoad("/Scripts/Animate.lua") -----------------------------Constants--------------------------------- choiceAccept = 1 diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Missions/Training/Basic_Training_-_Bazooka.lua --- a/share/hedgewars/Data/Missions/Training/Basic_Training_-_Bazooka.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Missions/Training/Basic_Training_-_Bazooka.lua Sat Nov 17 00:41:30 2012 +0400 @@ -13,7 +13,7 @@ -- about translations. -- We can use the function loc(text) to localize a string. -loadfile(GetDataPath() .. "Scripts/Locale.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") -- This variable will hold the number of destroyed targets. local score = 0 diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Missions/Training/Basic_Training_-_Cluster_Bomb.lua --- a/share/hedgewars/Data/Missions/Training/Basic_Training_-_Cluster_Bomb.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Missions/Training/Basic_Training_-_Cluster_Bomb.lua Sat Nov 17 00:41:30 2012 +0400 @@ -1,4 +1,4 @@ -loadfile(GetDataPath() .. "Scripts/Locale.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") local player = nil local scored = 0 diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Missions/Training/Basic_Training_-_Grenade.lua --- a/share/hedgewars/Data/Missions/Training/Basic_Training_-_Grenade.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Missions/Training/Basic_Training_-_Grenade.lua Sat Nov 17 00:41:30 2012 +0400 @@ -13,7 +13,7 @@ -- about translations. -- We can use the function loc(text) to localize a string. -loadfile(GetDataPath() .. "Scripts/Locale.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") -- This variable will hold the number of destroyed targets. local score = 0 diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Missions/Training/Basic_Training_-_Rope.lua --- a/share/hedgewars/Data/Missions/Training/Basic_Training_-_Rope.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Missions/Training/Basic_Training_-_Rope.lua Sat Nov 17 00:41:30 2012 +0400 @@ -7,8 +7,8 @@ --I know there need to be more "tutorial" specefic messages, but I had a hard timer figuring out what to type / what would be the best technical description. -loadfile( GetDataPath() .. "Scripts/Locale.lua" )() -loadfile( GetDataPath() .. "Scripts/Utils.lua" )() -- For the gearIsInBox function, wrote my own, but decided it was a waste to include it +HedgewarsScriptLoad("/Scripts/Locale.lua") +HedgewarsScriptLoad("/Scripts/Utils.lua") -- For the gearIsInBox function, wrote my own, but decided it was a waste to include it local Player = nil -- Pointer to hog created in: onGameInit local Target = nil -- Pointer to target hog diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Missions/Training/Basic_Training_-_Shotgun.lua --- a/share/hedgewars/Data/Missions/Training/Basic_Training_-_Shotgun.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Missions/Training/Basic_Training_-_Shotgun.lua Sat Nov 17 00:41:30 2012 +0400 @@ -13,7 +13,7 @@ -- about translations. -- We can use the function loc(text) to localize a string. -loadfile(GetDataPath() .. "Scripts/Locale.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") -- This variable will hold the number of destroyed targets. local score = 0 diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Missions/Training/Basic_Training_-_Sniper_Rifle.lua --- a/share/hedgewars/Data/Missions/Training/Basic_Training_-_Sniper_Rifle.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Missions/Training/Basic_Training_-_Sniper_Rifle.lua Sat Nov 17 00:41:30 2012 +0400 @@ -13,7 +13,7 @@ -- about translations. -- We can use the function loc(text) to localize a string. -loadfile(GetDataPath() .. "Scripts/Locale.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") -- This variable will hold the number of destroyed targets. local score = 0 diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Missions/Training/User_Mission_-_Bamboo_Thicket.lua --- a/share/hedgewars/Data/Missions/Training/User_Mission_-_Bamboo_Thicket.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Missions/Training/User_Mission_-_Bamboo_Thicket.lua Sat Nov 17 00:41:30 2012 +0400 @@ -1,5 +1,5 @@ -loadfile(GetDataPath() .. "Scripts/Locale.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") local player = nil local enemy = nil diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Missions/Training/User_Mission_-_Dangerous_Ducklings.lua --- a/share/hedgewars/Data/Missions/Training/User_Mission_-_Dangerous_Ducklings.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Missions/Training/User_Mission_-_Dangerous_Ducklings.lua Sat Nov 17 00:41:30 2012 +0400 @@ -1,5 +1,5 @@ -loadfile(GetDataPath() .. "Scripts/Locale.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") local player = nil -- This variable will point to the hog's gear diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Missions/Training/User_Mission_-_Diver.lua --- a/share/hedgewars/Data/Missions/Training/User_Mission_-_Diver.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Missions/Training/User_Mission_-_Diver.lua Sat Nov 17 00:41:30 2012 +0400 @@ -1,5 +1,5 @@ -loadfile(GetDataPath() .. "Scripts/Locale.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") local player = nil -- This variable will point to the hog's gear local enemy = nil diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Missions/Training/User_Mission_-_Newton_and_the_Hammock.lua --- a/share/hedgewars/Data/Missions/Training/User_Mission_-_Newton_and_the_Hammock.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Missions/Training/User_Mission_-_Newton_and_the_Hammock.lua Sat Nov 17 00:41:30 2012 +0400 @@ -1,5 +1,5 @@ -loadfile(GetDataPath() .. "Scripts/Locale.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") local player = nil local enemy = nil diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Missions/Training/User_Mission_-_RCPlane_Challenge.lua --- a/share/hedgewars/Data/Missions/Training/User_Mission_-_RCPlane_Challenge.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Missions/Training/User_Mission_-_RCPlane_Challenge.lua Sat Nov 17 00:41:30 2012 +0400 @@ -1,4 +1,4 @@ -loadfile(GetDataPath() .. "Scripts/Locale.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") local player = nil local RCGear = nil diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Missions/Training/User_Mission_-_Rope_Knock_Challenge.lua --- a/share/hedgewars/Data/Missions/Training/User_Mission_-_Rope_Knock_Challenge.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Missions/Training/User_Mission_-_Rope_Knock_Challenge.lua Sat Nov 17 00:41:30 2012 +0400 @@ -1,4 +1,4 @@ -loadfile(GetDataPath() .. "Scripts/Locale.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") local hhs = {} local missionWon = nil diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Missions/Training/User_Mission_-_Spooky_Tree.lua --- a/share/hedgewars/Data/Missions/Training/User_Mission_-_Spooky_Tree.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Missions/Training/User_Mission_-_Spooky_Tree.lua Sat Nov 17 00:41:30 2012 +0400 @@ -1,5 +1,5 @@ -loadfile(GetDataPath() .. "Scripts/Locale.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") --------------------------------------------------------------- diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Missions/Training/User_Mission_-_Teamwork.lua --- a/share/hedgewars/Data/Missions/Training/User_Mission_-_Teamwork.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Missions/Training/User_Mission_-_Teamwork.lua Sat Nov 17 00:41:30 2012 +0400 @@ -1,4 +1,4 @@ -loadfile(GetDataPath() .. "Scripts/Locale.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") local player = nil -- This variable will point to the hog's gear local p2 = nil diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Missions/Training/User_Mission_-_That_Sinking_Feeling.lua --- a/share/hedgewars/Data/Missions/Training/User_Mission_-_That_Sinking_Feeling.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Missions/Training/User_Mission_-_That_Sinking_Feeling.lua Sat Nov 17 00:41:30 2012 +0400 @@ -1,6 +1,6 @@ -loadfile(GetDataPath() .. "Scripts/Locale.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") local player local hh = {} diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Missions/Training/User_Mission_-_The_Great_Escape.lua --- a/share/hedgewars/Data/Missions/Training/User_Mission_-_The_Great_Escape.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Missions/Training/User_Mission_-_The_Great_Escape.lua Sat Nov 17 00:41:30 2012 +0400 @@ -1,4 +1,4 @@ -loadfile(GetDataPath() .. "Scripts/Locale.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") local player = nil local enemy = nil diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Missions/Training/portal.lua --- a/share/hedgewars/Data/Missions/Training/portal.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Missions/Training/portal.lua Sat Nov 17 00:41:30 2012 +0400 @@ -1,5 +1,5 @@ -loadfile(GetDataPath() .. "Scripts/Locale.lua")() -loadfile(GetDataPath() .. "Scripts/Utils.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") +HedgewarsScriptLoad("/Scripts/Utils.lua") local MineArray = {} local player diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Scripts/Multiplayer/Balanced_Random_Weapon.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/Balanced_Random_Weapon.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Scripts/Multiplayer/Balanced_Random_Weapon.lua Sat Nov 17 00:41:30 2012 +0400 @@ -1,5 +1,5 @@ -loadfile(GetDataPath() .. "Scripts/Locale.lua")() -loadfile(GetDataPath() .. "Scripts/Tracker.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") +HedgewarsScriptLoad("/Scripts/Tracker.lua") local weapons = { amGrenade, amClusterBomb, amBazooka, amBee, amShotgun, amMine, amDEagle, amDynamite, amFirePunch, amWhip, amPickHammer, amBaseballBat, amMortar, amCake, amSeduction, amWatermelon, amHellishBomb, amDrill, amBallgun, amRCPlane, amSniperRifle, amMolotov, amBirdy, amBlowTorch, amGasBomb, amFlamethrower, amSMine, amKamikaze } diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Scripts/Multiplayer/Capture_the_Flag.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/Capture_the_Flag.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Scripts/Multiplayer/Capture_the_Flag.lua Sat Nov 17 00:41:30 2012 +0400 @@ -75,7 +75,7 @@ ----------------- -- enable awesome translaction support so we can use loc() wherever we want -loadfile(GetDataPath() .. "Scripts/Locale.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") --------------------------------------------------------------- ----------lots of bad variables and things diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Scripts/Multiplayer/Continental_supplies.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/Continental_supplies.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Scripts/Multiplayer/Continental_supplies.lua Sat Nov 17 00:41:30 2012 +0400 @@ -10,9 +10,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ]] -loadfile(GetDataPath() .. "Scripts/Locale.lua")() -loadfile(GetDataPath() .. "Scripts/Utils.lua")() -loadfile(GetDataPath() .. "Scripts/Tracker.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") +HedgewarsScriptLoad("/Scripts/Utils.lua") +HedgewarsScriptLoad("/Scripts/Tracker.lua") function int_sqrt(num) temp=num diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Scripts/Multiplayer/Highlander.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/Highlander.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Scripts/Multiplayer/Highlander.lua Sat Nov 17 00:41:30 2012 +0400 @@ -51,8 +51,8 @@ -- added napalm (whoops) to list of possible weapons you can get -- hogs no longer recieve airstrike-related weps on border maps -loadfile(GetDataPath() .. "Scripts/Locale.lua")() -loadfile(GetDataPath() .. "Scripts/Tracker.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") +HedgewarsScriptLoad("/Scripts/Tracker.lua") local airWeapons = {amAirAttack, amMineStrike, amNapalm, amDrillStrike --[[,amPiano]]} diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Scripts/Multiplayer/Mutant.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/Mutant.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Scripts/Multiplayer/Mutant.lua Sat Nov 17 00:41:30 2012 +0400 @@ -52,8 +52,8 @@ --]] -loadfile(GetDataPath() .. "Scripts/Locale.lua")() -loadfile(GetDataPath() .. "Scripts/Tracker.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") +HedgewarsScriptLoad("/Scripts/Tracker.lua") --[[ MUTANT SCRIPT diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Scripts/Multiplayer/No_Jumping.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/No_Jumping.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Scripts/Multiplayer/No_Jumping.lua Sat Nov 17 00:41:30 2012 +0400 @@ -2,7 +2,7 @@ -- NO JUMPING -------------------------------- -loadfile(GetDataPath() .. "Scripts/Locale.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") local specialGear = nil diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Scripts/Multiplayer/Racer.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/Racer.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Scripts/Multiplayer/Racer.lua Sat Nov 17 00:41:30 2012 +0400 @@ -65,7 +65,7 @@ -- SCRIPT BEGINS ----------------------------- -loadfile(GetDataPath() .. "Scripts/Locale.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") ------------------ -- Got Variables? diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Scripts/Multiplayer/Random_Weapon.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/Random_Weapon.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Scripts/Multiplayer/Random_Weapon.lua Sat Nov 17 00:41:30 2012 +0400 @@ -1,10 +1,10 @@ -- Random Weapons, example for gameplay scripts -- Load the library for localisation ("loc" function) -loadfile(GetDataPath() .. "Scripts/Locale.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") -- Load the gear tracker -loadfile(GetDataPath() .. "Scripts/Tracker.lua")() +HedgewarsScriptLoad("/Scripts/Tracker.lua") -- List of available weapons local weapons = { amGrenade, amClusterBomb, amBazooka, amBee, amShotgun, diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Scripts/Multiplayer/Space_Invasion.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/Space_Invasion.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Scripts/Multiplayer/Space_Invasion.lua Sat Nov 17 00:41:30 2012 +0400 @@ -1,6 +1,6 @@ -loadfile(GetDataPath() .. "Scripts/Locale.lua")() -loadfile(GetDataPath() .. "Scripts/Tracker.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") +HedgewarsScriptLoad("/Scripts/Tracker.lua") --------------------------------------------------- --------------------------------------------------- diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Scripts/Multiplayer/The_Specialists.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/The_Specialists.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Scripts/Multiplayer/The_Specialists.lua Sat Nov 17 00:41:30 2012 +0400 @@ -52,8 +52,8 @@ -- balance hog health, maybe -- add proper gameflag checking, maybe (so that we can throw in a .cfg and let the users break everything) -loadfile(GetDataPath() .. "Scripts/Locale.lua")() -loadfile(GetDataPath() .. "Scripts/Tracker.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") +HedgewarsScriptLoad("/Scripts/Tracker.lua") local numhhs = 0 local hhs = {} diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Scripts/Multiplayer/Tumbler.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/Tumbler.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Scripts/Multiplayer/Tumbler.lua Sat Nov 17 00:41:30 2012 +0400 @@ -3,8 +3,8 @@ -- v.0.7.1 ------------------------------------ -loadfile(GetDataPath() .. "Scripts/Locale.lua")() -loadfile(GetDataPath() .. "Scripts/Tracker.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") +HedgewarsScriptLoad("/Scripts/Tracker.lua") local fMod = 1000000 -- use this for dev and .16+ games diff -r 448d61778ca7 -r da083f8d95e6 share/hedgewars/Data/Scripts/Multiplayer/WxW.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/WxW.lua Sat Nov 17 00:15:30 2012 +0400 +++ b/share/hedgewars/Data/Scripts/Multiplayer/WxW.lua Sat Nov 17 00:41:30 2012 +0400 @@ -54,9 +54,9 @@ -- GO PONIES, GO PONIES, GO! ----------------------------- -loadfile(GetDataPath() .. "Scripts/Locale.lua")() -loadfile(GetDataPath() .. "Scripts/Tracker.lua")() -loadfile(GetDataPath() .. "Scripts/Utils.lua")() +HedgewarsScriptLoad("/Scripts/Locale.lua") +HedgewarsScriptLoad("/Scripts/Tracker.lua") +HedgewarsScriptLoad("/Scripts/Utils.lua") -- experimental menu stuff local menuIndex = 1