- Fixed: Some non-POD arguments to printf and a typo in the GCC portion of dobject.h.

SVN r101 (trunk)
This commit is contained in:
Randy Heit 2006-05-10 03:29:07 +00:00
parent d1ba4a1b76
commit c70ba60fd6
3 changed files with 5 additions and 5 deletions

View file

@ -1924,7 +1924,7 @@ static bool C_TabCompleteList ()
Printf (TEXTCOLOR_BLUE "Completions for %s:\n", CmdLine+2); Printf (TEXTCOLOR_BLUE "Completions for %s:\n", CmdLine+2);
for (i = TabPos; nummatches > 0; ++i, --nummatches) for (i = TabPos; nummatches > 0; ++i, --nummatches)
{ {
Printf ("%-*s", int(maxwidth), TabCommands[i].Name); Printf ("%-*s", int(maxwidth), TabCommands[i].Name.GetChars());
x += maxwidth; x += maxwidth;
if (x > ConCols - maxwidth) if (x > ConCols - maxwidth)
{ {

View file

@ -439,15 +439,15 @@ static void ParseDecorate (void (*process)(FState *, int))
info->NumOwnedStates = states.Size(); info->NumOwnedStates = states.Size();
if (info->NumOwnedStates == 0) if (info->NumOwnedStates == 0)
{ {
SC_ScriptError ("%s does not define any animation frames", typeName ); SC_ScriptError ("%s does not define any animation frames", typeName.GetChars() );
} }
else if (extra.SpawnEnd == 0) else if (extra.SpawnEnd == 0)
{ {
SC_ScriptError ("%s does not have a Frames definition", typeName ); SC_ScriptError ("%s does not have a Frames definition", typeName.GetChars() );
} }
else if (def == DEF_BreakableDecoration && extra.DeathEnd == 0) else if (def == DEF_BreakableDecoration && extra.DeathEnd == 0)
{ {
SC_ScriptError ("%s does not have a DeathFrames definition", typeName ); SC_ScriptError ("%s does not have a DeathFrames definition", typeName.GetChars() );
} }
else if (extra.IceDeathEnd != 0 && extra.bGenericIceDeath) else if (extra.IceDeathEnd != 0 && extra.bGenericIceDeath)
{ {

View file

@ -176,7 +176,7 @@ private: \
# pragma data_seg() # pragma data_seg()
# define _DECLARE_TI(cls) __declspec(allocate(".creg$u")) ClassReg *cls::RegistrationInfoPtr = &cls::RegistrationInfo; # define _DECLARE_TI(cls) __declspec(allocate(".creg$u")) ClassReg *cls::RegistrationInfoPtr = &cls::RegistrationInfo;
#else #else
# define _DECLARE_TI(cls) ClassReg *cls::RegistrationInfoPtr __attribute__((section("creg"))) = &cls::RegistartionInfo; # define _DECLARE_TI(cls) ClassReg *cls::RegistrationInfoPtr __attribute__((section("creg"))) = &cls::RegistrationInfo;
#endif #endif
#define _IMP_PCLASS(cls,ptrs,create) \ #define _IMP_PCLASS(cls,ptrs,create) \