From d6b31a270ce0401855b14bfbe81925d703158bbd Mon Sep 17 00:00:00 2001
From: onpon4
Date: Sat, 21 Jan 2017 23:55:54 -0500
Subject: [PATCH] More cleanup, updated copyright notices.
---
docs/index.html | 4 ++--
src/alien.cpp | 2 +-
src/audio.cpp | 2 +-
src/bullet.cpp | 2 +-
src/cargo.cpp | 2 +-
src/collectable.cpp | 2 +-
src/cutscene.cpp | 2 +-
src/engine.cpp | 2 +-
src/event.cpp | 2 +-
src/explosion.cpp | 2 +-
src/game.cpp | 2 +-
src/gfx.cpp | 2 +-
src/info.cpp | 6 +++---
src/intermission.cpp | 17 +++++++++++++++--
src/mission.cpp | 17 +++++++++++++++--
src/structs.h | 2 +-
src/title.cpp | 2 +-
17 files changed, 48 insertions(+), 22 deletions(-)
diff --git a/docs/index.html b/docs/index.html
index b17b3c3..189fd77 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -28,7 +28,7 @@
Copyright © 2003 Parallel Realities
Copyright © 2012 Guus Sliepen, Astrid S. de Wijn and others
- Copyright © 2015, 2016 Julie Marchant
+ Copyright © 2015-2017 Julie Marchant
Project: Starfighter is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version.
@@ -379,7 +379,7 @@
Copyright © 2003 Parallel Realities
Copyright © 2012 Guus Sliepen, Astrid S. de Wijn and
others
- Copyright © 2015, 2016 Julie Marchant
+ Copyright © 2015-2017 Julie Marchant
Created using the SDL
library.
diff --git a/src/alien.cpp b/src/alien.cpp
index 0d90781..7bcf4f4 100644
--- a/src/alien.cpp
+++ b/src/alien.cpp
@@ -1,7 +1,7 @@
/*
Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012 Guus Sliepen
-Copyright (C) 2012, 2015, 2016 Julie Marchant
+Copyright (C) 2012, 2015-2017 Julie Marchant
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/audio.cpp b/src/audio.cpp
index 15c97cb..bccdf87 100644
--- a/src/audio.cpp
+++ b/src/audio.cpp
@@ -1,7 +1,7 @@
/*
Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012 Guus Sliepen
-Copyright (C) 2015, 2016 Julie Marchant
+Copyright (C) 2015-2017 Julie Marchant
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/bullet.cpp b/src/bullet.cpp
index c99d395..86a567a 100644
--- a/src/bullet.cpp
+++ b/src/bullet.cpp
@@ -1,7 +1,7 @@
/*
Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012 Guus Sliepen
-Copyright (C) 2015, 2016 Julie Marchant
+Copyright (C) 2015-2017 Julie Marchant
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/cargo.cpp b/src/cargo.cpp
index 5d07878..b55790e 100644
--- a/src/cargo.cpp
+++ b/src/cargo.cpp
@@ -1,7 +1,7 @@
/*
Copyright (C) 2003 Parallel Realities
Copyright (C) 2011 Guus Sliepen
-Copyright (C) 2015, 2016 Julie Marchant
+Copyright (C) 2015-2017 Julie Marchant
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/collectable.cpp b/src/collectable.cpp
index 1c06cfe..f3d4215 100644
--- a/src/collectable.cpp
+++ b/src/collectable.cpp
@@ -1,7 +1,7 @@
/*
Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012 Guus Sliepen
-Copyright (C) 2015, 2016 Julie Marchant
+Copyright (C) 2015-2017 Julie Marchant
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/cutscene.cpp b/src/cutscene.cpp
index 2db0ed3..cc164f6 100644
--- a/src/cutscene.cpp
+++ b/src/cutscene.cpp
@@ -1,7 +1,7 @@
/*
Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012, 2013 Guus Sliepen
-Copyright (C) 2012, 2015, 2016 Julie Marchant
+Copyright (C) 2012, 2015-2017 Julie Marchant
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/engine.cpp b/src/engine.cpp
index e134246..fbe2404 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -1,7 +1,7 @@
/*
Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012, 2013 Guus Sliepen
-Copyright (C) 2015, 2016 Julie Marchant
+Copyright (C) 2015-2017 Julie Marchant
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/event.cpp b/src/event.cpp
index 6d03821..06a532e 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -1,7 +1,7 @@
/*
Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012, 2013 Guus Sliepen
-Copyright (C) 2012, 2015, 2016 Julie Marchant
+Copyright (C) 2012, 2015-2017 Julie Marchant
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/explosion.cpp b/src/explosion.cpp
index b84aa37..48e4723 100644
--- a/src/explosion.cpp
+++ b/src/explosion.cpp
@@ -1,7 +1,7 @@
/*
Copyright (C) 2003 Parallel Realities
Copyright (C) 2011 Guus Sliepen
-Copyright (C) 2015, 2016 Julie Marchant
+Copyright (C) 2015-2017 Julie Marchant
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/game.cpp b/src/game.cpp
index 7a80eab..1fd7a3c 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1,7 +1,7 @@
/*
Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012, 2013 Guus Sliepen
-Copyright (C) 2012, 2014, 2015, 2016 Julie Marchant
+Copyright (C) 2012, 2014-2017 Julie Marchant
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/gfx.cpp b/src/gfx.cpp
index 2d15289..9f87f18 100644
--- a/src/gfx.cpp
+++ b/src/gfx.cpp
@@ -1,7 +1,7 @@
/*
Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012, 2013 Guus Sliepen
-Copyright (C) 2015, 2016 Julie Marchant
+Copyright (C) 2015-2017 Julie Marchant
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/info.cpp b/src/info.cpp
index 3a93e12..2af0ec0 100644
--- a/src/info.cpp
+++ b/src/info.cpp
@@ -1,7 +1,7 @@
/*
Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012, 2013 Guus Sliepen
-Copyright (C) 2015, 2016 Julie Marchant
+Copyright (C) 2015-2017 Julie Marchant
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -17,11 +17,11 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
-#include "Starfighter.h"
-
#include "defs.h"
#include "structs.h"
+#include "gfx.h"
+
void info_clearLines()
{
for (int i = 0 ; i < MAX_INFOLINES ; i++)
diff --git a/src/intermission.cpp b/src/intermission.cpp
index 2715c13..807d636 100644
--- a/src/intermission.cpp
+++ b/src/intermission.cpp
@@ -1,7 +1,7 @@
/*
Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012, 2013 Guus Sliepen
-Copyright (C) 2012, 2015, 2016 Julie Marchant
+Copyright (C) 2012, 2015-2017 Julie Marchant
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -17,11 +17,24 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
-#include "Starfighter.h"
+#include "SDL.h"
+#include "colors.h"
#include "defs.h"
#include "structs.h"
+#include "audio.h"
+#include "engine.h"
+#include "game.h"
+#include "gfx.h"
+#include "player.h"
+#include "renderer.h"
+#include "save.h"
+#include "screen.h"
+#include "shop.h"
+#include "weapons.h"
+#include "window.h"
+
Planet intermission_planets[MAX_PLANETS];
void intermission_initPlanets(int system)
diff --git a/src/mission.cpp b/src/mission.cpp
index b0c67c5..847cbf4 100644
--- a/src/mission.cpp
+++ b/src/mission.cpp
@@ -1,7 +1,7 @@
/*
Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012, 2013 Guus Sliepen
-Copyright (C) 2012, 2015, 2016 Julie Marchant
+Copyright (C) 2012, 2015-2017 Julie Marchant
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -17,12 +17,25 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
-#include "Starfighter.h"
+#include "SDL.h"
+#include "colors.h"
#include "defs.h"
#include "structs.h"
+#include "alien.h"
+#include "audio.h"
+#include "engine.h"
+#include "event.h"
+#include "game.h"
+#include "gfx.h"
+#include "info.h"
+#include "intermission.h"
+#include "mission.h"
+#include "player.h"
#include "radio.h"
+#include "renderer.h"
+#include "screen.h"
Mission mission;
diff --git a/src/structs.h b/src/structs.h
index e31a7aa..baf1f02 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -1,7 +1,7 @@
/*
Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012, 2013 Guus Sliepen
-Copyright (C) 2015, 2016 Julie Marchant
+Copyright (C) 2015-2017 Julie Marchant
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/title.cpp b/src/title.cpp
index 9c5c5cd..63d9f7f 100644
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -412,7 +412,7 @@ int title_show()
5, screen->h - 60, FONT_WHITE, 0, gfx_background);
gfx_renderString("Copyright Guus Sliepen, Astrid S. de Wijn and others 2012",
5, screen->h - 40, FONT_WHITE, 0, gfx_background);
- gfx_renderString("Copyright 2015, 2016 Julie Marchant",
+ gfx_renderString("Copyright 2015-2017 Julie Marchant",
5, screen->h - 20, FONT_WHITE, 0, gfx_background);
gfx_renderString(buildVersion, screen->w - 6 - strlen(buildVersion) * 9,
screen->h - 20, FONT_WHITE, 0, gfx_background);