thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: Move Gui/Gfx related permanent objects from EngineState to SciEngine

Browse source 
svn-id: r48047
This commit is contained in:
Max Horn 2010-02-13 17:43:31 +00:00
parent ac4d325e0d
commit 721a57a661
14 changed files with 212 additions and 222 deletions
Download patch file Download diff file Expand all files Collapse all files

16
engines/sci/engine/kernel32.cpp
View file

@ -668,7 +668,7 @@ reg_t kSave(EngineState *s, int argc, reg_t *argv) {
reg_t kAddScreenItem(EngineState *s, int argc, reg_t *argv) {
reg_t viewObj = argv[0];
s->_gfxFrameout->kernelAddScreenItem(viewObj);
g_sci->_gfxFrameout->kernelAddScreenItem(viewObj);
return NULL_REG;
}
@ -682,7 +682,7 @@ reg_t kUpdateScreenItem(EngineState *s, int argc, reg_t *argv) {
reg_t kDeleteScreenItem(EngineState *s, int argc, reg_t *argv) {
reg_t viewObj = argv[0];
s->_gfxFrameout->kernelDeleteScreenItem(viewObj);
g_sci->_gfxFrameout->kernelDeleteScreenItem(viewObj);
/*
reg_t viewObj = argv[0];
@ -704,7 +704,7 @@ reg_t kDeleteScreenItem(EngineState *s, int argc, reg_t *argv) {
reg_t kAddPlane(EngineState *s, int argc, reg_t *argv) {
reg_t planeObj = argv[0];
s->_gfxFrameout->kernelAddPlane(planeObj);
g_sci->_gfxFrameout->kernelAddPlane(planeObj);
warning("kAddPlane object %04x:%04x", PRINT_REG(planeObj));
return NULL_REG;
}
@ -712,7 +712,7 @@ reg_t kAddPlane(EngineState *s, int argc, reg_t *argv) {
reg_t kDeletePlane(EngineState *s, int argc, reg_t *argv) {
reg_t planeObj = argv[0];
s->_gfxFrameout->kernelDeletePlane(planeObj);
g_sci->_gfxFrameout->kernelDeletePlane(planeObj);
warning("kDeletePlane object %04x:%04x", PRINT_REG(planeObj));
return NULL_REG;
}
@ -720,7 +720,7 @@ reg_t kDeletePlane(EngineState *s, int argc, reg_t *argv) {
reg_t kUpdatePlane(EngineState *s, int argc, reg_t *argv) {
reg_t planeObj = argv[0];
s->_gfxFrameout->kernelUpdatePlane(planeObj);
g_sci->_gfxFrameout->kernelUpdatePlane(planeObj);
return s->r_acc;
}
@ -734,8 +734,8 @@ reg_t kRepaintPlane(EngineState *s, int argc, reg_t *argv) {
}
reg_t kGetHighPlanePri(EngineState *s, int argc, reg_t *argv) {
warning("kGetHighPlanePri: %d", s->_gfxFrameout->kernelGetHighPlanePri());
return make_reg(0, s->_gfxFrameout->kernelGetHighPlanePri());
warning("kGetHighPlanePri: %d", g_sci->_gfxFrameout->kernelGetHighPlanePri());
return make_reg(0, g_sci->_gfxFrameout->kernelGetHighPlanePri());
}
reg_t kFrameOut(EngineState *s, int argc, reg_t *argv) {
@ -743,7 +743,7 @@ reg_t kFrameOut(EngineState *s, int argc, reg_t *argv) {
// as its called right after a view is updated
// TODO
s->_gfxFrameout->kernelFrameout();
g_sci->_gfxFrameout->kernelFrameout();
return NULL_REG;
}