From 48015aa751d94e2e2ec05aa24ea1791bae9c2ccd Mon Sep 17 00:00:00 2001 From: Matthew Duggan Date: Sat, 7 Jan 2023 10:46:55 +0900 Subject: [PATCH] TETRAEDGE: Small fixes. --- engines/tetraedge/game/application.cpp | 2 +- engines/tetraedge/game/game.cpp | 8 ++++++-- engines/tetraedge/game/game.h | 2 +- engines/tetraedge/game/main_menu.cpp | 4 +++- engines/tetraedge/te/te_camera.h | 2 +- engines/tetraedge/te/te_free_move_zone.cpp | 2 ++ engines/tetraedge/te/te_text_base2.cpp | 4 +++- engines/tetraedge/tetraedge.cpp | 10 +++++++--- 8 files changed, 24 insertions(+), 10 deletions(-) diff --git a/engines/tetraedge/game/application.cpp b/engines/tetraedge/game/application.cpp index 98ed7325b04..284cd0a6c90 100644 --- a/engines/tetraedge/game/application.cpp +++ b/engines/tetraedge/game/application.cpp @@ -299,7 +299,7 @@ void Application::startGame(bool newGame, int difficulty) { _appSpriteLayout.unload(); if (newGame) _difficulty = difficulty; - g_engine->getGame()->enter(newGame); + g_engine->getGame()->enter(); } void Application::resume() { diff --git a/engines/tetraedge/game/game.cpp b/engines/tetraedge/game/game.cpp index fc631015e28..8b66666b570 100644 --- a/engines/tetraedge/game/game.cpp +++ b/engines/tetraedge/game/game.cpp @@ -271,7 +271,7 @@ void Game::draw() { } } -void Game::enter(bool newgame) { +void Game::enter() { _enteredFlag2 = true; _entered = true; _luaShowOwnerError = false; @@ -339,7 +339,7 @@ void Game::enter(bool newgame) { _inventory.cellphone()->onCallNumber().add(this, &Game::onCallNumber); - if (!newgame) { + if (hasLoadName()) { loadBackup(_loadName); } else { _gameLoadState = 1; @@ -1016,6 +1016,10 @@ bool Game::onMouseClick(const Common::Point &pt) { if (app->isFading()) return true; + // In case we capture a click during a video.. + if (!_scene.currentCamera()) + return false; + _posPlayer = TeVector3f32(-1.0f, -1.0f, -1.0f); if (_previousMousePos == TeVector2s32(-1, -1)) { _previousMousePos = pt; diff --git a/engines/tetraedge/game/game.h b/engines/tetraedge/game/game.h index 36979202b83..9674923b5e5 100644 --- a/engines/tetraedge/game/game.h +++ b/engines/tetraedge/game/game.h @@ -101,7 +101,7 @@ public: void deleteNoScale(); void draw(); - void enter(bool newgame); + void enter(); // will load game if _loadName is set. // Note: game uses ILayouts here.. static TeI3DObject2 *findLayoutByName(TeLayout *parent, const Common::String &name); static TeSpriteLayout *findSpriteLayoutByName(TeLayout *parent, const Common::String &name); diff --git a/engines/tetraedge/game/main_menu.cpp b/engines/tetraedge/game/main_menu.cpp index a3deb90f071..9a02a952ac0 100644 --- a/engines/tetraedge/game/main_menu.cpp +++ b/engines/tetraedge/game/main_menu.cpp @@ -124,7 +124,9 @@ void MainMenu::enter() { versionNum->setText(versionSectionStr + app->getVersionString()); } - if (ConfMan.get("skip_mainmenu") == "true") { + // Skip the menu if we are loading. + Game *game = g_engine->getGame(); + if (game->hasLoadName() || ConfMan.get("skip_mainmenu") == "true") { onNewGameConfirmed(); } } diff --git a/engines/tetraedge/te/te_camera.h b/engines/tetraedge/te/te_camera.h index 0d73a0a1859..1afc99d426c 100644 --- a/engines/tetraedge/te/te_camera.h +++ b/engines/tetraedge/te/te_camera.h @@ -79,7 +79,7 @@ public: int projMatrixType() const { return _projectionMatrixType; } void setPerspectiveVal(float val) { _somePerspectiveVal = val; } float orthoNearPlane() const { return _orthNearVal; } - float orthoFarPlane() const { return _orthNearVal; } + float orthoFarPlane() const { return _orthFarVal; } private: void updateProjectionMatrix(); diff --git a/engines/tetraedge/te/te_free_move_zone.cpp b/engines/tetraedge/te/te_free_move_zone.cpp index 77b5be41363..ba4dd874364 100644 --- a/engines/tetraedge/te/te_free_move_zone.cpp +++ b/engines/tetraedge/te/te_free_move_zone.cpp @@ -807,6 +807,8 @@ TePickMesh2 *TeFreeMoveZone::findNearestMesh(TeIntrusivePtr &camera, c Common::Array &pickMeshes, TeVector3f32 *outloc, bool lastHitFirst) { TeVector3f32 closestLoc; TePickMesh2 *nearestMesh = nullptr; + if (!camera) + return nullptr; float closestDist = camera->orthoFarPlane(); Math::Ray camRay; for (unsigned int i = 0; i < pickMeshes.size(); i++) { diff --git a/engines/tetraedge/te/te_text_base2.cpp b/engines/tetraedge/te/te_text_base2.cpp index 19794a82b44..ed5015a16c7 100644 --- a/engines/tetraedge/te/te_text_base2.cpp +++ b/engines/tetraedge/te/te_text_base2.cpp @@ -214,7 +214,9 @@ void TeTextBase2::drawEmptyChar(unsigned int offset) { void TeTextBase2::drawLine(TeImage &img, const Common::String &str, int yoffset) { TeIntrusivePtr font = _fonts[0]; - font->draw(img, str, _fontSize, yoffset, _globalColor, _alignStyle); + // Note: We draw this with black because the global color will be applied on + // the mesh. + font->draw(img, str, _fontSize, yoffset, TeColor(0, 0, 0, 255), _alignStyle); } unsigned int TeTextBase2::endOfWord(unsigned int offset) const { diff --git a/engines/tetraedge/tetraedge.cpp b/engines/tetraedge/tetraedge.cpp index d2afbf479a6..05bf6b71680 100644 --- a/engines/tetraedge/tetraedge.cpp +++ b/engines/tetraedge/tetraedge.cpp @@ -148,7 +148,7 @@ Common::Error TetraedgeEngine::loadGameState(int slot) { return Common::kReadingFailed; // The game will reopen the file and do the loading, see Game::initLoadedBackupData - _game->setLoadName(saveStateName); + getGame()->setLoadName(saveStateName); delete saveFile; return Common::kNoError; @@ -193,18 +193,22 @@ Common::Error TetraedgeEngine::run() { _renderer = new TeRenderer(); _renderer->init(); _renderer->reset(); - _application->create(); // Set the engine's debugger console setDebugger(new Console()); getInputMgr()->_keyUpSignal.add(this, &TetraedgeEngine::onKeyUp); - // If a savegame was selected from the launcher, load it + // If a savegame was selected from the launcher, load it. + // Should be before application->create() because it only + // sets the game name to load inside the Game object. It will + // actually be loaded when the application is created. int saveSlot = ConfMan.getInt("save_slot"); if (saveSlot != -1) (void)loadGameState(saveSlot); + _application->create(); + Common::Event e; while (!shouldQuit()) {