a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-11-07 19:34:53 +00:00
Code Issues Projects Releases Wiki Activity

Messages fix and update librw

Browse source
This commit is contained in:
erorcun 2020-10-24 21:56:04 +03:00
parent d1394c6994
commit de09a80a35
3 changed files with 12 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/rw/RwHelper.cpp
View file

@ -549,12 +549,14 @@ CameraSize(RwCamera * camera, RwRect * rect,
if( raster ) if( raster )
{ {
RwRasterDestroy(raster); RwRasterDestroy(raster);
camera->frameBuffer = nil;
} }
zRaster = RwCameraGetZRaster(camera); zRaster = RwCameraGetZRaster(camera);
if( zRaster ) if( zRaster )
{ {
RwRasterDestroy(zRaster); RwRasterDestroy(zRaster);
camera->zBuffer = nil;
} }
/* /*

33
src/text/Messages.cpp
View file

@ -71,7 +71,7 @@ CMessages::WideStringCompare(wchar *str1, wchar *str2, uint16 size)
if (len1 != len2 && (len1 < size || len2 < size)) if (len1 != len2 && (len1 < size || len2 < size))
return false; return false;
for (int32 i = 0; FixupChar(str1[i]) != '\0' && i < size; i++) { for (int32 i = 0; i < size && FixupChar(str1[i]) != '\0'; i++) {
if (FixupChar(str1[i]) != FixupChar(str2[i])) if (FixupChar(str1[i]) != FixupChar(str2[i]))
return false; return false;
} }
@ -99,13 +99,9 @@ CMessages::Process()
if (BriefMessages[0].m_pText != nil && CTimer::GetTimeInMilliseconds() > BriefMessages[0].m_nTime + BriefMessages[0].m_nStartTime) { if (BriefMessages[0].m_pText != nil && CTimer::GetTimeInMilliseconds() > BriefMessages[0].m_nTime + BriefMessages[0].m_nStartTime) {
BriefMessages[0].m_pText = nil; BriefMessages[0].m_pText = nil;
int32 i = 0; int32 i;
while (i < NUMBRIEFMESSAGES-1) { for (i = 0; i < NUMBRIEFMESSAGES-1 && BriefMessages[i + 1].m_pText != nil; i++) {
if (BriefMessages[i + 1].m_pText == nil)
break;
BriefMessages[i] = BriefMessages[i + 1]; BriefMessages[i] = BriefMessages[i + 1];
i++;
} }
CMessages::BriefMessages[i].m_pText = nil; CMessages::BriefMessages[i].m_pText = nil;
CMessages::BriefMessages[0].m_nStartTime = CTimer::GetTimeInMilliseconds(); CMessages::BriefMessages[0].m_nStartTime = CTimer::GetTimeInMilliseconds();
@ -328,7 +324,7 @@ void
CMessages::AddToPreviousBriefArray(wchar *text, int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6, wchar *string) CMessages::AddToPreviousBriefArray(wchar *text, int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6, wchar *string)
{ {
int32 i; int32 i;
for (i = 0; PreviousBriefs[i].m_pText && i < NUMPREVIOUSBRIEFS; i++) { for (i = 0; i < NUMPREVIOUSBRIEFS && PreviousBriefs[i].m_pText != nil; i++) {
if (PreviousBriefs[i].m_nNumber[0] == n1 if (PreviousBriefs[i].m_nNumber[0] == n1
&& PreviousBriefs[i].m_nNumber[1] == n2 && PreviousBriefs[i].m_nNumber[1] == n2
&& PreviousBriefs[i].m_nNumber[2] == n3 && PreviousBriefs[i].m_nNumber[2] == n3
@ -505,7 +501,7 @@ CMessages::AddMessageWithNumber(wchar *str, uint32 time, uint16 flag, int32 n1,
GetWideStringLength(outstr); GetWideStringLength(outstr);
uint16 i = 0; uint16 i = 0;
while (i < NUMBRIEFMESSAGES && BriefMessages[i].m_pText) while (i < NUMBRIEFMESSAGES && BriefMessages[i].m_pText != nil)
i++; i++;
if (i >= NUMBRIEFMESSAGES) return; if (i >= NUMBRIEFMESSAGES) return;
@ -722,35 +718,24 @@ CMessages::ClearThisPrint(wchar *str)
do { do {
equal = false; equal = false;
uint16 i = 0; uint16 i;
while (i < NUMBRIEFMESSAGES) { for (i = 0; i < NUMBRIEFMESSAGES && BriefMessages[i].m_pText != nil; i++) {
if (BriefMessages[i].m_pText == nil)
break;
equal = FastWideStringComparison(str, BriefMessages[i].m_pText); equal = FastWideStringComparison(str, BriefMessages[i].m_pText);
if (equal) break; if (equal) break;
i++;
} }
if (equal) { if (equal) {
if (i != 0) { if (i != 0) {
BriefMessages[i].m_pText = nil; BriefMessages[i].m_pText = nil;
while (i < NUMBRIEFMESSAGES-1) { for (; i < NUMBRIEFMESSAGES-1 && BriefMessages[i+1].m_pText != nil; i++) {
if (BriefMessages[i + 1].m_pText == nil)
break;
BriefMessages[i] = BriefMessages[i + 1]; BriefMessages[i] = BriefMessages[i + 1];
i++;
} }
BriefMessages[i].m_pText = nil; BriefMessages[i].m_pText = nil;
} else { } else {
BriefMessages[0].m_pText = nil; BriefMessages[0].m_pText = nil;
while (i < NUMBRIEFMESSAGES-1) { for (; i < NUMBRIEFMESSAGES-1 && BriefMessages[i+1].m_pText != nil; i++) {
if (BriefMessages[i + 1].m_pText == nil)
break;
BriefMessages[i] = BriefMessages[i + 1]; BriefMessages[i] = BriefMessages[i + 1];
i++;
} }
BriefMessages[i].m_pText = nil; BriefMessages[i].m_pText = nil;
BriefMessages[0].m_nStartTime = CTimer::GetTimeInMilliseconds(); BriefMessages[0].m_nStartTime = CTimer::GetTimeInMilliseconds();

2
vendor/librw vendored

@ -1 +1 @@
Subproject commit edc77742c512b85ad35544b2cfbe3f359dc75805 Subproject commit ee2a32e142fa2d2a1bb6c4fed0c25c2f1e5a1129