libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 22:28:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ULTIMA8: Remove some dead code

Browse Source 
Code that has been #if 0 for a long time, and some default setting for Crusader
which is not used.
This commit is contained in:
Matthew Duggan 2021-05-23 11:04:46 +09:00
parent 01e08d5cbe
commit b9ddaf64f2
2 changed files with 15 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
engines/ultima/ultima8/games/remorse_game.cpp
View File

@ -44,12 +44,6 @@ namespace Ultima {
namespace Ultima8 {
RemorseGame::RemorseGame() : Game() {
// Set some defaults for gameplay-related settings
ConfMan.registerDefault("endgame", true);
ConfMan.registerDefault("footsteps", true);
ConfMan.registerDefault("talkspeed", 96);
ConfMan.registerDefault("subtitles", true);
ConfMan.registerDefault("speech_mute", false);
}
RemorseGame::~RemorseGame() {
@ -59,7 +53,7 @@ RemorseGame::~RemorseGame() {
static bool loadPalette(const char *path, PaletteManager::PalIndex index) {
Common::SeekableReadStream *pf = FileSystem::get_instance()->ReadFile(path);
if (!pf) {
perr << "Unable to load static/*.pal." << Std::endl;
perr << "Unable to load " << path << Std::endl;
return false;
}
@ -120,23 +114,20 @@ bool RemorseGame::startGame() {
ObjectManager::get_instance()->assignActorObjId(actor, 1);
if (GAME_IS_REMORSE) {
// Some useful points to warp into for testing..
actor->setLocation(0, 0, 0); // Map 1 (mission 1)
//actor->setLocation(60716, 59400, 16); // Map 1 (mission 1)
//actor->setLocation(42493, 26621, 16); // Map 2 (mission 1 / level 4)
//actor->setLocation(34302, 32254, 16); // Map 3 (mission 2)
//actor->setLocation(34813, 33789, 16); // Map 4
//actor->setLocation(37373, 30205, 16); // Map 5
//actor->setLocation(37373, 30205, 16); // Map 6
//actor->setLocation(35070, 26142, 96); // Map 7
//actor->setLocation(29693, 32253, 0); // Map 8 - unfinished area?
//actor->setLocation(2046, 2046, 0); // Map 9
//actor->setLocation(14845, 6141, 0); // Map 22 - debugging map
//actor->setLocation(34302, 32254, 16); // Map 40 (Rebel base)
} else {
actor->setLocation(58174, 56606, 16);
}
actor->setLocation(0, 0, 0); // Map 1 (mission 1)
// Some useful points to warp into for testing No Remorse
//actor->setLocation(60716, 59400, 16); // Map 1 (mission 1)
//actor->setLocation(42493, 26621, 16); // Map 2 (mission 1 / level 4)
//actor->setLocation(34302, 32254, 16); // Map 3 (mission 2)
//actor->setLocation(34813, 33789, 16); // Map 4
//actor->setLocation(37373, 30205, 16); // Map 5
//actor->setLocation(37373, 30205, 16); // Map 6
//actor->setLocation(35070, 26142, 96); // Map 7
//actor->setLocation(29693, 32253, 0); // Map 8 - unfinished area?
//actor->setLocation(2046, 2046, 0); // Map 9
//actor->setLocation(14845, 6141, 0); // Map 22 - debugging map
//actor->setLocation(34302, 32254, 16); // Map 40 (Rebel base)
World::get_instance()->switchMap(0);

129
engines/ultima/ultima8/graphics/xform_blend.cpp
View File

@ -65,134 +65,5 @@ const uint8 CruXFormPal[1024] = {
0, 0, 0, 0
};
#if 0
//
// XFORM Blend Funcs
//
// BlendFunc is always glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
#define XFORM_BLEND_FUNC(ra,ga,ba,a) { \
r*=255-a; \
g*=255-a; \
b*=255-a; \
r+=ra*255; \
g+=ga*255; \
b+=ba*255; }
//
// Colour 8 (green->dark grey)
//
// xform_palette[32] = 48;
// xform_palette[33] = 48;
// xform_palette[34] = 48;
// xform_palette[35] = 80;
//
// dest*175 + {48,48,48}
//
uint32 P_FASTCALL U8xformCol8(uint32 col) {
static uint32 r, g, b;
UNPACK_RGB8(col, r, g, b);
XFORM_BLEND_FUNC(48, 48, 48, 80);
return PACK_RGB16(r, g, b);
}
// Adjust 9 (black->vdark grey)
// xform_palette[36] = 24;
// xform_palette[37] = 24;
// xform_palette[38] = 24;
// xform_palette[39] = 80;
uint32 P_FASTCALL U8xformCol9(uint32 col) {
static uint32 r, g, b;
UNPACK_RGB8(col, r, g, b);
XFORM_BLEND_FUNC(24, 24, 24, 80);
return PACK_RGB16(r, g, b);
}
// Adjust 9 (yellow)
// xform_palette[40] = 64;
// xform_palette[41] = 64;
// xform_palette[42] = 24;
// xform_palette[43] = 64;
uint32 P_FASTCALL U8xformCol10(uint32 col) {
static uint32 r, g, b;
UNPACK_RGB8(col, r, g, b);
XFORM_BLEND_FUNC(64, 64, 24, 64);
return PACK_RGB16(r, g, b);
}
// Adjust 11 (white->grey)
// xform_palette[44] = 80;
// xform_palette[45] = 80;
// xform_palette[46] = 80;
// xform_palette[47] = 80;
uint32 P_FASTCALL U8xformCol11(uint32 col) {
static uint32 r, g, b;
UNPACK_RGB8(col, r, g, b);
XFORM_BLEND_FUNC(80, 80, 80, 80);
return PACK_RGB16(r, g, b);
}
// Adjust 12 (red->orange)
// xform_palette[48] = 180;
// xform_palette[49] = 90;
// xform_palette[50] = 0;
// xform_palette[51] = 80;
uint32 P_FASTCALL U8xformCol12(uint32 col) {
static uint32 r, g, b;
UNPACK_RGB8(col, r, g, b);
XFORM_BLEND_FUNC(180, 90, 0, 80);
if (r > 65535) r = 65535;
if (g > 65535) g = 65535;
return PACK_RGB16(r, g, b);
}
// 13 (blue) just need alpha modified
// xform_palette[52] = 0;
// xform_palette[53] = 0;
// xform_palette[54] = 252;
// xform_palette[55] = 40;
uint32 P_FASTCALL U8xformCol13(uint32 col) {
static uint32 r, g, b;
UNPACK_RGB8(col, r, g, b);
XFORM_BLEND_FUNC(0, 0, 252, 40);
if (b > 65535) b = 65535;
return PACK_RGB16(r, g, b);
}
// 14 (blue) just need alpha modified
// xform_palette[56] = 0;
// xform_palette[57] = 0;
// xform_palette[58] = 104;
// xform_palette[59] = 40;
uint32 P_FASTCALL U8xformCol14(uint32 col) {
static uint32 r, g, b;
UNPACK_RGB8(col, r, g, b);
XFORM_BLEND_FUNC(0, 0, 104, 40);
if (b > 65535) b = 65535;
return PACK_RGB16(r, g, b);
}
const xformBlendFuncType U8XFormFuncs[256] = {
0, // 0
0, // 1
0, // 2
0, // 3
0, // 4
0, // 5
0, // 6
0, // 7
static_cast<xformBlendFuncType>(&U8xformCol8), // 8 (green->dark grey)
static_cast<xformBlendFuncType>(&U8xformCol9), // 9 (black->vdark grey)
static_cast<xformBlendFuncType>(&U8xformCol10), // 10 (yellow)
static_cast<xformBlendFuncType>(&U8xformCol11), // 11 (white->grey)
static_cast<xformBlendFuncType>(&U8xformCol12), // 12 (red->orange)
static_cast<xformBlendFuncType>(&U8xformCol13), // 13 (blue)
static_cast<xformBlendFuncType>(&U8xformCol14), // 14 (blue)
0 // 15
};
#endif
} // End of namespace Ultima8
} // End of namespace Ultima