fixed bugs

orkhasnat · Jul 18, 2021 · 2030739 · 2030739
1 parent b74f5a0
commit 2030739
Show file tree

Hide file tree

Showing 180 changed files with 25,311 additions and 63 deletions.
diff --git a/bin/openal32.dll b/bin/openal32.dll
diff --git a/bin/sfml-audio-2.dll b/bin/sfml-audio-2.dll
diff --git a/bin/sfml-graphics-2.dll b/bin/sfml-graphics-2.dll
diff --git a/bin/sfml-system-2.dll b/bin/sfml-system-2.dll
diff --git a/bin/sfml-window-2.dll b/bin/sfml-window-2.dll
diff --git a/data/audio/burst.ogg b/data/audio/burst.ogg
diff --git a/data/audio/intro.ogg b/data/audio/intro.ogg
diff --git a/data/audio/playing.ogg b/data/audio/playing.ogg
diff --git a/data/font/arial.ttf b/data/font/arial.ttf
diff --git a/data/img/Platform.jpg b/data/img/Platform.jpg
diff --git a/data/img/Spike.png b/data/img/Spike.png
diff --git a/data/img/Spikes_Flip.png b/data/img/Spikes_Flip.png
diff --git a/data/img/bg/0.jpg b/data/img/bg/0.jpg
diff --git a/data/img/bg/1.jpg b/data/img/bg/1.jpg
diff --git a/data/img/bg/2.jpg b/data/img/bg/2.jpg
diff --git a/data/img/bg/3.jpg b/data/img/bg/3.jpg
diff --git a/data/img/bg/4.jpg b/data/img/bg/4.jpg
diff --git a/data/img/bg/5.jpg b/data/img/bg/5.jpg
diff --git a/data/img/bg/6.jpg b/data/img/bg/6.jpg
diff --git a/data/img/bg/7.jpg b/data/img/bg/7.jpg
diff --git a/data/img/intro/0.jpg b/data/img/intro/0.jpg
diff --git a/data/img/intro/1.jpg b/data/img/intro/1.jpg
diff --git a/data/img/intro/10.jpg b/data/img/intro/10.jpg
diff --git a/data/img/intro/11.jpg b/data/img/intro/11.jpg
diff --git a/data/img/intro/12.jpg b/data/img/intro/12.jpg
diff --git a/data/img/intro/13.jpg b/data/img/intro/13.jpg
diff --git a/data/img/intro/14.jpg b/data/img/intro/14.jpg
diff --git a/data/img/intro/15.jpg b/data/img/intro/15.jpg
diff --git a/data/img/intro/16.jpg b/data/img/intro/16.jpg
diff --git a/data/img/intro/17.jpg b/data/img/intro/17.jpg
diff --git a/data/img/intro/2.jpg b/data/img/intro/2.jpg
diff --git a/data/img/intro/3.jpg b/data/img/intro/3.jpg
diff --git a/data/img/intro/4.jpg b/data/img/intro/4.jpg
diff --git a/data/img/intro/5.jpg b/data/img/intro/5.jpg
diff --git a/data/img/intro/6.jpg b/data/img/intro/6.jpg
diff --git a/data/img/intro/7.jpg b/data/img/intro/7.jpg
diff --git a/data/img/intro/8.jpg b/data/img/intro/8.jpg
diff --git a/data/img/intro/9.jpg b/data/img/intro/9.jpg
diff --git a/include/Ball.hpp b/include/Ball.hpp
@@ -8,7 +8,6 @@
 
 class Ball
 {
-    const int weight;
     int isBouncing, isProtected, isBoosted;
     Platform *standingOn;
     friend class Game;

diff --git a/include/Game.hpp b/include/Game.hpp
@@ -16,6 +16,8 @@ class Game
     std::deque<Platform *> platforms;
     Ball *ball;
     sf::RectangleShape frame;
+    sf::Texture texture;
+    sf::Sprite spikes;
     sf::Music playing;
     friend void Coin::bonus(int *_score);
     friend void Gem::bonus(int *_life);

diff --git a/include/Platform.hpp b/include/Platform.hpp
@@ -12,11 +12,12 @@
 class Platform
 {
 protected:
-    const int width;
+    int width;
     int ballx;
     Item *item;
     PlatformType platformtype;
     ItemType itemtype;
+    sf::Texture texture;
 
 public:
     sf::Sprite sprite;

diff --git a/include/SFML/Audio.hpp b/include/SFML/Audio.hpp
@@ -0,0 +1,56 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2018 Laurent Gomila ([email protected])
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+#ifndef SFML_AUDIO_HPP
+#define SFML_AUDIO_HPP
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+
+#include <SFML/System.hpp>
+#include <SFML/Audio/InputSoundFile.hpp>
+#include <SFML/Audio/Listener.hpp>
+#include <SFML/Audio/Music.hpp>
+#include <SFML/Audio/OutputSoundFile.hpp>
+#include <SFML/Audio/Sound.hpp>
+#include <SFML/Audio/SoundBuffer.hpp>
+#include <SFML/Audio/SoundBufferRecorder.hpp>
+#include <SFML/Audio/SoundFileFactory.hpp>
+#include <SFML/Audio/SoundFileReader.hpp>
+#include <SFML/Audio/SoundFileWriter.hpp>
+#include <SFML/Audio/SoundRecorder.hpp>
+#include <SFML/Audio/SoundSource.hpp>
+#include <SFML/Audio/SoundStream.hpp>
+
+
+#endif // SFML_AUDIO_HPP
+
+////////////////////////////////////////////////////////////
+/// \defgroup audio Audio module
+///
+/// Sounds, streaming (musics or custom sources), recording,
+/// spatialization.
+///
+////////////////////////////////////////////////////////////
diff --git a/include/SFML/Audio/AlResource.hpp b/include/SFML/Audio/AlResource.hpp
@@ -0,0 +1,70 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2018 Laurent Gomila ([email protected])
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+#ifndef SFML_ALRESOURCE_HPP
+#define SFML_ALRESOURCE_HPP
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/Audio/Export.hpp>
+
+
+namespace sf
+{
+////////////////////////////////////////////////////////////
+/// \brief Base class for classes that require an OpenAL context
+///
+////////////////////////////////////////////////////////////
+class SFML_AUDIO_API AlResource
+{
+protected:
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Default constructor
+    ///
+    ////////////////////////////////////////////////////////////
+    AlResource();
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Destructor
+    ///
+    ////////////////////////////////////////////////////////////
+    ~AlResource();
+};
+
+} // namespace sf
+
+
+#endif // SFML_ALRESOURCE_HPP
+
+////////////////////////////////////////////////////////////
+/// \class sf::AlResource
+/// \ingroup audio
+///
+/// This class is for internal use only, it must be the base
+/// of every class that requires a valid OpenAL context in
+/// order to work.
+///
+////////////////////////////////////////////////////////////
diff --git a/include/SFML/Audio/Export.hpp b/include/SFML/Audio/Export.hpp
@@ -0,0 +1,48 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2018 Laurent Gomila ([email protected])
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+#ifndef SFML_AUDIO_EXPORT_HPP
+#define SFML_AUDIO_EXPORT_HPP
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/Config.hpp>
+
+
+////////////////////////////////////////////////////////////
+// Define portable import / export macros
+////////////////////////////////////////////////////////////
+#if defined(SFML_AUDIO_EXPORTS)
+
+    #define SFML_AUDIO_API SFML_API_EXPORT
+
+#else
+
+    #define SFML_AUDIO_API SFML_API_IMPORT
+
+#endif
+
+
+#endif // SFML_AUDIO_EXPORT_HPP