Merge remote-tracking branch 'upstream/master' into chinese-font

Author: rohkea

configure.ac

@@ -31,9 +31,16 @@ PKG_CHECK_MODULES([ZLIB],[zlib])
 
 # Checks for header files.
 AC_CHECK_HEADERS([stdint.h stdlib.h string.h unistd.h wchar.h])
+
+
+AC_EGREP_CPP(yes,
+[#ifdef EMSCRIPTEN
+  yes
+#endif
+],[],[
 AC_LANG_PUSH([C++])
 AC_CHECK_HEADERS([boost/foreach.hpp],[],[AC_MSG_ERROR(['boost' is required but it doesn't seem to be installed on this system.])])
-AC_LANG_POP([C++])
+AC_LANG_POP([C++])])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_BIGENDIAN

src/game_battle.cpp

@@ -67,6 +67,13 @@ void Game_Battle::Quit() {
 
 	Game_Temp::battle_running = false;
 
+	std::vector<Game_Battler*> allies;
+	Main_Data::game_party->GetBattlers(allies);
+	// Remove conditions which end after battle
+	for (std::vector<Game_Battler*>::iterator it = allies.begin(); it != allies.end(); it++) {
+		(*it)->RemoveBattleStates();
+	}
+
 	Game_Message::SetPositionFixed(message_is_fixed);
 	Game_Message::SetPosition(message_position);
 }

src/game_battler.cpp

@@ -211,10 +211,10 @@ void Game_Battler::RemoveState(int state_id) {
 }
 
 static bool NonPermanent(int state_id) {
-	return Data::states[state_id - 1].type == 0;
+	return Data::states[state_id - 1].type == RPG::State::Persistence_ends;
 }
 
-void Game_Battler::RemoveStates() {
+void Game_Battler::RemoveBattleStates() {
 	std::vector<int16_t>& states = GetStates();
 	std::vector<int16_t>::iterator end = std::remove_if(states.begin(), states.end(), NonPermanent);
 	states.erase(end, states.end());

src/game_battler.h

@@ -254,7 +254,7 @@ class Game_Battler {
 	/**
 	 * Removes all states which end after battle.
 	 */
-	void RemoveStates();
+	void RemoveBattleStates();
 
 	/**
 	 * Removes all states.

src/game_interpreter.cpp

@@ -105,6 +105,11 @@ void Game_Interpreter::Setup(const std::vector<RPG::EventCommand>& _list, int _e
 	index = 0;
 
 	CancelMenuCall();
+
+	if (main_flag) {
+		Game_Message::SetFaceName("");
+	}
+
 	if (!updating)
 		Update();
 }
@@ -384,6 +389,9 @@ void Game_Interpreter::InputButton() {
 
 bool Game_Interpreter::CommandEnd() {
 	CloseMessageWindow();
+	if (main_flag) {
+		Game_Message::SetFaceName("");
+	}
 
 	// FIXME: Hangs in some cases when Autostart events start
 	//if (main_flag) {

src/output.cpp

@@ -193,9 +193,12 @@ void Output::ErrorStr(std::string const& err) {
 		std::cout << err << std::endl;
 		std::cout << std::endl;
 		std::cout << "EasyRPG Player will close now.";
-#ifdef GEKKO
+#if defined (GEKKO)
 		// Wii stdin is non-blocking
 		sleep(5);
+#elif defined (EMSCRIPTEN)
+		// Don't show JavaScript Window.prompt from stdin call
+		std::cout << " Process finished.";
 #else
 		std::cout << " Press any key..." << std::endl;
 		std::cin.get();

src/platform/sdl_main.cpp

@@ -20,7 +20,6 @@
 #include "graphics.h"
 #include "input.h"
 #include "audio.h"
-
 #include <cstdlib>
 #include <SDL.h>
 

src/player.cpp

@@ -65,6 +65,9 @@
 	#include <dbghelp.h>
 	static void InitMiniDumpWriter();
 #endif
+#ifdef EMSCRIPTEN
+	#include <emscripten.h>
+#endif
 
 namespace Player {
 	bool exit_flag;
@@ -138,15 +141,32 @@ void Player::Run() {
 	Graphics::FrameReset();
 
 	// Main loop
+#ifdef EMSCRIPTEN
+	emscripten_set_main_loop(Player::MainLoop, 0, 0);
+#else
+	Player::MainLoop();
+#endif
+
+	Player::Exit();
+}
+
+void Player::MainLoop() {
+#ifdef EMSCRIPTEN
+    if (Scene::instance->type == Scene::Null) {
+      emscripten_cancel_main_loop();
+      return;
+    }
+#else
 	while (Scene::instance->type != Scene::Null) {
+#endif
 		Scene::instance->MainFunction();
 		for (size_t i = 0; i < Scene::old_instances.size(); ++i) {
 			Graphics::Pop();
 		}
 		Scene::old_instances.clear();
+#ifndef EMSCRIPTEN
 	}
-
-	Player::Exit();
+#endif
 }
 
 void Player::Pause() {

src/player.h

@@ -42,6 +42,11 @@ namespace Player {
 	 */
 	void Run();
 
+	/**
+	 * Runs the game loop.
+	 */
+	void MainLoop();
+
 	/**
 	 * Pauses the game engine.
 	 */

src/sdl_ui.cpp

@@ -162,7 +162,9 @@ uint32_t SdlUi::GetTicks() const {
 }
 
 void SdlUi::Sleep(uint32_t time) {
+#ifndef EMSCRIPTEN
 	SDL_Delay(time);
+#endif
 }
 
 bool SdlUi::RequestVideoMode(int width, int height, bool fullscreen) {
@@ -648,19 +650,23 @@ void SdlUi::ProcessActiveEvent(SDL_Event &evnt) {
 		// Filter SDL events with FilterUntilFocus until focus is
 		// regained
 		filtering_done = false;
-#if SDL_MAJOR_VERSION==1
+#ifndef EMSCRIPTEN
+#  if SDL_MAJOR_VERSION==1
 		SDL_SetEventFilter(&FilterUntilFocus);
-#else
+#  else
 		SDL_SetEventFilter(&FilterUntilFocus_SDL2, NULL);
+#  endif
 #endif
 
 		SDL_WaitEvent(NULL);
 
-#if SDL_MAJOR_VERSION==1
+#ifndef EMSCRIPTEN
+#  if SDL_MAJOR_VERSION==1
 		SDL_SetEventFilter(NULL);
-#else
+#  else
 		SDL_SetEventFilter(NULL, NULL);
-#endif 
+#  endif
+#endif
 
 		ShowCursor(last);