[Scummvm-cvs-logs] CVS: scummvm/saga render.cpp,1.19,1.20 render.h,1.11,1.12 saga.cpp,1.27,1.28

Jonathan Gray khalek at users.sourceforge.net
Sun Aug 1 05:07:01 CEST 2004


Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16455

Modified Files:
	render.cpp render.h saga.cpp 
Log Message:
init _gfx in a less hacky manner

Index: render.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/render.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- render.cpp	1 Aug 2004 11:48:53 -0000	1.19
+++ render.cpp	1 Aug 2004 12:06:12 -0000	1.20
@@ -49,16 +49,18 @@
 	return R_SUCCESS;
 }
 
-Render::Render(SagaEngine *vm, OSystem *system) : _vm(vm), _system(system), _initialized(false) {
+Render::Render(SagaEngine *vm, OSystem *system, Gfx *gfx) {
+	_vm = vm;
+	_system = system;
+	_gfx = gfx;
+	_initialized = false;
+
 	R_GAME_DISPLAYINFO disp_info;
 	int tmp_w, tmp_h, tmp_bytepp;
 
 	// Initialize system graphics
 	GAME_GetDisplayInfo(&disp_info);
 
-	_vm->_gfx = new Gfx(system, disp_info.logical_w, disp_info.logical_h);
-	_gfx = _vm->_gfx;
-
 	// Initialize FPS timer callback
 	g_timer->installTimerProc(&fpsTimerCallback, 1000000, this);
 

Index: render.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/render.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- render.h	1 Aug 2004 11:48:53 -0000	1.11
+++ render.h	1 Aug 2004 12:06:12 -0000	1.12
@@ -52,7 +52,7 @@
 class Render {
 public:
 	int reg(void);
-	Render(SagaEngine *vm, OSystem *system);
+	Render(SagaEngine *vm, OSystem *system, Gfx *gfx);
 	~Render(void);
 	bool initialized();
 	int drawScene(void);

Index: saga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- saga.cpp	1 Aug 2004 01:56:21 -0000	1.27
+++ saga.cpp	1 Aug 2004 12:06:12 -0000	1.28
@@ -33,7 +33,7 @@
 #include "saga.h"
 
 #include "timer.h"
-#include "gfx_mod.h"
+#include "gfx.h"
 #include "rscfile_mod.h"
 #include "render.h"
 #include "actor_mod.h"
@@ -191,7 +191,11 @@
 	}
 
 	// Initialize graphics
-	_render = new Render(this, _system);
+	R_GAME_DISPLAYINFO disp_info;
+	GAME_GetDisplayInfo(&disp_info);
+	_gfx = new Gfx(_system, disp_info.logical_w, disp_info.logical_h);
+
+	_render = new Render(this, _system, _gfx);
 	if (!_render->initialized()) {
 		return;
 	}





More information about the Scummvm-git-logs mailing list