mirror of
https://github.com/libretro/scummvm.git
synced 2025-04-03 07:11:49 +00:00
Fix whitespace
svn-id: r48477
This commit is contained in:
parent
4e9183cc1b
commit
fe51070977
@ -751,7 +751,7 @@ void Parallaction_ns::setupBalloonManager() {
|
||||
}
|
||||
|
||||
void Parallaction_br::setupBalloonManager() {
|
||||
_balloonMan = new BalloonManager_br(this, _dialogueFont);
|
||||
_balloonMan = new BalloonManager_br(this, _dialogueFont);
|
||||
}
|
||||
|
||||
|
||||
|
@ -480,7 +480,7 @@ void Parallaction::exitDialogueMode() {
|
||||
/* Since the current instance of _dialogueMan must be destroyed before the
|
||||
zone commands are executed, as they may create a new instance of _dialogueMan that
|
||||
would overwrite the current, we need to save the references to the command lists.
|
||||
*/
|
||||
*/
|
||||
CommandList *_cmdList = _dialogueMan->_cmdList;
|
||||
ZonePtr z = _dialogueMan->_z;
|
||||
|
||||
|
@ -799,7 +799,7 @@ GfxObj* Gfx::registerBalloon(Frames *frames, const char *text) {
|
||||
void Gfx::freeDialogueObjects() {
|
||||
_items.clear();
|
||||
|
||||
_vm->_balloonMan->reset();
|
||||
_vm->_balloonMan->reset();
|
||||
|
||||
for (uint i = 0; i < _balloons.size(); i++) {
|
||||
delete _balloons[i];
|
||||
|
@ -440,7 +440,7 @@ public:
|
||||
void freeCharacterObjects();
|
||||
void freeLocationObjects();
|
||||
void showGfxObj(GfxObj* obj, bool visible);
|
||||
void blt(const Common::Rect& r, byte *data, Graphics::Surface *surf, uint16 z, uint scale, byte transparentColor);
|
||||
void blt(const Common::Rect& r, byte *data, Graphics::Surface *surf, uint16 z, uint scale, byte transparentColor);
|
||||
void unpackBlt(const Common::Rect& r, byte *data, uint size, Graphics::Surface *surf, uint16 z, uint scale, byte transparentColor);
|
||||
|
||||
// labels
|
||||
|
@ -164,11 +164,11 @@ class MainMenuInputState_BR : public MenuInputState {
|
||||
int _selection;
|
||||
|
||||
void cleanup() {
|
||||
_vm->_gfx->freeDialogueObjects();
|
||||
_vm->_gfx->freeDialogueObjects();
|
||||
|
||||
for (int i = 0; i < _availItems; i++) {
|
||||
delete _lines[i];
|
||||
_lines[i] = 0;
|
||||
_lines[i] = 0;
|
||||
}
|
||||
}
|
||||
|
||||
@ -194,9 +194,9 @@ public:
|
||||
memset(_lines, 0, sizeof(_lines));
|
||||
}
|
||||
|
||||
~MainMenuInputState_BR() {
|
||||
cleanup();
|
||||
}
|
||||
~MainMenuInputState_BR() {
|
||||
cleanup();
|
||||
}
|
||||
|
||||
virtual MenuInputState* run() {
|
||||
int event = _vm->_input->getLastButtonEvent();
|
||||
|
@ -264,12 +264,12 @@ void Parallaction_br::cleanupGame() {
|
||||
|
||||
|
||||
void Parallaction_br::changeLocation() {
|
||||
if (_newLocationName.empty()) {
|
||||
return;
|
||||
}
|
||||
if (_newLocationName.empty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
char location[200];
|
||||
strcpy(location, _newLocationName.c_str());
|
||||
char location[200];
|
||||
strcpy(location, _newLocationName.c_str());
|
||||
|
||||
char *partStr = strrchr(location, '.');
|
||||
if (partStr) {
|
||||
|
@ -94,19 +94,19 @@ public:
|
||||
/*
|
||||
bind accept the following input formats:
|
||||
|
||||
1 - [S].slide.[L]{.[C]}
|
||||
1 - [S].slide.[L]{.[C]}
|
||||
2 - [L]{.[C]}
|
||||
|
||||
where:
|
||||
where:
|
||||
|
||||
[S] is the slide to be shown
|
||||
[L] is the location to switch to (immediately in case 2, or right after slide [S] in case 1)
|
||||
[C] is the character to be selected, and is optional
|
||||
[L] is the location to switch to (immediately in case 2, or right after slide [S] in case 1)
|
||||
[C] is the character to be selected, and is optional
|
||||
|
||||
The routine tells one form from the other by searching for the '.slide.'
|
||||
The routine tells one form from the other by searching for the '.slide.'
|
||||
|
||||
NOTE: there exists one script in which [L] is not used in the case 1, but its use
|
||||
is commented out, and would definitely crash the current implementation.
|
||||
NOTE: there exists one script in which [L] is not used in the case 1, but its use
|
||||
is commented out, and would definitely crash the current implementation.
|
||||
*/
|
||||
void LocationName::bind(const char *s) {
|
||||
|
||||
@ -324,13 +324,13 @@ void Parallaction_ns::runPendingZones() {
|
||||
// between one and the other.
|
||||
//
|
||||
void Parallaction_ns::changeLocation() {
|
||||
if (_newLocationName.empty()) {
|
||||
return;
|
||||
}
|
||||
if (_newLocationName.empty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
char location[200];
|
||||
strcpy(location, _newLocationName.c_str());
|
||||
strcpy(_location._name, _newLocationName.c_str());
|
||||
char location[200];
|
||||
strcpy(location, _newLocationName.c_str());
|
||||
strcpy(_location._name, _newLocationName.c_str());
|
||||
|
||||
debugC(1, kDebugExec, "changeLocation(%s)", location);
|
||||
|
||||
|
@ -164,7 +164,7 @@ uint32 PathWalker_NS::buildSubPath(const Common::Point& pos, const Common::Point
|
||||
void PathWalker_NS::buildPath(AnimationPtr a, uint16 x, uint16 y) {
|
||||
debugC(1, kDebugWalk, "PathBuilder::buildPath to (%i, %i)", x, y);
|
||||
|
||||
_a = a;
|
||||
_a = a;
|
||||
|
||||
_walkPath.clear();
|
||||
|
||||
|
@ -38,26 +38,26 @@ struct Character;
|
||||
|
||||
|
||||
class PathWalker_NS {
|
||||
AnimationPtr _a;
|
||||
AnimationPtr _a;
|
||||
PointList _walkPath;
|
||||
int16 _direction, _step;
|
||||
|
||||
// builder routines
|
||||
// builder routines
|
||||
PointList _subPath;
|
||||
void correctPathPoint(Common::Point &to);
|
||||
uint32 buildSubPath(const Common::Point& pos, const Common::Point& stop);
|
||||
uint16 walkFunc1(const Common::Point &to, Common::Point& node);
|
||||
|
||||
// walker routines
|
||||
// walker routines
|
||||
void finalizeWalk();
|
||||
void clipMove(Common::Point& pos, const Common::Point& to);
|
||||
void checkDoor(const Common::Point &foot);
|
||||
void updateDirection(const Common::Point& pos, const Common::Point& to);
|
||||
void updateDirection(const Common::Point& pos, const Common::Point& to);
|
||||
|
||||
public:
|
||||
PathWalker_NS();
|
||||
|
||||
void buildPath(AnimationPtr a, uint16 x, uint16 y);
|
||||
void buildPath(AnimationPtr a, uint16 x, uint16 y);
|
||||
void walk();
|
||||
};
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user