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

PRIVATE: fixes

Browse source
This commit is contained in:
neuromancer 2021-02-13 18:27:24 -03:00 • committed by Eugene Sandulenko
parent 386c07149e
commit 8d9ed3d8d6
8 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/private/code.cpp
View file

@ -438,4 +438,4 @@ void execute(Inst *p) {
}
}
}
} // End of namespace Private

19
engines/private/cursors.cpp
View file

@ -349,14 +349,19 @@ void PrivateEngine::initCursors() {
void PrivateEngine::changeCursor(Common::String cursor) {
assert(_cursorData.contains(cursor));
Common::Point p = *_cursorPoints.getVal(cursor);
Common::Point s;
if (strcmp(cursor.c_str(), "default") == 0)
s = Common::Point(11, 16);
else
s = Common::Point(32, 32);
CursorMan.replaceCursor(_cursorData.getVal(cursor), s.x, s.y, p.x, p.y, 0, false);
int x, y;
if (strcmp(cursor.c_str(), "default") == 0) {
x = 11;
y = 16;
}
else {
x = 32;
y = 32;
}
CursorMan.replaceCursor(_cursorData.getVal(cursor), x, y, p.x, p.y, 0, false);
CursorMan.showMouse(true);
}
}
} // End of namespace Private

2
engines/private/cursors.h
View file

@ -34,6 +34,6 @@ namespace Private {
typedef Common::HashMap<Common::String, const byte*> CursorDataMap;
typedef Common::HashMap<Common::String, Common::Point*> CursorPointMap;
}
} // End of namespace Private
#endif

2
engines/private/funcs.cpp
View file

@ -821,4 +821,4 @@ void call(char *name, ArgArray args) {
}
}
} // End of namespace Private

2
engines/private/grammar.h
View file

@ -125,6 +125,6 @@ extern void loadSetting(Common::String *);
extern void execute(Inst *);
}
} // End of namespace Private
#endif

2
engines/private/metaengine.cpp
View file

@ -43,7 +43,7 @@ bool PrivateEngine::isDemo() const {
return (bool)(_gameDescription->flags & ADGF_DEMO);
}
}
} // End of namespace Private
#if PLUGIN_ENABLED_DYNAMIC(PRIVATE)
REGISTER_PLUGIN_DYNAMIC(PRIVATE, PLUGIN_TYPE_ENGINE, PrivateMetaEngine);

2
engines/private/symbol.cpp
View file

@ -174,4 +174,4 @@ Symbol *install(Common::String *n, int t, int d, char *s, Common::Rect *r, Symbo
return sp;
}
}
} // End of namespace Private

2
engines/private/symbol.h
View file

@ -64,6 +64,6 @@ extern Symbol *constant(int, int, char *);
extern void installAll(char *);
extern Symbol *lookup(Common::String, SymbolMap);
}
} // End of namespace Private
#endif