From a11d3e923814832af2cdc3a1921ec98ef629f2b3 Mon Sep 17 00:00:00 2001 From: Meep-Eep Date: Fri, 10 Aug 2007 14:47:50 +0000 Subject: [PATCH] A few comments, cleanups. git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2835 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/sc2code/libs/graphics/display.h | 3 ++- sc2/src/sc2code/libs/graphics/sdl/3do_blt.c | 16 +++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/sc2/src/sc2code/libs/graphics/display.h b/sc2/src/sc2code/libs/graphics/display.h index 2b0e28f14..c5ea7beef 100644 --- a/sc2/src/sc2code/libs/graphics/display.h +++ b/sc2/src/sc2code/libs/graphics/display.h @@ -24,7 +24,8 @@ typedef struct CREATE_FLAGS DisplayFlags; BYTE DisplayDepth; - COUNT DisplayWidth, DisplayHeight; + COUNT DisplayWidth; + COUNT DisplayHeight; DRAWABLE (*alloc_image) (COUNT NumFrames, DRAWABLE_TYPE DrawableType, CREATE_FLAGS flags, SIZE width, SIZE height); diff --git a/sc2/src/sc2code/libs/graphics/sdl/3do_blt.c b/sc2/src/sc2code/libs/graphics/sdl/3do_blt.c index 6f7c09634..7e809ea26 100644 --- a/sc2/src/sc2code/libs/graphics/sdl/3do_blt.c +++ b/sc2/src/sc2code/libs/graphics/sdl/3do_blt.c @@ -30,7 +30,8 @@ read_screen (RECT *lpRect, FRAME DstFramePtr) || !(GetFrameParentDrawable (DstFramePtr)->Flags & MAPPED_TO_DISPLAY)) { - log_add (log_Warning, "Unimplemented function activated: read_screen()"); + log_add (log_Warning, "Unimplemented function activated: " + "read_screen()"); } else { @@ -53,14 +54,14 @@ alloc_image (COUNT NumFrames, DRAWABLE_TYPE DrawableType, CREATE_FLAGS static DISPLAY_INTERFACE DisplayInterface = { - WANT_MASK, + /* .DisplayFlags = */ WANT_MASK, - 16, // SCREEN_DEPTH, - 320, - 240, + /* .DisplayDepth = */ 16, + /* .DisplayWidth = */ 320, + /* .DisplayHeight = */ 240, - alloc_image, - read_screen, + /* .alloc_iamge = */ alloc_image, + /* .read_display = */ read_screen, }; void @@ -70,3 +71,4 @@ LoadDisplay (DISPLAY_INTERFACE **pDisplay) } #endif +