[Scummvm-git-logs] scummvm master -> 022906fb86f2894192ee4abcef8b1326ab08223b
bluegr
noreply at scummvm.org
Wed May 11 22:25:35 UTC 2022
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
022906fb86 TINSEL: Remove unused defines
Commit: 022906fb86f2894192ee4abcef8b1326ab08223b
https://github.com/scummvm/scummvm/commit/022906fb86f2894192ee4abcef8b1326ab08223b
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2022-05-12T01:25:18+03:00
Commit Message:
TINSEL: Remove unused defines
Changed paths:
engines/tinsel/bmv.cpp
engines/tinsel/dialogs.cpp
engines/tinsel/graphics.cpp
engines/tinsel/move.cpp
engines/tinsel/pdisplay.cpp
engines/tinsel/strres.cpp
diff --git a/engines/tinsel/bmv.cpp b/engines/tinsel/bmv.cpp
index ab815057789..910bada8045 100644
--- a/engines/tinsel/bmv.cpp
+++ b/engines/tinsel/bmv.cpp
@@ -50,9 +50,6 @@ namespace Tinsel {
#define BMOVIE_EXTENSION ".bmv"
#define SZ_C_BLOB 65
-#define SZ_U_BLOB 128
-
-#define BLANK_SOUND 0x0 // for 16 bit silence
#define PT_A 20 // Number of times PT_B may be reached
#define PT_B 6
@@ -64,8 +61,6 @@ namespace Tinsel {
#define CD_SLOT_NOP 0x00 // Skip to next slot
#define CD_LE_FIN 0x01 // End of movie
-#define CD_PDELTA 0x02 // Image compressed to previous one
-#define CD_SDELTA 0x03 // Image self-compressed
#define BIT0 0x01
diff --git a/engines/tinsel/dialogs.cpp b/engines/tinsel/dialogs.cpp
index 54951a8ae61..42eea9948db 100644
--- a/engines/tinsel/dialogs.cpp
+++ b/engines/tinsel/dialogs.cpp
@@ -171,7 +171,6 @@ enum PARTS_INDEX {
#define IX_CURDU ((TinselVersion >= 2) ? IX2_CURDU : IX1_CURDU)
#define IX_CURLR ((TinselVersion >= 2) ? IX2_CURLR : IX1_CURLR)
#define IX_CURUD ((TinselVersion >= 2) ? IX2_CURUD : IX1_CURUD)
-#define IX_CURUL ((TinselVersion >= 2) ? IX2_CURUL : IX1_CURUL)
#define IX_MDGROOVE ((TinselVersion >= 2) ? IX2_MDGROOVE : IX1_MDGROOVE)
#define IX_MDSLIDER ((TinselVersion >= 2) ? IX2_MDSLIDER : IX1_MDSLIDER)
#define IX_NTR ((TinselVersion >= 2) ? IX2_NTR : IX1_NTR)
@@ -190,7 +189,6 @@ enum PARTS_INDEX {
#define FIX_IT 3
#define FIX_SP 4
#define FIX_USA 5
-#define HOPEDFORFREELS 6 // Expected flag reels
//-----------------------
#define MAX_ININV ((TinselVersion >= 2) ? 160 : 150) // Max in an inventory
@@ -214,9 +212,7 @@ enum PARTS_INDEX {
#define NM_BG_SIZ_X ((TinselVersion >= 2) ? -18 : -3) // }
#define NM_BG_SIZ_Y ((TinselVersion >= 2) ? -18 : -3) // } How much larger it is than edges
-#define NM_RS_T_INSET 3
#define NM_RS_B_INSET 4
-#define NM_RS_L_INSET 3
#define NM_RS_R_INSET 4
#define NM_RS_THICKNESS 5
#define NM_MOVE_AREA_B_Y 30
@@ -278,7 +274,6 @@ static const int vFillers[MAXVICONS] = {
//----- Data pertinant to configure (incl. load/save game) -----
-#define COL_MAINBOX TBLUE1 // Base blue color
#define COL_BOX TBLUE1
#define COL_HILIGHT TBLUE4
@@ -349,10 +344,6 @@ struct CONFINIT {
#define FBX 15 // x-offset of first button
#endif
-#define OPTX 33
-#define OPTY 30
-#define BOX_V_SEP 7
-
#define BOXX 56 // X-position of text boxes
#define BOXY 50 // Y-position of text boxes
#define T3_BOXX 60
@@ -427,8 +418,6 @@ static CONFBOX* ciOptionBoxLookup[] = {
| These are the load and save game menus. |
\*-------------------------------------------------------------*/
-#define NUM_RGROUP_BOXES 9
-
#ifdef JAPAN
#define NUM_RGROUP_BOXES 7 // number of visible slots
#define SY 32 // y-position of first slot
@@ -837,7 +826,6 @@ enum {
/*-------------------------------------------------------------------------*/
/*** Magic numbers ***/
-#define M_SW 5 // Side width
#define M_TH 5 // Top height
#ifdef JAPAN
#define M_TOFF 6 // Title text Y offset from top
diff --git a/engines/tinsel/graphics.cpp b/engines/tinsel/graphics.cpp
index de596d4ee48..9a97b2d866f 100644
--- a/engines/tinsel/graphics.cpp
+++ b/engines/tinsel/graphics.cpp
@@ -26,7 +26,6 @@
#include "tinsel/palette.h"
#include "tinsel/scene.h"
#include "tinsel/tinsel.h"
-#include "tinsel/scn.h"
#include "common/textconsole.h"
@@ -34,11 +33,6 @@ namespace Tinsel {
//----------------- LOCAL DEFINES --------------------
-// Defines used in graphic drawing
-#define CHARPTR_OFFSET 16
-#define CHAR_WIDTH 4
-#define CHAR_HEIGHT 4
-
extern uint8 g_transPalette[MAX_COLORS];
//----------------- SUPPORT FUNCTIONS ---------------------
diff --git a/engines/tinsel/move.cpp b/engines/tinsel/move.cpp
index 75366223ad7..5cf7044fe9a 100644
--- a/engines/tinsel/move.cpp
+++ b/engines/tinsel/move.cpp
@@ -52,9 +52,7 @@ HPOLYGON InitExtraBlock(MOVER *ca, MOVER *ta);
//----------------- LOCAL DEFINES --------------------
#define XMDIST ((TinselVersion >= 2) ? 6 : 4)
-#define XHMDIST ((TinselVersion >= 2) ? 3 : 2)
#define YMDIST ((TinselVersion >= 2) ? 3 : 2)
-#define YHMDIST ((TinselVersion >= 2) ? 3 : 2)
#define XTHERE 1
#define XRESTRICT 2
diff --git a/engines/tinsel/pdisplay.cpp b/engines/tinsel/pdisplay.cpp
index 689970fc228..c95777a8e8c 100644
--- a/engines/tinsel/pdisplay.cpp
+++ b/engines/tinsel/pdisplay.cpp
@@ -55,13 +55,6 @@ extern int g_newestString; // The overrun counter, in STRRES.C
//----------------- LOCAL DEFINES --------------------
-#define LPOSX 295 // X-co-ord of lead actor's position display
-#define CPOSX 24 // X-co-ord of cursor's position display
-#define OPOSX SCRN_CENTER_X // X-co-ord of overrun counter's display
-#define SPOSX SCRN_CENTER_X // X-co-ord of string numbner's display
-
-#define POSY 0 // Y-co-ord of these position displays
-
enum HotSpotTag {
NO_HOTSPOT_TAG,
POLY_HOTSPOT_TAG,
diff --git a/engines/tinsel/strres.cpp b/engines/tinsel/strres.cpp
index 3a42327cff7..737d25060f9 100644
--- a/engines/tinsel/strres.cpp
+++ b/engines/tinsel/strres.cpp
@@ -68,12 +68,6 @@ bool g_bMultiByte = false;
LANGUAGE g_textLanguage, g_sampleLanguage = TXT_ENGLISH;
-//----------------- LOCAL DEFINES ----------------------------
-
-#define languageExtension ".txt"
-#define indexExtension ".idx"
-#define sampleExtension ".smp"
-
//----------------- FUNCTIONS --------------------------------
void ResetVarsStrRes() {
More information about the Scummvm-git-logs
mailing list