mirror of
https://github.com/ioquake/ioq3.git
synced 2024-11-10 07:11:46 +00:00
Merge remote-tracking branch 'upstream/main' into vs2019
This commit is contained in:
commit
3c78fe2295
2 changed files with 4 additions and 2 deletions
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
|
@ -4,7 +4,7 @@ on: [push, pull_request]
|
|||
jobs:
|
||||
linux:
|
||||
name: Linux
|
||||
runs-on: ubuntu-16.04
|
||||
runs-on: ubuntu-18.04
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Install Dependencies
|
||||
|
|
|
@ -2933,7 +2933,9 @@ void FS_AddGameDirectory( const char *path, const char *dir ) {
|
|||
// Get .pk3 files
|
||||
pakfiles = Sys_ListFiles(curpath, ".pk3", NULL, &numfiles, qfalse);
|
||||
|
||||
if ( pakfiles ) {
|
||||
qsort( pakfiles, numfiles, sizeof(char*), paksort );
|
||||
}
|
||||
|
||||
if ( fs_numServerPaks ) {
|
||||
numdirs = 0;
|
||||
|
|
Loading…
Reference in a new issue