From c70ba60fd63511962e5444c63fedc787da251129 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Wed, 10 May 2006 03:29:07 +0000 Subject: [PATCH] - Fixed: Some non-POD arguments to printf and a typo in the GCC portion of dobject.h. SVN r101 (trunk) --- src/c_console.cpp | 2 +- src/decorations.cpp | 6 +++--- src/dobject.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/c_console.cpp b/src/c_console.cpp index a7ef0ca3d..986cf4a79 100644 --- a/src/c_console.cpp +++ b/src/c_console.cpp @@ -1924,7 +1924,7 @@ static bool C_TabCompleteList () Printf (TEXTCOLOR_BLUE "Completions for %s:\n", CmdLine+2); for (i = TabPos; nummatches > 0; ++i, --nummatches) { - Printf ("%-*s", int(maxwidth), TabCommands[i].Name); + Printf ("%-*s", int(maxwidth), TabCommands[i].Name.GetChars()); x += maxwidth; if (x > ConCols - maxwidth) { diff --git a/src/decorations.cpp b/src/decorations.cpp index 548b412fe..ff57b2d74 100644 --- a/src/decorations.cpp +++ b/src/decorations.cpp @@ -439,15 +439,15 @@ static void ParseDecorate (void (*process)(FState *, int)) info->NumOwnedStates = states.Size(); 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) { - 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) { - 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) { diff --git a/src/dobject.h b/src/dobject.h index c96ef24f5..f8c03a49f 100644 --- a/src/dobject.h +++ b/src/dobject.h @@ -176,7 +176,7 @@ private: \ # pragma data_seg() # define _DECLARE_TI(cls) __declspec(allocate(".creg$u")) ClassReg *cls::RegistrationInfoPtr = &cls::RegistrationInfo; #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 #define _IMP_PCLASS(cls,ptrs,create) \