- fixed some GCC warnings

This commit is contained in:
Christoph Oelckers 2022-05-19 09:43:10 +02:00
commit da30b6f6f0
5 changed files with 22 additions and 28 deletions

View file

@ -1040,7 +1040,7 @@ void I_NetMessage(const char* text, ...)
va_list argptr;
va_start(argptr, text);
str.VFormat(format, argptr);
str.VFormat(text, argptr);
va_end(argptr);
fprintf(stderr, "\r%-40s\n", str.GetChars());
#endif

View file

@ -1227,25 +1227,14 @@ static int PatchThing (int thingy)
}
else if (linelen == 16 && stricmp(Line1, "infighting group") == 0)
{
if (val < 0)
{
Printf("Infighting groups must be >= 0 (check your dehacked)\n");
val = 0;
}
type->ActorInfo()->infighting_group = val;
}
else if (linelen == 16 && stricmp(Line1, "projectile group") == 0)
{
if (val < 0) val = -1;
type->ActorInfo()->projectile_group = val;
}
else if (linelen == 12 && stricmp(Line1, "splash group") == 0)
{
if (val < 0)
{
Printf("Splash groups must be >= 0 (check your dehacked)\n");
val = 0;
}
type->ActorInfo()->splash_group = val;
}
else if (linelen == 10 && stricmp(Line1, "fast speed") == 0)
@ -1289,7 +1278,7 @@ static int PatchThing (int thingy)
0xffff8000, // 8 - Orange
};
if (val < 0 || val > 8) val = 0;
if (val > 8) val = 0;
unsigned color = bloodcolor[val];
info->BloodColor = color;
info->BloodTranslation = val == 0? 0 : TRANSLATION(TRANSLATION_Blood, CreateBloodTranslation(color));

View file

@ -161,7 +161,7 @@ class FPlayerClass
{
public:
FPlayerClass ();
FPlayerClass (const FPlayerClass &other);
FPlayerClass (const FPlayerClass &other) = default;
~FPlayerClass ();
bool CheckSkin (int skin);

View file

@ -159,13 +159,6 @@ FPlayerClass::FPlayerClass ()
Flags = 0;
}
FPlayerClass::FPlayerClass (const FPlayerClass &other)
{
Type = other.Type;
Flags = other.Flags;
Skins = other.Skins;
}
FPlayerClass::~FPlayerClass ()
{
}