Linux: I made Sconscript call wx-config inside of the main SConstruct, added a nowx argument, Made the filesystemviewer use the correct struct and fixed a silly scissor error that was made

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@589 8ced0084-cf51-0410-be5f-012b33b47a6e

1 files changed, 5 insertions, 5 deletions

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/BPStructs.cpp b/Source/Plugins/Plugin_VideoOGL/Src/BPStructs.cpp
index 282d29adad..50db2d00b7 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/BPStructs.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/BPStructs.cpp
@@ -561,9 +561,9 @@ void SetColorMask()
 

 bool SetScissorRect()

 {

-    int xoff = bpmem.scissorOffset.x*2-342;

-    int yoff = bpmem.scissorOffset.y*2-342;

-    //printf("xoff: %d yoff: %d\n", xoff, yoff);

+    int xoff = bpmem.scissorOffset.x * 2 - 342;

+    int yoff = bpmem.scissorOffset.y * 2 - 342;

+

     RECT rc;

     rc.left = bpmem.scissorTL.x + xoff - 342;

     rc.left *= MValueX;

@@ -572,10 +572,10 @@ bool SetScissorRect()
     rc.top *= MValueY;

     if (rc.top < 0) rc.top = 0;

     

-    rc.right = bpmem.scissorBR.x + xoff - 342 +1;

+    rc.right = bpmem.scissorBR.x + xoff - 342;

     rc.right *= MValueX;

     if (rc.right > 640 * MValueX) rc.right = 640 * MValueX;

-    rc.bottom = bpmem.scissorBR.y + yoff - 342 +1;

+    rc.bottom = bpmem.scissorBR.y + yoff - 342;

     rc.bottom *= MValueY;

     if (rc.bottom > 480 * MValueY) rc.bottom = 480 * MValueY;