PublicMirrors/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship.git synced 2025-01-23 21:45:00 +03:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Add /Zi to release config on win64 for debugging info in release mode.

Browse Source 
Revert some of the intro cutscene fix PR, and fix it in a different way.
This commit is contained in:
Malkierian 2024-12-02 16:43:27 -07:00 committed by Alejandro Asenjo Nitti
parent 840fc5617d
commit 542c756b2e
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -359,6 +359,7 @@ if(MSVC)
${DEFAULT_CXX_EXCEPTION_HANDLING} ${DEFAULT_CXX_EXCEPTION_HANDLING}
) )
target_compile_options(${PROJECT_NAME} PRIVATE $<$<CONFIG:Debug>:/ZI;>) target_compile_options(${PROJECT_NAME} PRIVATE $<$<CONFIG:Debug>:/ZI;>)
target_compile_options(${PROJECT_NAME} PRIVATE $<$<CONFIG:Release>:/Zi;>)
elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32") elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")
target_compile_options(${PROJECT_NAME} PRIVATE target_compile_options(${PROJECT_NAME} PRIVATE
$<$<CONFIG:Debug>: $<$<CONFIG:Debug>:

10
src/engine/fox_radio.c
View File

@ -572,7 +572,6 @@ void Radio_Draw(void) {
case 32: case 32:
if (Audio_GetCurrentVoice() == 0) { if (Audio_GetCurrentVoice() == 0) {
gRadioMsgListIndex++; gRadioMsgListIndex++;
gRadioMsgId = 10 * (gRadioMsgListIndex + 1);
gRadioMsg = SEGMENTED_TO_VIRTUAL(gRadioMsgList[gRadioMsgListIndex]); gRadioMsg = SEGMENTED_TO_VIRTUAL(gRadioMsgList[gRadioMsgListIndex]);
Audio_PlayVoice(Message_IdFromPtr(gRadioMsg)); Audio_PlayVoice(Message_IdFromPtr(gRadioMsg));
gRadioMsgCharIndex = 0; gRadioMsgCharIndex = 0;
@ -603,16 +602,15 @@ void Radio_Draw(void) {
if (!(fakeTemp)) { if (!(fakeTemp)) {
ret = Audio_GetCurrentVoiceStatus(); ret = Audio_GetCurrentVoiceStatus();
if (gRadioMsgId < 50) { if (gRadioMsgCharIndex < 60) {
if (gRadioMsg[gRadioMsgCharIndex + 1] == MSGCHAR_NXT) { if (gRadioMsg[gRadioMsgCharIndex + 1] == MSGCHAR_NXT && *gRadioMsg != 38) {
if (ret == 0) { if (ret == 0) {
gRadioState = 31; gRadioState = 31;
} }
} else { }
else {
gRadioMsgCharIndex++; gRadioMsgCharIndex++;
} }
} else {
gRadioMsgCharIndex++;
} }
if (sRadioCheckMouthFlag) { if (sRadioCheckMouthFlag) {