zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-01-31 05:40:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

GCC fixes for recent code changes.

Browse source 
SVN r316 (trunk)
This commit is contained in:
Randy Heit 2006-08-31 01:30:22 +00:00
parent b1e564d907
commit a2fbb8c880
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/c_console.cpp
View file

@ -666,7 +666,7 @@ void AddToConsole (int printlevel, const char *text)
char *work_p; char *work_p;
char *linestart; char *linestart;
FString cc = 'A' + CR_TAN; FString cc('A' + char(CR_TAN));
int size, len; int size, len;
int x; int x;
int maxwidth; int maxwidth;

2
src/p_acs.cpp
View file

@ -3703,7 +3703,7 @@ int DLevelScript::RunScript ()
case PCD_PRINTCOLOR: case PCD_PRINTCOLOR:
work += TEXTCOLOR_ESCAPE; work += TEXTCOLOR_ESCAPE;
work += 'A' + CLAMPCOLOR(STACK(1)); work += 'A' + char(CLAMPCOLOR(STACK(1)));
sp--; sp--;
break; break;

2
src/r_jpeg.h
View file

@ -26,4 +26,4 @@ void JPEG_ErrorExit (j_common_ptr cinfo);
void JPEG_OutputMessage (j_common_ptr cinfo); void JPEG_OutputMessage (j_common_ptr cinfo);
#endif #endif

24
src/v_font.cpp
View file

@ -110,6 +110,18 @@ protected:
void MakeTexture (); void MakeTexture ();
}; };
struct TempParmInfo
{
unsigned int StartParm[2];
unsigned int ParmLen[2];
int Index;
};
struct TempColorInfo
{
FName Name;
unsigned int ParmInfo;
};
// EXTERNAL FUNCTION PROTOTYPES -------------------------------------------- // EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
// PUBLIC FUNCTION PROTOTYPES ---------------------------------------------- // PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
@ -1569,18 +1581,6 @@ wrong:
void V_InitFontColors () void V_InitFontColors ()
{ {
struct TempParmInfo
{
unsigned int StartParm[2];
unsigned int ParmLen[2];
int Index;
};
struct TempColorInfo
{
FName Name;
unsigned int ParmInfo;
};
TArray<FName> names; TArray<FName> names;
int lump, lastlump = 0; int lump, lastlump = 0;
TranslationParm tparm; TranslationParm tparm;