Restored behavior of .\ filepath prefix in legacy compat modes (#309)

* Restored behavior of .\ filepath prefix in legacy compat modes.

* Fixed 0A99 tests when PortableGTA.asi is used.

Author: MiranDMC

CHANGELOG.md

@@ -1,5 +1,6 @@
 ## 5.0.1
 - cleo.log file moved back to the game root (as in CLEO4)
+- Restored behavior of '.\\' prefix for scripts in legacy compat mode
 - fixed **0AB9 ([get_audio_stream_state](https://library.sannybuilder.com/#/sa/audio/0AB9))** not always returning Stopped, despite playback ended
 - fixed **2507 ([get_audio_stream_progress](https://library.sannybuilder.com/#/sa/audio/2507))** sometimes returning values smaller than 1.0, despite playback ended
 - fixed progress set with **2508 ([set_audio_stream_progress](https://library.sannybuilder.com/#/sa/audio/2508))** being ignored by stopped streams

source/CScriptEngine.cpp

@@ -681,7 +681,7 @@ namespace CLEO
 
             if(_strcmpi(r, DIR_GAME) == 0) virtualPrefix = VPref::Game;
             else if (_strcmpi(r, DIR_USER) == 0) virtualPrefix = VPref::User;
-            else if (_strcmpi(r, DIR_SCRIPT) == 0) virtualPrefix = VPref::Script;
+            else if (_strcmpi(r, DIR_SCRIPT) == 0 && !IsLegacyScript((CRunningScript*)this)) virtualPrefix = VPref::Script;
             else if (_strcmpi(r, DIR_CLEO) == 0) virtualPrefix = VPref::Cleo;
             else if (_strcmpi(r, DIR_MODULES) == 0) virtualPrefix = VPref::Modules;
         }

tests/cleo_tests/FilesystemOperations/0A99.txt

@@ -38,19 +38,21 @@ function tests
 
     function test2
         set_current_directory {path} 1 // user files
-        0@ = resolve_filepath ""
-        assert_suffix(0@, "\GTA San Andreas User Files", true)
+        does_file_exist {path} "gta_sa.set" // game's settings file in user dir
+        assert_result_true()
     end
 
 
     function test3
         set_current_directory {path} "root:" // game root
         0@ = resolve_filepath ""
         assert_eqs(0@, "") // relative to root, so empty
+        does_file_exist {path} "gta_sa.set" // game's settings file in user dir
+        assert_result_false()
 
         set_current_directory {path} "user:" // user files
-        0@ = resolve_filepath ""
-        assert_suffix(0@, "\GTA San Andreas User Files", true)
+        does_file_exist {path} "gta_sa.set" // game's settings file in user dir
+        assert_result_true()
 
         set_current_directory {path} "cleo:" // cleo directory
         0@ = resolve_filepath ""

tests/cleo_tests/FilesystemOperations/0AAB.txt

@@ -10,16 +10,33 @@ function tests
 
     it("should fail on a non-existing file", test1)
     it("should success on existing file", test2)
+    it("should handle .\ prefix", test3)
+    it_cs4("should handle .\ prefix", test4)
     return
-    
+
     function test1
         does_file_exist {path} "cleo\not_a_file.txt" // tested opcode
         assert_result_false()
     end
-    
-     function test2
+
+    function test2
         does_file_exist {path} "cleo\.cleo_config.ini" // tested opcode
         assert_result_true()
     end
-
+    
+    function test3
+        does_file_exist {path} ".\0AAB.s"
+        assert_result_true()
+        
+        does_file_exist {path} ".\cleo.asi"
+        assert_result_false()
+    end
+    
+    function test4
+        does_file_exist {path} ".\0AAB.s"
+        assert_result_false()
+        
+        does_file_exist {path} ".\cleo.asi"
+        assert_result_true()
+    end
 end