diff options
Diffstat (limited to 'engines')
38 files changed, 81 insertions, 81 deletions
diff --git a/engines/bladerunner/actor_combat.h b/engines/bladerunner/actor_combat.h index 2f65f1904d..8f36445008 100644 --- a/engines/bladerunner/actor_combat.h +++ b/engines/bladerunner/actor_combat.h @@ -66,7 +66,7 @@ public: void combatOff(); void tick(); - + void hitAttempt(); void save(SaveFileWriteStream &f); diff --git a/engines/bladerunner/fog.cpp b/engines/bladerunner/fog.cpp index c732b598c2..cb8235ba64 100644 --- a/engines/bladerunner/fog.cpp +++ b/engines/bladerunner/fog.cpp @@ -66,7 +66,7 @@ int Fog::readCommon(Common::ReadStream *stream) { void Fog::readAnimationData(Common::ReadStream *stream, int size) { _animatedParameters = stream->readUint32LE(); - + int floatCount = size / 4; _animationData = new float[floatCount]; for (int i = 0; i < floatCount; i++) { diff --git a/engines/bladerunner/item_pickup.h b/engines/bladerunner/item_pickup.h index 97d98ead36..0328bf428e 100644 --- a/engines/bladerunner/item_pickup.h +++ b/engines/bladerunner/item_pickup.h @@ -43,7 +43,7 @@ class ItemPickup { int _timeLeft; int _timeLast; Common::Rect _screenRect; - + public: ItemPickup(BladeRunnerEngine *vm); ~ItemPickup(); diff --git a/engines/chewy/chewy.cpp b/engines/chewy/chewy.cpp index 75c2a8d51b..81f8c7d03a 100644 --- a/engines/chewy/chewy.cpp +++ b/engines/chewy/chewy.cpp @@ -94,7 +94,7 @@ Common::Error ChewyEngine::run() { }*/ //_graphics->playVideo(0); - + _scene->change(0); //_sound->playSpeech(1); //_sound->playSound(1); diff --git a/engines/chewy/console.cpp b/engines/chewy/console.cpp index 65c4a681d6..af62bf017b 100644 --- a/engines/chewy/console.cpp +++ b/engines/chewy/console.cpp @@ -113,7 +113,7 @@ bool Console::Cmd_DrawImage(int argc, const char **argv) { Common::String filename = argv[1]; int resNum = atoi(argv[2]); - + _vm->_graphics->drawImage(filename, resNum); return false; diff --git a/engines/chewy/detection.cpp b/engines/chewy/detection.cpp index f6f66efba0..7b7f29f9e8 100644 --- a/engines/chewy/detection.cpp +++ b/engines/chewy/detection.cpp @@ -70,7 +70,7 @@ static const ChewyGameDescription gameDescriptions[] = { GUIO1(GUIO_NONE) }, }, - + { // Chewy - ESC von F5 - German // Master version 1.1 (CHEWY.EXE - offset 0x8AB28) @@ -87,7 +87,7 @@ static const ChewyGameDescription gameDescriptions[] = { GUIO1(GUIO_NONE) }, }, - + { // Chewy - ESC von F5 - German // Master version 1.0 (CHEWY.EXE - offset 0x8AB10) diff --git a/engines/chewy/scene.cpp b/engines/chewy/scene.cpp index 11bb4b38cd..5398a8da12 100644 --- a/engines/chewy/scene.cpp +++ b/engines/chewy/scene.cpp @@ -138,7 +138,7 @@ void Scene::change(uint scene) { _curScene = scene; _vm->_cursor->setCursor(0); _vm->_cursor->showCursor(); - + loadSceneInfo(); draw(); } @@ -320,14 +320,14 @@ void Scene::loadSceneInfo() { _sceneInfo->roomInfo.picNum = indexFile.readByte(); _sceneInfo->roomInfo.autoMoveCount = indexFile.readByte(); _sceneInfo->roomInfo.loadTaf = indexFile.readByte(); - + _sceneInfo->roomInfo.tafName = ""; for (int i = 0; i < 14; i++) _sceneInfo->roomInfo.tafName += indexFile.readByte(); _sceneInfo->roomInfo.zoomFactor = indexFile.readByte(); indexFile.readByte(); // padding - + for (int i = 0; i < MAX_AUTOMOVE; i++) { _sceneInfo->autoMove[i].x = indexFile.readSint16LE(); _sceneInfo->autoMove[i].y = indexFile.readSint16LE(); diff --git a/engines/director/lingo/lingo-gr.cpp b/engines/director/lingo/lingo-gr.cpp index b8d9749052..c908b2e591 100644 --- a/engines/director/lingo/lingo-gr.cpp +++ b/engines/director/lingo/lingo-gr.cpp @@ -1596,7 +1596,7 @@ int yydebug; # define YYMAXDEPTH 10000 #endif - + #if YYERROR_VERBOSE @@ -1807,7 +1807,7 @@ yysyntax_error (char *yyresult, int yystate, int yychar) } } #endif /* YYERROR_VERBOSE */ - + /*-----------------------------------------------. | Release the memory associated to this symbol. | @@ -1839,7 +1839,7 @@ yydestruct (yymsg, yytype, yyvaluep) break; } } - + /* Prevent warnings from -Wmissing-prototypes. */ @@ -1896,7 +1896,7 @@ yyparse () #endif #endif { - + int yystate; int yyn; int yyresult; diff --git a/engines/director/lingo/lingo-lex.cpp b/engines/director/lingo/lingo-lex.cpp index 7b0398367b..de7005275d 100644 --- a/engines/director/lingo/lingo-lex.cpp +++ b/engines/director/lingo/lingo-lex.cpp @@ -168,7 +168,7 @@ extern FILE *yyin, *yyout; #define EOB_ACT_LAST_MATCH 2 #define YY_LESS_LINENO(n) - + /* Return all but the first "n" matched characters back to the input stream. */ #define yyless(n) \ do \ @@ -225,7 +225,7 @@ struct yy_buffer_state int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -963,7 +963,7 @@ YY_DECL register yy_state_type yy_current_state; register char *yy_cp, *yy_bp; register int yy_act; - + #line 85 "engines/director/lingo/lingo-lex.l" @@ -1859,7 +1859,7 @@ static int yy_get_next_buffer (void) { register yy_state_type yy_current_state; register char *yy_cp; - + yy_current_state = (yy_start); yy_current_state += YY_AT_BOL(); @@ -1920,7 +1920,7 @@ static int yy_get_next_buffer (void) { int c; - + *(yy_c_buf_p) = (yy_hold_char); if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR ) @@ -1994,7 +1994,7 @@ static int yy_get_next_buffer (void) */ void yyrestart (FILE * input_file ) { - + if ( ! YY_CURRENT_BUFFER ){ yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = @@ -2011,7 +2011,7 @@ static int yy_get_next_buffer (void) */ void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ) { - + /* TODO. We should be able to replace this entire function body * with * yypop_buffer_state(); @@ -2057,7 +2057,7 @@ static void yy_load_buffer_state (void) YY_BUFFER_STATE yy_create_buffer (FILE * file, int size ) { YY_BUFFER_STATE b; - + b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); @@ -2084,7 +2084,7 @@ static void yy_load_buffer_state (void) */ void yy_delete_buffer (YY_BUFFER_STATE b ) { - + if ( ! b ) return; @@ -2100,7 +2100,7 @@ static void yy_load_buffer_state (void) #ifndef __cplusplus extern int isatty (int ); #endif /* __cplusplus */ - + /* Initializes or reinitializes a buffer. * This function is sometimes called more than once on the same buffer, * such as during a yyrestart() or at EOF. @@ -2109,7 +2109,7 @@ extern int isatty (int ); { int oerrno = errno; - + yy_flush_buffer(b ); b->yy_input_file = file; @@ -2125,7 +2125,7 @@ extern int isatty (int ); } b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; - + errno = oerrno; } @@ -2214,7 +2214,7 @@ void yypop_buffer_state (void) static void yyensure_buffer_stack (void) { yy_size_t num_to_alloc; - + if (!(yy_buffer_stack)) { /* First allocation is just for 2 elements, since we don't know if this @@ -2227,9 +2227,9 @@ static void yyensure_buffer_stack (void) ); if ( ! (yy_buffer_stack) ) YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); - + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - + (yy_buffer_stack_max) = num_to_alloc; (yy_buffer_stack_top) = 0; return; @@ -2263,7 +2263,7 @@ static void yyensure_buffer_stack (void) YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) { YY_BUFFER_STATE b; - + if ( size < 2 || base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) @@ -2299,7 +2299,7 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) */ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) { - + return yy_scan_bytes(yystr,strlen(yystr) ); } @@ -2315,7 +2315,7 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len YY_BUFFER_STATE b; char *buf; yy_size_t n, i; - + /* Get memory for full buffer, including space for trailing EOB's. */ n = _yybytes_len + 2; buf = (char *) yyalloc(n ); @@ -2373,7 +2373,7 @@ static void yy_fatal_error (yyconst char* msg ) */ int yyget_lineno (void) { - + return yylineno; } @@ -2416,7 +2416,7 @@ char *yyget_text (void) */ void yyset_lineno (int line_number ) { - + yylineno = line_number; } @@ -2477,7 +2477,7 @@ static int yy_init_globals (void) /* yylex_destroy is for both reentrant and non-reentrant scanners. */ int yylex_destroy (void) { - + /* Pop the buffer stack, destroying each element. */ while(YY_CURRENT_BUFFER){ yy_delete_buffer(YY_CURRENT_BUFFER ); diff --git a/engines/director/resource.cpp b/engines/director/resource.cpp index e748583146..22b33e7bcc 100644 --- a/engines/director/resource.cpp +++ b/engines/director/resource.cpp @@ -176,7 +176,7 @@ void DirectorEngine::loadEXEv4(Common::SeekableReadStream *stream) { void DirectorEngine::loadEXEv5(Common::SeekableReadStream *stream) { uint32 ver = stream->readUint32LE(); - + if (ver != MKTAG('P', 'J', '9', '5')) error("Invalid projector tag found in v5 EXE [%s]", tag2str(ver)); diff --git a/engines/mohawk/riven_stacks/jspit.cpp b/engines/mohawk/riven_stacks/jspit.cpp index eeff81005b..b1f15a10c0 100644 --- a/engines/mohawk/riven_stacks/jspit.cpp +++ b/engines/mohawk/riven_stacks/jspit.cpp @@ -369,7 +369,7 @@ int JSpit::jspitElevatorLoop() { return 1; } } - + return 0; } diff --git a/engines/plumbers/plumbers.h b/engines/plumbers/plumbers.h index 5dbb337f92..430c696c6d 100644 --- a/engines/plumbers/plumbers.h +++ b/engines/plumbers/plumbers.h @@ -111,7 +111,7 @@ private: }; Common::Queue<Action> _actions; - + void loadImage(const Common::String &dirname, const Common::String &filename); void drawScreen(); diff --git a/engines/sludge/detection.cpp b/engines/sludge/detection.cpp index a530a5c796..361d44b1e1 100644 --- a/engines/sludge/detection.cpp +++ b/engines/sludge/detection.cpp @@ -86,11 +86,11 @@ public: virtual const char *getName() const { return "Sludge Engine"; } - + virtual const char *getOriginalCopyright() const { return "Copyright (C) 2000-2014 Hungry Software and contributors"; } - + virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Sludge::SludgeGameDescription *gd = (const Sludge::SludgeGameDescription *)desc; if (gd) { diff --git a/engines/testbed/graphics.cpp b/engines/testbed/graphics.cpp index 589c95de3b..65833d1de8 100644 --- a/engines/testbed/graphics.cpp +++ b/engines/testbed/graphics.cpp @@ -601,7 +601,7 @@ TestExitStatus GFXtests::filteringMode() { return passed; } - + /** * Tests the aspect ratio correction by: drawing an ellipse, when corrected the ellipse should render to a circle */ diff --git a/engines/titanic/game/chicken_dispensor.cpp b/engines/titanic/game/chicken_dispensor.cpp index 8d16289647..ced0c78ef1 100644 --- a/engines/titanic/game/chicken_dispensor.cpp +++ b/engines/titanic/game/chicken_dispensor.cpp @@ -106,7 +106,7 @@ bool CChickenDispensor::StatusChangeMsg(CStatusChangeMsg *msg) { bool CChickenDispensor::MovieEndMsg(CMovieEndMsg *msg) { int movieFrame = msg->_endFrame; - + if (movieFrame == 16) { // Dispensed a chicken _cursorId = CURSOR_HAND; diff --git a/engines/titanic/sound/music_room_instrument.cpp b/engines/titanic/sound/music_room_instrument.cpp index 882325c08a..99ead2f8eb 100644 --- a/engines/titanic/sound/music_room_instrument.cpp +++ b/engines/titanic/sound/music_room_instrument.cpp @@ -77,7 +77,7 @@ CMusicRoomInstrument::CMusicRoomInstrument(CProjectItem *project, CSoundManager _gameObjects[0] = static_cast<CGameObject *>(_project->findByName("Tubular Bells")); _insStartTime = 0.4; break; - + case MV_SNAKE: _gameObjects[0] = static_cast<CGameObject *>(_project->findByName("Snake_Hammer")); _gameObjects[1] = static_cast<CGameObject *>(_project->findByName("Snake_Glass")); diff --git a/engines/titanic/star_control/base_stars.cpp b/engines/titanic/star_control/base_stars.cpp index 0fcf8a964f..00206b1a9d 100644 --- a/engines/titanic/star_control/base_stars.cpp +++ b/engines/titanic/star_control/base_stars.cpp @@ -462,7 +462,7 @@ void CBaseStars::draw4(CSurfaceArea *surfaceArea, CStarCamera *camera, CStarClos + vector._z * pose._row3._z + pose._vector._z; if (tempZ <= minVal) continue; - + tempY = vector._x * pose._row1._y + vector._y * pose._row2._y + vector._z * pose._row3._y + pose._vector._y; tempX = vector._x * pose._row1._x + vector._y * pose._row2._x + vector._z * pose._row3._x + pose._vector._x; total2 = tempY * tempY + tempX * tempX + tempZ * tempZ; diff --git a/engines/titanic/star_control/camera_auto_mover.cpp b/engines/titanic/star_control/camera_auto_mover.cpp index 71f7de85b2..d8808653eb 100644 --- a/engines/titanic/star_control/camera_auto_mover.cpp +++ b/engines/titanic/star_control/camera_auto_mover.cpp @@ -78,7 +78,7 @@ void CCameraAutoMover::calcSpeeds(int val1, int val2, float distance) { _field40 = nMoverTransitions-1; _field48 = nMoverTransitions-1; _field3C = (double)val2 * _field38; - + // Calculate the speeds for a graduated movement between stars double base = 0.0, total = 0.0, power = 4.0, baseInc = 0.03125; for (int idx = nMoverTransitions - 1; idx >= 0; --idx) { @@ -86,7 +86,7 @@ void CCameraAutoMover::calcSpeeds(int val1, int val2, float distance) { total += _speeds[idx]; base += baseInc; } - + for (int idx = 0; idx < nMoverTransitions; ++idx) { _speeds[idx] = _speeds[idx] * _field3C / total; } diff --git a/engines/titanic/star_control/frect.h b/engines/titanic/star_control/frect.h index 654c578cfd..d792eb69b4 100644 --- a/engines/titanic/star_control/frect.h +++ b/engines/titanic/star_control/frect.h @@ -41,7 +41,7 @@ public: * Returns true if the rects equal */ bool operator==(const FRect &p) const; - + /** * Returns true if the rects are not equal */ diff --git a/engines/titanic/star_control/star_camera.h b/engines/titanic/star_control/star_camera.h index f2d27212fe..9d0c954765 100644 --- a/engines/titanic/star_control/star_camera.h +++ b/engines/titanic/star_control/star_camera.h @@ -234,7 +234,7 @@ public: * Lock in the first matched star marker */ bool lockMarker1(FVector v1, FVector v2, FVector v3); - + /** * Lock in the second matched star marker */ diff --git a/engines/titanic/star_control/star_control.cpp b/engines/titanic/star_control/star_control.cpp index 8464262b31..7922a2f7f2 100644 --- a/engines/titanic/star_control/star_control.cpp +++ b/engines/titanic/star_control/star_control.cpp @@ -241,7 +241,7 @@ void CStarControl::doAction(StarControlAction action) { pet->starsSetReference(); break; } - + case STAR_FADE_IN: _view.fn3(true); break; diff --git a/engines/titanic/star_control/star_crosshairs.h b/engines/titanic/star_control/star_crosshairs.h index d60541c205..3d060fd91d 100644 --- a/engines/titanic/star_control/star_crosshairs.h +++ b/engines/titanic/star_control/star_crosshairs.h @@ -80,12 +80,12 @@ public: bool fn1(CStarField *starField, CSurfaceArea *surfaceArea, CStarCamera *camera); void fn2(CVideoSurface *surface, CStarField *starField, CStarMarkers *markers); - + /** * Increments the index for the number of matches */ void incMatches(); - + /** * Draw the crosshairs for a given star */ @@ -101,12 +101,12 @@ public: * Erase crosshairs for the most recently selected star */ void eraseCurrent(CSurfaceArea *surfaceArea); - + /** * Draw crosshairs at the given position */ void drawAt(const FPoint &pt, CSurfaceArea *surfaceArea); - + /** * Returns the position of the most recently selected star */ diff --git a/engines/titanic/star_control/star_field.h b/engines/titanic/star_control/star_field.h index bd3f8aecb6..3b1c3db2b5 100644 --- a/engines/titanic/star_control/star_field.h +++ b/engines/titanic/star_control/star_field.h @@ -78,17 +78,17 @@ public: void set2(int val); int get54() const; void set54(int val); - + /** * Gets the current display mode */ StarMode getMode() const; - + /** * Sets the display mode */ void setMode(StarMode mode); - + /** * Toggles whether the big box is visible */ diff --git a/engines/titanic/star_control/star_view.h b/engines/titanic/star_control/star_view.h index 553195b0c7..241efbcde5 100644 --- a/engines/titanic/star_control/star_view.h +++ b/engines/titanic/star_control/star_view.h @@ -148,14 +148,14 @@ public: * Toggles between starfield and photo modes */ void toggleMode(); - + void fn11(); /** * Toggles whether the viewpoint box is visible in the starfield */ void toggleBox(); - + void fn13(); void fn14(); @@ -163,7 +163,7 @@ public: * Called when the photograph is used on the navigation computer */ void setHasReference(); - + /** * Handles locking in a star */ diff --git a/engines/titanic/star_control/unmarked_camera_mover.cpp b/engines/titanic/star_control/unmarked_camera_mover.cpp index c879dc25e8..401f550bee 100644 --- a/engines/titanic/star_control/unmarked_camera_mover.cpp +++ b/engines/titanic/star_control/unmarked_camera_mover.cpp @@ -48,7 +48,7 @@ void CUnmarkedCameraMover::moveTo(const FVector &srcV, const FVector &destV, con void CUnmarkedCameraMover::transitionBetweenOrientations(const FVector &v1, const FVector &v2, const FVector &v3, const FMatrix &m) { if (isLocked()) decLockCount(); - + FVector vector1 = v1; FVector vector2 = v2; FPose matrix1 = vector2.getFrameTransform(vector1); diff --git a/engines/titanic/star_control/viewport.cpp b/engines/titanic/star_control/viewport.cpp index e368dfa317..d66ff423c6 100644 --- a/engines/titanic/star_control/viewport.cpp +++ b/engines/titanic/star_control/viewport.cpp @@ -178,7 +178,7 @@ void CViewport::randomizeOrientation() { FPose m1(X_AXIS, ranRotAngleX); FPose m2(Y_AXIS, ranRotAngleY); FPose m3(Z_AXIS, ranRotAngleZ); - + FPose s1(m1, m2); FPose s2(s1, m3); diff --git a/engines/titanic/support/avi_surface.cpp b/engines/titanic/support/avi_surface.cpp index 3b22a4fee2..ff439abe25 100644 --- a/engines/titanic/support/avi_surface.cpp +++ b/engines/titanic/support/avi_surface.cpp @@ -489,7 +489,7 @@ Graphics::ManagedSurface *AVISurface::duplicateTransparency() const { bool AVISurface::playCutscene(const Rect &r, uint startFrame, uint endFrame) { if (g_vm->shouldQuit()) return false; - + // TODO: Fixes slight "jumping back" when rotating in place in Top Of Well // balcony between two elevators. Need a more generalized fix at some point if (_movieName == "z48.avi") diff --git a/engines/titanic/titanic.cpp b/engines/titanic/titanic.cpp index 5daf399b04..0931d91806 100644 --- a/engines/titanic/titanic.cpp +++ b/engines/titanic/titanic.cpp @@ -190,7 +190,7 @@ void TitanicEngine::setRoomNames() { bool TitanicEngine::canLoadGameStateCurrently() { CGameManager *gameManager = _window->_gameManager; CScreenManager *screenMan = CScreenManager::_screenManagerPtr; - + if (!gameManager) // Allow loading from copyright screen and continue dialogs return true; diff --git a/engines/titanic/true_talk/tt_talker.h b/engines/titanic/true_talk/tt_talker.h index 4f0b59c044..68b77d8b75 100644 --- a/engines/titanic/true_talk/tt_talker.h +++ b/engines/titanic/true_talk/tt_talker.h @@ -54,7 +54,7 @@ public: * End the speech */ void endSpeech(int val); - + /** * Called when a speech is finished, to signal to the associated character * that the speech is over diff --git a/engines/titanic/true_talk/tt_vocab.cpp b/engines/titanic/true_talk/tt_vocab.cpp index eae456b184..0269e71cee 100644 --- a/engines/titanic/true_talk/tt_vocab.cpp +++ b/engines/titanic/true_talk/tt_vocab.cpp @@ -225,7 +225,7 @@ TTword *TTvocab::getPrimeWord(TTstring &str, TTword **srcWord) const { if (srcWord) // Pass out the pointer to the original word *srcWord = vocabP; - + // Return the new copy of the word return newWord; } @@ -267,7 +267,7 @@ TTword *TTvocab::getSuffixedWord(TTstring &str, TTword **srcWord) const { word = getPrimeWord(tempStr); } } - + } else if (tempStr.hasSuffix("ing")) { tempStr.deleteSuffix(3); word = getPrimeWord(tempStr); @@ -303,11 +303,11 @@ TTword *TTvocab::getSuffixedWord(TTstring &str, TTword **srcWord) const { } } } - + } else if (tempStr.hasSuffix("ed")) { tempStr.deleteSuffix(1); word = getPrimeWord(tempStr); - + if (!word) { tempStr.deleteSuffix(1); word = getPrimeWord(tempStr); @@ -333,7 +333,7 @@ TTword *TTvocab::getSuffixedWord(TTstring &str, TTword **srcWord) const { } else { tempStr = str; } - + } else if (tempStr.hasSuffix("er")) { tempStr.deleteSuffix(1); word = getPrimeWord(tempStr); @@ -395,7 +395,7 @@ TTword *TTvocab::getSuffixedWord(TTstring &str, TTword **srcWord) const { } } } - + } else if (tempStr.hasSuffix("est")) { tempStr.deleteSuffix(2); word = getPrimeWord(tempStr); diff --git a/engines/xeen/dialogs/credits_screen.cpp b/engines/xeen/dialogs/credits_screen.cpp index 09547ba282..d0269ad716 100644 --- a/engines/xeen/dialogs/credits_screen.cpp +++ b/engines/xeen/dialogs/credits_screen.cpp @@ -28,7 +28,7 @@ namespace Xeen { void CreditsScreen::show(XeenEngine *vm) { CreditsScreen *dlg = new CreditsScreen(vm); - + switch (vm->getGameID()) { case GType_Clouds: dlg->execute(Res.CLOUDS_CREDITS); @@ -41,7 +41,7 @@ void CreditsScreen::show(XeenEngine *vm) { dlg->execute(Res.DARK_SIDE_CREDITS); break; } - + delete dlg; } diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp index 3cc8afe4bd..c1628da13f 100644 --- a/engines/xeen/interface.cpp +++ b/engines/xeen/interface.cpp @@ -209,7 +209,7 @@ void Interface::mainIconsPrint() { Windows &windows = *_vm->_windows; windows[38].close(); windows[12].close(); - + res._globalSprites.draw(0, 7, Common::Point(232, 74)); drawButtons(&windows[0]); windows[34].update(); diff --git a/engines/xeen/party.cpp b/engines/xeen/party.cpp index b4b57e75ee..5ae53d69c6 100644 --- a/engines/xeen/party.cpp +++ b/engines/xeen/party.cpp @@ -1603,7 +1603,7 @@ uint Party::getScore() { uint time = _vm->_events->playTime() / GAME_FRAME_RATE; int minutes = (time % 3600) / 60; int hours = time / 3600; - + score += minutes + (hours * 100); return score; } diff --git a/engines/xeen/resources.cpp b/engines/xeen/resources.cpp index 513b1b7986..58f2926e9c 100644 --- a/engines/xeen/resources.cpp +++ b/engines/xeen/resources.cpp @@ -32,7 +32,7 @@ Resources *g_resources; Resources::Resources() { g_resources = this; g_vm->_files->setGameCc(1); - + _globalSprites.load("global.icn"); if (g_vm->getGameID() == GType_Swords) _logoSprites.load("logo.int"); diff --git a/engines/xeen/saves.cpp b/engines/xeen/saves.cpp index 96490c8937..82e294921b 100644 --- a/engines/xeen/saves.cpp +++ b/engines/xeen/saves.cpp @@ -272,7 +272,7 @@ bool SavesManager::loadGame() { bool SavesManager::saveGame() { Map &map = *g_vm->_map; - + if (map.mazeData()._mazeFlags & RESTRICTION_SAVE) { ErrorScroll::show(g_vm, Res.SAVE_OFF_LIMITS, WT_NONFREEZED_WAIT); return false; diff --git a/engines/xeen/scripts.cpp b/engines/xeen/scripts.cpp index ee55ffeeff..66e9013cda 100644 --- a/engines/xeen/scripts.cpp +++ b/engines/xeen/scripts.cpp @@ -479,7 +479,7 @@ bool Scripts::cmdTeleport(ParamsIterator ¶ms) { Sound &sound = *_vm->_sound; windows.closeAll(); - + bool restartFlag = _event->_opcode == OP_TeleportAndContinue; int mapId = params.readByte(); Common::Point pt; diff --git a/engines/xeen/scripts.h b/engines/xeen/scripts.h index 9cd4b6f101..89b6bda250 100644 --- a/engines/xeen/scripts.h +++ b/engines/xeen/scripts.h @@ -278,7 +278,7 @@ private: * Moves the position of an object */ bool cmdMoveObj(ParamsIterator ¶ms); - + /** * Take or give amounts from various character or party figures */ @@ -319,13 +319,13 @@ private: * Gives up to three different item/amounts to various character and/or party properties */ bool cmdGiveMulti(ParamsIterator ¶ms); - + /** * Prompts the user to enter a word for passwords or mirror * teleport destinations */ bool cmdConfirmWord(ParamsIterator ¶ms); - + /** * Deals damage to a character */ diff --git a/engines/xeen/subtitles.h b/engines/xeen/subtitles.h index 37148dbc92..55c5faaa26 100644 --- a/engines/xeen/subtitles.h +++ b/engines/xeen/subtitles.h @@ -65,7 +65,7 @@ public: * Set which subtitle line to display */ void setLine(int line); - + /** * Resets subtitles, stopping any display */ |