xaymar/BlitzNext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

gxruntime/gxgraphics: Replace ddSurf with IDirectDrawSurface7

Browse Source
This commit is contained in:
Michael Fabian 'Xaymar' Dirks
2019-01-17 16:59:42 +01:00
parent ffccbd5907
commit 22c38213a0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gxruntime/gxgraphics.cpp
+3 -3
View File
@@ -190,7 +190,7 @@ void gxGraphics::closeMovie(gxMovie *m) {
} }
gxCanvas *gxGraphics::createCanvas(int w, int h, int flags) { gxCanvas *gxGraphics::createCanvas(int w, int h, int flags) {
ddSurf *s = ddUtil::createSurface(w, h, flags, this); IDirectDrawSurface7 *s = ddUtil::createSurface(w, h, flags, this);
if (!s) return 0; if (!s) return 0;
gxCanvas *c = new gxCanvas(this, s, flags); gxCanvas *c = new gxCanvas(this, s, flags);
canvas_set.insert(c); canvas_set.insert(c);
@@ -199,7 +199,7 @@ gxCanvas *gxGraphics::createCanvas(int w, int h, int flags) {
} }
gxCanvas *gxGraphics::loadCanvas(const string &f, int flags) { gxCanvas *gxGraphics::loadCanvas(const string &f, int flags) {
ddSurf *s = ddUtil::loadSurface(f, flags, this); IDirectDrawSurface7 *s = ddUtil::loadSurface(f, flags, this);
if (!s) return 0; if (!s) return 0;
gxCanvas *c = new gxCanvas(this, s, flags); gxCanvas *c = new gxCanvas(this, s, flags);
canvas_set.insert(c); canvas_set.insert(c);
@@ -311,7 +311,7 @@ gxFont *gxGraphics::loadFont(const string &f, int height, int flags) {
int cw = max_x, ch = y + height; int cw = max_x, ch = y + height;
if (gxCanvas *c = createCanvas(cw, ch, 0)) { if (gxCanvas *c = createCanvas(cw, ch, 0)) {
ddSurf *surf = c->getSurface(); IDirectDrawSurface7 *surf = c->getSurface();
HDC surf_hdc; HDC surf_hdc;
if (surf->GetDC(&surf_hdc) >= 0) { if (surf->GetDC(&surf_hdc) >= 0) {
gxruntime/gxgraphics.h
+2 -2
View File
@@ -54,8 +54,8 @@ private:
gxMesh *dummy_mesh; gxMesh *dummy_mesh;
DDSURFACEDESC2 initDesc(int w, int h, int flags); DDSURFACEDESC2 initDesc(int w, int h, int flags);
ddSurf *createSurface(int width, int height, int flags); IDirectDrawSurface7 *createSurface(int width, int height, int flags);
ddSurf *loadSurface(const std::string &f, int flags); IDirectDrawSurface7 *loadSurface(const std::string &f, int flags);
std::set<gxFont*> font_set; std::set<gxFont*> font_set;
std::set<gxCanvas*> canvas_set; std::set<gxCanvas*> canvas_set;