diff --git a/source/ps/Hotkey.cpp b/source/ps/Hotkey.cpp index da1442ab67..21d3c13e05 100755 --- a/source/ps/Hotkey.cpp +++ b/source/ps/Hotkey.cpp @@ -122,7 +122,7 @@ static SHotkeyInfo hotkeyInfo[] = { HOTKEY_CONTEXTORDER_NEXT, "contextorder.next", SDLK_RIGHTBRACKET, 0 }, { HOTKEY_CONTEXTORDER_PREVIOUS, "contextorder.previous", SDLK_LEFTBRACKET, 0 }, { HOTKEY_HIGHLIGHTALL, "highlightall", SDLK_o, 0 }, - + { HOTKEY_PROFILE_TOGGLE, "profile.toggle", SDLK_F11, 0 }, { HOTKEY_PLAYMUSIC, "playmusic", SDLK_p, 0 } }; diff --git a/source/ps/Hotkey.h b/source/ps/Hotkey.h index 3e5c2bb389..9e689927cb 100755 --- a/source/ps/Hotkey.h +++ b/source/ps/Hotkey.h @@ -92,6 +92,8 @@ enum HOTKEY_CONTEXTORDER_PREVIOUS, HOTKEY_HIGHLIGHTALL, + HOTKEY_PROFILE_TOGGLE, + HOTKEY_PLAYMUSIC, HOTKEY_LAST, diff --git a/source/ps/ProfileViewer.cpp b/source/ps/ProfileViewer.cpp index 9d3763b928..6057370f1c 100644 --- a/source/ps/ProfileViewer.cpp +++ b/source/ps/ProfileViewer.cpp @@ -97,19 +97,19 @@ void RenderProfile() glTranslatef( 0.0f, 20.0f, 0.0f ); - float unlogged = currentNode->GetFrameTime(); + float unlogged = (float)currentNode->GetFrameTime(); int currentNodeid = 1; for( it = currentNode->GetChildren()->begin(); it != currentNode->GetChildren()->end(); it++, currentNodeid++ ) { - unlogged -= (*it)->GetFrameTime(); + unlogged -= (float)(*it)->GetFrameTime(); RenderProfileNode( *it, currentNodeid ); } glColor3f( 1.0f, 0.5f, 0.5f ); for( it = currentNode->GetScriptChildren()->begin(); it != currentNode->GetScriptChildren()->end(); it++, currentNodeid++ ) { - unlogged -= (*it)->GetFrameTime(); + unlogged -= (float)(*it)->GetFrameTime(); RenderProfileNode( *it, currentNodeid ); } glColor3f( 1.0f, 1.0f, 1.0f );