libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-05 16:21:40 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

More compilation fixes by lordhoto

Browse Source 
svn-id: r31621
This commit is contained in:
Filippos Karapetis 2008-04-20 17:26:48 +00:00
parent b33f873fe5
commit e06918c29f
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/m4/rails.cpp
View File

@ -324,6 +324,7 @@ void Rails::disposePath(RailNode *pathStart) {
} }
} }
/*
static RailNode* duplicatePath(RailNode *pathStart) { static RailNode* duplicatePath(RailNode *pathStart) {
RailNode *newNode = NULL; RailNode *newNode = NULL;
RailNode *firstNode = NULL; RailNode *firstNode = NULL;
@ -349,6 +350,7 @@ static RailNode* duplicatePath(RailNode *pathStart) {
return firstNode; return firstNode;
} }
*/
bool Rails::getShortestPath(int32 origID, int32 destID, RailNode **shortPath) { bool Rails::getShortestPath(int32 origID, int32 destID, RailNode **shortPath) {
// TODO // TODO

3
engines/m4/scene.cpp
View File

@ -228,7 +228,6 @@ void Scene::loadSceneHotSpotsMads(int sceneNumber) {
int hotspotCount = hotspotStream->readUint16LE(); int hotspotCount = hotspotStream->readUint16LE();
delete hotspotStream; delete hotspotStream;
HotSpotList *hotspotList = _sceneResources.hotspots;
_sceneResources.hotspotCount = hotspotCount; _sceneResources.hotspotCount = hotspotCount;
hotspotStream = hotSpotData.getItemStream(1); hotspotStream = hotSpotData.getItemStream(1);
@ -483,10 +482,12 @@ bool Scene::onEvent(M4EventType eventType, int param1, int x, int y, bool &captu
if (currentHotSpot != NULL && currentHotSpot->getActive()) { if (currentHotSpot != NULL && currentHotSpot->getActive()) {
update(); update();
_vm->_actor->setWalkerDirection(currentHotSpot->getFacing()); _vm->_actor->setWalkerDirection(currentHotSpot->getFacing());
/*
int posX = currentHotSpot->getFeetX(); int posX = currentHotSpot->getFeetX();
int posY = currentHotSpot->getFeetY() - int posY = currentHotSpot->getFeetY() -
scaleValue(_vm->_actor->getWalkerHeight(), _vm->_actor->getWalkerScaling(), 0); scaleValue(_vm->_actor->getWalkerHeight(), _vm->_actor->getWalkerScaling(), 0);
//_vm->_actor->placeWalkerSpriteAt(0, posX, posY); //_vm->_actor->placeWalkerSpriteAt(0, posX, posY);
*/
// Player said.... (for scene scripts) // Player said.... (for scene scripts)
printf("Player said: %s %s\n", currentHotSpot->getVerb(), currentHotSpot->getVocab()); printf("Player said: %s %s\n", currentHotSpot->getVerb(), currentHotSpot->getVocab());

12
engines/m4/script.cpp
View File

@ -1105,8 +1105,8 @@ int ScriptInterpreter::o1_setHotspot() {
int ScriptInterpreter::o1_loadConversation() { int ScriptInterpreter::o1_loadConversation() {
const char *name = STRING(0); const char *name = STRING(0);
int trigger = INTEGER(1); //int trigger = INTEGER(1);
int flag = INTEGER(2); //int flag = INTEGER(2);
// TODO; just to show something // TODO; just to show something
_vm->_converse->startConversation(name); _vm->_converse->startConversation(name);
@ -1177,17 +1177,17 @@ int ScriptInterpreter::o1_unloadSeries() {
} }
int ScriptInterpreter::o1_preloadBreakSeries() { int ScriptInterpreter::o1_preloadBreakSeries() {
const SeriesStreamBreakList& seriesStreamBreakList = DATA(0, SeriesStreamBreakList); //const SeriesStreamBreakList& seriesStreamBreakList = DATA(0, SeriesStreamBreakList);
return 1; return 1;
} }
int ScriptInterpreter::o1_unloadBreakSeries() { int ScriptInterpreter::o1_unloadBreakSeries() {
const SeriesStreamBreakList& seriesStreamBreakList = DATA(0, SeriesStreamBreakList); //const SeriesStreamBreakList& seriesStreamBreakList = DATA(0, SeriesStreamBreakList);
return 1; return 1;
} }
int ScriptInterpreter::o1_startBreakSeries() { int ScriptInterpreter::o1_startBreakSeries() {
const SeriesStreamBreakList& seriesStreamBreakList = DATA(0, SeriesStreamBreakList); //const SeriesStreamBreakList& seriesStreamBreakList = DATA(0, SeriesStreamBreakList);
return 1; return 1;
} }
@ -1271,7 +1271,7 @@ int ScriptInterpreter::o1_wilburSaid() {
} }
int ScriptInterpreter::o1_wilburParse() { int ScriptInterpreter::o1_wilburParse() {
const ParserArray& parserArray = DATA(0, ParserArray); //const ParserArray& parserArray = DATA(0, ParserArray);
RETURN(0); RETURN(0);
return 1; return 1;
} }