From 5579c5773870af306fd011ad86a9a474a505d9c2 Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Fri, 4 Sep 2020 00:54:23 +0100
Subject: [PATCH 1/2] Remove some explicit array sizes

These are just annoying, and chances are the source code never did
this.

I might just remove *all* of these at some point.
---
 src/Bullet.cpp  | 2 +-
 src/Caret.cpp   | 2 +-
 src/MapName.cpp | 2 +-
 src/NpcTbl.cpp  | 2 +-
 src/Stage.cpp   | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Bullet.cpp b/src/Bullet.cpp
index ec9afd69..e2e591b2 100644
--- a/src/Bullet.cpp
+++ b/src/Bullet.cpp
@@ -102,7 +102,7 @@ void PutBullet(int fx, int fy)
 	}
 }
 
-BULLET_TABLE gBulTbl[46] = {
+BULLET_TABLE gBulTbl[] = {
 	// Null
 	{0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0}},
 	// Snake
diff --git a/src/Caret.cpp b/src/Caret.cpp
index 6480035f..5a91c728 100644
--- a/src/Caret.cpp
+++ b/src/Caret.cpp
@@ -38,7 +38,7 @@ struct CARET_TABLE
 CARET gCrt[CARET_MAX];
 
 // Sprite offsets
-CARET_TABLE gCaretTable[18] = {
+CARET_TABLE gCaretTable[] = {
 	{0, 0},                   // CARET_NULL
 	{ 4 * 0x200,  4 * 0x200}, // CARET_BUBBLE
 	{ 8 * 0x200,  8 * 0x200}, // CARET_PROJECTILE_DISSIPATION
diff --git a/src/MapName.cpp b/src/MapName.cpp
index 12dd378b..780d4179 100644
--- a/src/MapName.cpp
+++ b/src/MapName.cpp
@@ -15,7 +15,7 @@ void ReadyMapName(const char *str)
 	int a;
 
 	// Handle "Studio Pixel presents" text in the intro, using an obfuscated string
-	unsigned char presentText[24] = {
+	unsigned char presentText[] = {
 #ifdef JAPANESE
 		// "開発室Pixel presents"
 		0x8A - 1,	// 開
diff --git a/src/NpcTbl.cpp b/src/NpcTbl.cpp
index cf37082a..2512d6d9 100644
--- a/src/NpcTbl.cpp
+++ b/src/NpcTbl.cpp
@@ -10,7 +10,7 @@
 #include "NpcAct.h"
 
 // Npc function table
-const NPCFUNCTION gpNpcFuncTbl[361] = {
+const NPCFUNCTION gpNpcFuncTbl[] = {
 	ActNpc000,
 	ActNpc001,
 	ActNpc002,
diff --git a/src/Stage.cpp b/src/Stage.cpp
index aa0773f4..328da6c8 100644
--- a/src/Stage.cpp
+++ b/src/Stage.cpp
@@ -33,7 +33,7 @@ MusicID gOldNo;
 
 // Note: Pixel made numerous capitalisation errors when creating this table.
 // This isn't a problem for Windows, because of its case-insensitive filesystem.
-const STAGE_TABLE gTMT[95] = {
+const STAGE_TABLE gTMT[] = {
 	STAGE_ENTRY("0",      "0",      BACKGROUND_TYPE_BLACK,        "bk0",     "Guest",  "0",      0, "Null",                  "\x96\xB3"),	/* 無 */
 	STAGE_ENTRY("Pens",   "Pens1",  BACKGROUND_TYPE_MOVE_DISTANT, "BkBlue",  "Guest",  "0",      0, "Arthur's House",        "\x83\x41\x81\x5B\x83\x54\x81\x5B\x82\xCC\x89\xC6"),	/* アーサーの家 */
 	STAGE_ENTRY("Eggs",   "Eggs",   BACKGROUND_TYPE_MOVE_DISTANT, "BkGreen", "Eggs1",  "Ravil",  0, "Egg Corridor",          "\x83\x5E\x83\x7D\x83\x53\x89\xF1\x98\x4C"),	/* タマゴ回廊 */
@@ -206,7 +206,7 @@ BOOL TransferStage(int no, int w, int x, int y)
 }
 
 // Music
-const char* const gMusicTable[42] = {
+const char* const gMusicTable[] = {
 	"XXXX",
 	"WANPAKU",
 	"ANZEN",

From b311888a12236747f1e6e9f1f011178225d8405f Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Fri, 4 Sep 2020 00:57:00 +0100
Subject: [PATCH 2/2] Remove ccache in Travis file

This matches the portable branch
---
 .travis.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d09e848d..a2dd8bfc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,9 +8,6 @@ dist: bionic
 # Enable C++ language support
 language: cpp
 
-# Cache compiled object files with ccache
-cache: ccache
-
 compiler:
     - gcc