Port to Sailfish OS

Author: Thomas Perl

BPGame.cpp

@@ -19,6 +19,8 @@
 #include "BPGame.h"
 #include "SDL.h"
 
+#include "location.h"
+
 #include <GLES/gl.h>
 
 #include "SDL_ttf.h" 
@@ -68,7 +70,14 @@ bool BPGame::ShowingClearScores;
 SpriteFont* BPGame::sfcMessageBoxText;
 SpriteFont* BPGame::sfcMessageBoxTitle;
 
+// Implemented in main.cpp
+void
+bp_game_audio_set_last_music(const char *music);
+
 void BPGame::Init(int width, int height) {
+	this->width = width;
+	this->height = height;
+
 	srand(time(0));
 
 	EnableSound = true;
@@ -1200,7 +1209,7 @@ void BPGame::AllocString(SpriteFont** tex, const char* str, FontSizes size, floa
 	SAFE_DELETE((*tex));
 
 	// it's incredibly lazy to open and close the font each time - hurray!
-	TTF_Font* fnt = TTF_OpenFont("/opt/brainparty/Content/freesans.ttf", size - 3); // NB: the -3 is here because the freesans.ttf font we're using is a big chunkier than the iPhone font
+	TTF_Font* fnt = TTF_OpenFont(DATA_DIR "freesans.ttf", size - 3); // NB: the -3 is here because the freesans.ttf font we're using is a big chunkier than the iPhone font
 
 	static SDL_Color white = { 255, 255, 255, 255 };
 
@@ -1305,7 +1314,7 @@ void BPGame::LoadSettings() {
 	NumUnlockedGames = 0;
 
 	ifstream ifs;
-	ifs.open("/home/user/.brainparty");
+	ifs.open(bp_get_save_file_name());
 
 	FirstRun = false;
 
@@ -1435,8 +1444,8 @@ void BPGame::LoadSettings() {
 }
 
 void BPGame::SaveSettings() {
- 	ofstream savefile;
- 	savefile.open("/home/user/.brainparty");
+	ofstream savefile;
+	savefile.open(bp_get_save_file_name());
 	savefile << EnableSound << endl;
 	savefile << EnableMusic << endl;
 	savefile << endl;
@@ -2347,9 +2356,11 @@ void BPGame::PlayMusic(const char* name) {
 		Mix_FreeMusic(Music);
 		Music = NULL;
 	}
+
+	bp_game_audio_set_last_music(name);
 
 	string* file = new string(name);
-	file->insert(0, "/opt/brainparty/Content/");
+	file->insert(0, DATA_DIR);
 	file->append(".ogg");
 
 	Music = Mix_LoadMUS(file->c_str());
@@ -2359,6 +2370,8 @@ void BPGame::PlayMusic(const char* name) {
 }
 
 void BPGame::StopMusic() {
+	bp_game_audio_set_last_music(NULL);
+
 	if (Music != NULL) {
 		Mix_HaltMusic();
 		Mix_FreeMusic(Music);
@@ -2376,7 +2389,7 @@ bool BPGame::FileExists(const char * filename) {
 
 Mix_Chunk* BPGame::LoadSound(const char* filename, const char* extension) {
 	string* file = new string(filename);
-	file->insert(0, "/opt/brainparty/Content/");
+	file->insert(0, DATA_DIR);
 	file->append(".wav");
 
 	Mix_Chunk* retval = Mix_LoadWAV(file->c_str());

BPGame.h

@@ -61,6 +61,9 @@ struct cmp_str {
 };
 
 class BPGame {
+private:
+	int width;
+	int height;
 public:
     	int GLViewRenderbuffer;
 	int GLViewFramebuffer;
@@ -206,29 +209,33 @@ class BPGame {
         inline void ConvertCoordinates(float &x, float &y) {
             /**
              * This converts the physical (screen) coordinates to the
-             * game world coordinates. We've rotated the screen by 90
-             * degrees, and the resolution is also different. We then
-             * center the scaled image on the screen (the "-26"). The
+             * game world coordinates.
+             * We center the scaled image on the screen (the "-26"). The
              * "1.666/1.6" is here, because the screen has a ratio of
-             * 480/800 and the world 480/320.
+             * 800/480 (or a similar ratio) and the world is 480/320.
              *
              *   world:      screen:
-             *   a--b        b--d
+             *   a--b        a--b
              *   |  |        |  |
-             *   c--d        a--c
-             *   320x480     800x480
+             *   c--d        c--d
+             *   320x480     width x height
              *
              * The world is centered on the screen, so the world takes
-             * up 720 pixels height on the screen - 40 pixels are black
+             * up ... pixels height on the screen - .. pixels are black
              * border at the top (screen: left) and bottom (screen: right).
              *
-             * These 40 pixels are ~ 26 pixels in world coordinates:
+             * These .. pixels are ~ 26 pixels in world coordinates:
              *   offset_in_world = (40 * 480 / 800) * 1.666 / 1.5
+             *
+             * TODO: Rewrite all this into a separate class that deals with
+             * input projection as well as GL viewport/projection setup.
              **/
-            float tmp = (480.-y)*320./480.;
-            y = ((x*480./800.)*1.666/1.5)-26;
-            x = tmp;
+            float xx = x / width * 320.;
+            float yy = ((y / height * 480.)*1.666/1.5)-26;
+            x = xx;
+            y = yy;
         }
+
 	void TouchStart(float x, float y);
 	void TouchStop(float x, float y);
 	void TouchDrag(float x, float y);

Makefile

@@ -1,33 +1,21 @@
-MACHINE= $(shell uname -s)
-OBJFILES := $(patsubst %.cpp,%.o,$(wildcard *.cpp))
+TARGET := brainparty
 
-ifeq ($(MACHINE),Darwin)
-	INCLUDES = -I/Library/Frameworks/SDL.framework/Headers -I/Library/Frameworks/SDL_image.framework/Headers -I/Library/Frameworks/SDL_mixer.framework/Headers -I/Library/Frameworks/SDL_ttf.framework/Headers -I/System/Library/Frameworks/OpenGL.framework/Headers
-	LIBS = -m32 -framework SDL -framework SDL_image -framework SDL_mixer -framework SDL_ttf -framework Cocoa -framework OpenGL
+OBJFILES := $(patsubst %.cpp,%.o,$(wildcard *.cpp))
 
-	# SDL isn't in a great state on 64-bit Macs, so force 32-bit for now
-	CXXFLAGS = -g -c -m32 -Wno-deprecated
+PKGS := sdl2 SDL2_mixer SDL2_ttf SDL2_image audioresource egl glesv1_cm glib-2.0
 
-	# to compile on OS X you need to include this Objective C file
-	OSXCOMPAT = SDLMain.m
-else
-	INCLUDES = `sdl-config --cflags` -I/usr/X11R6/include
-	LIBS = `sdl-config --libs`
-	LIBS += -lEGL -lGLES_CM -lSDL_mixer -lSDL_ttf -lSDL_image
-	CXXFLAGS = -O2 -c -Wno-deprecated
-	OSXCOMPAT = 
-endif
+CXXFLAGS += $(shell pkg-config --cflags $(PKGS))
+LIBS += $(shell pkg-config --libs $(PKGS))
 
-# object files have corresponding source files
-CXX = g++
+CXXFLAGS += -O2 -c -Wno-deprecated
 
-all: brainparty
+all: $(TARGET)
 
-brainparty: $(OBJFILES)
-	$(CXX) -o brainparty $(INCLUDES) $(OSXCOMPAT) $(OBJFILES) $(LIBS)
+$(TARGET): $(OBJFILES)
+	$(CXX) -o $@ $(OBJFILES) $(LIBS)
 
 %.o: %.cpp
-	$(CXX) $(CXXFLAGS) $(INCLUDES) -o $@ $<
+	$(CXX) $(CXXFLAGS) -o $@ $<
 
 clean:
-	rm -f brainparty *.o
+	rm -f $(TARGET) $(OBJFILES)

Texture.cpp

@@ -17,6 +17,7 @@
 
 #include "Texture.h"
 #include "SDL_image.h"
+#include "location.h"
 
 Texture::Texture(SDL_Surface* surface) {	
 	int po2width = Texture::NextPO2(surface->w);
@@ -37,7 +38,6 @@ Texture::Texture(SDL_Surface* surface) {
 		#endif		
 		);
 
-		SDL_SetAlpha(surface, 0, 0);	
 		SDL_BlitSurface(surface, NULL, tmpsurface, NULL);
 		InitWithSurface(tmpsurface, surface->w, surface->h);
 		SDL_FreeSurface(tmpsurface);		
@@ -48,7 +48,7 @@ Texture::Texture(SDL_Surface* surface) {
 
 Texture::Texture(const char* filename, float actualwidth, float actualheight) {
 	string file = filename;
-	file.insert(0, "/opt/brainparty/Content/");
+	file.insert(0, DATA_DIR);
 	file.append(".png");
 
 	SDL_Surface *surface = IMG_Load(file.c_str());

brainparty.desktop

@@ -1,7 +1,5 @@
 [Desktop Entry]
-Name=Brain Party
-Exec=invoker --single-instance --type=e /opt/brainparty/brainparty
-Icon=/opt/brainparty/brainparty.png
-Terminal=false
 Type=Application
-Categories=Game;LogicGame;
+Name=Brain Party
+Exec=harbour-brainparty
+Icon=harbour-brainparty

location.cpp

@@ -0,0 +1,22 @@
+#include "location.h"
+
+#include <glib.h>
+#include <stdio.h>
+
+extern gchar *appname;
+
+const char *bp_get_save_file_name()
+{
+    static const char *save_file_name = NULL;
+
+    // Create save directory
+    gchar *dirname = g_build_filename(g_get_user_data_dir(), appname, NULL);
+    g_mkdir_with_parents(dirname, 0755);
+    g_free(dirname);
+
+    if (!save_file_name) {
+        save_file_name = g_build_filename(g_get_user_data_dir(), appname, "save", NULL);
+    }
+
+    return save_file_name;
+}

location.h

@@ -0,0 +1,8 @@
+#ifndef BRAINPARTY_LOCATION_H
+#define BRAINPARTY_LOCATION_H
+
+#define DATA_DIR "/usr/share/harbour-brainparty/"
+
+const char *bp_get_save_file_name();
+
+#endif /* BRAINPARTY_LOCATION_H */