zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-10 14:51:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: Makefile.mgw was mysteriously missing some targets. After fixing that,

Browse source 
I also removed some of GCC's warnings.


SVN r255 (trunk)
This commit is contained in:
Randy Heit 2006-07-16 01:25:29 +00:00
parent de6add8e59
commit 5e37e4a0b8
7 changed files with 29 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Makefile.mgw
View file

@ -19,10 +19,13 @@ $(RELEASETARGET): game
$(DEBUGTARGET): debuggame
basetools: ccdv.exe
$(MAKE) -C tools/lemon -f Makefile
$(MAKE) -C tools/re2c -f Makefile
$(MAKE) -C wadsrc -f Makefile
$(MAKE) -C tools/lemon
$(MAKE) -C tools/re2c
$(MAKE) -C zlib -f Makefile.mgw
$(MAKE) -C tools/makewad
$(MAKE) -C tools/dehsupp
$(MAKE) -C tools/xlatcc
$(MAKE) -C wadsrc
$(MAKE) -C flac -f Makefile.mgw
cleanexe:

4
docs/rh-log.txt
View file

@ -1,3 +1,7 @@
July 15, 2006
- Fixed: Makefile.mgw was mysteriously missing some targets. After fixing that,
I also removed some of GCC's warnings.
July 14, 2006 (Changes by Graf Zahl)
- Fixed: Any kill in multiplayer games that could not be credited to a player
didn't count at all - not even toward the global level statistics.

4
src/m_menu.cpp
View file

@ -1538,7 +1538,7 @@ void M_NewGame(int choice)
if (players[consoleplayer].userinfo.PlayerClass >= 0)
{
int n = 0;
for (int i = 0; i < PlayerClasses.Size () && n < 7; i++)
for (int i = 0; i < (int)PlayerClasses.Size () && n < 7; i++)
{
if (!(PlayerClasses[i].Flags & PCF_NOMENU))
{
@ -3335,7 +3335,7 @@ EXTERN_CVAR (Int, screenblocks)
void M_Init (void)
{
int i;
unsigned int i;
atterm (M_Deinit);

8
src/p_user.cpp
View file

@ -85,7 +85,7 @@ FPlayerClass::~FPlayerClass ()
bool FPlayerClass::CheckSkin (int skin)
{
for (int i = 0; i < Skins.Size (); i++)
for (unsigned int i = 0; i < Skins.Size (); i++)
{
if (Skins[i] == skin)
return true;
@ -181,7 +181,7 @@ CCMD (addplayerclass)
CCMD (playerclasses)
{
for (int i = 0; i < PlayerClasses.Size (); i++)
for (unsigned int i = 0; i < PlayerClasses.Size (); i++)
{
Printf ("% 3d %s\n", i,
PlayerClasses[i].Type->Meta.GetMetaString (APMETA_DisplayName));
@ -793,8 +793,8 @@ void APlayerPawn::FilterCoopRespawnInventory (APlayerPawn *oldplayer)
const char *APlayerPawn::GetSoundClass ()
{
if (player != NULL &&
player->userinfo.skin >= PlayerClasses.Size () &&
(unsigned)player->userinfo.skin < numskins)
(unsigned int)player->userinfo.skin >= PlayerClasses.Size () &&
(size_t)player->userinfo.skin < numskins)
{
return skins[player->userinfo.skin].name;
}

2
src/r_things.cpp
View file

@ -633,7 +633,7 @@ void R_InitSkins (void)
skins[i].range0end = transtype->Meta.GetMetaInt (APMETA_ColorRange) >> 8;
remove = true;
for (j = 0; j < PlayerClasses.Size (); j++)
for (j = 0; j < (int)PlayerClasses.Size (); j++)
{
const PClass *type = PlayerClasses[j].Type;

10
src/thingdef.cpp
View file

@ -3501,15 +3501,11 @@ static void PlayerDisplayName (APlayerPawn *defaults, Baggage &bag)
//==========================================================================
static void PlayerSoundClass (APlayerPawn *defaults, Baggage &bag)
{
char tmp[256];
FString tmp;
SC_MustGetString ();
sprintf (tmp, sc_String);
for (int i = 0; i < strlen (tmp); i++)
if (tmp[i] == ' ')
tmp[i] = '_';
tmp = sc_String;
tmp.ReplaceChars (' ', '_');
bag.Info->Class->Meta.SetMetaString (APMETA_SoundClass, tmp);
}

16
src/thingdef_exp.cpp
View file

@ -219,7 +219,7 @@ ExpVal GetZ (AActor *actor, int id)
return val;
}
static struct
static struct FExpVar
{
const char *name; // identifier
int array; // array size (0 if not an array)
@ -381,7 +381,7 @@ int ParseExpression (bool _not)
data->EvalConst ();
}
for (int i = 0; i < StateExpressions.Size (); i++)
for (unsigned int i = 0; i < StateExpressions.Size (); i++)
{
if (StateExpressions[i]->Compare (data))
{
@ -781,7 +781,7 @@ static ExpData *ParseExpressionA ()
SC_MustGetString ();
int varid = -1;
for (int i = 0; i < sizeof(ExpVars)/sizeof(ExpVars[0]); i++)
for (size_t i = 0; i < countof(ExpVars); i++)
{
if (!stricmp (sc_String, ExpVars[i].name))
{
@ -820,7 +820,7 @@ static ExpData *ParseExpressionA ()
int EvalExpressionI (int id, AActor *self)
{
if (StateExpressions.Size()<= id) return 0;
if (StateExpressions.Size() <= (unsigned int)id) return 0;
ExpVal val = EvalExpression (StateExpressions[id], self);
@ -841,7 +841,7 @@ bool EvalExpressionN(int id, AActor * self)
float EvalExpressionF (int id, AActor *self)
{
if (StateExpressions.Size()<= id) return 0.f;
if (StateExpressions.Size() <= (unsigned int)id) return 0.f;
ExpVal val = EvalExpression (StateExpressions[id], self);
@ -861,6 +861,8 @@ static ExpVal EvalExpression (ExpData *data, AActor *self)
switch (data->Type)
{
case EX_NOP:
break;
case EX_Const:
val = data->Value;
break;
@ -1406,7 +1408,7 @@ static ExpVal EvalExpression (ExpData *data, AActor *self)
case EX_Sin:
{
ExpVal a = EvalExpression (data->Children[0], self);
angle_t angle = ((a.Type == VAL_Int) ? (float)a.Int : a.Float) * ANGLE_1;
angle_t angle = (a.Type == VAL_Int) ? (a.Int * ANGLE_1) : angle_t(a.Float * ANGLE_1);
val.Type = VAL_Float;
val.Float = FIXED2FLOAT (finesine[angle>>ANGLETOFINESHIFT]);
@ -1416,7 +1418,7 @@ static ExpVal EvalExpression (ExpData *data, AActor *self)
case EX_Cos:
{
ExpVal a = EvalExpression (data->Children[0], self);
angle_t angle = ((a.Type == VAL_Int) ? (float)a.Int : a.Float) * ANGLE_1;
angle_t angle = (a.Type == VAL_Int) ? (a.Int * ANGLE_1) : angle_t(a.Float * ANGLE_1);
val.Type = VAL_Float;
val.Float = FIXED2FLOAT (finecosine[angle>>ANGLETOFINESHIFT]);