Merge pull request #284 from MoeMod/luash

fix sprview
MoeMod · Apr 19, 2021 · e4b3990 · e4b3990
2 parents 9215771 + fc525da
commit e4b3990
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -104,7 +104,7 @@ jobs:
     - 7z x CSMoE-CD-GameDir-Full.7z
     script:
     - mkdir -p osx-build && cd osx-build
-    - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES="x86_64" ../
+    - cmake -DCMAKE_BUILD_TYPE=Release ../
     - cmake --build . --target csmoe_cpack_dmg -j 4
     - cd ..
     before_deploy:

diff --git a/engine/common/filesystem.c b/engine/common/filesystem.c
@@ -2341,7 +2341,7 @@ searchpath_t *FS_FindFile( const char *name, int* index, qboolean gamedironly )
 		}
 	}
 
-	if( fs_ext_path && ( pEnvPath = getenv( "Path" )))
+	if( fs_ext_path )
 	{
 		char	netpath[MAX_SYSPATH];
 
@@ -2351,7 +2351,8 @@ searchpath_t *FS_FindFile( const char *name, int* index, qboolean gamedironly )
 
 		// root folder has a more priority than netpath
 		Q_strncpy( search->filename, host.rootdir, sizeof( search->filename ));
-		Q_strcat( search->filename, "\\" );
+
+		Q_strcat( search->filename, "/" );
 		Q_snprintf( netpath, MAX_SYSPATH, "%s%s", search->filename, name );
 
 		if( FS_SysFileExists( netpath, !(search->flags & FS_CUSTOM_PATH ) ) )
@@ -2362,12 +2363,13 @@ searchpath_t *FS_FindFile( const char *name, int* index, qboolean gamedironly )
 		}
 
 		// search for environment path
+        pEnvPath = getenv( "Path" );
 		while( pEnvPath )
 		{
 			char *end = Q_strchr( pEnvPath, ';' );
 			if( !end ) break;
 			Q_strncpy( search->filename, pEnvPath, (end - pEnvPath) + 1 );
-			Q_strcat( search->filename, "\\" );
+			Q_strcat( search->filename, "/" );
 			Q_snprintf( netpath, MAX_SYSPATH, "%s%s", search->filename, name );
 
 			if( FS_SysFileExists( netpath, !(search->flags & FS_CUSTOM_PATH ) ) )