Changeset 3224

Timestamp:

01/17/10 16:02:23 (8 months ago)

Author:

sience

Message:

-uoam bugfixed
-USE_HOME_DIR now standard (delete if you don't want to use User Home Dirs)

Location:

trunk

Files:

• USE_HOME_DIR (added)
• lua/config_declarations.lua (modified) (1 diff)
• lua/lib.compass.lua (modified) (1 diff)
• lua/lib.configdialog.lua (modified) (1 diff)
• lua/main.lua (modified) (3 diffs)

trunk/lua/config_declarations.lua

@@ -433 +433 @@
 gConfig:DeclareBoolean("gEnable2DWaterAnim", "gfx", "2D : Water Animation", 'enable/disable Water Animation in 2d mode', false)
 gConfig:DeclareBoolean("gEnableBloomShader", "gfx", "bloom shader", 'TODO', false)
-gConfig:DeclareBoolean("gGrannyAnimEnabled", "gfx", "granny anims, bad for performance as long as we don't use anim-shader", 'TODO', false) 
+gConfig:DeclareBoolean("gGrannyAnimEnabled", "gfx", "granny anims, bad for performance as long as we don't use anim-shader", 'TODO', true) 
 gConfig:DeclareBoolean("gUseWaterShader", "gfx", "water shader", 'TODO', false)
 gConfig:DeclareBoolean("gWaterAsGroundTiles", "gfx", "water as ground tiles", 'TODO', false)

trunk/lua/lib.compass.lua

@@ -60 +60 @@
 
 function MarkCurrentPosition    (name)
-    if gUoamMarkFilePath then
-        local fp = io.open(gUoamMarkFilePath,"a")
+    if gUoamMarkPathFile then
+        local fp = io.open(gUoamMarkPathFile,"a")
         if (fp) then
             local x,y,z = MacroRead_GetPlayerPosition()

trunk/lua/lib.configdialog.lua

@@ -194 +194 @@
 function ConfigDialogPage_PacketVideo(page)
     page:AddChild("Button",{label="Play Iris PacketVideo (*.ipv)",on_button_click=function ()  
-            if (PacketVideo_Load(FileOpenDialog(".","*.ipv","select iris packetvideo"))) then PacketVideo_Playback() end
+            if (PacketVideo_Load(FileOpenDialog(gPacketVideoFileName_folderpath,"*.ipv","select iris packetvideo"))) then PacketVideo_Playback() end
         end})
     page:AddChild("Button",{label="Play Razor PacketVideo (*.rpv)",on_button_click=function ()  

trunk/lua/main.lua

@@ -15 +15 @@
 -- User Directories/Files
 gTempPath           = gMainWorkingDir.."tmp/"
-gUoamMarkFile           = "mark.uoam"
-gUoamMarkFilePath       = gTempPath..gUoamMarkFile
 gScreenshotDir          = gMainWorkingDir.."screenshots/"
 gConfigPath         = gMainWorkingDir.."config/"
@@ -28 +26 @@
 gPacketVideoFileName_folderpath = gMainWorkingDir.."videos/"
 gUOAMDir                        = gConfigPath.."uoam/"
+gUoamMarkFile           = "mark.uoam"
+gUoamMarkPathFile       = gUOAMDir..gUoamMarkFile
 
 gSecondsSinceLastFrame = 0
@@ -54 +54 @@
                 gPacketVideoFileName_folderpath = gHomeIrisPath.."videos/" -- todo : text='will be saved as .ipv files in iris/videos/'
                 gUOAMDir                        = gConfigPath.."uoam/"
+                gUoamMarkPathFile       = gUOAMDir..gUoamMarkFile
                 
                 -- check if config.lua is already copied