ioquake/ioq3
0
0
Fork 0
mirror of https://github.com/ioquake/ioq3.git synced 2024-11-13 00:24:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Tom Kidd 2021-10-02 21:19:48 -05:00
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: jobs:
linux: linux:
name: Linux name: Linux
runs-on: ubuntu-16.04 runs-on: ubuntu-18.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Install Dependencies - name: Install Dependencies

2
code/qcommon/files.c
View file

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