projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added ugly workaround for Console crash at startup
[supertux.git]
/
src
/
video
/
surface.cpp
diff --git
a/src/video/surface.cpp
b/src/video/surface.cpp
index
790aa3f
..
2214293
100644
(file)
--- a/
src/video/surface.cpp
+++ b/
src/video/surface.cpp
@@
-21,7
+21,7
@@
#include <SDL.h>
#include "video/texture.hpp"
#include <SDL.h>
#include "video/texture.hpp"
-#include "video/video_system
s
.hpp"
+#include "video/video_system.hpp"
SurfacePtr
Surface::create(const std::string& file)
SurfacePtr
Surface::create(const std::string& file)
@@
-36,23
+36,23
@@
Surface::create(const std::string& file, const Rect& rect)
}
Surface::Surface(const std::string& file) :
}
Surface::Surface(const std::string& file) :
- texture(
texture_manager
->get(file)),
+ texture(
TextureManager::current()
->get(file)),
surface_data(),
rect(0, 0,
Size(texture->get_image_width(),
texture->get_image_height())),
flipx(false)
{
surface_data(),
rect(0, 0,
Size(texture->get_image_width(),
texture->get_image_height())),
flipx(false)
{
- surface_data = VideoSystem::new_surface_data(*this);
+ surface_data = VideoSystem::
current()->
new_surface_data(*this);
}
Surface::Surface(const std::string& file, const Rect& rect_) :
}
Surface::Surface(const std::string& file, const Rect& rect_) :
- texture(
texture_manager
->get(file, rect_)),
+ texture(
TextureManager::current()
->get(file, rect_)),
surface_data(),
rect(0, 0, Size(rect_.get_width(), rect_.get_height())),
flipx(false)
{
surface_data(),
rect(0, 0, Size(rect_.get_width(), rect_.get_height())),
flipx(false)
{
- surface_data = VideoSystem::new_surface_data(*this);
+ surface_data = VideoSystem::
current()->
new_surface_data(*this);
}
Surface::Surface(const Surface& rhs) :
}
Surface::Surface(const Surface& rhs) :
@@
-61,12
+61,12
@@
Surface::Surface(const Surface& rhs) :
rect(rhs.rect),
flipx(false)
{
rect(rhs.rect),
flipx(false)
{
- surface_data = VideoSystem::new_surface_data(*this);
+ surface_data = VideoSystem::
current()->
new_surface_data(*this);
}
Surface::~Surface()
{
}
Surface::~Surface()
{
- VideoSystem::free_surface_data(surface_data);
+ VideoSystem::
current()->
free_surface_data(surface_data);
}
SurfacePtr
}
SurfacePtr