Substitute/Re3
Substitute/Re3
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

fixfixfix

Browse Source
This commit is contained in:
Fire-Head 2020-06-28 00:31:45 +03:00
parent 1c11a8081f
commit 233792e2b8
4 changed files with 711 additions and 716 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/Frontend_PS2.h
View File

@ -194,11 +194,6 @@ public:
#endif #endif
#ifdef IMPROVED_VIDEOMODE #ifdef IMPROVED_VIDEOMODE
//int32 m_nPrefsWidth = 1280 ;//640;
//int32 m_nPrefsHeight = 960;//480;
//int32 m_nPrefsWidth = 1024;
//int32 m_nPrefsHeight = 768;
int32 m_nPrefsWidth = 640; int32 m_nPrefsWidth = 640;
int32 m_nPrefsHeight = 480; int32 m_nPrefsHeight = 480;
int32 m_nPrefsDepth = 32; int32 m_nPrefsDepth = 32;

76
src/core/Pad.cpp
View File

@ -369,10 +369,10 @@ CControllerState::Clear(void)
void CKeyboardState::Clear() void CKeyboardState::Clear()
{ {
for ( int32 i = 0; i < 12; i++ ) for ( int32 i = 0; i < 12; i++ )
F[i] = 0; F[i] = 0;
for ( int32 i = 0; i < 256; i++ ) for ( int32 i = 0; i < 256; i++ )
VK_KEYS[i] = 0; VK_KEYS[i] = 0;
ESC = INS = DEL = HOME = END = PGUP = PGDN = 0; ESC = INS = DEL = HOME = END = PGUP = PGDN = 0;
@ -411,9 +411,9 @@ void CPad::Initialise(void)
CPad::GetPad(i)->Mode = 0; CPad::GetPad(i)->Mode = 0;
} }
bObsoleteControllerMessage = false; bObsoleteControllerMessage = false;
bOldDisplayNoControllerMessage = false; bOldDisplayNoControllerMessage = false;
bDisplayNoControllerMessage = false; bDisplayNoControllerMessage = false;
} }
#endif #endif
@ -770,7 +770,7 @@ void CPad::AddToCheatString(char c)
CheatString[0] = c; CheatString[0] = c;
#define _CHEATCMP(str) strncmp(str, CheatString, sizeof(str)-1) #define _CHEATCMP(str) strncmp(str, CheatString, sizeof(str)-1)
// "4414LDRULDRU" - R2 R2 L1 R2 LEFT DOWN RIGHT UP LEFT DOWN RIGHT UP // "4414LDRULDRU" - R2 R2 L1 R2 LEFT DOWN RIGHT UP LEFT DOWN RIGHT UP
if ( !_CHEATCMP("URDLURDL4144") ) if ( !_CHEATCMP("URDLURDL4144") )
WeaponCheat(); WeaponCheat();
@ -1129,8 +1129,8 @@ void CPad::Update(int16 pad)
state = scePadGetState(pad, 0); state = scePadGetState(pad, 0);
switch(Phase) switch(Phase)
{ {
case 0: case 0:
if (state != scePadStateStable && state != scePadStateFindCTP1) if (state != scePadStateStable && state != scePadStateFindCTP1)
break; break;
id = scePadInfoMode(pad, 0, InfoModeCurID, 0); id = scePadInfoMode(pad, 0, InfoModeCurID, 0);
@ -1154,7 +1154,7 @@ void CPad::Update(int16 pad)
break; break;
// Analog Controller (old dualshock) // Analog Controller (old dualshock)
case 40: // Analog Contoller check valid (otherwise fail phase) case 40: // Analog Contoller check valid (otherwise fail phase)
if (scePadInfoMode(pad, 0, InfoModeIdTable, -1)==0) if (scePadInfoMode(pad, 0, InfoModeIdTable, -1)==0)
{ {
Phase = 99; Phase = 99;
@ -1162,11 +1162,11 @@ void CPad::Update(int16 pad)
} }
Phase++; Phase++;
case 41: // Analog controller: Request Lock analog mode (asynchronous) case 41: // Analog controller: Request Lock analog mode (asynchronous)
if (scePadSetMainMode(pad, 0, 1, 3)==1) Phase++; if (scePadSetMainMode(pad, 0, 1, 3)==1) Phase++;
break; break;
case 42: // Analog controller: Check state of previous request case 42: // Analog controller: Check state of previous request
if (scePadGetReqState(pad, 0)==scePadReqStateFaild) if (scePadGetReqState(pad, 0)==scePadReqStateFaild)
{ {
Phase--; Phase--;
@ -1180,7 +1180,7 @@ void CPad::Update(int16 pad)
break; break;
// DualShock 2 Controller // DualShock 2 Controller
case 50: // Analog Contoller check valid (otherwise fail phase) case 50: // Analog Contoller check valid (otherwise fail phase)
if (scePadInfoMode(pad, 0, InfoModeIdTable, -1)==0) if (scePadInfoMode(pad, 0, InfoModeIdTable, -1)==0)
{ {
Phase = 99; Phase = 99;
@ -1188,11 +1188,11 @@ void CPad::Update(int16 pad)
} }
Phase++; Phase++;
case 51: // Analog controller: Request Lock analog mode (asynchronous) case 51: // Analog controller: Request Lock analog mode (asynchronous)
if (scePadSetMainMode(pad, 0, 1, 3)==1) Phase++; if (scePadSetMainMode(pad, 0, 1, 3)==1) Phase++;
break; break;
case 52: // Analog controller: Check state of previous request case 52: // Analog controller: Check state of previous request
if (scePadGetReqState(pad, 0)==scePadReqStateFaild) if (scePadGetReqState(pad, 0)==scePadReqStateFaild)
{ {
Phase--; Phase--;
@ -1227,7 +1227,7 @@ void CPad::Update(int16 pad)
break; break;
// DualShock 2 Controller // DualShock 2 Controller
case 80: // Set motors case 80: // Set motors
if (scePadInfoAct(pad, 0, -1, 0)==0) if (scePadInfoAct(pad, 0, -1, 0)==0)
{ {
Phase = 99; Phase = 99;
@ -1247,7 +1247,7 @@ void CPad::Update(int16 pad)
break; break;
case 81: case 81:
if ( scePadGetState(pad, 0) != scePadStateExecCmd ) if ( scePadGetState(pad, 0) != scePadStateExecCmd )
{ {
Phase = 99; Phase = 99;
@ -1295,34 +1295,34 @@ void CPad::Update(int16 pad)
{ {
tpad = paddata; tpad = paddata;
NewState.DPadUp = ( tpad & SCE_PADLup ) ? 255 : 0; NewState.DPadUp = ( tpad & SCE_PADLup ) ? 255 : 0;
NewState.DPadDown = ( tpad & SCE_PADLdown ) ? 255 : 0; NewState.DPadDown = ( tpad & SCE_PADLdown ) ? 255 : 0;
NewState.DPadLeft = ( tpad & SCE_PADLleft ) ? 255 : 0; NewState.DPadLeft = ( tpad & SCE_PADLleft ) ? 255 : 0;
NewState.DPadRight = ( tpad & SCE_PADLright ) ? 255 : 0; NewState.DPadRight = ( tpad & SCE_PADLright ) ? 255 : 0;
NewState.Triangle = ( tpad & SCE_PADRup ) ? 255 : 0; NewState.Triangle = ( tpad & SCE_PADRup ) ? 255 : 0;
NewState.Cross = ( tpad & SCE_PADRdown ) ? 255 : 0; NewState.Cross = ( tpad & SCE_PADRdown ) ? 255 : 0;
NewState.Square = ( tpad & SCE_PADRleft ) ? 255 : 0; NewState.Square = ( tpad & SCE_PADRleft ) ? 255 : 0;
NewState.Circle = ( tpad & SCE_PADRright ) ? 255 : 0; NewState.Circle = ( tpad & SCE_PADRright ) ? 255 : 0;
NewState.Start = ( tpad & SCE_PADstart ) ? 255 : 0; NewState.Start = ( tpad & SCE_PADstart ) ? 255 : 0;
NewState.Select = ( tpad & SCE_PADselect ) ? 255 : 0; NewState.Select = ( tpad & SCE_PADselect ) ? 255 : 0;
NewState.LeftShoulder1 = ( tpad & SCE_PADL1 ) ? 255 : 0; NewState.LeftShoulder1 = ( tpad & SCE_PADL1 ) ? 255 : 0;
NewState.LeftShoulder2 = ( tpad & SCE_PADL2 ) ? 255 : 0; NewState.LeftShoulder2 = ( tpad & SCE_PADL2 ) ? 255 : 0;
NewState.RightShoulder1 = ( tpad & SCE_PADR1 ) ? 255 : 0; NewState.RightShoulder1 = ( tpad & SCE_PADR1 ) ? 255 : 0;
NewState.RightShoulder2 = ( tpad & SCE_PADR2 ) ? 255 : 0; NewState.RightShoulder2 = ( tpad & SCE_PADR2 ) ? 255 : 0;
NewState.LeftShock = ( tpad & SCE_PADi ) ? 255 : 0; NewState.LeftShock = ( tpad & SCE_PADi ) ? 255 : 0;
NewState.RightShock = ( tpad & SCE_PADj ) ? 255 : 0; NewState.RightShock = ( tpad & SCE_PADj ) ? 255 : 0;
NewState.RightStickX = (short)rdata[4]; NewState.RightStickX = (short)rdata[4];
NewState.RightStickY = (short)rdata[5]; NewState.RightStickY = (short)rdata[5];
NewState.LeftStickX = (short)rdata[6]; NewState.LeftStickX = (short)rdata[6];
NewState.LeftStickY = (short)rdata[7]; NewState.LeftStickY = (short)rdata[7];
#define CLAMP_AXIS(x) (((x) < 43 && (x) >= -42) ? 0 : (((x) > 0) ? (Max((x)-42, 0)*127/85) : Min((x)+42, 0)*127/85)) #define CLAMP_AXIS(x) (((x) < 43 && (x) >= -42) ? 0 : (((x) > 0) ? (Max((x)-42, 0)*127/85) : Min((x)+42, 0)*127/85))
#define FIX_AXIS(x) CLAMP_AXIS((x)-128) #define FIX_AXIS(x) CLAMP_AXIS((x)-128)
NewState.RightStickX = FIX_AXIS(NewState.RightStickX); NewState.RightStickX = FIX_AXIS(NewState.RightStickX);
NewState.RightStickY = FIX_AXIS(NewState.RightStickY); NewState.RightStickY = FIX_AXIS(NewState.RightStickY);
NewState.LeftStickX = FIX_AXIS(NewState.LeftStickX); NewState.LeftStickX = FIX_AXIS(NewState.LeftStickX);
NewState.LeftStickY = FIX_AXIS(NewState.LeftStickY); NewState.LeftStickY = FIX_AXIS(NewState.LeftStickY);
#undef FIX_AXIS #undef FIX_AXIS
#undef CLAMP_AXIS #undef CLAMP_AXIS
@ -1349,7 +1349,7 @@ void CPad::Update(int16 pad)
return; return;
} }
break; break;
} }
if ( pad == 0 ) if ( pad == 0 )
{ {

4
src/render/MBlur.cpp
View File

@ -22,12 +22,12 @@ CMBlur::MotionBlurOpen(RwCamera *cam)
RwRect rect = {0, 0, 0, 0}; RwRect rect = {0, 0, 0, 0};
if (pFrontBuffer) if (pFrontBuffer)
return TRUE; return TRUE;
BlurOn = true; BlurOn = true;
rect.w = RwRasterGetWidth(RwCameraGetRaster(cam)); rect.w = RwRasterGetWidth(RwCameraGetRaster(cam));
rect.h = RwRasterGetHeight(RwCameraGetRaster(cam)); rect.h = RwRasterGetHeight(RwCameraGetRaster(cam));
pFrontBuffer = RwRasterCreate(0, 0, 0, rwRASTERDONTALLOCATE|rwRASTERTYPECAMERATEXTURE); pFrontBuffer = RwRasterCreate(0, 0, 0, rwRASTERDONTALLOCATE|rwRASTERTYPECAMERATEXTURE);
if (!pFrontBuffer) if (!pFrontBuffer)