diff --git a/Assets/Images/Game/Stages/WhompFortress/bg.png b/Assets/Images/Game/Stages/WhompFortress/bg.png new file mode 100644 index 00000000..a56760db Binary files /dev/null and b/Assets/Images/Game/Stages/WhompFortress/bg.png differ diff --git a/Assets/Images/Game/Stages/WhompFortress/bgplatform.png b/Assets/Images/Game/Stages/WhompFortress/bgplatform.png new file mode 100644 index 00000000..038c276d Binary files /dev/null and b/Assets/Images/Game/Stages/WhompFortress/bgplatform.png differ diff --git a/Assets/Images/Game/Stages/WhompFortress/bumper.png b/Assets/Images/Game/Stages/WhompFortress/bumper.png new file mode 100644 index 00000000..739790ba Binary files /dev/null and b/Assets/Images/Game/Stages/WhompFortress/bumper.png differ diff --git a/Assets/Images/Game/Stages/WhompFortress/fg.png b/Assets/Images/Game/Stages/WhompFortress/fg.png new file mode 100644 index 00000000..080e32af Binary files /dev/null and b/Assets/Images/Game/Stages/WhompFortress/fg.png differ diff --git a/Assets/Images/Game/Stages/WhompFortress/floatplat.png b/Assets/Images/Game/Stages/WhompFortress/floatplat.png new file mode 100644 index 00000000..53ccd994 Binary files /dev/null and b/Assets/Images/Game/Stages/WhompFortress/floatplat.png differ diff --git a/Assets/Images/Game/Stages/WhompFortress/mg.png b/Assets/Images/Game/Stages/WhompFortress/mg.png new file mode 100644 index 00000000..913c0eef Binary files /dev/null and b/Assets/Images/Game/Stages/WhompFortress/mg.png differ diff --git a/Assets/Images/Game/Stages/WhompFortress/plat.png b/Assets/Images/Game/Stages/WhompFortress/plat.png new file mode 100644 index 00000000..bc46fcea Binary files /dev/null and b/Assets/Images/Game/Stages/WhompFortress/plat.png differ diff --git a/Assets/Images/Game/Stages/WhompFortress/plat2.png b/Assets/Images/Game/Stages/WhompFortress/plat2.png new file mode 100644 index 00000000..ce0f97ef Binary files /dev/null and b/Assets/Images/Game/Stages/WhompFortress/plat2.png differ diff --git a/Assets/Images/Game/Stages/WhompFortress/platform.png b/Assets/Images/Game/Stages/WhompFortress/platform.png new file mode 100644 index 00000000..66d661b3 Binary files /dev/null and b/Assets/Images/Game/Stages/WhompFortress/platform.png differ diff --git a/Assets/Images/Game/Stages/WhompFortress/slides.png b/Assets/Images/Game/Stages/WhompFortress/slides.png new file mode 100644 index 00000000..9cf3d2c6 Binary files /dev/null and b/Assets/Images/Game/Stages/WhompFortress/slides.png differ diff --git a/Assets/Images/Menus/StageSelect/whompfortress.png b/Assets/Images/Menus/StageSelect/whompfortress.png new file mode 100644 index 00000000..a2ad3a79 Binary files /dev/null and b/Assets/Images/Menus/StageSelect/whompfortress.png differ diff --git a/Assets/Music/Mario 64/Whomp Fortress.ogg b/Assets/Music/Mario 64/Whomp Fortress.ogg new file mode 100644 index 00000000..4f20ae5e Binary files /dev/null and b/Assets/Music/Mario 64/Whomp Fortress.ogg differ diff --git a/Projects/VisualStudio/iSSB.vcxproj b/Projects/VisualStudio/iSSB.vcxproj index 73d1140d..5cc782d5 100755 --- a/Projects/VisualStudio/iSSB.vcxproj +++ b/Projects/VisualStudio/iSSB.vcxproj @@ -1,104 +1,106 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 16.0 - Win32Proj - {f19aa7c0-292a-4552-ab81-72bd03639b82} - iSSB - 10.0 - - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - - - - - - - - - - - - - - - - - - - true - - - false - - - true - - - false - - - - Level3 - true - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;SMASHBROS_SCRIPT_DISABLE;%(PreprocessorDefinitions) - true - ../../External/ChaiScript/include;../../External/SDL/SDL/include;../../External/SDL/SDL_image;../../External/SDL/SDL_image/VisualC/external/include;../../External/SDL/SDL_mixer/include;../../External/SDL/SDL_ttf;../../External/SDL/SDL_gfx;../../External/SDL/SDL_p2p/include;../../External/dirent/include;../../External/PlistCpp/include;../../External/PlistCpp/src;%(AdditionalIncludeDirectories) - stdcpp20 - - - Console - true - - - %(AdditionalDependencies) - - + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 16.0 + Win32Proj + {f19aa7c0-292a-4552-ab81-72bd03639b82} + iSSB + 10.0 + + + + Application + true + v142 + Unicode + + + Application + false + v142 + true + Unicode + + + Application + true + v142 + Unicode + + + Application + false + v142 + true + Unicode + + + + + + + + + + + + + + + + + + + + + true + + + false + + + true + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(VCInstallDir)include;$(VCInstallDir)atlmfc\include; + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(VCInstallDir)include;$(VCInstallDir)atlmfc\include; + + + false + + + + Level3 + true + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;SMASHBROS_SCRIPT_DISABLE;%(PreprocessorDefinitions) + true + ../../External/ChaiScript/include;../../External/SDL/SDL/include;../../External/SDL/SDL_image;../../External/SDL/SDL_image/VisualC/external/include;../../External/SDL/SDL_mixer/include;../../External/SDL/SDL_ttf;../../External/SDL/SDL_gfx;../../External/SDL/SDL_p2p/include;../../External/dirent/include;../../External/PlistCpp/include;../../External/PlistCpp/src;%(AdditionalIncludeDirectories) + stdcpp20 + + + Console + true + + + %(AdditionalDependencies) + + rmdir $(OutDir)Images $(OutDir)Sounds $(OutDir)Fonts $(OutDir)Music /q /s || set errorlevel=0 mkdir $(OutDir)Images mkdir $(OutDir)Fonts @@ -107,30 +109,30 @@ mkdir $(OutDir)Sounds xcopy /y /s "..\..\Assets\Images" $(OutDir)Images xcopy /y /s "..\..\Assets\Fonts" $(OutDir)Fonts xcopy /y /s "..\..\Assets\Music" $(OutDir)Music -xcopy /y /s "..\..\Assets\Sounds" $(OutDir)Sounds - - - - - Level3 - true - true - true - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;SMASHBROS_SCRIPT_DISABLE;%(PreprocessorDefinitions) - true - ../../External/ChaiScript/include;../../External/SDL/SDL/include;../../External/SDL/SDL_image;../../External/SDL/SDL_image/VisualC/external/include;../../External/SDL/SDL_mixer/include;../../External/SDL/SDL_ttf;../../External/SDL/SDL_gfx;../../External/SDL/SDL_p2p/include;../../External/dirent/include;../../External/PlistCpp/include;../../External/PlistCpp/src;%(AdditionalIncludeDirectories) - stdcpp20 - - - Console - true - true - true - - - %(AdditionalDependencies) - - +xcopy /y /s "..\..\Assets\Sounds" $(OutDir)Sounds + + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;SMASHBROS_SCRIPT_DISABLE;%(PreprocessorDefinitions) + true + ../../External/ChaiScript/include;../../External/SDL/SDL/include;../../External/SDL/SDL_image;../../External/SDL/SDL_image/VisualC/external/include;../../External/SDL/SDL_mixer/include;../../External/SDL/SDL_ttf;../../External/SDL/SDL_gfx;../../External/SDL/SDL_p2p/include;../../External/dirent/include;../../External/PlistCpp/include;../../External/PlistCpp/src;%(AdditionalIncludeDirectories) + stdcpp20 + + + Console + true + true + true + + + %(AdditionalDependencies) + + rmdir $(OutDir)Images $(OutDir)Sounds $(OutDir)Fonts $(OutDir)Music /q /s || set errorlevel=0 mkdir $(OutDir)Images mkdir $(OutDir)Fonts @@ -139,26 +141,26 @@ mkdir $(OutDir)Sounds xcopy /y /s "..\..\Assets\Images" $(OutDir)Images xcopy /y /s "..\..\Assets\Fonts" $(OutDir)Fonts xcopy /y /s "..\..\Assets\Music" $(OutDir)Music -xcopy /y /s "..\..\Assets\Sounds" $(OutDir)Sounds - - - - - Level3 - true - _DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;SMASHBROS_SCRIPT_DISABLE;%(PreprocessorDefinitions) - true - ../../External/ChaiScript/include;../../External/SDL/SDL/include;../../External/SDL/SDL_image;../../External/SDL/SDL_image/VisualC/external/include;../../External/SDL/SDL_mixer/include;../../External/SDL/SDL_ttf;../../External/SDL/SDL_gfx;../../External/SDL/SDL_p2p/include;../../External/dirent/include;../../External/PlistCpp/include;../../External/PlistCpp/src;%(AdditionalIncludeDirectories) - stdcpp20 - - - Console - true - - - %(AdditionalDependencies) - - +xcopy /y /s "..\..\Assets\Sounds" $(OutDir)Sounds + + + + + Level3 + true + _DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;SMASHBROS_SCRIPT_DISABLE;%(PreprocessorDefinitions) + true + ../../External/ChaiScript/include;../../External/SDL/SDL/include;../../External/SDL/SDL_image;../../External/SDL/SDL_image/VisualC/external/include;../../External/SDL/SDL_mixer/include;../../External/SDL/SDL_ttf;../../External/SDL/SDL_gfx;../../External/SDL/SDL_p2p/include;../../External/dirent/include;../../External/PlistCpp/include;../../External/PlistCpp/src;%(AdditionalIncludeDirectories) + stdcpp20 + + + Console + true + + + %(AdditionalDependencies) + + rmdir $(OutDir)Images $(OutDir)Sounds $(OutDir)Fonts $(OutDir)Music /q /s || set errorlevel=0 mkdir $(OutDir)Images mkdir $(OutDir)Fonts @@ -167,30 +169,30 @@ mkdir $(OutDir)Sounds xcopy /y /s "..\..\Assets\Images" $(OutDir)Images xcopy /y /s "..\..\Assets\Fonts" $(OutDir)Fonts xcopy /y /s "..\..\Assets\Music" $(OutDir)Music -xcopy /y /s "..\..\Assets\Sounds" $(OutDir)Sounds - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;SMASHBROS_SCRIPT_DISABLE;%(PreprocessorDefinitions) - true - ../../External/ChaiScript/include;../../External/SDL/SDL/include;../../External/SDL/SDL_image;../../External/SDL/SDL_image/VisualC/external/include;../../External/SDL/SDL_mixer/include;../../External/SDL/SDL_ttf;../../External/SDL/SDL_gfx;../../External/SDL/SDL_p2p/include;../../External/dirent/include;../../External/PlistCpp/include;../../External/PlistCpp/src;%(AdditionalIncludeDirectories) - stdcpp20 - - - Console - true - true - true - - - %(AdditionalDependencies) - - +xcopy /y /s "..\..\Assets\Sounds" $(OutDir)Sounds + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;SMASHBROS_SCRIPT_DISABLE;%(PreprocessorDefinitions) + true + ../../External/ChaiScript/include;../../External/SDL/SDL/include;../../External/SDL/SDL_image;../../External/SDL/SDL_image/VisualC/external/include;../../External/SDL/SDL_mixer/include;../../External/SDL/SDL_ttf;../../External/SDL/SDL_gfx;../../External/SDL/SDL_p2p/include;../../External/dirent/include;../../External/PlistCpp/include;../../External/PlistCpp/src;%(AdditionalIncludeDirectories) + stdcpp20 + + + Console + true + true + true + + + %(AdditionalDependencies) + + rmdir $(OutDir)Images $(OutDir)Sounds $(OutDir)Fonts $(OutDir)Music /q /s || set errorlevel=0 mkdir $(OutDir)Images mkdir $(OutDir)Fonts @@ -199,308 +201,310 @@ mkdir $(OutDir)Sounds xcopy /y /s "..\..\Assets\Images" $(OutDir)Images xcopy /y /s "..\..\Assets\Fonts" $(OutDir)Fonts xcopy /y /s "..\..\Assets\Music" $(OutDir)Music -xcopy /y /s "..\..\Assets\Sounds" $(OutDir)Sounds - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - - +xcopy /y /s "..\..\Assets\Sounds" $(OutDir)Sounds + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + + + + \ No newline at end of file diff --git a/Projects/VisualStudio/iSSB.vcxproj.filters b/Projects/VisualStudio/iSSB.vcxproj.filters index ce79e1fd..c79f6776 100755 --- a/Projects/VisualStudio/iSSB.vcxproj.filters +++ b/Projects/VisualStudio/iSSB.vcxproj.filters @@ -1,944 +1,950 @@ - - - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx - - - {8b4a8b6b-9b0d-485b-bfe9-2395e27508b7} - - - {8755406c-279c-48ba-a5e2-f04fa8bf6f1a} - - - {ac9a6da2-8044-48d4-bbc9-9d1d0bf1915e} - - - {84b7a8a3-0bf1-4d23-be56-468cfb416b1b} - - - {45f08c33-b3de-4ba2-a7e0-d960d51b0b73} - - - {8cdaeeb1-f1bd-401f-b25d-14d974928835} - - - {40d593d2-1347-4dfa-abf1-b9113bb075f1} - - - {cfeeceb8-d543-452a-9d92-c81108fced4e} - - - {a318a0a3-660e-4801-b292-f4b241136fb1} - - - {54f6f245-4b3c-46bd-950f-dbcb1fa3a864} - - - {4191eb65-0319-4a59-a5d6-832c75ed04f1} - - - {ebcc7515-5df6-4171-bf65-b19af4fb96ac} - - - {995d2e1a-1ad5-4209-8621-f5afbcd970a6} - - - {b172c1e0-ae48-49ff-ab5e-0bc32e453a74} - - - {a0ad8f17-1b81-4be6-b371-2867d557ee30} - - - {68489aae-dfa3-43df-ad6c-ac7cc3066f9b} - - - {f08d10b7-12e1-47ff-ae90-f4a46f54bf53} - - - {64d8c8ed-7635-4dcc-86e5-4481c3ab2c19} - - - {a35ccbd1-0bd4-4d1e-9c47-acef04ad4032} - - - {07baa175-b6d4-4123-a538-337faf2c6ace} - - - {86eae762-63a4-4aaf-b16c-b4b803a00f4b} - - - {30a6c63e-bfa3-407f-b590-201972981ee4} - - - {71c10688-afa8-4814-a11c-27abf5d4f912} - - - {f71efef2-1ab8-4e9d-bfb1-106fbc83555a} - - - {127f29b3-65dc-4487-a362-8a5d83354d46} - - - {76fd9852-731d-4f83-9eda-f7c19d84dabf} - - - {eebe2d33-4566-43cf-8219-fc232006d2ee} - - - {6fab49b1-31bc-4fbc-bc69-2436ac9aa72f} - - - {ceaf66b9-2531-49d9-a5b2-396362d41773} - - - {bfe4e19d-d6e8-4965-81ef-c86708001d71} - - - {46004194-2ef0-4516-9015-18e9e6ff2c20} - - - {8e02b2ef-afb2-4f8a-ae3c-b4e0ab3764dd} - - - {bf30f317-bf55-4835-9db6-e822a3130b1d} - - - {91fa6fa2-9230-42e4-b936-cec33e4ce47f} - - - {77d36977-014d-40b0-bf47-75a922bd8c06} - - - {0adfd660-cfcd-476c-9020-ec773344efc8} - - - {16827ffd-d922-44bd-b13a-703bbfc4ad3a} - - - {6e103523-2cb4-4cc4-8373-d8b3f2a086fe} - - - - - Source\GameEngine\Actor - - - Source\GameEngine\Actor - - - Source\GameEngine\Actor - - - Source\GameEngine\Actor - - - Source\GameEngine\Actor - - - Source\GameEngine\Actor - - - Source\GameEngine\CodeBridge - - - Source\GameEngine\CodeBridge - - - Source\GameEngine\Graphics - - - Source\GameEngine\Input - - - Source\GameEngine\Input - - - Source\GameEngine\Output - - - Source\GameEngine\ScreenManager - - - Source\GameEngine\ScreenManager - - - Source\GameEngine\ScreenManager - - - Source\GameEngine\Sound - - - Source\GameEngine\Sound - - - Source\GameEngine\Util - - - Source\GameEngine\Util - - - Source\GameEngine\Util - - - Source\GameEngine\Util - - - Source\GameEngine\Util - - - Source\GameEngine\Util - - - Source\GameEngine\Util - - - Source\GameEngine\Util - - - Source\GameEngine\Util - - - Source\GameEngine\Util - - - Source\GameEngine\Util - - - Source\GameEngine\Util - - - Source\GameEngine - - - Source\GameEngine - - - Source\GameEngine - - - Source\GameEngine - - - Source\GameEngine - - - Source\GameEngine - - - Source\ScriptModule - - - Source\ScriptModule - - - Source\ScriptModule - - - Source\ScriptModule\modules\GameEngine\inherit - - - Source\ScriptModule\modules\GameEngine\inherit - - - Source\ScriptModule\modules\GameEngine\inherit - - - Source\ScriptModule\modules\GameEngine\inherit - - - Source\ScriptModule\modules\GameEngine\inherit - - - Source\ScriptModule\modules\GameEngine - - - Source\ScriptModule\modules\GameEngine - - - Source\ScriptModule\modules\GameEngine - - - Source\ScriptModule\modules\GameEngine - - - Source\ScriptModule\modules\GameEngine - - - Source\ScriptModule\modules\GameEngine - - - Source\ScriptModule\modules\GameEngine - - - Source\ScriptModule\modules\GameEngine - - - Source\ScriptModule\modules\SmashBros\inherit - - - Source\ScriptModule\modules\SmashBros\inherit - - - Source\ScriptModule\modules\SmashBros\inherit - - - Source\ScriptModule\modules\SmashBros - - - Source\ScriptModule\modules\SmashBros - - - Source\ScriptModule\modules\SmashBros - - - Source\ScriptModule\modules\SmashBros - - - Source\ScriptModule\modules\SmashBros - - - Source\SmashBros\Game\Stages\StagePieces - - - Source\SmashBros\Game\Stages\StagePieces - - - Source\SmashBros\Game\Stages\StagePieces - - - Source\SmashBros\Game\Stages - - - Source\SmashBros\Game\Stages - - - Source\SmashBros\Game\Stages - - - Source\SmashBros\Game\Stages - - - Source\SmashBros\Game\Stages - - - Source\SmashBros\Game\Stages - - - Source\SmashBros\Game\Characters - - - Source\SmashBros\Game\Characters - - - Source\SmashBros\Game\Characters - - - Source\SmashBros\Game\Characters - - - Source\SmashBros\Game\Characters - - - Source\SmashBros\Game\Characters - - - Source\SmashBros\Game\Items - - - Source\SmashBros\Game\Items - - - Source\SmashBros\Game\Items - - - Source\SmashBros\Game\Items - - - Source\SmashBros\Game\Items - - - Source\SmashBros\Game\Items - - - Source\SmashBros\Game - - - Source\SmashBros\Game - - - Source\SmashBros\Menus\MenuPieces - - - Source\SmashBros\Menus\MenuPieces - - - Source\SmashBros\Menus\MenuPieces - - - Source\SmashBros\Menus\MenuPieces - - - Source\SmashBros\Menus\MenuPieces - - - Source\SmashBros\Menus\MenuPieces - - - Source\SmashBros\Menus\MenuPieces - - - Source\SmashBros\Menus\MenuPieces - - - Source\SmashBros\Menus\MenuPieces - - - Source\SmashBros\Menus\MenuPieces - - - Source\SmashBros\Menus - - - Source\SmashBros\Menus - - - Source\SmashBros\Menus - - - Source\SmashBros\Menus - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source - - - Source - - - External\PlistCpp\src - - - External\PlistCpp\src - - - External\PlistCpp\src - - - External\SDL\SDL_gfx - - - External\SDL\SDL_gfx - - - External\SDL\SDL_gfx - - - External\SDL\SDL_gfx - - - External\SDL\SDL_p2p\src - - - - - Source\GameEngine\Actor - - - Source\GameEngine\Actor - - - Source\GameEngine\Actor - - - Source\GameEngine\Actor - - - Source\GameEngine\Actor - - - Source\GameEngine\Actor - - - Source\GameEngine\CodeBridge - - - Source\GameEngine\CodeBridge - - - Source\GameEngine\Graphics - - - Source\GameEngine\Input - - - Source\GameEngine\Input - - - Source\GameEngine\Input - - - Source\GameEngine\Output - - - Source\GameEngine\ScreenManager - - - Source\GameEngine\ScreenManager - - - Source\GameEngine\ScreenManager - - - Source\GameEngine\Sound - - - Source\GameEngine\Sound - - - Source\GameEngine\Util - - - Source\GameEngine\Util - - - Source\GameEngine\Util - - - Source\GameEngine\Util - - - Source\GameEngine\Util - - - Source\GameEngine\Util - - - Source\GameEngine\Util - - - Source\GameEngine\Util - - - Source\GameEngine\Util - - - Source\GameEngine\Util - - - Source\GameEngine\Util - - - Source\GameEngine\Util - - - Source\GameEngine\Util - - - Source\GameEngine\Util - - - Source\GameEngine - - - Source\GameEngine - - - Source\GameEngine - - - Source\GameEngine - - - Source\GameEngine - - - Source\GameEngine - - - Source\GameEngine - - - Source\GameEngine - - - Source\ScriptModule - - - Source\ScriptModule - - - Source\ScriptModule - - - Source\ScriptModule - - - Source\ScriptModule\modules\GameEngine\inherit - - - Source\ScriptModule\modules\GameEngine\inherit - - - Source\ScriptModule\modules\GameEngine\inherit - - - Source\ScriptModule\modules\GameEngine\inherit - - - Source\ScriptModule\modules\GameEngine\inherit - - - Source\ScriptModule\modules\GameEngine - - - Source\ScriptModule\modules\GameEngine - - - Source\ScriptModule\modules\GameEngine - - - Source\ScriptModule\modules\GameEngine - - - Source\ScriptModule\modules\SmashBros\inherit - - - Source\ScriptModule\modules\SmashBros\inherit - - - Source\ScriptModule\modules\SmashBros\inherit - - - Source\ScriptModule\modules\SmashBros - - - Source\SmashBros\Game\Stages\StagePieces - - - Source\SmashBros\Game\Stages\StagePieces - - - Source\SmashBros\Game\Stages\StagePieces - - - Source\SmashBros\Game\Stages - - - Source\SmashBros\Game\Stages - - - Source\SmashBros\Game\Stages - - - Source\SmashBros\Game\Stages - - - Source\SmashBros\Game\Stages - - - Source\SmashBros\Game\Stages - - - Source\SmashBros\Game\Characters - - - Source\SmashBros\Game\Characters - - - Source\SmashBros\Game\Characters - - - Source\SmashBros\Game\Characters - - - Source\SmashBros\Game\Characters - - - Source\SmashBros\Game\Characters - - - Source\SmashBros\Game\Items - - - Source\SmashBros\Game\Items - - - Source\SmashBros\Game\Items - - - Source\SmashBros\Game\Items - - - Source\SmashBros\Game\Items - - - Source\SmashBros\Game\Items - - - Source\SmashBros\Game - - - Source\SmashBros\Game - - - Source\SmashBros\Menus\MenuPieces - - - Source\SmashBros\Menus\MenuPieces - - - Source\SmashBros\Menus\MenuPieces - - - Source\SmashBros\Menus\MenuPieces - - - Source\SmashBros\Menus\MenuPieces - - - Source\SmashBros\Menus\MenuPieces - - - Source\SmashBros\Menus\MenuPieces - - - Source\SmashBros\Menus\MenuPieces - - - Source\SmashBros\Menus\MenuPieces - - - Source\SmashBros\Menus\MenuPieces - - - Source\SmashBros\Menus - - - Source\SmashBros\Menus - - - Source\SmashBros\Menus - - - Source\SmashBros\Menus - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source\SmashBros - - - Source - - - External\PlistCpp\src - - - External\PlistCpp\src - - - External\PlistCpp\src - - - External\PlistCpp\src - - - External\PlistCpp\src - - - External\SDL\SDL_gfx - - - External\SDL\SDL_gfx - - - External\SDL\SDL_gfx - - - External\SDL\SDL_gfx - - - External\SDL\SDL_gfx - - - External\SDL\SDL_p2p\include - - - - - Source\GameEngine\Util - - - External\SDL\SDL_image\VisualC\external\lib\x86 - - - External\SDL\SDL_image\VisualC\external\lib\x86 - - - External\SDL\SDL_image\VisualC\external\lib\x86 - - - External\SDL\SDL_image\VisualC\external\lib\x86 - - - External\SDL\SDL_image\VisualC\external\lib\x86 - - - External\SDL\SDL_image\VisualC\external\lib\x64 - - - External\SDL\SDL_image\VisualC\external\lib\x64 - - - External\SDL\SDL_image\VisualC\external\lib\x64 - - - External\SDL\SDL_image\VisualC\external\lib\x64 - - - External\SDL\SDL_image\VisualC\external\lib\x64 - - - + + + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {8b4a8b6b-9b0d-485b-bfe9-2395e27508b7} + + + {8755406c-279c-48ba-a5e2-f04fa8bf6f1a} + + + {ac9a6da2-8044-48d4-bbc9-9d1d0bf1915e} + + + {84b7a8a3-0bf1-4d23-be56-468cfb416b1b} + + + {45f08c33-b3de-4ba2-a7e0-d960d51b0b73} + + + {8cdaeeb1-f1bd-401f-b25d-14d974928835} + + + {40d593d2-1347-4dfa-abf1-b9113bb075f1} + + + {cfeeceb8-d543-452a-9d92-c81108fced4e} + + + {a318a0a3-660e-4801-b292-f4b241136fb1} + + + {54f6f245-4b3c-46bd-950f-dbcb1fa3a864} + + + {4191eb65-0319-4a59-a5d6-832c75ed04f1} + + + {ebcc7515-5df6-4171-bf65-b19af4fb96ac} + + + {995d2e1a-1ad5-4209-8621-f5afbcd970a6} + + + {b172c1e0-ae48-49ff-ab5e-0bc32e453a74} + + + {a0ad8f17-1b81-4be6-b371-2867d557ee30} + + + {68489aae-dfa3-43df-ad6c-ac7cc3066f9b} + + + {f08d10b7-12e1-47ff-ae90-f4a46f54bf53} + + + {64d8c8ed-7635-4dcc-86e5-4481c3ab2c19} + + + {a35ccbd1-0bd4-4d1e-9c47-acef04ad4032} + + + {07baa175-b6d4-4123-a538-337faf2c6ace} + + + {86eae762-63a4-4aaf-b16c-b4b803a00f4b} + + + {30a6c63e-bfa3-407f-b590-201972981ee4} + + + {71c10688-afa8-4814-a11c-27abf5d4f912} + + + {f71efef2-1ab8-4e9d-bfb1-106fbc83555a} + + + {127f29b3-65dc-4487-a362-8a5d83354d46} + + + {76fd9852-731d-4f83-9eda-f7c19d84dabf} + + + {eebe2d33-4566-43cf-8219-fc232006d2ee} + + + {6fab49b1-31bc-4fbc-bc69-2436ac9aa72f} + + + {ceaf66b9-2531-49d9-a5b2-396362d41773} + + + {bfe4e19d-d6e8-4965-81ef-c86708001d71} + + + {46004194-2ef0-4516-9015-18e9e6ff2c20} + + + {8e02b2ef-afb2-4f8a-ae3c-b4e0ab3764dd} + + + {bf30f317-bf55-4835-9db6-e822a3130b1d} + + + {91fa6fa2-9230-42e4-b936-cec33e4ce47f} + + + {77d36977-014d-40b0-bf47-75a922bd8c06} + + + {0adfd660-cfcd-476c-9020-ec773344efc8} + + + {16827ffd-d922-44bd-b13a-703bbfc4ad3a} + + + {6e103523-2cb4-4cc4-8373-d8b3f2a086fe} + + + + + Source\GameEngine\Actor + + + Source\GameEngine\Actor + + + Source\GameEngine\Actor + + + Source\GameEngine\Actor + + + Source\GameEngine\Actor + + + Source\GameEngine\Actor + + + Source\GameEngine\CodeBridge + + + Source\GameEngine\CodeBridge + + + Source\GameEngine\Graphics + + + Source\GameEngine\Input + + + Source\GameEngine\Input + + + Source\GameEngine\Output + + + Source\GameEngine\ScreenManager + + + Source\GameEngine\ScreenManager + + + Source\GameEngine\ScreenManager + + + Source\GameEngine\Sound + + + Source\GameEngine\Sound + + + Source\GameEngine\Util + + + Source\GameEngine\Util + + + Source\GameEngine\Util + + + Source\GameEngine\Util + + + Source\GameEngine\Util + + + Source\GameEngine\Util + + + Source\GameEngine\Util + + + Source\GameEngine\Util + + + Source\GameEngine\Util + + + Source\GameEngine\Util + + + Source\GameEngine\Util + + + Source\GameEngine\Util + + + Source\GameEngine + + + Source\GameEngine + + + Source\GameEngine + + + Source\GameEngine + + + Source\GameEngine + + + Source\GameEngine + + + Source\ScriptModule + + + Source\ScriptModule + + + Source\ScriptModule + + + Source\ScriptModule\modules\GameEngine\inherit + + + Source\ScriptModule\modules\GameEngine\inherit + + + Source\ScriptModule\modules\GameEngine\inherit + + + Source\ScriptModule\modules\GameEngine\inherit + + + Source\ScriptModule\modules\GameEngine\inherit + + + Source\ScriptModule\modules\GameEngine + + + Source\ScriptModule\modules\GameEngine + + + Source\ScriptModule\modules\GameEngine + + + Source\ScriptModule\modules\GameEngine + + + Source\ScriptModule\modules\GameEngine + + + Source\ScriptModule\modules\GameEngine + + + Source\ScriptModule\modules\GameEngine + + + Source\ScriptModule\modules\GameEngine + + + Source\ScriptModule\modules\SmashBros\inherit + + + Source\ScriptModule\modules\SmashBros\inherit + + + Source\ScriptModule\modules\SmashBros\inherit + + + Source\ScriptModule\modules\SmashBros + + + Source\ScriptModule\modules\SmashBros + + + Source\ScriptModule\modules\SmashBros + + + Source\ScriptModule\modules\SmashBros + + + Source\ScriptModule\modules\SmashBros + + + Source\SmashBros\Game\Stages\StagePieces + + + Source\SmashBros\Game\Stages\StagePieces + + + Source\SmashBros\Game\Stages\StagePieces + + + Source\SmashBros\Game\Stages + + + Source\SmashBros\Game\Stages + + + Source\SmashBros\Game\Stages + + + Source\SmashBros\Game\Stages + + + Source\SmashBros\Game\Stages + + + Source\SmashBros\Game\Stages + + + Source\SmashBros\Game\Characters + + + Source\SmashBros\Game\Characters + + + Source\SmashBros\Game\Characters + + + Source\SmashBros\Game\Characters + + + Source\SmashBros\Game\Characters + + + Source\SmashBros\Game\Characters + + + Source\SmashBros\Game\Items + + + Source\SmashBros\Game\Items + + + Source\SmashBros\Game\Items + + + Source\SmashBros\Game\Items + + + Source\SmashBros\Game\Items + + + Source\SmashBros\Game\Items + + + Source\SmashBros\Game + + + Source\SmashBros\Game + + + Source\SmashBros\Menus\MenuPieces + + + Source\SmashBros\Menus\MenuPieces + + + Source\SmashBros\Menus\MenuPieces + + + Source\SmashBros\Menus\MenuPieces + + + Source\SmashBros\Menus\MenuPieces + + + Source\SmashBros\Menus\MenuPieces + + + Source\SmashBros\Menus\MenuPieces + + + Source\SmashBros\Menus\MenuPieces + + + Source\SmashBros\Menus\MenuPieces + + + Source\SmashBros\Menus\MenuPieces + + + Source\SmashBros\Menus + + + Source\SmashBros\Menus + + + Source\SmashBros\Menus + + + Source\SmashBros\Menus + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source + + + Source + + + External\PlistCpp\src + + + External\PlistCpp\src + + + External\PlistCpp\src + + + External\SDL\SDL_gfx + + + External\SDL\SDL_gfx + + + External\SDL\SDL_gfx + + + External\SDL\SDL_gfx + + + External\SDL\SDL_p2p\src + + + Source\SmashBros\Game\Stages + + + + + Source\GameEngine\Actor + + + Source\GameEngine\Actor + + + Source\GameEngine\Actor + + + Source\GameEngine\Actor + + + Source\GameEngine\Actor + + + Source\GameEngine\Actor + + + Source\GameEngine\CodeBridge + + + Source\GameEngine\CodeBridge + + + Source\GameEngine\Graphics + + + Source\GameEngine\Input + + + Source\GameEngine\Input + + + Source\GameEngine\Input + + + Source\GameEngine\Output + + + Source\GameEngine\ScreenManager + + + Source\GameEngine\ScreenManager + + + Source\GameEngine\ScreenManager + + + Source\GameEngine\Sound + + + Source\GameEngine\Sound + + + Source\GameEngine\Util + + + Source\GameEngine\Util + + + Source\GameEngine\Util + + + Source\GameEngine\Util + + + Source\GameEngine\Util + + + Source\GameEngine\Util + + + Source\GameEngine\Util + + + Source\GameEngine\Util + + + Source\GameEngine\Util + + + Source\GameEngine\Util + + + Source\GameEngine\Util + + + Source\GameEngine\Util + + + Source\GameEngine\Util + + + Source\GameEngine\Util + + + Source\GameEngine + + + Source\GameEngine + + + Source\GameEngine + + + Source\GameEngine + + + Source\GameEngine + + + Source\GameEngine + + + Source\GameEngine + + + Source\GameEngine + + + Source\ScriptModule + + + Source\ScriptModule + + + Source\ScriptModule + + + Source\ScriptModule + + + Source\ScriptModule\modules\GameEngine\inherit + + + Source\ScriptModule\modules\GameEngine\inherit + + + Source\ScriptModule\modules\GameEngine\inherit + + + Source\ScriptModule\modules\GameEngine\inherit + + + Source\ScriptModule\modules\GameEngine\inherit + + + Source\ScriptModule\modules\GameEngine + + + Source\ScriptModule\modules\GameEngine + + + Source\ScriptModule\modules\GameEngine + + + Source\ScriptModule\modules\GameEngine + + + Source\ScriptModule\modules\SmashBros\inherit + + + Source\ScriptModule\modules\SmashBros\inherit + + + Source\ScriptModule\modules\SmashBros\inherit + + + Source\ScriptModule\modules\SmashBros + + + Source\SmashBros\Game\Stages\StagePieces + + + Source\SmashBros\Game\Stages\StagePieces + + + Source\SmashBros\Game\Stages\StagePieces + + + Source\SmashBros\Game\Stages + + + Source\SmashBros\Game\Stages + + + Source\SmashBros\Game\Stages + + + Source\SmashBros\Game\Stages + + + Source\SmashBros\Game\Stages + + + Source\SmashBros\Game\Stages + + + Source\SmashBros\Game\Characters + + + Source\SmashBros\Game\Characters + + + Source\SmashBros\Game\Characters + + + Source\SmashBros\Game\Characters + + + Source\SmashBros\Game\Characters + + + Source\SmashBros\Game\Characters + + + Source\SmashBros\Game\Items + + + Source\SmashBros\Game\Items + + + Source\SmashBros\Game\Items + + + Source\SmashBros\Game\Items + + + Source\SmashBros\Game\Items + + + Source\SmashBros\Game\Items + + + Source\SmashBros\Game + + + Source\SmashBros\Game + + + Source\SmashBros\Menus\MenuPieces + + + Source\SmashBros\Menus\MenuPieces + + + Source\SmashBros\Menus\MenuPieces + + + Source\SmashBros\Menus\MenuPieces + + + Source\SmashBros\Menus\MenuPieces + + + Source\SmashBros\Menus\MenuPieces + + + Source\SmashBros\Menus\MenuPieces + + + Source\SmashBros\Menus\MenuPieces + + + Source\SmashBros\Menus\MenuPieces + + + Source\SmashBros\Menus\MenuPieces + + + Source\SmashBros\Menus + + + Source\SmashBros\Menus + + + Source\SmashBros\Menus + + + Source\SmashBros\Menus + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source\SmashBros + + + Source + + + External\PlistCpp\src + + + External\PlistCpp\src + + + External\PlistCpp\src + + + External\PlistCpp\src + + + External\PlistCpp\src + + + External\SDL\SDL_gfx + + + External\SDL\SDL_gfx + + + External\SDL\SDL_gfx + + + External\SDL\SDL_gfx + + + External\SDL\SDL_gfx + + + External\SDL\SDL_p2p\include + + + Source\SmashBros\Game\Stages + + + + + Source\GameEngine\Util + + + External\SDL\SDL_image\VisualC\external\lib\x86 + + + External\SDL\SDL_image\VisualC\external\lib\x86 + + + External\SDL\SDL_image\VisualC\external\lib\x86 + + + External\SDL\SDL_image\VisualC\external\lib\x86 + + + External\SDL\SDL_image\VisualC\external\lib\x86 + + + External\SDL\SDL_image\VisualC\external\lib\x64 + + + External\SDL\SDL_image\VisualC\external\lib\x64 + + + External\SDL\SDL_image\VisualC\external\lib\x64 + + + External\SDL\SDL_image\VisualC\external\lib\x64 + + + External\SDL\SDL_image\VisualC\external\lib\x64 + + + \ No newline at end of file diff --git a/Source/SmashBros/Game/Stages/WhompFortress.cpp b/Source/SmashBros/Game/Stages/WhompFortress.cpp new file mode 100644 index 00000000..6e41e636 --- /dev/null +++ b/Source/SmashBros/Game/Stages/WhompFortress.cpp @@ -0,0 +1,148 @@ + +#include "WhompFortress.h" + +namespace SmashBros +{ + WhompFortress::WhompFortress(float x1, float y1) : Stage(x1, y1) + { + setSpawnPoint(0, 0,0); + setSpawnPoint(1, -110,-110); + setSpawnPoint(2, 110,-110); + setSpawnPoint(3, 50, -10); + setSpawnPoint(4, -50, -10); + + bottomViewBorder = 295; + topViewBorder = -340; + leftViewBorder = -372; + rightViewBorder = 372; + + leftBorder = -500; + topBorder = -430; + rightBorder = 500; + bottomBorder = 250; + + setItemBoundaries(-350, -160, 350, 100); + //showItemBoundaries(true); + + loadGameElements(); + loadPlatforms(); + loadHangPoints(); + loadForeground(); + loadGround(); + + setBackground("Images/Game/Stages/WhompFortress/bg.png"); + setBackgroundScale(1.45); + setBackgroundType(BG_FIXED); + + //setWireframeColor(Color.blue); + //showWireframes(true); + + MusicManager::loadSong("Whomp Fortress"); + } + + WhompFortress::~WhompFortress() + { + // + } + + void WhompFortress::loadGameElements() + { + GameElement* bg; + + bg = new GameElement(-15, -100); + Animation* anim = new Animation("normal", 1, 1, 1); + anim->addFrame("Images/Game/Stages/WhompFortress/mg.png"); + bg->addAnimation(anim); + bg->changeAnimation("normal", FORWARD); + addElement(bg); + } + + void WhompFortress::loadPlatforms() + { + Platform* plat; + + plat = new Platform(Platform::TYPE_GOTHROUGH, 1, 25); + plat->addAnimation(new Animation("normal", 1, "Images/Game/Stages/WhompFortress/floatplat.png")); + plat->changeAnimation("normal", FORWARD); + plat->setVisible(false); + addPlatform(plat); + + plat = new Platform(Platform::TYPE_NORMAL, 0,100); + Animation*anim; + anim = new Animation("normal", 5, 38, 1); + anim->addFrame("Images/Game/Stages/WhompFortress/platform.png"); + plat->addAnimation(anim); + plat->changeAnimation("normal", FORWARD); + plat->setVisible(false); + addPlatform(plat); + + plat = new Platform(Platform::TYPE_NORMAL, 1, 25); + plat->addAnimation(new Animation("normal", 1, "Images/Game/Stages/WhompFortress/plat.png")); + plat->changeAnimation("normal", FORWARD); + plat->setVisible(false); + addPlatform(plat); + + plat = new Platform(Platform::TYPE_NORMAL, -15, -83); + plat->addAnimation(new Animation("normal", 1, "Images/Game/Stages/WhompFortress/plat2.png")); + plat->changeAnimation("normal", FORWARD); + plat->setVisible(false); + addPlatform(plat); + + plat = new Platform(Platform::TYPE_NORMAL, 0,-140); + plat->addAnimation(new Animation("normal",1,"Images/Game/Stages/WhompFortress/slides.png")); + plat->changeAnimation("normal", FORWARD); + plat->setVisible(false); + addPlatform(plat); + + plat = new Platform(Platform::TYPE_NORMAL, -15, -240); + plat->addAnimation(new Animation("normal", 1, "Images/Game/Stages/WhompFortress/bumper.png")); + plat->changeAnimation("normal", FORWARD); + plat->setVisible(false); + addPlatform(plat); + } + + void WhompFortress::loadForeground() + { + GameElement* foreground; + + foreground = new GameElement(0, 180); + foreground->addAnimation(new Animation("normal", 4, "Images/Game/Stages/WhompFortress/bgplatform.png")); + foreground->changeAnimation("normal", FORWARD); + addForeground(foreground); + + foreground = new GameElement(1, 25); + foreground->addAnimation(new Animation("normal", 4, "Images/Game/Stages/WhompFortress/fg.png")); + foreground->changeAnimation("normal", FORWARD); + addForeground(foreground); + } + + void WhompFortress::loadHangPoints() + { + HangPoint*hp; + + // left platform + hp = new HangPoint(HangPoint::LEFT,-140,25); + //hp->setVisible(true); + //hp->setFilled(true); + //hp->setColor(Color::GREEN); + addHangPoint(hp); + + // right platform + hp = new HangPoint(HangPoint::RIGHT,105,25); + //hp->setVisible(true); + //hp->setFilled(true); + //hp->setColor(Color::GREEN); + addHangPoint(hp); + } + + void WhompFortress::loadGround() + { + } + + void WhompFortress::Draw(Graphics2D&g, long gameTime) + { + Stage::Draw(g, gameTime); + } + + +} diff --git a/Source/SmashBros/Game/Stages/WhompFortress.h b/Source/SmashBros/Game/Stages/WhompFortress.h new file mode 100644 index 00000000..2ec95449 --- /dev/null +++ b/Source/SmashBros/Game/Stages/WhompFortress.h @@ -0,0 +1,30 @@ + +#include "../../Stage.h" + +#pragma once + +namespace SmashBros +{ + class WhompFortress : public Stage + { + private: + class RandomThing : public GameElement + { + public: + RandomThing(); + RandomThing(boolean create); + virtual ~RandomThing(); + }; + void loadGameElements(); + void loadPlatforms(); + void loadForeground(); + void loadHangPoints(); + void loadGround(); + + public: + WhompFortress(float x1, float y1); + ~WhompFortress(); + + virtual void Draw(Graphics2D&g, long gameTime); + }; +} diff --git a/Source/SmashBros/Global.h b/Source/SmashBros/Global.h index b830bb35..494fb865 100755 --- a/Source/SmashBros/Global.h +++ b/Source/SmashBros/Global.h @@ -84,7 +84,7 @@ namespace SmashBros static const int totalCharacters = 6; static const int totalItems = 6; - static const int totalStages = 5; + static const int totalStages = 6; //CHARACTER CONSTANTS static const int CHAR_MARIO = 1; @@ -101,6 +101,7 @@ namespace SmashBros static const int STAGE_FINALDESTINATION = 3; static const int STAGE_HYRULETEMPLE = 4; static const int STAGE_CORNERIA = 5; + static const int STAGE_WHOMPFORTRESS = 6; //ITEM CONSTANTS static const int ITEM_CUSTOM = 0; diff --git a/Source/SmashBros/Loader.cpp b/Source/SmashBros/Loader.cpp index 118dd57b..2b5f69ff 100755 --- a/Source/SmashBros/Loader.cpp +++ b/Source/SmashBros/Loader.cpp @@ -14,6 +14,7 @@ #include "Game/Stages/FinalDestinationBrawl.h" #include "Game/Stages/HyruleTemple.h" #include "Game/Stages/Corneria.h" +#include "Game/Stages/WhompFortress.h" #ifndef SMASHBROS_SCRIPT_DISABLE #include "../ScriptModule/ScriptManager.h" @@ -134,6 +135,7 @@ namespace SmashBros case Global::CHAR_LINK: p = new Link(x1,y1,playerNo,team); p->charNo = Global::CHAR_LINK; + break; } return p; } @@ -341,6 +343,9 @@ namespace SmashBros case Global::STAGE_CORNERIA: return "corneria.png"; + + case Global::STAGE_WHOMPFORTRESS: + return "whompfortress.png"; } } @@ -370,7 +375,9 @@ namespace SmashBros case Global::STAGE_CORNERIA: return new Corneria(x1,y1); - + + case Global::STAGE_WHOMPFORTRESS: + return new WhompFortress(x1,y1); default: #ifndef SMASHBROS_SCRIPT_DISABLE if(stageNum > Global::totalStages) diff --git a/Source/SmashBros/Menus/Menus.cpp b/Source/SmashBros/Menus/Menus.cpp index 1fc20959..eda8837c 100755 --- a/Source/SmashBros/Menus/Menus.cpp +++ b/Source/SmashBros/Menus/Menus.cpp @@ -198,6 +198,8 @@ namespace SmashBros MusicManager::addSong("Zelda Theme", "Music/Legend of Zelda/Main Theme.ogg"); MusicManager::addSong("Zelda Theme Remix", "Music/Legend of Zelda/Main Theme Remix.ogg"); + MusicManager::addSong("Whomp Fortress", "Music/Mario 64/Whomp Fortress.ogg"); + MusicManager::loadSong("Main Theme"); //Loading sounds