The-Homebrew-Cloud/re3-wiiu
2
0
Fork 0
mirror of https://gitlab.com/GaryOderNichts/re3-wiiu.git synced 2024-12-23 08:11:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/GTAmodding/re3 into wiiu

Browse Source
This commit is contained in:
GaryOderNichts 2021-01-31 23:23:36 +01:00
commit ddb28462dc
6 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
gamefiles/TEXT/american.gxt
View File

Binary file not shown.

4
src/audio/MusicManager.cpp
View File

@ -163,13 +163,13 @@ cMusicManager::DisplayRadioStationName()
case CHATTERBOX: string = TheText.Get("FEA_FM8"); break; case CHATTERBOX: string = TheText.Get("FEA_FM8"); break;
case USERTRACK: string = TheText.Get("FEA_FM9"); break; case USERTRACK: string = TheText.Get("FEA_FM9"); break;
#ifdef RADIO_OFF_TEXT #ifdef RADIO_OFF_TEXT
case RADIO_OFF: case POLICE_RADIO: string = TheText.Get("FEM_OFF"); break; case RADIO_OFF: case POLICE_RADIO: string = TheText.Get("FEA_FMN"); break;
#endif #endif
default: return; default: return;
}; };
#ifdef RADIO_OFF_TEXT #ifdef RADIO_OFF_TEXT
if(pRetune == USERTRACK && !SampleManager.IsMP3RadioChannelAvailable()) { string = TheText.Get("FEM_OFF"); } if(pRetune == USERTRACK && !SampleManager.IsMP3RadioChannelAvailable()) { string = TheText.Get("FEA_FMN"); }
#else #else
if(pRetune > CHATTERBOX && !SampleManager.IsMP3RadioChannelAvailable()) { return; } if(pRetune > CHATTERBOX && !SampleManager.IsMP3RadioChannelAvailable()) { return; }
#endif #endif

2
src/core/re3.cpp
View File

@ -694,7 +694,7 @@ void CTweakVars::Add(CTweakVar *var)
TweakVarsListSize = 0; TweakVarsListSize = 0;
} }
if(TweakVarsListSize > 63) if(TweakVarsListSize > 63)
TweakVarsList = (CTweakVar**) realloc(TweakVarsList, (TweakVarsListSize + 1) * sizeof(*var)); TweakVarsList = (CTweakVar**) realloc(TweakVarsList, (TweakVarsListSize + 1) * sizeof(CTweakVar*));
TweakVarsList[TweakVarsListSize++] = var; TweakVarsList[TweakVarsListSize++] = var;
// TweakVarsList.push_back(var); // TweakVarsList.push_back(var);

4
src/render/Renderer.cpp
View File

@ -1396,6 +1396,10 @@ CRenderer::ScanSectorPoly(RwV2d *poly, int32 numVertices, void (*scanfunc)(CPtrL
void void
CRenderer::InsertEntityIntoList(CEntity *ent) CRenderer::InsertEntityIntoList(CEntity *ent)
{ {
#ifdef FIX_BUGS
if (!ent->m_rwObject) return;
#endif
#ifdef NEW_RENDERER #ifdef NEW_RENDERER
// TODO: there are more flags being checked here // TODO: there are more flags being checked here
if(gbNewRenderer && (ent->IsVehicle() || ent->IsPed())) if(gbNewRenderer && (ent->IsVehicle() || ent->IsPed()))

4
src/rw/VisibilityPlugins.cpp
View File

@ -192,6 +192,10 @@ CVisibilityPlugins::InitAlphaEntityList(void)
bool bool
CVisibilityPlugins::InsertEntityIntoSortedList(CEntity *e, float dist) CVisibilityPlugins::InsertEntityIntoSortedList(CEntity *e, float dist)
{ {
#ifdef FIX_BUGS
if (!e->m_rwObject) return true;
#endif
AlphaObjectInfo item; AlphaObjectInfo item;
item.entity = e; item.entity = e;
item.sort = dist; item.sort = dist;

3
utils/gxt/american.txt
View File

@ -8070,6 +8070,9 @@ INVERT PAD VERTICALLY
[FEM_TWP] [FEM_TWP]
Toggle Waypoint Toggle Waypoint
[FEA_FMN]
RADIO OFF
{ end of file } { end of file }
[DUMMY] [DUMMY]