- Fixed: Inventory.Icon printed error message for all the missing icons in

Strife's teaser.
- Fixed: st_start.cpp needed a 
  #define _WIN32_WINNT 0x0501.
- Fixed a few uninitialized variables warnings for GCC.


SVN r418 (trunk)
This commit is contained in:
Christoph Oelckers 2006-12-19 16:08:48 +00:00
parent af2ef6f5f0
commit 43ddce519c
6 changed files with 17 additions and 4 deletions

View file

@ -1,3 +1,10 @@
December 19, 2006 (Changes by Graf Zahl)
- Fixed: Inventory.Icon printed error message for all the missing icons in
Strife's teaser.
- Fixed: st_start.cpp needed a
#define _WIN32_WINNT 0x0501.
- Fixed a few uninitialized variables warnings for GCC.
December 18, 2006
- Reorganized the network startup loops so now they are event driven. There is
a single function that gets called to drive it, and it uses callbacks to

View file

@ -845,7 +845,7 @@ private:
FaceIndex = CalcPainOffset() + ST_OUCHOFFSET;
FacePriority = 8;
}
else
else if (CPlayer->mo != NULL)
{
badguyangle = R_PointToAngle2(CPlayer->mo->x,
CPlayer->mo->y,

View file

@ -3414,8 +3414,13 @@ static void InventoryIcon (AInventory *defaults, Baggage &bag)
defaults->Icon = TexMan.AddPatch (sc_String, ns_sprites);
if (defaults->Icon<=0)
{
if (bag.Info->GameFilter == GAME_Any || bag.Info->GameFilter & gameinfo.gametype)
// Don't print warnings if the item is for another game or if this is a shareware IWAD.
// Strife's teaser doesn't contain all the icon graphics of the full game.
if ((bag.Info->GameFilter == GAME_Any || bag.Info->GameFilter & gameinfo.gametype) &&
!(gameinfo.flags&GI_SHAREWARE))
{
Printf("Icon '%s' for '%s' not found\n", sc_String, bag.Info->Class->TypeName.GetChars());
}
}
}
}

View file

@ -1592,7 +1592,7 @@ void V_InitFontColors ()
{
TArray<FName> names;
int lump, lastlump = 0;
TranslationParm tparm;
TranslationParm tparm = { 0 }; // Silence GCC
TArray<TranslationParm> parms;
TArray<TempParmInfo> parminfo;
TArray<TempColorInfo> colorinfo;

View file

@ -283,7 +283,7 @@ int FWadCollection::AddExternalFile(const char *filename)
LumpRecord lump;
lump.fullname = copystring(filename);
lump.name[0]=0;
memset(lump.name, 0, sizeof(lump.name));
lump.wadnum=-1;
lump.flags = LUMPF_EXTERNAL;
lump.position = 0;

View file

@ -33,6 +33,7 @@
*/
#define WIN32_LEAN_AND_MEAN
#define _WIN32_WINNT 0x0501 // required to get the MARQUEE defines
#include <windows.h>
#include <commctrl.h>
#include <stdio.h>