[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
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga actionmap.cpp,1.16,1.17 actor.cpp,1.15,1.16 animation.cpp,1.17,1.18 console.cpp,1.7,1.8 cvar.cpp,1.8,1.9 events.cpp,1.14,1.15 font.cpp,1.11,1.12 gfx.cpp,1.21,1.22 gfx.h,1.5,1.6 ihnm_introproc.cpp,1.9,1.10 input.cpp,1.5,1.6 interface.cpp,1.11,1.12 isomap.cpp,1.9,1.10 ite_introproc.cpp,1.13,1.14 objectmap.cpp,1.11,1.12 palanim.cpp,1.9,1.10 render.cpp,1.18,1.19 render.h,1.10,1.11 saga.h,1.19,1.20 scene.cpp,1.17,1.18 script.cpp,1.10,1.11 sdata.cpp,1.7,1.8 sdebug.cpp,1.5,1.6 sfuncs.cpp,1.7,1.8 sprite.cpp,1.10,1.11 sstack.cpp,1.4,1.5 sthread.cpp,1.10,1.11 text.cpp,1.3,1.4 gfx_mod.h,1.7,NONE
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga actionmap.cpp,1.17,1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
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;
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga actionmap.cpp,1.16,1.17 actor.cpp,1.15,1.16 animation.cpp,1.17,1.18 console.cpp,1.7,1.8 cvar.cpp,1.8,1.9 events.cpp,1.14,1.15 font.cpp,1.11,1.12 gfx.cpp,1.21,1.22 gfx.h,1.5,1.6 ihnm_introproc.cpp,1.9,1.10 input.cpp,1.5,1.6 interface.cpp,1.11,1.12 isomap.cpp,1.9,1.10 ite_introproc.cpp,1.13,1.14 objectmap.cpp,1.11,1.12 palanim.cpp,1.9,1.10 render.cpp,1.18,1.19 render.h,1.10,1.11 saga.h,1.19,1.20 scene.cpp,1.17,1.18 script.cpp,1.10,1.11 sdata.cpp,1.7,1.8 sdebug.cpp,1.5,1.6 sfuncs.cpp,1.7,1.8 sprite.cpp,1.10,1.11 sstack.cpp,1.4,1.5 sthread.cpp,1.10,1.11 text.cpp,1.3,1.4 gfx_mod.h,1.7,NONE
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga actionmap.cpp,1.17,1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list