Merge PR HaikuArchives#26

App.cpp

@@ -23,7 +23,7 @@ App::App()
 	Game *theGame = new Game(4, 4);
 	WindowBoard *win = new WindowBoard(theGame);
 	BMessenger gameMsg(NULL, theGame);
-	gameMsg.SendMessage(H2048_NEW_GAME);
+	gameMsg.SendMessage(H2048_LOAD_GAME);
 }
 
 int main()

Game.cpp

@@ -5,6 +5,7 @@
 
 #include "Game.h"
 #include "GameBoard.h"
+#include "WindowBoard.h"
 
 #include <algorithm>
 #include <cstdlib>
@@ -36,6 +37,9 @@ Game::Game(uint32 sizeX, uint32 sizeY)
 	result = create_directory(fHighscore_path, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
 	sprintf(fHighscore_path, "%s/%s", fHighscore_path, HIGHSCORE_FILENAME);
 
+	sprintf(fSaveFile_path, "%s/%s", buffer, HAIKU2048_DIRECTORY);
+	sprintf(fSaveFile_path, "%s/%s", fSaveFile_path, SAVEFILE_FILENAME);
+
 	std::ifstream highscore(fHighscore_path, std::ios::binary);
 	memset(fUsername, 0, sizeof(char) * 32);
 	memset(fPlayername, 0, sizeof(char) * 32);
@@ -47,7 +51,6 @@ Game::Game(uint32 sizeX, uint32 sizeY)
 	}
 	fBoard = new uint32[fSizeX * fSizeY];
 	fPreviousBoard = new uint32[fSizeX * fSizeY];
-
 	Run();
 }
 
@@ -70,6 +73,18 @@ Game::MessageReceived(BMessage *message)
 		case H2048_NEW_GAME:
 			newGame();
 			break;
+		case H2048_LOAD_GAME:
+			if(!load()){
+				newGame();
+			}
+			break;
+		case H2048_SAVE_GAME:
+		{
+			BRect frame;
+			message->FindRect("frame",&frame);
+			save(frame);
+			break;
+		}
 		case H2048_NAME_REQUESTED:
 		{
 			sprintf(fPlayername, "%s", (const char*)message->FindString("playername"));
@@ -433,7 +448,8 @@ Game::gameOver()
 }
 
 void
