From 95d31b80396dece49f9128dd65d4622aeecbfae3 Mon Sep 17 00:00:00 2001 From: onpon4 Date: Fri, 24 Apr 2015 22:45:50 -0400 Subject: [PATCH] Removed now empty debris.cpp and debris.h. --- Makefile | 2 +- src/Starfighter.h | 1 - src/debris.cpp | 22 ---------------------- src/debris.h | 23 ----------------------- 4 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 src/debris.cpp delete mode 100644 src/debris.h diff --git a/Makefile b/Makefile index 345dc4b..601e9a1 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ CXXFLAGS ?= -O2 -Wall -g CXXFLAGS += `pkg-config --cflags sdl2 SDL2_image SDL2_mixer` LIBS = `pkg-config --libs sdl2 SDL2_image SDL2_mixer` -OBJS = alien.o audio.o bullet.o cargo.o collectable.o debris.o events.o explosions.o game.o globals.o graphics.o init.o intermission.o loadSave.o messages.o misc.o missions.o player.o resources.o script.o ship.o shop.o Starfighter.o title.o weapons.o +OBJS = alien.o audio.o bullet.o cargo.o collectable.o events.o explosions.o game.o globals.o graphics.o init.o intermission.o loadSave.o messages.o misc.o missions.o player.o resources.o script.o ship.o shop.o Starfighter.o title.o weapons.o VERSION = 1.3.2-dev PROG = starfighter diff --git a/src/Starfighter.h b/src/Starfighter.h index 79d01a7..e7d4f0f 100644 --- a/src/Starfighter.h +++ b/src/Starfighter.h @@ -40,7 +40,6 @@ along with this program. If not, see . #include "bullet.h" #include "cargo.h" #include "collectable.h" -#include "debris.h" #include "events.h" #include "explosions.h" #include "game.h" diff --git a/src/debris.cpp b/src/debris.cpp deleted file mode 100644 index 6632e10..0000000 --- a/src/debris.cpp +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright (C) 2003 Parallel Realities -Copyright (C) 2011, 2012 Guus Sliepen -Copyright (C) 2015 Julian Marchant - -This program 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. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#include "Starfighter.h" - - diff --git a/src/debris.h b/src/debris.h deleted file mode 100644 index 69ef3a4..0000000 --- a/src/debris.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright (C) 2003 Parallel Realities -Copyright (C) 2011 Guus Sliepen -Copyright (C) 2015 Julian Marchant - -This program 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. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#ifndef DEBRIS_H -#define DEBRIS_H - -#endif