diff options
| author | Roman Masanin <36927roma@gmail.com> | 2020-10-24 21:26:56 +0200 |
|---|---|---|
| committer | Roman Masanin <36927roma@gmail.com> | 2020-10-24 21:26:56 +0200 |
| commit | a12789c632897c2f1339f806158e84c565bd8580 (patch) | |
| tree | f7eb31c812c3c194eeee0c8defe440e675eae567 /src/core | |
| parent | mark reflections done (diff) | |
| parent | Model indices edits (diff) | |
| download | re3-a12789c632897c2f1339f806158e84c565bd8580.tar re3-a12789c632897c2f1339f806158e84c565bd8580.tar.gz re3-a12789c632897c2f1339f806158e84c565bd8580.tar.bz2 re3-a12789c632897c2f1339f806158e84c565bd8580.tar.lz re3-a12789c632897c2f1339f806158e84c565bd8580.tar.xz re3-a12789c632897c2f1339f806158e84c565bd8580.tar.zst re3-a12789c632897c2f1339f806158e84c565bd8580.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/CdStreamPosix.cpp | 2 | ||||
| -rw-r--r-- | src/core/Game.h | 4 | ||||
| -rw-r--r-- | src/core/config.h | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/core/CdStreamPosix.cpp b/src/core/CdStreamPosix.cpp index fdc63a05..5c8d1b16 100644 --- a/src/core/CdStreamPosix.cpp +++ b/src/core/CdStreamPosix.cpp @@ -216,10 +216,12 @@ CdStreamShutdown(void) #ifndef ONE_THREAD_PER_CHANNEL gCdStreamThreadStatus = 2; sem_post(gCdStreamSema); + pthread_join(_gCdStreamThread, nil); #else for ( int32 i = 0; i < gNumChannels; i++ ) { gpReadInfo[i].nThreadStatus = 2; sem_post(gpReadInfo[i].pStartSemaphore); + pthread_join(gpReadInfo[i].pChannelThread, nil); } #endif } diff --git a/src/core/Game.h b/src/core/Game.h index 67d83c00..ee9ca943 100644 --- a/src/core/Game.h +++ b/src/core/Game.h @@ -4,7 +4,9 @@ enum eLevelName { LEVEL_IGNORE = -1, // beware, this is only used in CPhysical's m_nZoneLevel LEVEL_GENERIC = 0, LEVEL_BEACH, - LEVEL_MAINLAND + LEVEL_MAINLAND, + + NUM_LEVELS }; enum eAreaName { diff --git a/src/core/config.h b/src/core/config.h index 770a7c2e..0ef921ca 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -23,7 +23,7 @@ enum Config { MAXVEHICLESLOADED = 50, // 70 on mobile - NUMOBJECTINFO = 400, // TODO(MIAMI): fantasy // object.dat + NUMOBJECTINFO = 210, // Pool sizes NUMPTRNODES = 50000, |