Bumping version to 4.6

Javanaise · Jan 14, 2019 · 5bd8376 · 5bd8376
1 parent 82feec9
commit 5bd8376
Show file tree

Hide file tree

Showing 54 changed files with 15,949 additions and 27,554 deletions.
diff --git a/Assets/mrboom.6 b/Assets/mrboom.6
@@ -1,4 +1,4 @@
-.TH mrboom 6 "March 27 2017"
+.TH mrboom 6 "January 14 2019"
 .SH NAME
 mrboom \- 8 player Bomberman
 .SH SYNOPSIS

diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
-## Mr.Boom port for RetroArch/Libretro.
+## Mr.Boom port for RetroArch/Libretro and SDL2.
 
 Mr.Boom is a Bomberman clone for the [RetroArch platform](http://www.retroarch.com) and was converted from DOS assembly using [asm2c](https://github.com/frranck/asm2c).
 
-It runs on all RetroArch platforms: Android, Linux, Mac Os X, Nintendo Gamecube (NGC), Nintendo Wii, Raspberry Pi, Sony Playstation 3 (PS3), Sony Playstation Portable (PSP), Windows, Xbox, Xbox360...
+It runs on all RetroArch platforms: Android, Linux, Mac OS X, Nintendo Gamecube (NGC), Nintendo Switch, Nintendo Wii, Raspberry Pi, Sony Playstation 3 (PS3), Sony Playstation Portable (PSP), Windows, Xbox, Xbox360...
 
 It can also be compiled as a stand-alone version using SDL2.
 
@@ -12,7 +12,7 @@ Mr.Boom supports up to 8 players and features like netplay, AI bots [(new C++ fe
 
 Check the [Downloading and Playing Mr. Boom Core](https://youtu.be/_0rw36mA9mM) video.
 
-You can find netplay games by joining the [retroarch discord channel](https://discord.gg/011l9DB6qWt9B4bzO) or #mrboom on freenode!
+You can find netplay games by joining the [retroarch discord channel](https://discord.gg/011l9DB6qWt9B4bzO).
 
 ### Options available:
 
@@ -61,12 +61,7 @@ make clean
 make mrboom LIBSDL2=1 MINGW=mingw64
 ```
 
-### Libretro packages are available:
-
-- In the optional section from [Retropie](https://retropie.org.uk).
-- At the third-party Gentoo overlay [Abendbrot](https://github.com/stefan-gr/abendbrot).
-
-### SDL2 packages:
+### Packages available:
 
 [![Packaging status](https://repology.org/badge/vertical-allrepos/mrboom.svg)](https://repology.org/metapackage/mrboom)
 

diff --git a/common.hpp b/common.hpp
@@ -10,7 +10,7 @@
 extern "C" {
 #endif
 #define GAME_NAME            "Mr.Boom"
-#define GAME_VERSION         "4.5"
+#define GAME_VERSION         "4.6"
 #define PATH_MAX_LENGTH      256
 #define WIDTH                320
 #define HEIGHT               200

diff --git a/mrboom.c b/mrboom.c
@@ -436,7 +436,7 @@ Memory m = {
 {114,115,112,113,82,83,125,((0-1)),20,21,16,30,57,15,58,((0-1)),0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, //touches_
 {119,101,108,99,111,109,101,32,116,111,32,109,114,46,98,111,111,109,32,118,52,46,50,32,42}, //tected
 {32,32,112,108,97,121,101,114,115,32,99,97,110,32,106,111,105,110,32,116,104,101,32,103,97,109,101,32,117,115,105,110,103,32,116,104,101,105,114,32,97,99,116,105,111,110,32,107,101,121,115,46,46,46,32,32}, //tecte
-{32,32,117,115,101,32,116,104,101,32,98,32,98,117,116,116,111,110,32,116,111,32,100,114,111,112,32,97,32,98,111,109,98,32,32,32,97,32,116,111,32,116,114,105,103,103,101,114,32,116,104,101,32,98,111,109,98,32,114,101,109,111,116,101,32,99,111,110,116,114,111,108,32,32,32,120,32,116,111,32,106,117,109,112,32,40,105,102,32,121,111,117,32,97,114,101,32,114,105,100,105,110,103,32,97,32,107,97,110,103,97,114,111,111,41,32,32,32,115,101,108,101,99,116,32,116,111,32,97,100,100,32,97,32,98,111,109,98,101,114,45,98,111,116,32,32,32,115,116,97,114,116,32,116,111,32,115,116,97,114,116,33,32,32,32,103,114,97,112,104,105,99,115,32,98,121,32,122,97,97,99,32,101,120,111,99,101,116,32,101,97,115,121,32,97,110,100,32,109,97,114,98,108,101,109,97,100,32,32,32,109,117,115,105,99,115,32,98,121,32,52,45,109,97,116,32,99,97,114,116,101,114,32,104,101,97,116,98,101,97,116,32,113,117,97,122,97,114,32,106,101,115,116,101,114,32,101,115,116,114,97,121,107,32,114,101,122,32,97,110,100,32,107,101,110,101,116,32,32,40,99,41,32,49,57,57,55,45,50,48,49,56,32,114,101,109,100,121,32,115,111,102,116,119,97,114,101,46,32,32,32,32,32,40,119,114,97,112,32,116,105,109,101,41,32,32,219}, //dummy299
+{32,32,117,115,101,32,116,104,101,32,98,32,98,117,116,116,111,110,32,116,111,32,100,114,111,112,32,97,32,98,111,109,98,32,32,32,97,32,116,111,32,116,114,105,103,103,101,114,32,116,104,101,32,98,111,109,98,32,114,101,109,111,116,101,32,99,111,110,116,114,111,108,32,32,32,120,32,116,111,32,106,117,109,112,32,40,105,102,32,121,111,117,32,97,114,101,32,114,105,100,105,110,103,32,97,32,107,97,110,103,97,114,111,111,41,32,32,32,115,101,108,101,99,116,32,116,111,32,97,100,100,32,97,32,98,111,109,98,101,114,45,98,111,116,32,32,32,115,116,97,114,116,32,116,111,32,115,116,97,114,116,33,32,32,32,103,114,97,112,104,105,99,115,32,98,121,32,122,97,97,99,32,101,120,111,99,101,116,32,101,97,115,121,32,97,110,100,32,109,97,114,98,108,101,109,97,100,32,32,32,109,117,115,105,99,115,32,98,121,32,52,45,109,97,116,32,99,97,114,116,101,114,32,104,101,97,116,98,101,97,116,32,113,117,97,122,97,114,32,106,101,115,116,101,114,32,101,115,116,114,97,121,107,32,114,101,122,32,97,110,100,32,107,101,110,101,116,32,32,40,99,41,32,49,57,57,55,45,50,48,49,57,32,114,101,109,100,121,32,115,111,102,116,119,97,114,101,46,32,32,32,32,32,40,119,114,97,112,32,116,105,109,101,41,32,32,219}, //dummy299
 {0}, //dummy300
 {32,106,111,105,110,32}, //message1
 {32,32,117,115,32,32}, //dummy301

diff --git a/tests/statetests/state00000.mem b/tests/statetests/state00000.mem