From b9472023a6e4e51c95db4a36e825dd2a5acaedd9 Mon Sep 17 00:00:00 2001 From: avolkov Date: Sat, 19 Dec 2009 07:49:24 +0000 Subject: [PATCH] Dodge MSVC 'used without having been initialized' warnings git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3450 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/libs/graphics/font.c | 2 +- sc2/src/libs/graphics/sdl/opengl.c | 6 ++++-- sc2/src/libs/graphics/sdl/pure.c | 3 ++- sc2/src/libs/input/sdl/vcontrol.c | 2 +- sc2/src/libs/sound/mixer/mixer.c | 2 +- sc2/src/libs/strings/getstr.c | 3 ++- sc2/src/uqm/comm.c | 4 ++-- sc2/src/uqm/comm/melnorm/melnorm.c | 8 ++++++-- sc2/src/uqm/comm/starbas/starbas.c | 11 +++++++---- sc2/src/uqm/comm/thradd/thraddc.c | 4 +++- sc2/src/uqm/cyborg.c | 13 ++++++------- sc2/src/uqm/encount.c | 7 +++++-- sc2/src/uqm/flash.c | 2 +- sc2/src/uqm/grpinfo.c | 6 +++--- sc2/src/uqm/intro.c | 6 +++++- sc2/src/uqm/planets/plangen.c | 2 +- sc2/src/uqm/planets/pstarmap.c | 4 ++-- sc2/src/uqm/planets/report.c | 2 +- sc2/src/uqm/save.c | 2 +- sc2/src/uqm/ships/androsyn/androsyn.c | 2 +- sc2/src/uqm/ships/druuge/druuge.c | 7 +++---- sc2/src/uqm/ships/mmrnmhrm/mmrnmhrm.c | 2 +- sc2/src/uqm/ships/orz/orz.c | 2 +- sc2/src/uqm/ships/sis_ship/sis_ship.c | 3 ++- sc2/src/uqm/ships/urquan/urquan.c | 2 +- sc2/src/uqm/ships/utwig/utwig.c | 2 +- sc2/src/uqm/shipstat.c | 2 +- sc2/src/uqm/sis.c | 5 +++-- sc2/src/uqm/starbase.c | 1 + 29 files changed, 69 insertions(+), 48 deletions(-) diff --git a/sc2/src/libs/graphics/font.c b/sc2/src/libs/graphics/font.c index cac494006..e2d05dc8f 100644 --- a/sc2/src/libs/graphics/font.c +++ b/sc2/src/libs/graphics/font.c @@ -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; diff --git a/sc2/src/libs/graphics/sdl/opengl.c b/sc2/src/libs/graphics/sdl/opengl.c index cf0e6bc1d..f5b505f87 100644 --- a/sc2/src/libs/graphics/sdl/opengl.c +++ b/sc2/src/libs/graphics/sdl/opengl.c @@ -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) { diff --git a/sc2/src/libs/graphics/sdl/pure.c b/sc2/src/libs/graphics/sdl/pure.c index 9d2388540..3869887af 100644 --- a/sc2/src/libs/graphics/sdl/pure.c +++ b/sc2/src/libs/graphics/sdl/pure.c @@ -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; diff --git a/sc2/src/libs/input/sdl/vcontrol.c b/sc2/src/libs/input/sdl/vcontrol.c index 1558f4c1a..1459d7905 100644 --- a/sc2/src/libs/input/sdl/vcontrol.c +++ b/sc2/src/libs/input/sdl/vcontrol.c @@ -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: diff --git a/sc2/src/libs/sound/mixer/mixer.c b/sc2/src/libs/sound/mixer/mixer.c index 908b32384..c59d92ddb 100644 --- a/sc2/src/libs/sound/mixer/mixer.c +++ b/sc2/src/libs/sound/mixer/mixer.c @@ -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 && ( diff --git a/sc2/src/libs/strings/getstr.c b/sc2/src/libs/strings/getstr.c index 657a53be0..b055382a0 100644 --- a/sc2/src/libs/strings/getstr.c +++ b/sc2/src/libs/strings/getstr.c @@ -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; diff --git a/sc2/src/uqm/comm.c b/sc2/src/uqm/comm.c index f91431b7b..b18d74980 100644 --- a/sc2/src/uqm/comm.c +++ b/sc2/src/uqm/comm.c @@ -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 diff --git a/sc2/src/uqm/comm/melnorm/melnorm.c b/sc2/src/uqm/comm/melnorm/melnorm.c index 73dd23c8d..9006f59bf 100644 --- a/sc2/src/uqm/comm/melnorm/melnorm.c +++ b/sc2/src/uqm/comm/melnorm/melnorm.c @@ -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) { diff --git a/sc2/src/uqm/comm/starbas/starbas.c b/sc2/src/uqm/comm/starbas/starbas.c index a084516ad..89959b3a7 100644 --- a/sc2/src/uqm/comm/starbas/starbas.c +++ b/sc2/src/uqm/comm/starbas/starbas.c @@ -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) { diff --git a/sc2/src/uqm/comm/thradd/thraddc.c b/sc2/src/uqm/comm/thradd/thraddc.c index 80900633d..52e4f3a2a 100644 --- a/sc2/src/uqm/comm/thradd/thraddc.c +++ b/sc2/src/uqm/comm/thradd/thraddc.c @@ -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); diff --git a/sc2/src/uqm/cyborg.c b/sc2/src/uqm/cyborg.c index eede76bda..c1f91b052 100644 --- a/sc2/src/uqm/cyborg.c +++ b/sc2/src/uqm/cyborg.c @@ -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)) diff --git a/sc2/src/uqm/encount.c b/sc2/src/uqm/encount.c index 0e96f82cd..0d60b357a 100644 --- a/sc2/src/uqm/encount.c +++ b/sc2/src/uqm/encount.c @@ -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); diff --git a/sc2/src/uqm/flash.c b/sc2/src/uqm/flash.c index 786f7092d..9afbd2d66 100644 --- a/sc2/src/uqm/flash.c +++ b/sc2/src/uqm/flash.c @@ -236,7 +236,7 @@ Flash_continue (FlashContext *context) static void Flash_fixState (FlashContext *context) { - TimeCount stateTime; + TimeCount stateTime = 0; for (;;) { switch (context->state) { diff --git a/sc2/src/uqm/grpinfo.c b/sc2/src/uqm/grpinfo.c index 8ed507637..974cdde3f 100644 --- a/sc2/src/uqm/grpinfo.c +++ b/sc2/src/uqm/grpinfo.c @@ -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) diff --git a/sc2/src/uqm/intro.c b/sc2/src/uqm/intro.c index 7895a73ee..ae1caf8f2 100644 --- a/sc2/src/uqm/intro.c +++ b/sc2/src/uqm/intro.c @@ -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); diff --git a/sc2/src/uqm/planets/plangen.c b/sc2/src/uqm/planets/plangen.c index 25547ff9c..eae7fbd17 100644 --- a/sc2/src/uqm/planets/plangen.c +++ b/sc2/src/uqm/planets/plangen.c @@ -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) { diff --git a/sc2/src/uqm/planets/pstarmap.c b/sc2/src/uqm/planets/pstarmap.c index ffdc6fc49..fe2db375d 100644 --- a/sc2/src/uqm/planets/pstarmap.c +++ b/sc2/src/uqm/planets/pstarmap.c @@ -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; diff --git a/sc2/src/uqm/planets/report.c b/sc2/src/uqm/planets/report.c index cd05ef336..1b2a4db4e 100644 --- a/sc2/src/uqm/planets/report.c +++ b/sc2/src/uqm/planets/report.c @@ -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; diff --git a/sc2/src/uqm/save.c b/sc2/src/uqm/save.c index 7f2e0a2f2..9384ed3af 100644 --- a/sc2/src/uqm/save.c +++ b/sc2/src/uqm/save.c @@ -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]; diff --git a/sc2/src/uqm/ships/androsyn/androsyn.c b/sc2/src/uqm/ships/androsyn/androsyn.c index adad52db3..68bde3e6f 100644 --- a/sc2/src/uqm/ships/androsyn/androsyn.c +++ b/sc2/src/uqm/ships/androsyn/androsyn.c @@ -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) diff --git a/sc2/src/uqm/ships/druuge/druuge.c b/sc2/src/uqm/ships/druuge/druuge.c index 5002bae3e..fe575c162 100644 --- a/sc2/src/uqm/ships/druuge/druuge.c +++ b/sc2/src/uqm/ships/druuge/druuge.c @@ -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; } diff --git a/sc2/src/uqm/ships/mmrnmhrm/mmrnmhrm.c b/sc2/src/uqm/ships/mmrnmhrm/mmrnmhrm.c index dbb94863c..2205c630c 100644 --- a/sc2/src/uqm/ships/mmrnmhrm/mmrnmhrm.c +++ b/sc2/src/uqm/ships/mmrnmhrm/mmrnmhrm.c @@ -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 diff --git a/sc2/src/uqm/ships/orz/orz.c b/sc2/src/uqm/ships/orz/orz.c index 11a5c6875..f026bc794 100644 --- a/sc2/src/uqm/ships/orz/orz.c +++ b/sc2/src/uqm/ships/orz/orz.c @@ -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; diff --git a/sc2/src/uqm/ships/sis_ship/sis_ship.c b/sc2/src/uqm/ships/sis_ship/sis_ship.c index 580abaeb5..afea699aa 100644 --- a/sc2/src/uqm/ships/sis_ship/sis_ship.c +++ b/sc2/src/uqm/ships/sis_ship/sis_ship.c @@ -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; diff --git a/sc2/src/uqm/ships/urquan/urquan.c b/sc2/src/uqm/ships/urquan/urquan.c index 0318ca6b1..c052ec0fa 100644 --- a/sc2/src/uqm/ships/urquan/urquan.c +++ b/sc2/src/uqm/ships/urquan/urquan.c @@ -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); diff --git a/sc2/src/uqm/ships/utwig/utwig.c b/sc2/src/uqm/ships/utwig/utwig.c index 11db06d82..e3bc0ec0c 100644 --- a/sc2/src/uqm/ships/utwig/utwig.c +++ b/sc2/src/uqm/ships/utwig/utwig.c @@ -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) diff --git a/sc2/src/uqm/shipstat.c b/sc2/src/uqm/shipstat.c index 3a28dc28d..040542660 100644 --- a/sc2/src/uqm/shipstat.c +++ b/sc2/src/uqm/shipstat.c @@ -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 { diff --git a/sc2/src/uqm/sis.c b/sc2/src/uqm/sis.c index a602c6ad2..6ba82d981 100644 --- a/sc2/src/uqm/sis.c +++ b/sc2/src/uqm/sis.c @@ -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; diff --git a/sc2/src/uqm/starbase.c b/sc2/src/uqm/starbase.c index 7c6e094bb..2f48cd38c 100644 --- a/sc2/src/uqm/starbase.c +++ b/sc2/src/uqm/starbase.c @@ -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,