Changed C++ style comments.

This commit is contained in:
Philipp Wiesemann 2014-05-18 21:11:30 +02:00
parent f5c77149bf
commit 9bc47465ca
3 changed files with 8 additions and 5 deletions

View File

@ -1871,7 +1871,7 @@ SDL_RenderGetD3D9Device(SDL_Renderer * renderer)
#if SDL_VIDEO_RENDER_D3D && !SDL_RENDER_DISABLED #if SDL_VIDEO_RENDER_D3D && !SDL_RENDER_DISABLED
D3D_RenderData *data = (D3D_RenderData *) renderer->driverdata; D3D_RenderData *data = (D3D_RenderData *) renderer->driverdata;
// Make sure that this is a D3D renderer /* Make sure that this is a D3D renderer */
if (renderer->DestroyRenderer != D3D_DestroyRenderer) { if (renderer->DestroyRenderer != D3D_DestroyRenderer) {
SDL_SetError("Renderer is not a D3D renderer"); SDL_SetError("Renderer is not a D3D renderer");
return NULL; return NULL;

View File

@ -343,15 +343,16 @@ WIN_CreateWindowFrom(_THIS, SDL_Window * window, const void *data)
{ {
const char *hint = SDL_GetHint(SDL_HINT_VIDEO_WINDOW_SHARE_PIXEL_FORMAT); const char *hint = SDL_GetHint(SDL_HINT_VIDEO_WINDOW_SHARE_PIXEL_FORMAT);
if (hint) { if (hint) {
// This hint is a pointer (in string form) of the address of /* This hint is a pointer (in string form) of the address of
// the window to share a pixel format with the window to share a pixel format with
*/
SDL_Window *otherWindow = NULL; SDL_Window *otherWindow = NULL;
SDL_sscanf(hint, "%p", (void**)&otherWindow); SDL_sscanf(hint, "%p", (void**)&otherWindow);
// Do some error checking on the pointer /* Do some error checking on the pointer */
if (otherWindow != NULL && otherWindow->magic == &_this->window_magic) if (otherWindow != NULL && otherWindow->magic == &_this->window_magic)
{ {
// If the otherWindow has SDL_WINDOW_OPENGL set, set it for the new window as well /* If the otherWindow has SDL_WINDOW_OPENGL set, set it for the new window as well */
if (otherWindow->flags & SDL_WINDOW_OPENGL) if (otherWindow->flags & SDL_WINDOW_OPENGL)
{ {
window->flags |= SDL_WINDOW_OPENGL; window->flags |= SDL_WINDOW_OPENGL;

View File

@ -123,7 +123,9 @@ main(int argc, char *argv[])
} }
break; break;
case SDL_JOYAXISMOTION: case SDL_JOYAXISMOTION:
/*
// SDL_Log("Axis Move: %d\n", event.jaxis.axis); // SDL_Log("Axis Move: %d\n", event.jaxis.axis);
*/
if (enable_haptic) if (enable_haptic)
SDL_HapticRumblePlay(haptic, 0.25, 250); SDL_HapticRumblePlay(haptic, 0.25, 250);
break; break;