ioquake
/
ioq3
mirror of https://github.com/ioquake/ioq3.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into vs2019

This commit is contained in:
Tom Kidd 2021-10-02 21:19:48 -05:00
parent fa64d4f8a8 26780805c8
commit 3c78fe2295
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@ -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

4
code/qcommon/files.c
View File

@ -2933,7 +2933,9 @@ void FS_AddGameDirectory( const char *path, const char *dir ) {
// Get .pk3 files
pakfiles = Sys_ListFiles(curpath, ".pk3", NULL, &numfiles, qfalse);
qsort( pakfiles, numfiles, sizeof(char*), paksort );
if ( pakfiles ) {
qsort( pakfiles, numfiles, sizeof(char*), paksort );
}
if ( fs_numServerPaks ) {
numdirs = 0;