adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dodge MSVC 'used without having been initialized' warnings

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3450 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2009-12-19 07:49:24 +00:00
parent 076b8ad3e2
commit b9472023a6
29 changed files with 69 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/libs/graphics/font.c
+1 -1
View File
@@ -129,7 +129,7 @@ TextRect (TEXT *lpText, RECT *pRect, BYTE *pdelta)
{
COORD top_y, bot_y;
SIZE width;
UniChar next_ch;
UniChar next_ch = 0;
const unsigned char *pStr;
COUNT num_chars;
sc2/src/libs/graphics/sdl/opengl.c
+4 -2
View File
@@ -340,8 +340,10 @@ TFB_GL_DrawQuad (SDL_Rect *r)
{
BOOLEAN keep_aspect_ratio = optKeepAspectRatio;
int x1 = 0, y1 = 0, x2 = ScreenWidthActual, y2 = ScreenHeightActual;
int sx, sy, sw, sh;
float sx_multiplier, sy_multiplier;
int sx = 0, sy = 0;
int sw, sh;
float sx_multiplier = 1;
float sy_multiplier = 1;
if (keep_aspect_ratio)
{
sc2/src/libs/graphics/sdl/pure.c
+2 -1
View File
@@ -429,7 +429,8 @@ TFB_Pure_ColorLayer (Uint8 r, Uint8 g, Uint8 b, Uint8 a, SDL_Rect *rect)
void
Scale_PerfTest (void)
{
DWORD TimeStart, TimeIn, Now;
TimeCount TimeStart, TimeIn;
TimeCount Now = 0;
SDL_Rect updated = {0, 0, ScreenWidth, ScreenHeight};
int i;
sc2/src/libs/input/sdl/vcontrol.c
+1 -1
View File
@@ -420,7 +420,7 @@ event2gesture (SDL_Event *e, VCONTROL_GESTURE *g)
int
VControl_AddGestureBinding (VCONTROL_GESTURE *g, int *target)
{
int result;
int result = -1;
switch (g->type)
{
case VCONTROL_KEY:
sc2/src/libs/sound/mixer/mixer.c
+1 -1
View File
@@ -147,7 +147,7 @@ mixer_MixChannels (void *userdata, uint8 *stream, sint32 len)
for (i = 0; i < MAX_SOURCES; i++)
{
mixer_Source *src;
float samp;
float samp = 0;
/* find next source */
for (; i < MAX_SOURCES && (
sc2/src/libs/strings/getstr.c
+2 -1
View File
@@ -71,7 +71,8 @@ _GetConversationData (const char *path, RESOURCE_DATA *resdata)
DWORD opos,
slen[MAX_STRINGS], StringOffs, tot_string_size,
clen[MAX_STRINGS], ClipOffs, tot_clip_size,
tslen[MAX_STRINGS], TSOffs, tot_ts_size;
tslen[MAX_STRINGS], TSOffs;
DWORD tot_ts_size = 0;
char CurrentLine[1024], paths[1024], *clip_path, *ts_path,
*strdata, *clipdata, *ts_data;
uio_Stream *timestamp_fp = NULL;
sc2/src/uqm/comm.c
+2 -2
View File
@@ -156,7 +156,7 @@ add_text (int status, TEXT *pTextIn)
int num_lines = 0;
static COORD last_baseline;
BOOLEAN eol;
CONTEXT OldContext;
CONTEXT OldContext = NULL;
BatchGraphics ();
@@ -861,7 +861,7 @@ DoConvSummary (SUMMARY_STATE *pSS)
for (row = 0; row < MAX_SUMM_ROWS && pSS->NextSub;
++row, pSS->NextSub = GetNextTrackSubtitle (pSS->NextSub))
{
const unsigned char *next;
const unsigned char *next = NULL;
if (pSS->LeftOver)
{ // some text left from last subtitle
sc2/src/uqm/comm/melnorm/melnorm.c
+6 -2
View File
@@ -414,7 +414,7 @@ StripShip (COUNT fuel_required)
{
if (module_count[i])
{
RESPONSE_REF pStr;
RESPONSE_REF pStr = 0;
switch (i)
{
@@ -454,6 +454,8 @@ StripShip (COUNT fuel_required)
case ANTIMISSILE_DEFENSE:
pStr = DEFENSES;
break;
default:
assert (0 && "Unknown module");
}
if (i == end_mod && i != beg_mod)
@@ -868,7 +870,7 @@ TryFuelAgain:
}
else
{
RESPONSE_REF pStr;
RESPONSE_REF pStr = 0;
stack = GET_GAME_STATE (MELNORME_TECH_STACK);
switch (stack)
@@ -925,6 +927,8 @@ TryFuelAgain:
pStr = OK_BUY_NEW_TECH_13;
needed_credit = 75 * BIO_CREDIT_VALUE;
break;
default:
assert (0 && "Unknown tech");
}
if ((int)needed_credit > (int)credit)
{
sc2/src/uqm/comm/starbas/starbas.c
+7 -4
View File
@@ -174,7 +174,8 @@ ByeBye (RESPONSE_REF R)
NPCPhrase (GOOD_LUCK_AGAIN);
else
{
RESPONSE_REF pStr0, pStr1;
RESPONSE_REF pStr0 = 0;
RESPONSE_REF pStr1 = 0;
switch ((BYTE)TFB_Random () & 7)
{
@@ -1663,7 +1664,8 @@ NormalStarbase (RESPONSE_REF R)
}
else
{
RESPONSE_REF pStr0, pStr1;
RESPONSE_REF pStr0 = 0;
RESPONSE_REF pStr1 = 0;
switch ((BYTE)TFB_Random () & 7)
{
@@ -1728,14 +1730,15 @@ SellMinerals (RESPONSE_REF R)
{
COUNT i, total;
BOOLEAN Sleepy;
RESPONSE_REF pStr1, pStr2;
RESPONSE_REF pStr1 = 0;
RESPONSE_REF pStr2 = 0;
total = 0;
Sleepy = TRUE;
for (i = 0; i < NUM_ELEMENT_CATEGORIES; ++i)
{
COUNT amount;
DWORD TimeIn;
DWORD TimeIn = 0;
if (i == 0)
{
sc2/src/uqm/comm/thradd/thraddc.c
+3 -1
View File
@@ -136,7 +136,7 @@ static LOCDATA thradd_desc =
static int
GetCultureName (void)
{
int culture;
int culture = 0;
switch (GET_GAME_STATE (THRADD_CULTURE))
{
@@ -149,6 +149,8 @@ GetCultureName (void)
case 3:
culture = SLAVE_EMPIRE;
break;
default:
assert (0 && "Unknown culture");
}
return (culture);
sc2/src/uqm/cyborg.c
+6 -7
View File
@@ -36,7 +36,8 @@ PlotIntercept (ELEMENT *ElementPtr0, ELEMENT *ElementPtr1,
SIZE dy;
SIZE time_y_0, time_y_1;
POINT dst[2];
RECT r0, r1;
RECT r0 = {{0, 0}, {0, 0}};
RECT r1 = {{0, 0}, {0, 0}};
SIZE dx_0, dy_0, dx_1, dy_1;
if ((ElementPtr0->state_flags | ElementPtr1->state_flags) & FINITE_LIFE)
@@ -78,12 +79,8 @@ PlotIntercept (ELEMENT *ElementPtr0, ELEMENT *ElementPtr1,
}
else
{
GetFrameRect (
ElementPtr0->IntersectControl.IntersectStamp.frame,
&r0);
GetFrameRect (
ElementPtr1->IntersectControl.IntersectStamp.frame,
&r1);
GetFrameRect (ElementPtr0->IntersectControl.IntersectStamp.frame, &r0);
GetFrameRect (ElementPtr1->IntersectControl.IntersectStamp.frame, &r1);
dst[0].y += DISPLAY_TO_WORLD (r0.corner.y);
dst[1].y += DISPLAY_TO_WORLD (r1.corner.y);
@@ -1077,6 +1074,8 @@ if (!(ShipPtr->state_flags & FINITE_LIFE)
{
EVALUATE_DESC ed;
ed.MoveState = NO_MOVEMENT;
LockElement (hElement, &ed.ObjectPtr);
hNextElement = GetSuccElement (ed.ObjectPtr);
if (CollisionPossible (ed.ObjectPtr, &Ship))
sc2/src/uqm/encount.c
+5 -2
View File
@@ -439,7 +439,8 @@ UninitEncounter (void)
SIZE VictoryState;
COUNT RecycleAmount = 0;
SIZE i;
RECT r, scavenge_r;
RECT r;
RECT scavenge_r = {{0, 0}, {0, 0}};
TEXT t;
STAMP ship_s;
const UNICODE *str1 = NULL;
@@ -489,6 +490,8 @@ UninitEncounter (void)
UnlockShipFrag (&GLOBAL (npc_built_ship_q), hStarShip);
prevMsgMode = SetStatusMessageMode (SMM_RES_UNITS);
ship_s.origin.x = 0;
ship_s.origin.y = 0;
Sleepy = TRUE;
for (i = 0; i < NUM_SIDES; ++i)
{
@@ -721,7 +724,7 @@ EncounterBattle (void)
{
ACTIVITY OldActivity;
extern UWORD nth_frame;
InputContext *savedPlayerInput;
InputContext *savedPlayerInput = NULL;
LockMutex (GraphicsLock);
sc2/src/uqm/flash.c
+1 -1
View File
@@ -236,7 +236,7 @@ Flash_continue (FlashContext *context)
static void
Flash_fixState (FlashContext *context)
{
TimeCount stateTime;
TimeCount stateTime = 0;
for (;;) {
switch (context->state) {
sc2/src/uqm/grpinfo.c
+3 -3
View File
@@ -246,8 +246,9 @@ BuildGroup (QUEUE *pDstQueue, BYTE race_id)
void
BuildGroups (void)
{
BYTE Index, BestIndex;
COUNT BestPercent;
BYTE Index;
BYTE BestIndex = 0;
COUNT BestPercent = 0;
POINT universe;
HFLEETINFO hFleet, hNextFleet;
BYTE HomeWorld[] =
@@ -296,7 +297,6 @@ BuildGroups (void)
HomeWorld[SUPOX_SHIP] = 0;
}
BestPercent = 0;
universe = CurStarDescPtr->star_pt;
for (hFleet = GetHeadLink (&GLOBAL (avail_race_q)), Index = 0;
hFleet; hFleet = hNextFleet, ++Index)
sc2/src/uqm/intro.c
+5 -1
View File
@@ -585,7 +585,10 @@ DoPresentation (void *pIS)
#define PRES_DRAW_SIS 1
int cargs;
int draw_what;
int index, x, y, scale, angle;
int index = 0;
int x, y;
int scale;
int angle;
int scale_mode;
char ImgName[16];
int old_scale, old_mode;
@@ -622,6 +625,7 @@ DoPresentation (void *pIS)
y = 0;
}
s.frame = NULL;
if (draw_what == PRES_DRAW_INDEX)
{ /* draw stamp by index */
s.frame = SetAbsFrameIndex (pPIS->Frame, (COUNT)index);
sc2/src/uqm/planets/plangen.c
+1 -1
View File
@@ -837,7 +837,7 @@ DitherMap (SBYTE *DepthArray)
#define DITHER_VARIANCE (1 << (RANGE_SHIFT - 3))
COUNT i;
SBYTE *elev;
DWORD rand_val;
DWORD rand_val = 0;
for (i = 0, elev = DepthArray; i < MAP_WIDTH * MAP_HEIGHT; ++i, ++elev)
{
sc2/src/uqm/planets/pstarmap.c
+2 -2
View File
@@ -287,7 +287,7 @@ DrawStarMap (COUNT race_update, RECT *pClipRect)
COUNT which_space;
long diameter;
RECT r, old_r;
POINT oldOrigin;
POINT oldOrigin = {0, 0};
STAMP s;
FRAME star_frame;
STAR_DESC *SDPtr;
@@ -878,7 +878,7 @@ SplitStarName (STAR_SEARCH_STATE *pSS)
{
UNICODE *buf = pSS->Buffer;
UNICODE *next;
UNICODE *sep;
UNICODE *sep = NULL;
pSS->Prefix = 0;
pSS->PrefixLen = 0;
sc2/src/uqm/planets/report.c
+1 -1
View File
@@ -86,7 +86,7 @@ MakeReport (SOUND ReadOutSounds, UNICODE *pStr, COUNT StrLen)
BYTE ButtonState;
int end_page_len;
UNICODE end_page_buf[200];
UniChar last_c;
UniChar last_c = 0;
COUNT row_cells;
BOOLEAN Sleepy;
RECT r;
sc2/src/uqm/save.c
+1 -1
View File
@@ -531,7 +531,7 @@ static void
SaveProblemMessage (STAMP *MsgStamp)
{
#define MAX_MSG_LINES 1
RECT r;
RECT r = {{0, 0}, {0, 0}};
COUNT i;
TEXT t;
UNICODE *ppStr[MAX_MSG_LINES];
sc2/src/uqm/ships/androsyn/androsyn.c
+1 -1
View File
@@ -249,7 +249,7 @@ androsynth_intelligence (ELEMENT *ShipPtr, EVALUATE_DESC *ObjectsOfConcern,
}
else
{
STARSHIP *pEnemyStarShip;
STARSHIP *pEnemyStarShip = NULL;
lpEvalDesc = &ObjectsOfConcern[ENEMY_SHIP_INDEX];
if (lpEvalDesc->ObjectPtr)
sc2/src/uqm/ships/druuge/druuge.c
+3 -4
View File
@@ -192,14 +192,13 @@ static void
druuge_intelligence (ELEMENT *ShipPtr, EVALUATE_DESC *ObjectsOfConcern,
COUNT ConcernCounter)
{
UWORD ship_flags;
UWORD ship_flags = 0;
STARSHIP *StarShipPtr;
STARSHIP *EnemyStarShipPtr;
STARSHIP *EnemyStarShipPtr = NULL;
EVALUATE_DESC *lpEvalDesc;
GetElementStarShip (ShipPtr, &StarShipPtr);
ship_flags = 0;
lpEvalDesc = &ObjectsOfConcern[ENEMY_SHIP_INDEX];
if (StarShipPtr->cur_status_flags & SHIP_BEYOND_MAX_SPEED)
lpEvalDesc->MoveState = ENTICE;
@@ -216,7 +215,7 @@ druuge_intelligence (ELEMENT *ShipPtr, EVALUATE_DESC *ObjectsOfConcern,
++ShipPtr->thrust_wait;
}
ship_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter);
if (ship_flags)
if (EnemyStarShipPtr)
{
EnemyStarShipPtr->RaceDescPtr->ship_info.ship_flags = ship_flags;
}
sc2/src/uqm/ships/mmrnmhrm/mmrnmhrm.c
+1 -1
View File
@@ -155,7 +155,7 @@ mmrnmhrm_intelligence (ELEMENT *ShipPtr, EVALUATE_DESC *ObjectsOfConcern,
BOOLEAN CanTransform;
EVALUATE_DESC *lpEvalDesc;
STARSHIP *StarShipPtr;
STARSHIP *EnemyStarShipPtr;
STARSHIP *EnemyStarShipPtr = NULL;
GetElementStarShip (ShipPtr, &StarShipPtr);
CanTransform = (BOOLEAN)(StarShipPtr->special_counter == 0
sc2/src/uqm/ships/orz/orz.c
+1 -1
View File
@@ -540,7 +540,7 @@ marine_preprocess (ELEMENT *ElementPtr)
--ElementPtr->turn_wait;
else
{
COUNT facing, pfacing;
COUNT facing, pfacing = 0;
SIZE delta_x, delta_y, delta_facing;
HELEMENT hObject, hNextObject, hTarget;
ELEMENT *ObjectPtr;
sc2/src/uqm/ships/sis_ship/sis_ship.c
+2 -1
View File
@@ -141,7 +141,8 @@ void uninit_sis (RACE_DESC *pRaceDesc);
static void
sis_hyper_preprocess (ELEMENT *ElementPtr)
{
SIZE udx, udy, dx, dy;
SIZE udx = 0, udy = 0;
SIZE dx = 0, dy = 0;
SIZE AccelerateDirection;
STARSHIP *StarShipPtr;
sc2/src/uqm/ships/urquan/urquan.c
+1 -1
View File
@@ -487,7 +487,7 @@ urquan_intelligence (ELEMENT *ShipPtr, EVALUATE_DESC *ObjectsOfConcern,
lpEvalDesc = &ObjectsOfConcern[ENEMY_SHIP_INDEX];
{
STARSHIP *EnemyStarShipPtr;
STARSHIP *EnemyStarShipPtr = NULL;
if (lpEvalDesc->ObjectPtr)
GetElementStarShip (lpEvalDesc->ObjectPtr, &EnemyStarShipPtr);
sc2/src/uqm/ships/utwig/utwig.c
+1 -1
View File
@@ -144,7 +144,7 @@ initialize_lance (ELEMENT *ShipPtr, HELEMENT WeaponArray[])
for (i = 0; i < 3; ++i)
{
COUNT angle;
SIZE sin0, cos0;
SIZE sin0 = 0, cos0 = 0;
SIZE sin1sin0, cos1sin0, cos1cos0, sin1cos0;
switch (i)
sc2/src/uqm/shipstat.c
+1 -1
View File
@@ -140,7 +140,7 @@ InitShipStatus (SHIP_INFO *SIPtr, STARSHIP *StarShipPtr, RECT *pClipRect)
STAMP Stamp;
CONTEXT OldContext;
RECT oldClipRect;
POINT oldOrigin;
POINT oldOrigin = {0, 0};
if (StarShipPtr) // set during battle
{
sc2/src/uqm/sis.c
+3 -2
View File
@@ -1597,7 +1597,7 @@ flash_rect_func (void *data)
DWORD TimeIn;
const DWORD WaitTime = ONE_SECOND / 16;
SIZE strength;
RECT cached_rect;
RECT cached_rect = {{0, 0}, {0, 0}};
FRAME cached_screen_frame = 0;
Task task = (Task)data;
bool cached[CACHE_SIZE];
@@ -1716,7 +1716,8 @@ flash_rect_func (void *data)
void
SetFlashRect (RECT *pRect)
{
RECT clip_r, temp_r, flash_rect1, old_r;
RECT clip_r = {{0, 0}, {0, 0}};
RECT temp_r, flash_rect1, old_r;
CONTEXT OldContext;
int create_flash = 0;
sc2/src/uqm/starbase.c
+1
View File
@@ -140,6 +140,7 @@ DrawShipPiece (FRAME ModuleFrame, COUNT which_piece, COUNT which_slot,
}
Side.origin.x += which_slot * SHIP_PIECE_OFFSET;
Side.frame = NULL;
if (RepairSlot < 0)
{
Side.frame = SetAbsFrameIndex (ModuleFrame,