mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-02-24 15:32:30 +01:00
Code Issues Releases Wiki Activity

add subtitles settings, fix skaterboy,

Browse Source
This commit is contained in:
XProger 2019-02-16 06:24:52 +03:00
parent 787ef439e1
commit 2e0aa56726
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core.h
View File

@ -202,7 +202,7 @@ namespace Core {
#endif
} support;
#define SETTINGS_VERSION 3
#define SETTINGS_VERSION 4
#define SETTINGS_READING 0xFF
struct Settings {
@ -222,6 +222,7 @@ namespace Core {
uint8 quality[4];
};
uint8 simple;
uint8 subtitles;
uint8 vsync;
uint8 stereo;
void setFilter(Quality value) {
@ -728,6 +729,7 @@ namespace Core {
settings.detail.setShadows (Core::Settings::HIGH);
settings.detail.setWater (Core::Settings::HIGH);
settings.detail.simple = false;
settings.detail.subtitles = true;
settings.detail.vsync = true;
settings.detail.stereo = Settings::STEREO_OFF;
settings.audio.music = 14;

11
src/enemy.h
View File

@ -2790,15 +2790,20 @@ struct SkaterBoy : Human {
game->addEntity(TR::Entity::UZIS, getRoomIndex(), pos, 0);
}
virtual void hit(float damage, Controller *enemy = NULL, TR::HitType hitType = TR::HIT_DEFAULT) {
bool flag = health >= 120;
Human::hit(damage, enemy, hitType);
if (flag && health < 120) {
game->playTrack(56, true);
}
};
virtual int getStateGround() {
if (!think(false))
return state;
fullChestRotation = state == STATE_STAND_FIRE || state == STATE_MOVE_FIRE;
if (health < 120)
game->playTrack(56, true);
switch (state) {
case STATE_STOP :
flags.unused = 0;

15
src/inventory.h
View File

@ -122,16 +122,17 @@ struct OptionItem {
static const OptionItem optDetail[] = {
OptionItem( OptionItem::TYPE_TITLE, STR_SELECT_DETAIL ),
OptionItem( ),
OptionItem( OptionItem::TYPE_PARAM, STR_OPT_DETAIL_FILTER, SETTINGS( detail.filter ), STR_QUALITY_LOW, 0, 2 ),
OptionItem( OptionItem::TYPE_PARAM, STR_OPT_DETAIL_LIGHTING, SETTINGS( detail.lighting ), STR_QUALITY_LOW, 0, 2 ),
OptionItem( OptionItem::TYPE_PARAM, STR_OPT_DETAIL_SHADOWS, SETTINGS( detail.shadows ), STR_QUALITY_LOW, 0, 2 ),
OptionItem( OptionItem::TYPE_PARAM, STR_OPT_DETAIL_WATER, SETTINGS( detail.water ), STR_QUALITY_LOW, 0, 2 ),
OptionItem( OptionItem::TYPE_PARAM, STR_OPT_SIMPLE_ITEMS, SETTINGS( detail.simple ), STR_OFF, 0, 1 ),
OptionItem( OptionItem::TYPE_PARAM, STR_OPT_DETAIL_FILTER, SETTINGS( detail.filter ), STR_QUALITY_LOW, 0, 2 ),
OptionItem( OptionItem::TYPE_PARAM, STR_OPT_DETAIL_LIGHTING, SETTINGS( detail.lighting ), STR_QUALITY_LOW, 0, 2 ),
OptionItem( OptionItem::TYPE_PARAM, STR_OPT_DETAIL_SHADOWS, SETTINGS( detail.shadows ), STR_QUALITY_LOW, 0, 2 ),
OptionItem( OptionItem::TYPE_PARAM, STR_OPT_DETAIL_WATER, SETTINGS( detail.water ), STR_QUALITY_LOW, 0, 2 ),
OptionItem( OptionItem::TYPE_PARAM, STR_OPT_SIMPLE_ITEMS, SETTINGS( detail.simple ), STR_OFF, 0, 1 ),
OptionItem( OptionItem::TYPE_PARAM, STR_OPT_SUBTITLES, SETTINGS( detail.subtitles ), STR_OFF, 0, 1 ),
#if defined(_OS_WIN) || defined(_OS_LINUX) || defined(_OS_PSP) || defined(_OS_RPI) || defined(_OS_PSV)
OptionItem( OptionItem::TYPE_PARAM, STR_OPT_DETAIL_VSYNC, SETTINGS( detail.vsync ), STR_OFF, 0, 1 ),
OptionItem( OptionItem::TYPE_PARAM, STR_OPT_DETAIL_VSYNC, SETTINGS( detail.vsync ), STR_OFF, 0, 1 ),
#endif
#ifndef _OS_PSP
OptionItem( OptionItem::TYPE_PARAM, STR_OPT_DETAIL_STEREO, SETTINGS( detail.stereo ), STR_OFF, 0,
OptionItem( OptionItem::TYPE_PARAM, STR_OPT_DETAIL_STEREO, SETTINGS( detail.stereo ), STR_OFF, 0,
#if /*defined(_OS_WIN) ||*/ defined(_OS_ANDROID)
3 /* with VR option */
#else