Merge pull request #5546 from chinhodado/fixes

some minor fixes and changes
This commit is contained in:
Henrik Rydgård 2014-02-23 19:12:42 +07:00
commit b7651b61c7
5 changed files with 6 additions and 8 deletions

View File

@ -180,7 +180,6 @@ void __DisplayInit() {
lastNumFlips = 0;
fpsHistoryValid = 0;
fpsHistoryPos = 0;
fpsHistoryValid = 0;
InitGfxState();

View File

@ -76,7 +76,6 @@ void Process(VertexData& vertex, bool hasColor)
float _spot = Dot(-L,dir) / d / dir.Length();
float cutoff = getFloat24(gstate.lcutoff[light]&0xFFFFFF);
if (_spot > cutoff) {
spot = _spot;
float conv = getFloat24(gstate.lconv[light]&0xFFFFFF);
spot = pow(_spot, conv);
} else {

View File

@ -102,8 +102,8 @@ DrawingCoords TransformUnit::ScreenToDrawing(const ScreenCoords& coords)
ScreenCoords TransformUnit::DrawingToScreen(const DrawingCoords& coords)
{
ScreenCoords ret;
ret.x = (((u32)coords.x * 16 + gstate.getOffsetX16()));
ret.y = (((u32)coords.y * 16 + gstate.getOffsetY16()));
ret.x = (u32)coords.x * 16 + gstate.getOffsetX16();
ret.y = (u32)coords.y * 16 + gstate.getOffsetY16();
ret.z = coords.z;
return ret;
}

View File

@ -148,7 +148,7 @@ bool BreakpointWindow::fetchDialogData(HWND hwnd)
if (cpu->parseExpression(exp,size) == false)
{
sprintf(errorMessage,"Invalid expression \"%s\".",exp);
sprintf(errorMessage,"Invalid expression \"%s\".",str);
MessageBoxA(hwnd,errorMessage,"Error",MB_OK);
return false;
}
@ -270,4 +270,4 @@ void BreakpointWindow::initBreakpoint(u32 _address)
address = _address;
size = 1;
condition[0] = 0;
}
}

View File

@ -1273,7 +1273,7 @@ void CtrlDisAsmView::disassembleToFile()
ofn.lpstrFile = fileName ;
ofn.lpstrFile[0] = '\0';
ofn.nMaxFile = sizeof( fileName );
ofn.lpstrFilter = L"All files";
ofn.lpstrFilter = L"All Files\0*.*\0\0";
ofn.nFilterIndex = 1;
ofn.lpstrFileTitle = NULL ;
ofn.nMaxFileTitle = 0 ;
@ -1319,4 +1319,4 @@ u32 CtrlDisAsmView::getInstructionSizeAt(u32 address)
u32 start = manager.getStartAddress(address);
u32 next = manager.getNthNextAddress(start,1);
return next-address;
}
}