Remove stray #pragma once lines, update PGE emscripten build so it handles mouse scrolling proper. Add emscripten run script. Build 3146.

Crawler/CharacterInfoWindow.cpp

@@ -31,7 +31,6 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
 */
 #pragma endregion
-#pragma once
 #include "Crawler.h"
 #include "DEFINES.h"
 #include "Menu.h"

Crawler/ClassSelectionWindow.cpp

@@ -31,7 +31,6 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
 */
 #pragma endregion
-#pragma once
 #include "Crawler.h"
 #include "DEFINES.h"
 #include "Menu.h"

Crawler/Crawler.cpp

@@ -1110,7 +1110,7 @@ void Crawler::RenderWorld(float fElapsedTime){
 			if(dn->lifeTime<=1){
 				if(dn->lifeTime<DamageNumber::MOVE_UP_TIME){
 					if(dn->invertedDirection){
-						dn->pos.y+=20*fElapsedTime;
+						dn->pos.y+=40*fElapsedTime;
 					}else{
 						dn->pos.y-=20*fElapsedTime;
 					}
@@ -2129,7 +2129,9 @@ void Crawler::SetLoadoutItem(int slot,std::string itemName){
 		switch(slot){
 			case 0:{
 				itemAbility.action=[&](Player*p,vf2d pos={}){
-					return game->UseLoadoutItem(0);
+					bool itemUsed=game->UseLoadoutItem(0);
+
+					return itemUsed;
 				};
 				game->GetPlayer()->SetItem1UseFunc(itemAbility);
 			}break;

Crawler/InventoryConsumableWindow.cpp

@@ -31,7 +31,6 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
 */
 #pragma endregion
-#pragma once
 #include "Crawler.h"
 #include "olcPixelGameEngine.h"
 #include "safemap.h"

Crawler/ItemLoadoutWindow.cpp

@@ -31,7 +31,6 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
 */
 #pragma endregion
-#pragma once
 #include "Crawler.h"
 #include "DEFINES.h"
 #include "Menu.h"

Crawler/MainMenuWindow.cpp

@@ -31,7 +31,6 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
 */
 #pragma endregion
-#pragma once
 #include "Crawler.h"
 #include "DEFINES.h"
 #include "Menu.h"

Crawler/Menu.h

@@ -58,11 +58,6 @@ enum MenuType{
     ///////////////////////////////////////////////////////////
 };
 
-template<typename T>
-T*Component(MenuType menu,std::string componentName){
-    return (T*)Menu::menus[menu]->components[componentName];
-}
-
 class Menu:public IAttributable{
     friend class Crawler;
     friend class Player;
@@ -146,6 +141,11 @@ private:
     static bool cover; //A black cover for when a menu pops up to fade out the stuff behind it.
 };
 
+template<typename T>
+T*Component(MenuType menu,std::string componentName){
+    return (T*)Menu::menus[menu]->components[componentName];
+}
+
 struct MenuFuncData{
     Menu&menu;
     Crawler*game;

Crawler/OverworldMapLevelWindow.cpp

@@ -31,7 +31,6 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
 */
 #pragma endregion
-#pragma once
 #include "Crawler.h"
 #include "DEFINES.h"
 #include "Menu.h"

Crawler/State_OverworldMap.cpp

@@ -31,7 +31,6 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
 */
 #pragma endregion
-#pragma once
 #include "State_OverworldMap.h"
 #include "Crawler.h"
 #include "DEFINES.h"

Crawler/Version.h

@@ -35,7 +35,7 @@ SUCH DAMAGE.
 #define VERSION_MAJOR 0
 #define VERSION_MINOR 2
 #define VERSION_PATCH 1
-#define VERSION_BUILD 3137
+#define VERSION_BUILD 3146
 
 #define stringify(a) stringify_(a)
 #define stringify_(a) #a

Crawler/emscripten_run.ps1

@@ -0,0 +1,2 @@
+~\Documents\emsdk\emsdk_env.ps1 activate latest
+emrun play.html

Crawler/olcPixelGameEngine.h

@@ -6607,13 +6607,13 @@ namespace olc
 			// Move
 			if (eventType == EMSCRIPTEN_EVENT_TOUCHMOVE)
 			{
-				ptrPGE->olc_UpdateMouse(e->touches->targetX-ptrPGE->GetWindowPos().x, e->touches->targetY-ptrPGE->GetWindowPos().y);
+				ptrPGE->olc_UpdateMouse(e->touches->targetX-ptrPGE->GetWindowPos().x-EM_ASM_INT({return window.scrollX}), e->touches->targetY-ptrPGE->GetWindowPos().y-EM_ASM_INT({return window.scrollY}));
 			}
 
 			// Start
 			if (eventType == EMSCRIPTEN_EVENT_TOUCHSTART)
 			{
-				ptrPGE->olc_UpdateMouse(e->touches->targetX-ptrPGE->GetWindowPos().x, e->touches->targetY-ptrPGE->GetWindowPos().y);
+				ptrPGE->olc_UpdateMouse(e->touches->targetX-ptrPGE->GetWindowPos().x-EM_ASM_INT({return window.scrollX}), e->touches->targetY-ptrPGE->GetWindowPos().y-EM_ASM_INT({return window.scrollY}));
 				ptrPGE->olc_UpdateMouseState(0, true);
 			}
 
@@ -6631,7 +6631,7 @@ namespace olc
 		{
 			//Mouse Movement
 			if (eventType == EMSCRIPTEN_EVENT_MOUSEMOVE)
-				ptrPGE->olc_UpdateMouse(e->targetX-ptrPGE->GetWindowPos().x, e->targetY-ptrPGE->GetWindowPos().y);
+				ptrPGE->olc_UpdateMouse(e->targetX-ptrPGE->GetWindowPos().x-EM_ASM_INT({return window.scrollX}), e->targetY-ptrPGE->GetWindowPos().y-EM_ASM_INT({return window.scrollY}));
 
 
 			//Mouse button press