From 92c3a89255b32e367b92f195d5d3423a54a1d11b Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 9 Oct 2006 15:55:47 +0000 Subject: [PATCH] - Fixed: PrintAlias passed FString objects directly to Printf. - Added bitwise not (~) operator to ACS. SVN r352 (trunk) --- docs/rh-log.txt | 4 ++++ src/c_dispatch.cpp | 4 ++-- src/cmdlib.cpp | 2 ++ src/p_acs.cpp | 4 ++++ src/p_acs.h | 2 +- 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 4bed63763..8c7f97f86 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,3 +1,7 @@ +October 7, 2006 (Changes by Graf Zahl) +- Fixed: PrintAlias passed FString objects directly to Printf. +- Added bitwise not (~) operator to ACS. + October 6, 2006 (Changes by Graf Zahl) - Fixed: Hires texture replacements must call AddPatch if the texture isn't defined yet in order to replace lumps that are not in the diff --git a/src/c_dispatch.cpp b/src/c_dispatch.cpp index 4058c1afa..f5515cd86 100644 --- a/src/c_dispatch.cpp +++ b/src/c_dispatch.cpp @@ -993,11 +993,11 @@ void FConsoleAlias::PrintAlias () { if (m_Command[0]) { - Printf (TEXTCOLOR_YELLOW "%s : %s\n", m_Name, m_Command[0]); + Printf (TEXTCOLOR_YELLOW "%s : %s\n", m_Name, m_Command[0].GetChars()); } if (m_Command[1]) { - Printf (TEXTCOLOR_ORANGE "%s : %s\n", m_Name, m_Command[1]); + Printf (TEXTCOLOR_ORANGE "%s : %s\n", m_Name, m_Command[1].GetChars()); } } diff --git a/src/cmdlib.cpp b/src/cmdlib.cpp index 88df5707b..0ea2eacfc 100644 --- a/src/cmdlib.cpp +++ b/src/cmdlib.cpp @@ -1,6 +1,8 @@ // cmdlib.c (mostly borrowed from the Q2 source) +#ifdef _WIN32 #include +#endif #include "doomtype.h" #include "cmdlib.h" #include "i_system.h" diff --git a/src/p_acs.cpp b/src/p_acs.cpp index 25fc5b17e..c11fd21a7 100644 --- a/src/p_acs.cpp +++ b/src/p_acs.cpp @@ -3524,6 +3524,10 @@ int DLevelScript::RunScript () STACK(1) = !STACK(1); break; + case PCD_NEGATEBINARY: + STACK(1) = ~STACK(1); + break; + case PCD_LSHIFT: STACK(2) = (STACK(2) << STACK(1)); sp--; diff --git a/src/p_acs.h b/src/p_acs.h index 45ab7b18f..0a99d6142 100644 --- a/src/p_acs.h +++ b/src/p_acs.h @@ -535,7 +535,7 @@ public: PCD_CHANGELEVEL, PCD_SECTORDAMAGE, PCD_REPLACETEXTURES, -/*330*/ +/*330*/ PCD_NEGATEBINARY, PCODE_COMMAND_COUNT };