From 6c48debecd2d95595b0d7b4b844bb5640c473f63 Mon Sep 17 00:00:00 2001 From: elasota Date: Fri, 5 Jun 2020 23:21:56 -0400 Subject: [PATCH] Code cleanup --- GpApp/Events.cpp | 1 - GpApp/GameOver.cpp | 1 - GpApp/Input.cpp | 1 - GpApp/MainWindow.cpp | 1 - GpApp/Menu.cpp | 1 - GpApp/ObjectAdd.cpp | 1 - GpApp/ObjectEdit.cpp | 1 - GpApp/Room.cpp | 1 - PortabilityLayer/AntiAliasTable.h | 4 +- PortabilityLayer/PLToolUtils.h | 1 - PortabilityLayer/PortabilityLayer.vcxproj | 3 -- .../PortabilityLayer.vcxproj.filters | 9 ---- PortabilityLayer/QDPictOpcodeDefs.h | 42 +++++++++---------- 13 files changed, 23 insertions(+), 44 deletions(-) delete mode 100644 PortabilityLayer/PLToolUtils.h diff --git a/GpApp/Events.cpp b/GpApp/Events.cpp index 858efb4..8bbf924 100644 --- a/GpApp/Events.cpp +++ b/GpApp/Events.cpp @@ -8,7 +8,6 @@ #include "PLKeyEncoding.h" #include "PLTimeTaggedVOSEvent.h" -#include "PLToolUtils.h" #include "PLQDraw.h" #include "DialogManager.h" #include "Externs.h" diff --git a/GpApp/GameOver.cpp b/GpApp/GameOver.cpp index cd3c362..08e65d3 100644 --- a/GpApp/GameOver.cpp +++ b/GpApp/GameOver.cpp @@ -5,7 +5,6 @@ //============================================================================ -#include "PLToolUtils.h" #include "PLPasStr.h" #include "PLEventQueue.h" #include "PLKeyEncoding.h" diff --git a/GpApp/Input.cpp b/GpApp/Input.cpp index ef6d5cd..3bec75c 100644 --- a/GpApp/Input.cpp +++ b/GpApp/Input.cpp @@ -5,7 +5,6 @@ //============================================================================ -#include "PLToolUtils.h" #include "PLDialogs.h" #include "PLKeyEncoding.h" #include "DialogManager.h" diff --git a/GpApp/MainWindow.cpp b/GpApp/MainWindow.cpp index e821574..0c6c1f4 100644 --- a/GpApp/MainWindow.cpp +++ b/GpApp/MainWindow.cpp @@ -6,7 +6,6 @@ #include "PLNumberFormatting.h" -#include "PLToolUtils.h" #include "PLPasStr.h" #include "Externs.h" #include "Environ.h" diff --git a/GpApp/Menu.cpp b/GpApp/Menu.cpp index c7954ec..7b1c40c 100644 --- a/GpApp/Menu.cpp +++ b/GpApp/Menu.cpp @@ -12,7 +12,6 @@ #include "PLHacks.h" #include "PLMenus.h" #include "PLPasStr.h" -#include "PLToolUtils.h" #include "DialogManager.h" #include "DialogUtils.h" #include "Externs.h" diff --git a/GpApp/ObjectAdd.cpp b/GpApp/ObjectAdd.cpp index 8662ddd..be32d60 100644 --- a/GpApp/ObjectAdd.cpp +++ b/GpApp/ObjectAdd.cpp @@ -6,7 +6,6 @@ //============================================================================ -#include "PLToolUtils.h" #include "PLKeyEncoding.h" #include "DialogManager.h" #include "Externs.h" diff --git a/GpApp/ObjectEdit.cpp b/GpApp/ObjectEdit.cpp index f8ecd9e..becdca7 100644 --- a/GpApp/ObjectEdit.cpp +++ b/GpApp/ObjectEdit.cpp @@ -6,7 +6,6 @@ #include "PLKeyEncoding.h" #include "PLSound.h" -#include "PLToolUtils.h" #include "PLPasStr.h" #include "BitmapImage.h" #include "Externs.h" diff --git a/GpApp/Room.cpp b/GpApp/Room.cpp index b8ce060..9130220 100644 --- a/GpApp/Room.cpp +++ b/GpApp/Room.cpp @@ -6,7 +6,6 @@ #include "PLKeyEncoding.h" #include "PLResources.h" -#include "PLToolUtils.h" #include "PLPasStr.h" #include "PLStandardColors.h" #include "BitmapImage.h" diff --git a/PortabilityLayer/AntiAliasTable.h b/PortabilityLayer/AntiAliasTable.h index 13f4e5d..800b36d 100644 --- a/PortabilityLayer/AntiAliasTable.h +++ b/PortabilityLayer/AntiAliasTable.h @@ -1,12 +1,12 @@ #pragma once -#include +#include namespace PortabilityLayer { struct RGBAColor; - struct AntiAliasTable + struct AntiAliasTable { // Striped 256x16 because constant background color is more likely than constant sample uint8_t m_aaTranslate[256][16]; diff --git a/PortabilityLayer/PLToolUtils.h b/PortabilityLayer/PLToolUtils.h deleted file mode 100644 index 50e9667..0000000 --- a/PortabilityLayer/PLToolUtils.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once diff --git a/PortabilityLayer/PortabilityLayer.vcxproj b/PortabilityLayer/PortabilityLayer.vcxproj index 897d501..5d5e265 100644 --- a/PortabilityLayer/PortabilityLayer.vcxproj +++ b/PortabilityLayer/PortabilityLayer.vcxproj @@ -269,11 +269,8 @@ - - - diff --git a/PortabilityLayer/PortabilityLayer.vcxproj.filters b/PortabilityLayer/PortabilityLayer.vcxproj.filters index a8b51e0..915f7c4 100644 --- a/PortabilityLayer/PortabilityLayer.vcxproj.filters +++ b/PortabilityLayer/PortabilityLayer.vcxproj.filters @@ -93,9 +93,6 @@ Header Files - - Header Files - Header Files @@ -111,12 +108,6 @@ Header Files - - Header Files - - - Header Files - Header Files diff --git a/PortabilityLayer/QDPictOpcodeDefs.h b/PortabilityLayer/QDPictOpcodeDefs.h index 4922885..7dd7afb 100644 --- a/PortabilityLayer/QDPictOpcodeDefs.h +++ b/PortabilityLayer/QDPictOpcodeDefs.h @@ -1,26 +1,26 @@ -PL_PICTOP(0x0000, kNoop, 0) -PL_PICTOP(0x0001, kClipRegion, Rule_SizeTagged16) -PL_PICTOP(0x0002, kBackPattern, 8) -PL_PICTOP(0x0003, kTextFont, 2) -PL_PICTOP(0x0004, kTextFontStyle, 1) +PL_PICTOP(0x0000, kNoop, 0) +PL_PICTOP(0x0001, kClipRegion, Rule_SizeTagged16) +PL_PICTOP(0x0002, kBackPattern, 8) +PL_PICTOP(0x0003, kTextFont, 2) +PL_PICTOP(0x0004, kTextFontStyle, 1) PL_PICTOP(0x0005, kTextSourceMode, 2) PL_PICTOP(0x0007, kPenSize, 4) PL_PICTOP(0x0008, kPenMode, 2) PL_PICTOP(0x0009, kPenPattern, 8) PL_PICTOP(0x000c, kOrigin, 4) // Relative -PL_PICTOP(0x001a, kRGBForeColor, 6) -PL_PICTOP(0x001b, kRGBBackColor, 6) -PL_PICTOP(0x001e, kDefaultHilite, 0) -PL_PICTOP(0x001f, kOpColor, 6) -PL_PICTOP(0x0030, kFrameRect, 8) -PL_PICTOP(0x00a0, kShortComment, 2) -PL_PICTOP(0x00a1, kLongComment, Rule_LongComment) -PL_PICTOP(0x0090, kBitsRect, Rule_BitsRect) -PL_PICTOP(0x0091, kBitsRgn, Rule_BitsRgn) -PL_PICTOP(0x0098, kPackBitsRect, Rule_PackBitsRect) -PL_PICTOP(0x0099, kPackBitsRgn, Rule_PackBitsRgn) -PL_PICTOP(0x009a, kDirectBitsRect, Rule_DirectBitsRect) -PL_PICTOP(0x009b, kDirectBitsRgn, Rule_DirectBitsRgn) -PL_PICTOP(0x8200, kCompressedQT, Rule_SizeTagged32) -PL_PICTOP(0x8201, kUncompressedQT, Rule_SizeTagged32) -PL_PICTOP(0x00ff, kEndOfPicture, 0) +PL_PICTOP(0x001a, kRGBForeColor, 6) +PL_PICTOP(0x001b, kRGBBackColor, 6) +PL_PICTOP(0x001e, kDefaultHilite, 0) +PL_PICTOP(0x001f, kOpColor, 6) +PL_PICTOP(0x0030, kFrameRect, 8) +PL_PICTOP(0x00a0, kShortComment, 2) +PL_PICTOP(0x00a1, kLongComment, Rule_LongComment) +PL_PICTOP(0x0090, kBitsRect, Rule_BitsRect) +PL_PICTOP(0x0091, kBitsRgn, Rule_BitsRgn) +PL_PICTOP(0x0098, kPackBitsRect, Rule_PackBitsRect) +PL_PICTOP(0x0099, kPackBitsRgn, Rule_PackBitsRgn) +PL_PICTOP(0x009a, kDirectBitsRect, Rule_DirectBitsRect) +PL_PICTOP(0x009b, kDirectBitsRgn, Rule_DirectBitsRgn) +PL_PICTOP(0x8200, kCompressedQT, Rule_SizeTagged32) +PL_PICTOP(0x8201, kUncompressedQT, Rule_SizeTagged32) +PL_PICTOP(0x00ff, kEndOfPicture, 0)