-Game::copyBoard(uint32 *from, uint32 *to) {
+Game::copyBoard(uint32 *from, uint32 *to)
+{
 	for (int32 x = 0; x < fSizeX; ++x) {
 		for (int32 y = 0; y < fSizeY; ++y) {
 			to[x * fSizeX + y] = from[x * fSizeX + y];
@@ -442,7 +458,8 @@ Game::copyBoard(uint32 *from, uint32 *to) {
 }
 
 void
-Game::undoMove() {
+Game::undoMove()
+{
 	if (!fCanUndo) return;
 
 	copyBoard(fPreviousBoard, fBoard);
@@ -454,3 +471,67 @@ Game::undoMove() {
 	changed.AddBool("canUndo", false);
 	broadcastMessage(changed);
 }
+
+
+status_t
+Game::save(BRect frame)
+{
+	BFile saveFile(fSaveFile_path,B_WRITE_ONLY | B_CREATE_FILE);
+
+	BMessage saveMessage(H2048_SAVE_MESSAGE);
+
+	for(int i =0;i<fSizeX*fSizeY;i++){
+		saveMessage.AddUInt32("board",fBoard[i]);
+		saveMessage.AddUInt32("previousBoard", fPreviousBoard[i]);
+		}
+
+	saveMessage.AddUInt32("score",fScore);
+	saveMessage.AddUInt32("previousScore",fPreviousScore);
+
+	saveMessage.AddBool("canUndo",fCanUndo);
+	saveMessage.AddRect("windowFrame",frame);
+
+	return saveMessage.Flatten(&saveFile);
+}
+
+bool
+Game::load() {
+	BFile saveFile(fSaveFile_path,B_READ_ONLY);
+
+	BMessage saveMessage(H2048_SAVE_MESSAGE);
+	status_t result = saveMessage.Unflatten(&saveFile);
+	if(result!= B_OK) {
+		return false;
+	}
+
+	bool loadOK = true;
+
+	for(int i =0;i<fSizeX*fSizeY;i++) {
+		loadOK = loadOK && saveMessage.FindUInt32("board",i,&fBoard[i]) == B_OK;
+		loadOK = loadOK && saveMessage.FindUInt32("previousBoard",i,&fPreviousBoard[i]) == B_OK;
+	}
+
+	loadOK = loadOK && saveMessage.FindUInt32("score",&fScore) == B_OK;
+	loadOK = loadOK && saveMessage.FindUInt32("previousScore",&fPreviousScore) == B_OK;
+	loadOK = loadOK && saveMessage.FindBool("canUndo",&fCanUndo) == B_OK;
+
+	BRect frame;
+	loadOK = loadOK && saveMessage.FindRect("windowFrame",&frame) == B_OK;
+
+	if(!loadOK) return false;
+
+	BMessage setFrameMessage(H2048_SET_FRAME);
+	setFrameMessage.AddRect("frame",frame);
+	broadcastMessage(setFrameMessage);
+
+	BMessage startNotification(H2048_GAME_STARTED);
+	broadcastMessage(startNotification);
+
+	//Notify the boards about fCanUndo state
+	BMessage changed(H2048_BOARD_CHANGED);
+	changed.AddBool("canUndo", fCanUndo);
+	broadcastMessage(changed);
+
+	fInGame = true;
+	return true;
+}

Game.h

@@ -13,6 +13,7 @@
 
 #define HIGHSCORE_FILENAME "Highscore"
 #define HAIKU2048_DIRECTORY "Haiku2048"
+#define SAVEFILE_FILENAME "Haiku2048_state"
 
 class BMessage;
 class BMessenger;
@@ -30,7 +31,10 @@ enum
 	H2048_NEW_GAME		= '48NG',
 	H2048_NAME_REQUESTED= '48NR',
 	H2048_UNDO_MOVE		= '48UM',
-	H2048_MAKE_MOVE		= '48MM'
+	H2048_MAKE_MOVE		= '48MM',
+	H2048_LOAD_GAME		= '48LG',
+	H2048_SAVE_GAME		= '48SG',
+	H2048_SAVE_MESSAGE  = '48SM'
 };
 
 class Game : public BLooper
@@ -59,6 +63,8 @@ class Game : public BLooper
 			void		undoMove();
 			void		copyBoard(uint32 *from, uint32 *to);
 			void		broadcastMessage(BMessage &msg);
+			status_t	save(BRect frame);
+			bool		load();
 			uint32 *	boardAt(uint32 x, uint32 y);
 			uint32		newTile();
 			bool		gameOver();
@@ -87,6 +93,7 @@ class Game : public BLooper
 	char						fUsername[32];
 	char						fPlayername[32];
 	char						fHighscore_path[128];
+	char						fSaveFile_path[128];
 };
 
 #endif // GAME_H

GameBoard.cpp

@@ -39,6 +39,13 @@ GameBoard::MessageReceived(BMessage *message)
 
 			boardChanged(canUndo);
 			break;
+		case H2048_SET_FRAME:
+		{
+			BRect frame;
+			message->FindRect("frame",	&frame);
+			setFrame(frame);
+			break;
+		}
 		case H2048_REQUEST_NAME:
 			nameRequest();
 		default:

GameBoard.h

@@ -17,7 +17,8 @@ enum
 	H2048_GAME_STARTED		= '48GS',
 	H2048_GAME_ENDED		= '48GE',
 	H2048_REQUEST_NAME		= '48RN',
-	H2048_BOARD_CHANGED		= '48BC'
+	H2048_BOARD_CHANGED		= '48BC',
+	H2048_SET_FRAME  		= '48SB'
 };
 
 class GameBoard : public BLooper
@@ -33,6 +34,7 @@ class GameBoard : public BLooper
 	virtual	void		gameEnded() = 0;
 	virtual void 		nameRequest() = 0;
 	virtual	void		boardChanged(bool canUndo) = 0;
+	virtual void		setFrame(BRect frame) = 0;
 
 protected:
 	Game *			fTarget;

WindowBoard.cpp

@@ -111,6 +111,10 @@ GameWindow::~GameWindow()
 bool
 GameWindow::QuitRequested()
 {
+	BMessenger game(NULL, fMaster->fTarget);
+	BMessage saveMessage(H2048_SAVE_GAME);
+	saveMessage.AddRect("frame",Frame());
+	game.SendMessage(&saveMessage);
 	be_app_messenger.SendMessage(B_QUIT_REQUESTED);
 	return true;
 }
@@ -133,6 +137,16 @@ GameWindow::MessageReceived(BMessage *message)
 			showBoard(canUndo);
 			break;
 		}
+		case H2048_SET_FRAME:
+		{
+			BRect frame;
+			message->FindRect("frame",&frame);
+			MoveTo(frame.LeftTop());
+			prevWidth = (int)frame.Width();
+			prevHeight = (int)frame.Height();
+			ResizeTo((int)frame.Width(),(int)frame.Height());
+			break;
+		}
 		case H2048_UNDO_MOVE:
 		{
 			if (!fMaster->fSending) {
@@ -321,3 +335,13 @@ WindowBoard::nameRequest()
 	BMessenger messenger(NULL, fWindow);
 	messenger.SendMessage(H2048_REQUEST_NAME);
 }
+
+void
+WindowBoard::setFrame(BRect frame)
+{
+	BMessage setFrame(H2048_SET_FRAME);
+	setFrame.AddRect("frame", frame);
+
+	BMessenger messenger(NULL, fWindow);
+	messenger.SendMessage(&setFrame);
+}

WindowBoard.h

@@ -80,6 +80,7 @@ friend class GameWindow;
 			void		gameEnded();
 			void		nameRequest();
 			void		boardChanged(bool canUndo);
+			void		setFrame(BRect frame);
 
 private:
 	bool				fSending;