diff --git a/src/b_game.cpp b/src/b_game.cpp index e5a5b39022..8f02ce6927 100644 --- a/src/b_game.cpp +++ b/src/b_game.cpp @@ -602,7 +602,7 @@ bool DCajunMaster::LoadBots () else { teamnum = TEAM_None; - for (int i = 0; i < teams.Size (); ++i) + for (int i = 0; i < int(teams.Size()); ++i) { if (stricmp (teams[i].name, sc_String) == 0) { diff --git a/src/c_dispatch.cpp b/src/c_dispatch.cpp index e4e792f96f..fb43ec2736 100644 --- a/src/c_dispatch.cpp +++ b/src/c_dispatch.cpp @@ -720,7 +720,7 @@ void AddCommandString (char *cmd, int keynum) // // Special processing: // Inside quoted strings, \" becomes just " -// \\ becomes just \ +// \\ becomes just a single backslash // \c becomes just TEXTCOLOR_ESCAPE // $ is replaced by the contents of diff --git a/src/hu_scores.cpp b/src/hu_scores.cpp index 92bf3e225f..528d863069 100644 --- a/src/hu_scores.cpp +++ b/src/hu_scores.cpp @@ -152,7 +152,7 @@ static void HU_DoDrawScores (player_t *player, player_t *sortedplayers[MAXPLAYER { int color; int height = screen->Font->GetHeight() * CleanYfac; - int i; + unsigned int i; int maxwidth = 0; int numTeams = 0; int x ,y; diff --git a/src/p_setup.cpp b/src/p_setup.cpp index 8b5a03e4ed..2dd774b571 100644 --- a/src/p_setup.cpp +++ b/src/p_setup.cpp @@ -3407,7 +3407,7 @@ void P_SetupLevel (char *lumpname, int position) players[i].mo = NULL; } // [RH] Clear any scripted translation colors the previous level may have set. - for (i = 0; i < translationtables[TRANSLATION_LevelScripted].Size(); ++i) + for (i = 0; i < int(translationtables[TRANSLATION_LevelScripted].Size()); ++i) { FRemapTable *table = translationtables[TRANSLATION_LevelScripted][i]; if (table != NULL) diff --git a/src/textures/jpegtexture.cpp b/src/textures/jpegtexture.cpp index f11a7affc0..ec78c8fb79 100644 --- a/src/textures/jpegtexture.cpp +++ b/src/textures/jpegtexture.cpp @@ -389,6 +389,10 @@ int FJPEGTexture::CopyTrueColorPixels(BYTE * buffer, int buf_width, int buf_heig screen->CopyPixelDataRGB(buffer, buf_width, buf_height, x, y, buff, cinfo.output_width, cinfo.output_height, 4, cinfo.output_width * cinfo.output_components, CF_CMYK); break; + + default: + assert(0); + break; } jpeg_finish_decompress(&cinfo); } diff --git a/src/thingdef_codeptr.cpp b/src/thingdef_codeptr.cpp index 3413639590..20ffd042e0 100644 --- a/src/thingdef_codeptr.cpp +++ b/src/thingdef_codeptr.cpp @@ -2099,24 +2099,15 @@ void A_SetGravity(AActor * self) void A_ClearTarget(AActor * self) { - if (self->target != NULL) - { - self->target = NULL; - } - if (self->LastHeard != NULL) - { - self->LastHeard = NULL; - } - if (self->lastenemy != NULL) - { - self->lastenemy = NULL; - } + self->target = NULL; + self->LastHeard = NULL; + self->lastenemy = NULL; } //========================================================================== // // A_JumpIfTargetInLOS (fixed fov, state label) -// Jumps if the actor can see it's target, or if the player has a linetarget. +// Jumps if the actor can see its target, or if the player has a linetarget. // //========================================================================== @@ -2165,4 +2156,4 @@ void A_JumpIfTargetInLOS(AActor * self) DoJump(self, CallingState, StateParameters[index+1]); } -// [KS] *** End of my modifications *** \ No newline at end of file +// [KS] *** End of my modifications ***