From 8062f046c03ff9e462c87bbb6276639b149a5d0d Mon Sep 17 00:00:00 2001 From: avolkov Date: Mon, 27 Nov 2006 20:14:59 +0000 Subject: [PATCH] Warning fix; formatting fixes git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2550 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/sc2code/comm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sc2/src/sc2code/comm.c b/sc2/src/sc2code/comm.c index 193c0a302..532a60ee0 100644 --- a/sc2/src/sc2code/comm.c +++ b/sc2/src/sc2code/comm.c @@ -112,7 +112,7 @@ _count_lines (PTEXT pText) { ++numLines; pText->pStr = pStr; - eol = getLineWithinWidth(pText, &pStr, text_width, (COUNT)~0); + eol = getLineWithinWidth (pText, &pStr, text_width, (COUNT)~0); } while (!eol); pText->pStr = pStr; @@ -228,7 +228,7 @@ add_text (int status, PTEXT pTextIn) pText->pStr = pStr; pText->baseline.y += leading; - eol = getLineWithinWidth(pText, &pStr, text_width, maxchars); + eol = getLineWithinWidth (pText, &pStr, text_width, maxchars); maxchars -= pText->CharCount; if (maxchars != 0) @@ -916,8 +916,8 @@ typedef struct summary_state // extended state BOOLEAN Initialized; BOOLEAN PrintNext; - TFB_SoundChain *NextSub; - UNICODE *LeftOver; + const TFB_SoundChain *NextSub; + const UNICODE *LeftOver; } SUMMARY_STATE; typedef SUMMARY_STATE *PSUMMARY_STATE; @@ -983,7 +983,7 @@ DoConvSummary (PSUMMARY_STATE pSS) for (row = 0; row < MAX_SUMM_ROWS && pSS->NextSub; ++row, pSS->NextSub = pSS->NextSub->next) { - UNICODE *next; + const unsigned char *next; if (pSS->LeftOver) { // some text left from last subtitle @@ -999,7 +999,7 @@ DoConvSummary (PSUMMARY_STATE pSS) t.CharCount = (COUNT)~0; for ( ; row < MAX_SUMM_ROWS && - !getLineWithinWidth(&t, &next, r.extent.width, (COUNT)~0); + !getLineWithinWidth (&t, &next, r.extent.width, (COUNT)~0); ++row) { font_DrawText (&t);