From c4e54246a7926d0fbe69bd18c265b182bc57a487 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Mon, 17 Jun 2019 00:24:11 +0200 Subject: [PATCH] KINGDOM: Remove movie name array --- engines/kingdom/constants.cpp | 213 ---------------------------------- engines/kingdom/kingdom.cpp | 2 +- 2 files changed, 1 insertion(+), 214 deletions(-) diff --git a/engines/kingdom/constants.cpp b/engines/kingdom/constants.cpp index 1234e39c2bd..84b5e78dbf1 100644 --- a/engines/kingdom/constants.cpp +++ b/engines/kingdom/constants.cpp @@ -537,219 +537,6 @@ const char *_rezNames[] = { "KLF209.lbm", }; -const char *_movieNames[] = { - "", - "King001.mve", - "King002.mve", - "King003.mve", - "King004.mve", - "King005.mve", - "King006.mve", - "King007.mve", - "King008.mve", - "King009.mve", - "King010.mve", - "King011.mve", - "King012.mve", - "King013.mve", - "King014.mve", - "King015.mve", - "King016.mve", - "King017.mve", - "King018.mve", - "King019.mve", - "King020.mve", - "King021.mve", - "King022.mve", - "King023.mve", - "King024.mve", - "King025.mve", - "King026.mve", - "King027.mve", - "King028.mve", - "King029.mve", - "King030.mve", - "King031.mve", - "King032.mve", - "King033.mve", - "King034.mve", - "King035.mve", - "King036.mve", - "King037.mve", - "King038.mve", - "King039.mve", - "King040.mve", - "King041.mve", - "King042.mve", - "King043.mve", - "King044.mve", - "King045.mve", - "King046.mve", - "King047.mve", - "King048.mve", - "King049.mve", - "King050.mve", - "King051.mve", - "King052.mve", - "King053.mve", - "King054.mve", - "King055.mve", - "King056.mve", - "King057.mve", - "King058.mve", - "King059.mve", - "King060.mve", - "King061.mve", - "King062.mve", - "King063.mve", - "King064.mve", - "King065.mve", - "King066.mve", - "King067.mve", - "King068.mve", - "King069.mve", - "King070.mve", - "King071.mve", - "King072.mve", - "King073.mve", - "King074.mve", - "King075.mve", - "King076.mve", - "King077.mve", - "King078.mve", - "King079.mve", - "King080.mve", - "King081.mve", - "King082.mve", - "King083.mve", - "King084.mve", - "King085.mve", - "King086.mve", - "King087.mve", - "King088.mve", - "King089.mve", - "King090.mve", - "King091.mve", - "King092.mve", - "King093.mve", - "King094.mve", - "King095.mve", - "King096.mve", - "King097.mve", - "King098.mve", - "King099.mve", - "King100.mve", - "King101.mve", - "King102.mve", - "King103.mve", - "King104.mve", - "King105.mve", - "King106.mve", - "King107.mve", - "King108.mve", - "King109.mve", - "King110.mve", - "King111.mve", - "King112.mve", - "King113.mve", - "King114.mve", - "King115.mve", - "King116.mve", - "King117.mve", - "King118.mve", - "King119.mve", - "King120.mve", - "King121.mve", - "King122.mve", - "King123.mve", - "King124.mve", - "King125.mve", - "King126.mve", - "King127.mve", - "King128.mve", - "King129.mve", - "King130.mve", - "King131.mve", - "King132.mve", - "King133.mve", - "King134.mve", - "King135.mve", - "King136.mve", - "King137.mve", - "King138.mve", - "King139.mve", - "King140.mve", - "King141.mve", - "King142.mve", - "King143.mve", - "King144.mve", - "King145.mve", - "King146.mve", - "King147.mve", - "King148.mve", - "King149.mve", - "King150.mve", - "King151.mve", - "King152.mve", - "King153.mve", - "King154.mve", - "King155.mve", - "King156.mve", - "King157.mve", - "King158.mve", - "King159.mve", - "King160.mve", - "King161.mve", - "King162.mve", - "King163.mve", - "King164.mve", - "King165.mve", - "King166.mve", - "King167.mve", - "King168.mve", - "King169.mve", - "King170.mve", - "King171.mve", - "King172.mve", - "King173.mve", - "King174.mve", - "King175.mve", - "King176.mve", - "King177.mve", - "King178.mve", - "King179.mve", - "King180.mve", - "King181.mve", - "King182.mve", - "King183.mve", - "King184.mve", - "King185.mve", - "King186.mve", - "King187.mve", - "King188.mve", - "King189.mve", - "King190.mve", - "King191.mve", - "King192.mve", - "King193.mve", - "King194.mve", - "King195.mve", - "King196.mve", - "King197.mve", - "King198.mve", - "King199.mve", - "King200.mve", - "King201.mve", - "King202.mve", - "King203.mve", - "King204.mve", - "King205.mve", - "King206.mve", - "King207.mve", - "King208.mve", - "King209.mve" -}; - int _mapExit[] = { 0, 100, 90, 50, 420, 550, 110, 70, 80, 180, 190, 200, 210, 230, 240, 300, 290, 330, 360, 310, diff --git a/engines/kingdom/kingdom.cpp b/engines/kingdom/kingdom.cpp index 609440c44e0..56e8441581c 100644 --- a/engines/kingdom/kingdom.cpp +++ b/engines/kingdom/kingdom.cpp @@ -470,7 +470,7 @@ void KingdomGame::playMovie(int movieNum) { readMouse(); _mouseButton = 0; _keyActive = false; - const char *path = _movieNames[movieNum]; + const Common::String path = Common::String::format("King%.3d.mve", movieNum); // Check if the file is available. If not the original does the following: _ATimer = 55, display of error with a check of timer, exit // That can be replaced by an error()