diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 883003262..eca887ef8 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -274,7 +274,7 @@ consvar_t cv_showlocalskinmenus = {"showlocalskinmenus", "Yes", CV_SAVE, CV_YesN consvar_t cv_skipmapcheck = {"skipmapcheck", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; -INT32 cv_debug; +INT32 cv_debug = 0; static void UseMouse_OnChange(void); consvar_t cv_usemouse = {"use_mouse", "Off", CV_SAVE|CV_CALL, usemouse_cons_t, UseMouse_OnChange, 0, NULL, NULL, 0, 0, NULL}; @@ -531,7 +531,7 @@ boolean forceresetplayers = false; boolean deferencoremode = false; UINT8 splitscreen = 0; boolean circuitmap = true; // SRB2kart -INT32 adminplayers[MAXPLAYERS]; +INT32 adminplayers[MAXPLAYERS] = {}; /// \warning Keep this up-to-date if you add/remove/rename net text commands const char *netxcmdnames[MAXNETXCMD - 1] = @@ -2589,8 +2589,7 @@ void D_PickVote(void) SendNetXCmd(XD_PICKVOTE, &buf, 2); } -static char * -ConcatCommandArgv (int start, int end) +static char *ConcatCommandArgv(int start, int end) { char *final; diff --git a/src/m_menu.c b/src/m_menu.c index 7718c294a..a4bf51f3d 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -2995,6 +2995,7 @@ static void M_StopMessage(INT32 choice) static void M_DrawImageDef(void) { patch_t *patch = (patch_t *)W_CachePatchName(currentMenu->menuitems[itemOn].text, PU_PATCH); + if (patch->width <= BASEVIDWIDTH) V_DrawScaledPatch(0,0,0,patch); else @@ -3769,10 +3770,10 @@ static void M_HandleAddons(INT32 choice) } // ---- REPLAY HUT ----- -menudemo_t *demolist; // Replays that that have been checked to match with query +menudemo_t *demolist = NULL; // Replays that that have been checked to match with query // Locked behind Lock_search_state -menudemo_t *demolist_all; // All replays +menudemo_t *demolist_all = NULL; // All replays boolean replaynamesloaded = false; #ifdef HAVE_THREADS @@ -5104,7 +5105,7 @@ void M_PopupMasterServerRules(void) UINT16 ccvaralphakey = 4; INT16 ccvarlaststheader = 0; -INT32 CVARSETUP; +INT32 CVARSETUP = 0; void M_SlotCvarIntoModMenu(consvar_t* cvar, const char* category, const char* name) { @@ -5149,7 +5150,7 @@ void M_SlotCvarIntoModMenu(consvar_t* cvar, const char* category, const char* na // SKY ROOM // ======== -UINT8 skyRoomMenuTranslations[MAXUNLOCKABLES]; +UINT8 skyRoomMenuTranslations[MAXUNLOCKABLES] = {}; static char *M_GetConditionString(condition_t cond) { diff --git a/src/p_maputl.cpp b/src/p_maputl.cpp index 3209f6f51..37b31c4ac 100644 --- a/src/p_maputl.cpp +++ b/src/p_maputl.cpp @@ -230,8 +230,8 @@ PUREFUNC fixed_t P_InterceptVector(divline_t *v2, divline_t *v1) // Sets opentop and openbottom to the window through a two sided line. // OPTIMIZE: keep this precalculated // -fixed_t opentop, openbottom, openrange, lowfloor, highceiling; -pslope_t *opentopslope, *openbottomslope; +fixed_t opentop = 0, openbottom = 0, openrange = 0, lowfloor = 0, highceiling = 0; +pslope_t *opentopslope = NULL, *openbottomslope = NULL; // P_CameraLineOpening // P_LineOpening, but for camera @@ -985,7 +985,7 @@ boolean P_BlockThingsIterator(INT32 x, INT32 y, boolean (*func)(mobj_t *)) static intercept_t *intercepts = NULL; static intercept_t *intercept_p = NULL; -divline_t trace; +divline_t trace = {}; static boolean earlyout; //SoM: 4/6/2000: Remove limit on intercepts. diff --git a/src/p_mobj.c b/src/p_mobj.c index 143415ea2..14aa6af8d 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -10063,9 +10063,9 @@ static precipmobj_t *P_SpawnPrecipMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype // // P_RemoveMobj // -mapthing_t *itemrespawnque[ITEMQUESIZE]; -tic_t itemrespawntime[ITEMQUESIZE]; -size_t iquehead, iquetail; +mapthing_t *itemrespawnque[ITEMQUESIZE] = {}; +tic_t itemrespawntime[ITEMQUESIZE] = {}; +size_t iquehead = 0, iquetail = 0; #ifdef PARANOIA #define SCRAMBLE_REMOVED // Force debug build to crash when Removed mobj is accessed @@ -10949,8 +10949,8 @@ void P_MovePlayerToStarpost(INT32 playernum) } #define MAXHUNTEMERALDS 64 -mapthing_t *huntemeralds[MAXHUNTEMERALDS]; -INT32 numhuntemeralds; +mapthing_t *huntemeralds[MAXHUNTEMERALDS] = {}; +INT32 numhuntemeralds = 0; // // P_SpawnMapThing diff --git a/src/p_setup.c b/src/p_setup.c index 75d8049f0..887a74bb5 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -597,8 +597,8 @@ FUNCINLINE static ATTRINLINE void P_LoadSubsectors(void *data) // #define MAXLEVELFLATS 256 -size_t numlevelflats; -levelflat_t *levelflats; +size_t numlevelflats = 0; +levelflat_t *levelflats = NULL; //SoM: Other files want this info. size_t P_PrecacheLevelFlats(void) @@ -2030,8 +2030,8 @@ void P_SetupLevelSky(INT32 skynum, boolean global) R_SetupSkyDraw(); } -static const char *maplumpname; -lumpnum_t lastloadedmaplumpnum; // for comparative savegame +static const char *maplumpname = NULL; +lumpnum_t lastloadedmaplumpnum = LUMPERROR; // for comparative savegame // // P_LevelInitStuff @@ -2415,7 +2415,7 @@ static void P_InitCamera(void) displayplayers[0] = consoleplayer; // Start with your OWN view, please! } -struct minimapinfo minimapinfo; +struct minimapinfo minimapinfo = {}; static void P_InitMinimapInfo(void) { lumpnum_t lumpnum; diff --git a/src/p_user.c b/src/p_user.c index 0b743dcd1..943523244 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -1863,7 +1863,6 @@ boolean P_AnalogMove(player_t *player) return player->pflags & PF_ANALOGMODE; } - //#define OLD_MOVEMENT_CODE 1 static void P_3dMovement(player_t *player) { @@ -2931,7 +2930,7 @@ notrealplayer: // P_MoveCamera: make sure the camera is not outside the world and looks at the player avatar // -camera_t camera[MAXSPLITSCREENPLAYERS]; // Four cameras, three for splitscreen +camera_t camera[MAXSPLITSCREENPLAYERS] = {}; // Four cameras, three for splitscreen static void CV_CamRotate_OnChange(void) {