Warning fix; formatting fixes
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2550 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
@@ -112,7 +112,7 @@ _count_lines (PTEXT pText)
|
|||||||
{
|
{
|
||||||
++numLines;
|
++numLines;
|
||||||
pText->pStr = pStr;
|
pText->pStr = pStr;
|
||||||
eol = getLineWithinWidth(pText, &pStr, text_width, (COUNT)~0);
|
eol = getLineWithinWidth (pText, &pStr, text_width, (COUNT)~0);
|
||||||
} while (!eol);
|
} while (!eol);
|
||||||
pText->pStr = pStr;
|
pText->pStr = pStr;
|
||||||
|
|
||||||
@@ -228,7 +228,7 @@ add_text (int status, PTEXT pTextIn)
|
|||||||
pText->pStr = pStr;
|
pText->pStr = pStr;
|
||||||
pText->baseline.y += leading;
|
pText->baseline.y += leading;
|
||||||
|
|
||||||
eol = getLineWithinWidth(pText, &pStr, text_width, maxchars);
|
eol = getLineWithinWidth (pText, &pStr, text_width, maxchars);
|
||||||
|
|
||||||
maxchars -= pText->CharCount;
|
maxchars -= pText->CharCount;
|
||||||
if (maxchars != 0)
|
if (maxchars != 0)
|
||||||
@@ -916,8 +916,8 @@ typedef struct summary_state
|
|||||||
// extended state
|
// extended state
|
||||||
BOOLEAN Initialized;
|
BOOLEAN Initialized;
|
||||||
BOOLEAN PrintNext;
|
BOOLEAN PrintNext;
|
||||||
TFB_SoundChain *NextSub;
|
const TFB_SoundChain *NextSub;
|
||||||
UNICODE *LeftOver;
|
const UNICODE *LeftOver;
|
||||||
|
|
||||||
} SUMMARY_STATE;
|
} SUMMARY_STATE;
|
||||||
typedef SUMMARY_STATE *PSUMMARY_STATE;
|
typedef SUMMARY_STATE *PSUMMARY_STATE;
|
||||||
@@ -983,7 +983,7 @@ DoConvSummary (PSUMMARY_STATE pSS)
|
|||||||
for (row = 0; row < MAX_SUMM_ROWS && pSS->NextSub;
|
for (row = 0; row < MAX_SUMM_ROWS && pSS->NextSub;
|
||||||
++row, pSS->NextSub = pSS->NextSub->next)
|
++row, pSS->NextSub = pSS->NextSub->next)
|
||||||
{
|
{
|
||||||
UNICODE *next;
|
const unsigned char *next;
|
||||||
|
|
||||||
if (pSS->LeftOver)
|
if (pSS->LeftOver)
|
||||||
{ // some text left from last subtitle
|
{ // some text left from last subtitle
|
||||||
@@ -999,7 +999,7 @@ DoConvSummary (PSUMMARY_STATE pSS)
|
|||||||
|
|
||||||
t.CharCount = (COUNT)~0;
|
t.CharCount = (COUNT)~0;
|
||||||
for ( ; row < MAX_SUMM_ROWS &&
|
for ( ; row < MAX_SUMM_ROWS &&
|
||||||
!getLineWithinWidth(&t, &next, r.extent.width, (COUNT)~0);
|
!getLineWithinWidth (&t, &next, r.extent.width, (COUNT)~0);
|
||||||
++row)
|
++row)
|
||||||
{
|
{
|
||||||
font_DrawText (&t);
|
font_DrawText (&t);
|
||||||
|
|||||||
Reference in New Issue
Block a user