diff --git a/source/codeblocks/AssaultCube.cbp b/source/codeblocks/AssaultCube.cbp
index 3736e44b..e5dc15cb 100755
--- a/source/codeblocks/AssaultCube.cbp
+++ b/source/codeblocks/AssaultCube.cbp
@@ -35,7 +35,6 @@
-
@@ -75,7 +74,6 @@
-
diff --git a/source/src/i18n.cpp b/source/src/i18n.cpp
index 64362482..7cba7f68 100644
--- a/source/src/i18n.cpp
+++ b/source/src/i18n.cpp
@@ -10,8 +10,6 @@ i18nmanager::i18nmanager(const char *domain, const char *basepath) : domain(doma
locale = setlocale(LC_ALL, ""); // use current default locale
bindtextdomain(domain, basepath); // set base path
textdomain(domain);
- bind_textdomain_codeset(domain, "UTF-8"); // we use the utf-8 charset only
-
setlocale(LC_NUMERIC, "C"); // make sure numeric is consistent (very important for float usage in scripts)
}
diff --git a/source/src/i18n.h b/source/src/i18n.h
index 80a73476..bf31ced8 100644
--- a/source/src/i18n.h
+++ b/source/src/i18n.h
@@ -12,8 +12,3 @@ struct i18nmanager
};
extern char *lang;
-
-enum { CF_NONE = 0, CF_OK, CF_FAIL, CF_SIZE };
-
-#define FONTSTART 33
-#define FONTCHARS 94
diff --git a/source/src/protos.h b/source/src/protos.h
index 0df56234..dc24a2be 100644
--- a/source/src/protos.h
+++ b/source/src/protos.h
@@ -566,8 +566,6 @@ struct font
extern int VIRTW; // virtual screen size for text & HUD
extern bool ignoreblinkingbit;
extern font *curfont;
-
-extern void initfont();
extern bool setfont(const char *name);
extern font *getfont(const char *name);
extern void pushfont(const char *name);
diff --git a/source/vcpp/cube.vcproj b/source/vcpp/cube.vcproj
index 2cb7c78a..3276f98a 100644
--- a/source/vcpp/cube.vcproj
+++ b/source/vcpp/cube.vcproj
@@ -84,7 +84,7 @@
/>
major = SDL_TTF_MAJOR_VERSION; \
- (X)->minor = SDL_TTF_MINOR_VERSION; \
- (X)->patch = SDL_TTF_PATCHLEVEL; \
-}
-
-/* Backwards compatibility */
-#define TTF_MAJOR_VERSION SDL_TTF_MAJOR_VERSION
-#define TTF_MINOR_VERSION SDL_TTF_MINOR_VERSION
-#define TTF_PATCHLEVEL SDL_TTF_PATCHLEVEL
-#define TTF_VERSION(X) SDL_TTF_VERSION(X)
-
-/* This function gets the version of the dynamically linked SDL_ttf library.
- it should NOT be used to fill a version structure, instead you should
- use the SDL_TTF_VERSION() macro.
- */
-extern DECLSPEC const SDL_version * SDLCALL TTF_Linked_Version(void);
-
-/* ZERO WIDTH NO-BREAKSPACE (Unicode byte order mark) */
-#define UNICODE_BOM_NATIVE 0xFEFF
-#define UNICODE_BOM_SWAPPED 0xFFFE
-
-/* This function tells the library whether UNICODE text is generally
- byteswapped. A UNICODE BOM character in a string will override
- this setting for the remainder of that string.
-*/
-extern DECLSPEC void SDLCALL TTF_ByteSwappedUNICODE(int swapped);
-
-/* The internal structure containing font information */
-typedef struct _TTF_Font TTF_Font;
-
-/* Initialize the TTF engine - returns 0 if successful, -1 on error */
-extern DECLSPEC int SDLCALL TTF_Init(void);
-
-/* Open a font file and create a font of the specified point size.
- * Some .fon fonts will have several sizes embedded in the file, so the
- * point size becomes the index of choosing which size. If the value
- * is too high, the last indexed size will be the default. */
-extern DECLSPEC TTF_Font * SDLCALL TTF_OpenFont(const char *file, int ptsize);
-extern DECLSPEC TTF_Font * SDLCALL TTF_OpenFontIndex(const char *file, int ptsize, long index);
-extern DECLSPEC TTF_Font * SDLCALL TTF_OpenFontRW(SDL_RWops *src, int freesrc, int ptsize);
-extern DECLSPEC TTF_Font * SDLCALL TTF_OpenFontIndexRW(SDL_RWops *src, int freesrc, int ptsize, long index);
-
-/* Set and retrieve the font style */
-#define TTF_STYLE_NORMAL 0x00
-#define TTF_STYLE_BOLD 0x01
-#define TTF_STYLE_ITALIC 0x02
-#define TTF_STYLE_UNDERLINE 0x04
-#define TTF_STYLE_STRIKETHROUGH 0x08
-extern DECLSPEC int SDLCALL TTF_GetFontStyle(const TTF_Font *font);
-extern DECLSPEC void SDLCALL TTF_SetFontStyle(TTF_Font *font, int style);
-extern DECLSPEC int SDLCALL TTF_GetFontOutline(const TTF_Font *font);
-extern DECLSPEC void SDLCALL TTF_SetFontOutline(TTF_Font *font, int outline);
-
-/* Set and retrieve FreeType hinter settings */
-#define TTF_HINTING_NORMAL 0
-#define TTF_HINTING_LIGHT 1
-#define TTF_HINTING_MONO 2
-#define TTF_HINTING_NONE 3
-extern DECLSPEC int SDLCALL TTF_GetFontHinting(const TTF_Font *font);
-extern DECLSPEC void SDLCALL TTF_SetFontHinting(TTF_Font *font, int hinting);
-
-/* Get the total height of the font - usually equal to point size */
-extern DECLSPEC int SDLCALL TTF_FontHeight(const TTF_Font *font);
-
-/* Get the offset from the baseline to the top of the font
- This is a positive value, relative to the baseline.
- */
-extern DECLSPEC int SDLCALL TTF_FontAscent(const TTF_Font *font);
-
-/* Get the offset from the baseline to the bottom of the font
- This is a negative value, relative to the baseline.
- */
-extern DECLSPEC int SDLCALL TTF_FontDescent(const TTF_Font *font);
-
-/* Get the recommended spacing between lines of text for this font */
-extern DECLSPEC int SDLCALL TTF_FontLineSkip(const TTF_Font *font);
-
-/* Get/Set whether or not kerning is allowed for this font */
-extern DECLSPEC int SDLCALL TTF_GetFontKerning(const TTF_Font *font);
-extern DECLSPEC void SDLCALL TTF_SetFontKerning(TTF_Font *font, int allowed);
-
-/* Get the number of faces of the font */
-extern DECLSPEC long SDLCALL TTF_FontFaces(const TTF_Font *font);
-
-/* Get the font face attributes, if any */
-extern DECLSPEC int SDLCALL TTF_FontFaceIsFixedWidth(const TTF_Font *font);
-extern DECLSPEC char * SDLCALL TTF_FontFaceFamilyName(const TTF_Font *font);
-extern DECLSPEC char * SDLCALL TTF_FontFaceStyleName(const TTF_Font *font);
-
-/* Check wether a glyph is provided by the font or not */
-extern DECLSPEC int SDLCALL TTF_GlyphIsProvided(const TTF_Font *font, Uint16 ch);
-
-/* Get the metrics (dimensions) of a glyph
- To understand what these metrics mean, here is a useful link:
- http://freetype.sourceforge.net/freetype2/docs/tutorial/step2.html
- */
-extern DECLSPEC int SDLCALL TTF_GlyphMetrics(TTF_Font *font, Uint16 ch,
- int *minx, int *maxx,
- int *miny, int *maxy, int *advance);
-
-/* Get the dimensions of a rendered string of text */
-extern DECLSPEC int SDLCALL TTF_SizeText(TTF_Font *font, const char *text, int *w, int *h);
-extern DECLSPEC int SDLCALL TTF_SizeUTF8(TTF_Font *font, const char *text, int *w, int *h);
-extern DECLSPEC int SDLCALL TTF_SizeUNICODE(TTF_Font *font, const Uint16 *text, int *w, int *h);
-
-/* Create an 8-bit palettized surface and render the given text at
- fast quality with the given font and color. The 0 pixel is the
- colorkey, giving a transparent background, and the 1 pixel is set
- to the text color.
- This function returns the new surface, or NULL if there was an error.
-*/
-extern DECLSPEC SDL_Surface * SDLCALL TTF_RenderText_Solid(TTF_Font *font,
- const char *text, SDL_Color fg);
-extern DECLSPEC SDL_Surface * SDLCALL TTF_RenderUTF8_Solid(TTF_Font *font,
- const char *text, SDL_Color fg);
-extern DECLSPEC SDL_Surface * SDLCALL TTF_RenderUNICODE_Solid(TTF_Font *font,
- const Uint16 *text, SDL_Color fg);
-
-/* Create an 8-bit palettized surface and render the given glyph at
- fast quality with the given font and color. The 0 pixel is the
- colorkey, giving a transparent background, and the 1 pixel is set
- to the text color. The glyph is rendered without any padding or
- centering in the X direction, and aligned normally in the Y direction.
- This function returns the new surface, or NULL if there was an error.
-*/
-extern DECLSPEC SDL_Surface * SDLCALL TTF_RenderGlyph_Solid(TTF_Font *font,
- Uint16 ch, SDL_Color fg);
-
-/* Create an 8-bit palettized surface and render the given text at
- high quality with the given font and colors. The 0 pixel is background,
- while other pixels have varying degrees of the foreground color.
- This function returns the new surface, or NULL if there was an error.
-*/
-extern DECLSPEC SDL_Surface * SDLCALL TTF_RenderText_Shaded(TTF_Font *font,
- const char *text, SDL_Color fg, SDL_Color bg);
-extern DECLSPEC SDL_Surface * SDLCALL TTF_RenderUTF8_Shaded(TTF_Font *font,
- const char *text, SDL_Color fg, SDL_Color bg);
-extern DECLSPEC SDL_Surface * SDLCALL TTF_RenderUNICODE_Shaded(TTF_Font *font,
- const Uint16 *text, SDL_Color fg, SDL_Color bg);
-
-/* Create an 8-bit palettized surface and render the given glyph at
- high quality with the given font and colors. The 0 pixel is background,
- while other pixels have varying degrees of the foreground color.
- The glyph is rendered without any padding or centering in the X
- direction, and aligned normally in the Y direction.
- This function returns the new surface, or NULL if there was an error.
-*/
-extern DECLSPEC SDL_Surface * SDLCALL TTF_RenderGlyph_Shaded(TTF_Font *font,
- Uint16 ch, SDL_Color fg, SDL_Color bg);
-
-/* Create a 32-bit ARGB surface and render the given text at high quality,
- using alpha blending to dither the font with the given color.
- This function returns the new surface, or NULL if there was an error.
-*/
-extern DECLSPEC SDL_Surface * SDLCALL TTF_RenderText_Blended(TTF_Font *font,
- const char *text, SDL_Color fg);
-extern DECLSPEC SDL_Surface * SDLCALL TTF_RenderUTF8_Blended(TTF_Font *font,
- const char *text, SDL_Color fg);
-extern DECLSPEC SDL_Surface * SDLCALL TTF_RenderUNICODE_Blended(TTF_Font *font,
- const Uint16 *text, SDL_Color fg);
-
-/* Create a 32-bit ARGB surface and render the given glyph at high quality,
- using alpha blending to dither the font with the given color.
- The glyph is rendered without any padding or centering in the X
- direction, and aligned normally in the Y direction.
- This function returns the new surface, or NULL if there was an error.
-*/
-extern DECLSPEC SDL_Surface * SDLCALL TTF_RenderGlyph_Blended(TTF_Font *font,
- Uint16 ch, SDL_Color fg);
-
-/* For compatibility with previous versions, here are the old functions */
-#define TTF_RenderText(font, text, fg, bg) \
- TTF_RenderText_Shaded(font, text, fg, bg)
-#define TTF_RenderUTF8(font, text, fg, bg) \
- TTF_RenderUTF8_Shaded(font, text, fg, bg)
-#define TTF_RenderUNICODE(font, text, fg, bg) \
- TTF_RenderUNICODE_Shaded(font, text, fg, bg)
-
-/* Close an opened font file */
-extern DECLSPEC void SDLCALL TTF_CloseFont(TTF_Font *font);
-
-/* De-initialize the TTF engine */
-extern DECLSPEC void SDLCALL TTF_Quit(void);
-
-/* Check if the TTF engine is initialized */
-extern DECLSPEC int SDLCALL TTF_WasInit(void);
-
-/* We'll use SDL for reporting errors */
-#define TTF_SetError SDL_SetError
-#define TTF_GetError SDL_GetError
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_TTF_H */
diff --git a/source/xcode/Frameworks/SDL_ttf.framework/Versions/A/Resources/Info.plist b/source/xcode/Frameworks/SDL_ttf.framework/Versions/A/Resources/Info.plist
deleted file mode 100644
index eef74781..00000000
--- a/source/xcode/Frameworks/SDL_ttf.framework/Versions/A/Resources/Info.plist
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
- CFBundleDevelopmentRegion
- English
- CFBundleExecutable
- SDL_ttf
- CFBundleGetInfoString
- http://www.libsdl.org
- CFBundleIdentifier
- SDL_ttf
- CFBundleInfoDictionaryVersion
- 6.0
- CFBundleName
- Simple DirectMedia Layer
- CFBundlePackageType
- FMWK
- CFBundleShortVersionString
- 2.0.6
- CFBundleSignature
- SDL_ttfX
- CFBundleVersion
- 2.0.10
-
-
diff --git a/source/xcode/Frameworks/SDL_ttf.framework/Versions/A/SDL_ttf b/source/xcode/Frameworks/SDL_ttf.framework/Versions/A/SDL_ttf
deleted file mode 100755
index 5b89d2bb..00000000
Binary files a/source/xcode/Frameworks/SDL_ttf.framework/Versions/A/SDL_ttf and /dev/null differ
diff --git a/source/xcode/Frameworks/SDL_ttf.framework/Versions/Current b/source/xcode/Frameworks/SDL_ttf.framework/Versions/Current
deleted file mode 120000
index 8c7e5a66..00000000
--- a/source/xcode/Frameworks/SDL_ttf.framework/Versions/Current
+++ /dev/null
@@ -1 +0,0 @@
-A
\ No newline at end of file