commit 048bc0fb
Removed more unused files
Changed files
| M | source/code/Makefile before |
| M | source/code/MenuSystem.cpp before |
| D | source/code/ttfont.cpp before |
| D | source/code/ttfont.h before |
diff --git a/source/code/Makefile b/source/code/Makefile
index 27d4001..f6f228a 100644
--- a/source/code/Makefile
+++ b/source/code/Makefile
@@ -31,7 +31,7 @@ endif
#Compile with debug information or optimized.
ifeq ($(DEBUG),1)
-BASE_CFLAGS += -g -DDEBUG=1 -Wall
+BASE_CFLAGS += -g -DDEBUG=1 -Wall -Wno-sign-compare
else
BASE_CFLAGS += -O3
endif
diff --git a/source/code/MenuSystem.cpp b/source/code/MenuSystem.cpp
index 09bfcf1..5485a71 100644
--- a/source/code/MenuSystem.cpp
+++ b/source/code/MenuSystem.cpp
@@ -24,7 +24,6 @@ http://blockattack.sf.net
#include "MenuSystem.h"
#include "common.h"
-#include "CppSdlImageHolder.hpp"
#include "global.hpp"
int mousex;
diff --git a/source/code/ttfont.cpp b/source/code/ttfont.cpp
deleted file mode 100644
index c676abf..0000000
--- a/source/code/ttfont.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-===========================================================================
-blockattack - Block Attack - Rise of the Blocks
-Copyright (C) 2005-2012 Poul Sander
-
-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 2 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 http://www.gnu.org/licenses/
-
-Source information and contacts persons can be found at
-http://blockattack.sf.net
-===========================================================================
-*/
-
-#include "ttfont.h"
-
-TTFont::TTFont() {
- font = nullptr;
- actualInstance = false;
-}
-
-int TTFont::count = 0;
-
-TTFont::TTFont(TTF_Font *f) {
- if (!(TTF_WasInit())) {
- //Init TTF for the first time
- TTF_Init();
- }
-
-
- if (f == nullptr) {
- cout << "Font was null!" << endl;
- }
-
- actualInstance = false; //We have not yet copied to final location
- font = f;
-
-}
-
-TTFont::~TTFont() {
- if (!actualInstance) {
- return;
- }
-
- cout << "Closing a font" << endl;
-
- TTF_CloseFont(font);
- font = nullptr;
-
- count--;
- if (count==0) {
- TTF_Quit();
- }
-}
-
-//Copy constructor, you cannot copy an actual instance
-TTFont::TTFont(const TTFont &t) {
- if (t.font == nullptr || t.actualInstance) {
- font = nullptr;
- actualInstance = false;
- }
- else {
- font = t.font;
- actualInstance = true;
- count++;
- }
-}
-
-int TTFont::getTextHeight() {
- return TTF_FontHeight(font);
-}
-
-int TTFont::getTextWidth(string text) {
- int width = 0;
- if (TTF_SizeText(font,text.c_str(),&width,nullptr)!=0) {
- cout << "Failed to get text width!" << endl;
- }
- return width;
-}
-
-void TTFont::writeText(string text, SDL_Surface *target, int x, int y) {
- SDL_Surface *text_surface;
- SDL_Color color= {255,255,255};
- if (!(text_surface=TTF_RenderText_Solid(font,text.c_str(), color))) {
- cout << "Error writing text: " << TTF_GetError() << endl;
- }
- else {
- SDL_Rect dest;
- dest.x = x;
- dest.y = y;
- SDL_BlitSurface(text_surface,nullptr,target,&dest);
- SDL_FreeSurface(text_surface);
- }
-}
-
diff --git a/source/code/ttfont.h b/source/code/ttfont.h
deleted file mode 100644
index 1d3d652..0000000
--- a/source/code/ttfont.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-===========================================================================
-blockattack - Block Attack - Rise of the Blocks
-Copyright (C) 2005-2012 Poul Sander
-
-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 2 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 http://www.gnu.org/licenses/
-
-Source information and contacts persons can be found at
-http://blockattack.sf.net
-===========================================================================
-*/
-
-//
-// File: ttfont.hpp.h
-// Author: poul
-//
-// Created on 25. december 2007, 13:52
-//
-
-#ifndef _TTFONT_H
-#define _TTFONT_H
-
-#include <stdlib.h>
-#include <iostream>
-#include <string>
-#include "SDL.h"
-//#include "SDL_ttf.h" //To use True Type Fonts in SDL
-
-
-class TTFont
-{
-private:
- static int count; //The total number of instances
- TTF_Font *font;
- bool actualInstance;
-
-public:
- TTFont();
- TTFont(TTF_Font *f);
- TTFont(const TTFont &t);
- ~TTFont();
-
- int getTextWidth(string text);
- int getTextHeight();
- void writeText(string text, SDL_Surface *target, int x, int y);
-
-};
-
-#endif /* _TTFONT_H */
-