diff options
author | Torbjörn Andersson | 2003-11-02 18:50:09 +0000 |
---|---|---|
committer | Torbjörn Andersson | 2003-11-02 18:50:09 +0000 |
commit | 7ec257ae3f48275a911bc503aa7ed4591b06ceac (patch) | |
tree | e24b09e4bbad9fb6a933d4f376d5c4815aa214ba /sword2/resman.cpp | |
parent | c58b3819bb320bd3bd2fa023e6369fbbf0cae63b (diff) | |
download | scummvm-rg350-7ec257ae3f48275a911bc503aa7ed4591b06ceac.tar.gz scummvm-rg350-7ec257ae3f48275a911bc503aa7ed4591b06ceac.tar.bz2 scummvm-rg350-7ec257ae3f48275a911bc503aa7ed4591b06ceac.zip |
Even more stuff moving into Sword2Engine. I'm tempted to make a new class
for the mouse stuff, but I need to think about that a bit more. I have a
feeling the code could be cleaned up a bit anyway...
svn-id: r11060
Diffstat (limited to 'sword2/resman.cpp')
-rw-r--r-- | sword2/resman.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sword2/resman.cpp b/sword2/resman.cpp index 80f37c84d8..38768db7fd 100644 --- a/sword2/resman.cpp +++ b/sword2/resman.cpp @@ -30,7 +30,7 @@ #include "sword2/logic.h" #include "sword2/maketext.h" #include "sword2/memory.h" -#include "sword2/mouse.h" // for system Set_mouse & Set_luggage routines +#include "sword2/mouse.h" // for system setMouse & setLuggage routines #include "sword2/protocol.h" #include "sword2/resman.h" #include "sword2/sound.h" // for Clear_fx_queue() called from cacheNewCluster() @@ -998,7 +998,7 @@ void ResourceManager::cacheNewCluster(uint32 newCluster) { if (file == NULL) { error("init cannot *OPEN* cd.inf"); - } + } _cd_inf cdInf; @@ -1027,8 +1027,8 @@ void ResourceManager::cacheNewCluster(uint32 newCluster) { g_display->clearScene(); - Set_mouse(0); - Set_luggage(0); + g_sword2->setMouse(0); + g_sword2->setLuggage(0); uint8 *bgfile; bgfile = res_man.open(2950); // open the screen resource |