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

Revert last change, doesn't seem to work either

Browse source 
svn-id: r19486
This commit is contained in:
Chris Apers 2005-11-06 12:58:19 +00:00
parent c23723a9fe
commit f123080d63
2 changed files with 104 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sword1/logic.cpp
View file

@ -62,8 +62,6 @@ Logic::Logic(ObjectMan *pObjMan, ResMan *resMan, Screen *pScreen, Mouse *pMouse,
_eventMan = NULL; _eventMan = NULL;
_system = system; _system = system;
_mixer = mixer; _mixer = mixer;
setupMcodeTable();
} }
Logic::~Logic(void) { Logic::~Logic(void) {
@ -683,8 +681,7 @@ int Logic::interpretScript(Object *compact, int id, Header *scriptModule, int sc
} }
} }
void Logic::setupMcodeTable() { const BSMcodeTable Logic::_mcodeTable[100] = {
static const BSMcodeTable mcodeTable[100] = {
&Logic::fnBackground, &Logic::fnBackground,
&Logic::fnForeground, &Logic::fnForeground,
&Logic::fnSort, &Logic::fnSort,
@ -785,10 +782,7 @@ void Logic::setupMcodeTable() {
&Logic::fnGreen, &Logic::fnGreen,
&Logic::fnPurple, &Logic::fnPurple,
&Logic::fnBlack &Logic::fnBlack
}; };
_mcodeTable = mcodeTable;
}
int Logic::fnBackground(Object *cpt, int32 id, int32 c, int32 d, int32 e, int32 f, int32 z, int32 x) { int Logic::fnBackground(Object *cpt, int32 id, int32 c, int32 d, int32 e, int32 f, int32 z, int32 x) {

3
sword1/logic.h
View file

@ -88,8 +88,7 @@ private:
int fullAnimDriver(Object *compact); int fullAnimDriver(Object *compact);
int animDriver(Object *compact); int animDriver(Object *compact);
void setupMcodeTable(); static BSMcodeTable _mcodeTable[100];
const BSMcodeTable *_mcodeTable;
uint16 inRange(uint16 a, uint16 b, uint16 c); uint16 inRange(uint16 a, uint16 b, uint16 c);