aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorretro-wertz2019-08-02 19:37:20 +0800
committerretro-wertz2019-08-02 19:37:20 +0800
commitcf4334ed9741d6247673fefa057b71926b2e1cfe (patch)
tree72fd09569e596a982421e91e13d2a42408496ef2
parent0f288b5c9f0e792466a2e785e3090cd65f17c2de (diff)
downloadpcsx_rearmed-cf4334ed9741d6247673fefa057b71926b2e1cfe.tar.gz
pcsx_rearmed-cf4334ed9741d6247673fefa057b71926b2e1cfe.tar.bz2
pcsx_rearmed-cf4334ed9741d6247673fefa057b71926b2e1cfe.zip
Silence warning about misleading indent
-rw-r--r--libpcsxcore/plugins.c12
-rw-r--r--plugins/dfxvideo/soft.c10
2 files changed, 14 insertions, 8 deletions
diff --git a/libpcsxcore/plugins.c b/libpcsxcore/plugins.c
index afe3f3b..4f52ed2 100644
--- a/libpcsxcore/plugins.c
+++ b/libpcsxcore/plugins.c
@@ -1141,11 +1141,11 @@ void ReleasePlugins() {
if (Config.UseNet && hNETDriver != NULL) NET_shutdown();
- if (hCDRDriver != NULL) SysCloseLibrary(hCDRDriver); hCDRDriver = NULL;
- if (hGPUDriver != NULL) SysCloseLibrary(hGPUDriver); hGPUDriver = NULL;
- if (hSPUDriver != NULL) SysCloseLibrary(hSPUDriver); hSPUDriver = NULL;
- if (hPAD1Driver != NULL) SysCloseLibrary(hPAD1Driver); hPAD1Driver = NULL;
- if (hPAD2Driver != NULL) SysCloseLibrary(hPAD2Driver); hPAD2Driver = NULL;
+ if (hCDRDriver != NULL) { SysCloseLibrary(hCDRDriver); hCDRDriver = NULL; }
+ if (hGPUDriver != NULL) { SysCloseLibrary(hGPUDriver); hGPUDriver = NULL; }
+ if (hSPUDriver != NULL) { SysCloseLibrary(hSPUDriver); hSPUDriver = NULL; }
+ if (hPAD1Driver != NULL) { SysCloseLibrary(hPAD1Driver); hPAD1Driver = NULL; }
+ if (hPAD2Driver != NULL) { SysCloseLibrary(hPAD2Driver); hPAD2Driver = NULL; }
if (Config.UseNet && hNETDriver != NULL) {
SysCloseLibrary(hNETDriver); hNETDriver = NULL;
@@ -1164,7 +1164,7 @@ void ReleasePlugins() {
int ReloadCdromPlugin()
{
if (hCDRDriver != NULL || cdrIsoActive()) CDR_shutdown();
- if (hCDRDriver != NULL) SysCloseLibrary(hCDRDriver); hCDRDriver = NULL;
+ if (hCDRDriver != NULL) { SysCloseLibrary(hCDRDriver); hCDRDriver = NULL; }
if (UsingIso()) {
LoadCDRplugin(NULL);
diff --git a/plugins/dfxvideo/soft.c b/plugins/dfxvideo/soft.c
index c1c3bef..1b22ed5 100644
--- a/plugins/dfxvideo/soft.c
+++ b/plugins/dfxvideo/soft.c
@@ -6316,6 +6316,7 @@ static void DrawSoftwareSpriteMirror(unsigned char * baseAddr,int32_t w,int32_t
sprtYa=(sprtY<<10);
clutP=(clutY0<<10)+clutX0;
for (sprCY=0;sprCY<sprtH;sprCY++)
+ {
for (sprCX=0;sprCX<sprtW;sprCX++)
{
tC= psxVub[((textY0+(sprCY*lYDir))<<11) + textX0 +(sprCX*lXDir)];
@@ -6323,28 +6324,33 @@ static void DrawSoftwareSpriteMirror(unsigned char * baseAddr,int32_t w,int32_t
GetTextureTransColG_SPR(&psxVuw[sprA],GETLE16(&psxVuw[clutP+((tC>>4)&0xf)]));
GetTextureTransColG_SPR(&psxVuw[sprA+1],GETLE16(&psxVuw[clutP+(tC&0xf)]));
}
+ }
return;
case 1:
clutP>>=1;
for(sprCY=0;sprCY<sprtH;sprCY++)
+ {
for(sprCX=0;sprCX<sprtW;sprCX++)
{
tC = psxVub[((textY0+(sprCY*lYDir))<<11)+(GlobalTextAddrX<<1) + textX0 + (sprCX*lXDir)] & 0xff;
GetTextureTransColG_SPR(&psxVuw[((sprtY+sprCY)<<10)+sprtX + sprCX],psxVuw[clutP+tC]);
}
- return;
+ }
+ return;
case 2:
for (sprCY=0;sprCY<sprtH;sprCY++)
+ {
for (sprCX=0;sprCX<sprtW;sprCX++)
{
GetTextureTransColG_SPR(&psxVuw[((sprtY+sprCY)<<10)+sprtX+sprCX],
GETLE16(&psxVuw[((textY0+(sprCY*lYDir))<<10)+GlobalTextAddrX + textX0 +(sprCX*lXDir)]));
}
- return;
+ }
+ return;
}
}