libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-03 09:23:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCUMM: Stub off other football2002 u32 opcodes

Browse Source
This commit is contained in:
Matthew Hoops 2012-06-08 19:45:31 -04:00
parent c735b2acda
commit f22661e4b9
5 changed files with 94 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/scumm/detection_tables.h
View File

@ -384,7 +384,7 @@ static const GameSettings gameVariantsTable[] = {
// Added the use of bink videos
{"Baseball2003", 0, 0, GID_BASEBALL2003, 6, 100, MDT_NONE, GF_USE_KEY | GF_16BIT_COLOR, UNK, GUIO3(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI, GUIO_NOASPECT)},
{"basketball", 0, 0, GID_BASKETBALL, 6, 100, MDT_NONE, GF_USE_KEY| GF_16BIT_COLOR, UNK, GUIO3(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI, GUIO_NOASPECT)},
{"football2002", 0, 0, GID_FOOTBALL, 6, 100, MDT_NONE, GF_USE_KEY | GF_16BIT_COLOR, UNK, GUIO3(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI, GUIO_NOASPECT)},
{"football2002", 0, 0, GID_FOOTBALL2002, 6, 100, MDT_NONE, GF_USE_KEY | GF_16BIT_COLOR, UNK, GUIO3(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI, GUIO_NOASPECT)},
{"Soccer2004", 0, 0, GID_SOCCER2004, 6, 100, MDT_NONE, GF_USE_KEY | GF_16BIT_COLOR, UNK, GUIO3(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI, GUIO_NOASPECT)},
// U32 code required, for testing only

100
engines/scumm/he/logic/football.cpp
View File

@ -35,17 +35,16 @@ public:
LogicHEfootball(ScummEngine_v90he *vm) : LogicHE(vm) {}
int versionID();
int32 dispatch(int op, int numArgs, int32 *args);
virtual int32 dispatch(int op, int numArgs, int32 *args);
private:
protected:
int lineEquation3D(int32 *args);
int translateWorldToScreen(int32 *args);
virtual int translateWorldToScreen(int32 *args);
int fieldGoalScreenTranslation(int32 *args);
int translateScreenToWorld(int32 *args);
virtual int translateScreenToWorld(int32 *args);
int nextPoint(int32 *args);
int computePlayerBallIntercepts(int32 *args);
int computeTwoCircleIntercepts(int32 *args);
int largestFreeBlock();
};
int LogicHEfootball::versionID() {
@ -84,11 +83,6 @@ int32 LogicHEfootball::dispatch(int op, int numArgs, int32 *args) {
res = computeTwoCircleIntercepts(args);
break;
case 1028:
// Backyard Football 2002 only
res = largestFreeBlock();
break;
case 8221968:
// Someone had a fun and used his birthday as opcode number
res = getFromArray(args[0], args[1], args[2]);
@ -288,8 +282,86 @@ int LogicHEfootball::computeTwoCircleIntercepts(int32 *args) {
return 1;
}
int LogicHEfootball::largestFreeBlock() {
// Backyard Football 2002 only
class LogicHEfootball2002 : public LogicHEfootball {
public:
LogicHEfootball2002(ScummEngine_v90he *vm) : LogicHEfootball(vm) {}
int32 dispatch(int op, int numArgs, int32 *args);
private:
int translateWorldToScreen(int32 *args);
int translateScreenToWorld(int32 *args);
int getDayOfWeek();
int initScreenTranslations();
int getPlaybookFiles(int32 *args);
int largestFreeBlock();
};
int32 LogicHEfootball2002::dispatch(int op, int numArgs, int32 *args) {
int32 res = 0;
switch (op) {
case 1025:
res = getDayOfWeek();
break;
case 1026:
res = initScreenTranslations();
break;
case 1027:
res = getPlaybookFiles(args);
break;
case 1028:
res = largestFreeBlock();
break;
case 1029:
// Clean-up off heap
// Dummied in the Windows U32
res = 1;
break;
case 1516:
// Start auto LAN game
break;
default:
res = LogicHEfootball::dispatch(op, numArgs, args);
break;
}
return res;
}
int LogicHEfootball2002::translateWorldToScreen(int32 *args) {
// TODO: Implement modified 2002 version
return LogicHEfootball::translateWorldToScreen(args);
}
int LogicHEfootball2002::translateScreenToWorld(int32 *args) {
// TODO: Implement modified 2002 version
return LogicHEfootball::translateScreenToWorld(args);
}
int LogicHEfootball2002::getDayOfWeek() {
// TODO: Get day of week, store in var 108
return 1;
}
int LogicHEfootball2002::initScreenTranslations() {
// TODO: Set values used by translateWorldToScreen/translateScreenToWorld
return 1;
}
int LogicHEfootball2002::getPlaybookFiles(int32 *args) {
// TODO: Get list of playbook files
error("STUB: LogicHEfootball2002::getPlaybookFiles()");
return 1;
}
int LogicHEfootball2002::largestFreeBlock() {
// The Windows version always sets the variable to this
// The Mac version actually checks for the largest free block
writeScummVar(108, 100000000);
@ -300,4 +372,8 @@ LogicHE *makeLogicHEfootball(ScummEngine_v90he *vm) {
return new LogicHEfootball(vm);
}
LogicHE *makeLogicHEfootball2002(ScummEngine_v90he *vm) {
return new LogicHEfootball2002(vm);
}
} // End of namespace Scumm

3
engines/scumm/he/logic_he.cpp
View File

@ -87,6 +87,9 @@ LogicHE *LogicHE::makeLogicHE(ScummEngine_v90he *vm) {
case GID_FOOTBALL:
return makeLogicHEfootball(vm);
case GID_FOOTBALL2002:
return makeLogicHEfootball2002(vm);
case GID_SOCCER:
case GID_SOCCERMLS:
case GID_SOCCER2004:

1
engines/scumm/he/logic_he.h
View File

@ -61,6 +61,7 @@ protected:
LogicHE *makeLogicHErace(ScummEngine_v90he *vm);
LogicHE *makeLogicHEfunshop(ScummEngine_v90he *vm);
LogicHE *makeLogicHEfootball(ScummEngine_v90he *vm);
LogicHE *makeLogicHEfootball2002(ScummEngine_v90he *vm);
LogicHE *makeLogicHEsoccer(ScummEngine_v90he *vm);
LogicHE *makeLogicHEbaseball2001(ScummEngine_v90he *vm);
LogicHE *makeLogicHEbasketball(ScummEngine_v90he *vm);

1
engines/scumm/scumm.h
View File

@ -241,6 +241,7 @@ enum ScummGameId {
GID_PUTTRACE,
GID_FUNSHOP, // Used for all three funshops
GID_FOOTBALL,
GID_FOOTBALL2002,
GID_SOCCER,
GID_SOCCERMLS,
GID_SOCCER2004,