libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 07:11:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'branch-1-3-0' into master

Browse Source 
I manually resolved all conflicts, and inspected every single change.
Many were due to the version string mismatch and thus easily resolved.
The MSVC project files add in the 1-3-0 branch were not merged,
neither where the changes to gui/themes/translations.dat.

Conflicts:
	NEWS
	backends/base-backend.cpp
	backends/graphics/samsungtvsdl/samsungtvsdl-graphics.cpp
	backends/module.mk
	backends/platform/ds/arm9/makefile
	backends/platform/psp/README.PSP
	backends/platform/samsungtv/main.cpp
	backends/platform/samsungtv/samsungtv.cpp
	backends/saves/posix/posix-saves.cpp
	base/commandLine.cpp
	base/internal_version.h
	base/main.cpp
	common/array.h
	configure
	devtools/create_project/create_project.cpp
	dists/android/AndroidManifest.xml
	dists/android/plugin-manifest.xml
	dists/iphone/Info.plist
	dists/irix/scummvm.spec
	dists/macosx/Info.plist
	dists/redhat/scummvm-tools.spec
	dists/redhat/scummvm.spec
	dists/scummvm.rc
	dists/slackware/scummvm.SlackBuild
	dists/wii/meta.xml
	engines/sci/parser/vocabulary.cpp
	engines/tinsel/handle.cpp
	gui/themes/translations.dat
This commit is contained in:
Max Horn 2011-06-01 15:15:31 +02:00
commit a4610df482
19 changed files with 188 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
audio/softsynth/opl/mame.cpp
View File

@ -754,8 +754,10 @@ static int OPLOpenTable(void) {
} }
static void OPLCloseTable(void) { static void OPLCloseTable(void) {
#ifndef __DS__
free(TL_TABLE); free(TL_TABLE);
free(SIN_TABLE); free(SIN_TABLE);
#endif
free(AMS_TABLE); free(AMS_TABLE);
free(VIB_TABLE); free(VIB_TABLE);
free(ENV_CURVE); free(ENV_CURVE);

6
backends/graphics/samsungtvsdl/samsungtvsdl-graphics.cpp
View File

@ -20,12 +20,14 @@
* *
*/ */
#include "common/scummsys.h"
#if defined(SAMSUNGTV)
#include "backends/platform/samsungtv/samsungtv.h" #include "backends/platform/samsungtv/samsungtv.h"
#include "backends/events/samsungtvsdl/samsungtvsdl-events.h" #include "backends/events/samsungtvsdl/samsungtvsdl-events.h"
#include "backends/graphics/samsungtvsdl/samsungtvsdl-graphics.h" #include "backends/graphics/samsungtvsdl/samsungtvsdl-graphics.h"
#if defined(SAMSUNGTV)
SamsungTVSdlGraphicsManager::SamsungTVSdlGraphicsManager(SdlEventSource *sdlEventSource) SamsungTVSdlGraphicsManager::SamsungTVSdlGraphicsManager(SdlEventSource *sdlEventSource)
: SdlGraphicsManager(sdlEventSource) { : SdlGraphicsManager(sdlEventSource) {
} }

2
backends/platform/android/jni.cpp
View File

@ -602,10 +602,12 @@ void JNI::setPause(JNIEnv *env, jobject self, jboolean value) {
g_engine->pauseEngine(value); g_engine->pauseEngine(value);
#if 0
if (value && if (value &&
g_engine->hasFeature(Engine::kSupportsSavingDuringRuntime) && g_engine->hasFeature(Engine::kSupportsSavingDuringRuntime) &&
g_engine->canSaveGameStateCurrently()) g_engine->canSaveGameStateCurrently())
g_engine->saveGameState(0, "Android parachute"); g_engine->saveGameState(0, "Android parachute");
#endif
} }
pause = value; pause = value;

4
backends/platform/dc/Makefile
View File

@ -11,9 +11,13 @@ CXX = sh-elf-g++ -ml -m4-single-only
LD = $(CXX) LD = $(CXX)
CXXFLAGS= -O3 -Wno-multichar -funroll-loops -fschedule-insns2 -fomit-frame-pointer -fdelete-null-pointer-checks -fno-exceptions CXXFLAGS= -O3 -Wno-multichar -funroll-loops -fschedule-insns2 -fomit-frame-pointer -fdelete-null-pointer-checks -fno-exceptions
DEFINES = -D__DC__ -DNONSTANDARD_PORT -DUSE_MAD -DUSE_ZLIB -DDISABLE_DEFAULT_SAVEFILEMANAGER -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE -DUSE_RGB_COLOR DEFINES = -D__DC__ -DNONSTANDARD_PORT -DUSE_MAD -DUSE_ZLIB -DDISABLE_DEFAULT_SAVEFILEMANAGER -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE -DUSE_RGB_COLOR
# For release builds:
#DEFINES := -DNOSERIAL
LDFLAGS = -Wl,-Ttext,0x8c010000 -nostartfiles $(ronindir)/lib/crt0.o LDFLAGS = -Wl,-Ttext,0x8c010000 -nostartfiles $(ronindir)/lib/crt0.o
INCLUDES= -I./ -I$(srcdir) -I$(ronindir)/include/ -I$(srcdir)/engines INCLUDES= -I./ -I$(srcdir) -I$(ronindir)/include/ -I$(srcdir)/engines
LIBS = -L$(ronindir)/lib -lmad -lronin -lz -lm LIBS = -L$(ronindir)/lib -lmad -lronin -lz -lm
# For release builds:
#LIBS = -L$(ronindir)/lib -lmad -lronin-noserial -lz -lm
EXECUTABLE = scummvm.elf EXECUTABLE = scummvm.elf
DEPDIR = .deps DEPDIR = .deps
CXX_UPDATE_DEP_FLAG = -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP CXX_UPDATE_DEP_FLAG = -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP

6
backends/platform/ds/arm9/makefile
View File

@ -75,7 +75,7 @@ else
ifdef DS_BUILD_K ifdef DS_BUILD_K
else else
# USE_MAD = 1 USE_MAD = 1
endif endif
endif endif
endif endif
@ -246,6 +246,8 @@ ifdef USE_MAD
endif endif
DEFINES += -DREDUCE_MEMORY_USAGE -DDISABLE_DEBUGGER -DUSE_TEXT_CONSOLE_FOR_DEBUGGER -DDISABLE_MASS_ADD -DDISABLE_NES_APU DEFINES += -DREDUCE_MEMORY_USAGE -DDISABLE_DEBUGGER -DUSE_TEXT_CONSOLE_FOR_DEBUGGER -DDISABLE_MASS_ADD -DDISABLE_NES_APU
# for release builds:
#DEFINES += -DNDEBUG
LDFLAGS = -specs=ds_arm9.specs -mthumb-interwork -mno-fpu -Wl,-Map,map.txt -Wl,--gc-sections LDFLAGS = -specs=ds_arm9.specs -mthumb-interwork -mno-fpu -Wl,-Map,map.txt -Wl,--gc-sections
@ -259,7 +261,7 @@ BACKEND := ds
INCLUDES= -I$(portdir)/$(BUILD) -I$(srcdir) -I$(srcdir)/engines \ INCLUDES= -I$(portdir)/$(BUILD) -I$(srcdir) -I$(srcdir)/engines \
-I$(portdir)/data -I$(portdir)/../commoninclude \ -I$(portdir)/data -I$(portdir)/../commoninclude \
-I$(portdir)/source -I$(portdir)/source/mad \ -I$(portdir)/source -I$(portdir)/source/mad \
-I$(libndsdir)/include -include $(srcdir)/common/scummsys.h -I$(libndsdir)/include -include $(portdir)/source/portdefs.h
LIBS = -lm -L$(libndsdir)/lib -L$(portdir)/lib -lnds9 LIBS = -lm -L$(libndsdir)/lib -L$(portdir)/lib -lnds9

5
backends/platform/ds/arm9/source/dsmain.cpp
View File

@ -575,7 +575,7 @@ void initGame() {
for (int r = 0; r < NUM_SUPPORTED_GAMES; r++) { for (int r = 0; r < NUM_SUPPORTED_GAMES; r++) {
if (!stricmp(gameName, gameList[r].gameId)) { if (!stricmp(gameName, gameList[r].gameId)) {
s_currentGame = &gameList[r]; s_currentGame = &gameList[r];
// consolePrintf("Game list num: %d\n", s_currentGame); // consolePrintf("Game list num: %d\n", r);
} }
} }
} }
@ -1668,8 +1668,7 @@ void addEventsToQueue() {
if (!keyboardEnable) { if (!keyboardEnable) {
if ((!isScrollingWithDPad() || (indyFightState)) && (displayModeIs8Bit)) {
if ((isScrollingWithDPad() || (indyFightState)) && (displayModeIs8Bit)) {
// Controls specific to the control method // Controls specific to the control method
if (s_currentGame->control == CONT_SKY) { if (s_currentGame->control == CONT_SKY) {

99
backends/platform/ps2/Makefile.gdb
View File

@ -1,7 +1,7 @@
# $Header: Exp $ # $Header: Exp $
include $(PS2SDK)/Defs.make include $(PS2SDK)/Defs.make
PS2_EXTRA = /media/disk/nw8240/extras/scummvm/ports PS2_EXTRA = /works/devel/ps2/sdk-extra
PS2_EXTRA_INCS = /zlib/include /libmad/ee/include /SjPcm/ee/src /tremor PS2_EXTRA_INCS = /zlib/include /libmad/ee/include /SjPcm/ee/src /tremor
PS2_EXTRA_LIBS = /zlib/lib /libmad/ee/lib /SjPcm/ee/lib /tremor/tremor PS2_EXTRA_LIBS = /zlib/lib /libmad/ee/lib /SjPcm/ee/lib /tremor/tremor
@ -9,31 +9,44 @@ ENABLED=STATIC_PLUGIN
ENABLE_SCUMM = $(ENABLED) ENABLE_SCUMM = $(ENABLED)
ENABLE_SCUMM_7_8 = $(ENABLED) ENABLE_SCUMM_7_8 = $(ENABLED)
#ENABLE_HE = $(ENABLED) # ENABLE_HE = $(ENABLED)
#ENABLE_AGI = $(ENABLED) # ENABLE_AGI = $(ENABLED)
#ENABLE_AGOS = $(ENABLED) # ENABLE_AGOS = $(ENABLED)
#ENABLE_CINE = $(ENABLED) # ENABLE_AGOS2 = $(ENABLED)
#ENABLE_CRUISE = $(ENABLED) # ENABLE_CINE = $(ENABLED)
#ENABLE_DRASCULA = $(ENABLED) # ENABLE_CRUISE = $(ENABLED)
#ENABLE_GOB = $(ENABLED) # ENABLE_DRACI = $(ENABLED)
#ENABLE_KYRA = $(ENABLED) # ENABLE_DRASCULA = $(ENABLED)
#ENABLE_LURE = $(ENABLED) # ENABLE_GOB = $(ENABLED)
# ENABLE_M4 = $(ENABLED) # ENABLE_GROOVIE = $(ENABLED)
#ENABLE_MADE = $(ENABLED) ## ENABLE_GROOVIE2 = $(ENABLED)
#ENABLE_PARALLACTION = $(ENABLED) # ENABLE_HUGO = $(ENABLED)
#ENABLE_QUEEN = $(ENABLED) # ENABLE_IHNM = $(ENABLED)
#ENABLE_SAGA = $(ENABLED) # ENABLE_KYRA = $(ENABLED)
#ENABLE_SAGA2 = $(ENABLED) ## ENABLE_LOL = $(ENABLED)
#ENABLE_IHNM = $(ENABLED) # ENABLE_LURE = $(ENABLED)
#ENABLE_SKY = $(ENABLED) ## ENABLE_M4 = $(ENABLED)
#ENABLE_SWORD1 = $(ENABLED) # ENABLE_MADE = $(ENABLED)
#ENABLE_SWORD2 = $(ENABLED) # ENABLE_MOHAWK = $(ENABLED)
# ENABLE_TINSEL = $(ENABLED) # ENABLE_PARALLACTION = $(ENABLED)
#ENABLE_TOUCHE = $(ENABLED) # ENABLE_QUEEN = $(ENABLED)
# ENABLE_SAGA = $(ENABLED)
# ENABLE_SAGA2 = $(ENABLED)
# ENABLE_SCI = $(ENABLED)
## ENABLE_SCI32 = $(ENABLED)
# ENABLE_SKY = $(ENABLED)
# ENABLE_SWORD1 = $(ENABLED)
# ENABLE_SWORD2 = $(ENABLED)
# ENABLE_TEENAGENT = $(ENABLED)
# ENABLE_TINSEL = $(ENABLED)
# ENABLE_TOON = $(ENABLED)
# ENABLE_TOUCHE = $(ENABLED)
# ENABLE_TUCKER = $(ENABLED)
HAVE_GCC3 = true HAVE_GCC3 = true
CC = ee-gcc CC = ee-gcc
CXX = ee-g++ CXX = ee-g++
AS = ee-gcc AS = ee-gcc
LD = ee-gcc LD = ee-gcc
@ -48,35 +61,35 @@ VPATH = $(srcdir)
INCDIR = ../../../ INCDIR = ../../../
# DEPDIR = .deps # DEPDIR = .deps
DEFINES = -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_ZLIB -DFORCE_RTL -D_EE -D__PLAYSTATION2__ -D__PS2_DEBUG__ -g -Wall -Wno-multichar DEFINES = -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_ZLIB -DFORCE_RTL -DDISABLE_SAVEGAME_SORTING -D_EE -D__PLAYSTATION2__ -D__PS2_DEBUG__ -g -Wall -Wno-multichar -fno-rtti -fno-exceptions # -DNO_ADAPTOR
DEFINES += -DRELEASE_BUILD
INCLUDES = $(addprefix -I$(PS2_EXTRA),$(PS2_EXTRA_INCS)) INCLUDES = $(addprefix -I$(PS2_EXTRA),$(PS2_EXTRA_INCS))
INCLUDES += -I $(PS2GDB)/ee -I $(PS2SDK)/ee/include -I $(PS2SDK)/common/include -I ./common -I . -I $(srcdir) -I $(srcdir)/engines INCLUDES += -I $(PS2GDB)/ee -I $(PS2SDK)/ee/include -I $(PS2SDK)/common/include -I ./common -I . -I $(srcdir) -I $(srcdir)/engines
CXX_UPDATE_DEP_FLAG = -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP
TARGET = elf/scummvm.elf TARGET = elf/scummvm.elf
OBJS := backends/platform/ps2/DmaPipe.o \ OBJS := $(srcdir)/backends/platform/ps2/DmaPipe.o \
backends/platform/ps2/Gs2dScreen.o \ $(srcdir)/backends/platform/ps2/Gs2dScreen.o \
backends/platform/ps2/irxboot.o \ $(srcdir)/backends/platform/ps2/irxboot.o \
backends/platform/ps2/ps2input.o \ $(srcdir)/backends/platform/ps2/ps2input.o \
backends/platform/ps2/ps2pad.o \ $(srcdir)/backends/platform/ps2/ps2pad.o \
backends/platform/ps2/savefilemgr.o \ $(srcdir)/backends/platform/ps2/savefilemgr.o \
backends/platform/ps2/fileio.o \ $(srcdir)/backends/platform/ps2/fileio.o \
backends/platform/ps2/asyncfio.o \ $(srcdir)/backends/platform/ps2/asyncfio.o \
backends/platform/ps2/icon.o \ $(srcdir)/backends/platform/ps2/icon.o \
backends/platform/ps2/cd.o \ $(srcdir)/backends/platform/ps2/cd.o \
backends/platform/ps2/eecodyvdfs.o \ $(srcdir)/backends/platform/ps2/eecodyvdfs.o \
backends/platform/ps2/rpckbd.o \ $(srcdir)/backends/platform/ps2/rpckbd.o \
backends/platform/ps2/systemps2.o \ $(srcdir)/backends/platform/ps2/systemps2.o \
backends/platform/ps2/ps2mutex.o \ $(srcdir)/backends/platform/ps2/ps2mutex.o \
backends/platform/ps2/ps2time.o \ $(srcdir)/backends/platform/ps2/ps2time.o \
backends/platform/ps2/ps2debug.o $(srcdir)/backends/platform/ps2/ps2debug.o
MODULE_DIRS += . MODULE_DIRS += .
BACKEND := ps2
include $(srcdir)/Makefile.common include $(srcdir)/Makefile.common
LDFLAGS += -mno-crt0 $(PS2SDK)/ee/startup/crt0.o -T $(PS2SDK)/ee/startup/linkfile LDFLAGS += -mno-crt0 $(PS2SDK)/ee/startup/crt0.o -T $(PS2SDK)/ee/startup/linkfile

59
backends/platform/ps2/Makefile.ps2
View File

@ -12,28 +12,41 @@ ENABLE_SCUMM_7_8 = $(ENABLED)
ENABLE_HE = $(ENABLED) ENABLE_HE = $(ENABLED)
ENABLE_AGI = $(ENABLED) ENABLE_AGI = $(ENABLED)
ENABLE_AGOS = $(ENABLED) ENABLE_AGOS = $(ENABLED)
ENABLE_AGOS2 = $(ENABLED)
ENABLE_CINE = $(ENABLED) ENABLE_CINE = $(ENABLED)
ENABLE_CRUISE = $(ENABLED) ENABLE_CRUISE = $(ENABLED)
ENABLE_DRACI = $(ENABLED)
ENABLE_DRASCULA = $(ENABLED) ENABLE_DRASCULA = $(ENABLED)
ENABLE_GOB = $(ENABLED) ENABLE_GOB = $(ENABLED)
ENABLE_GROOVIE = $(ENABLED)
# ENABLE_GROOVIE2 = $(ENABLED)
ENABLE_HUGO = $(ENABLED)
ENABLE_IHNM = $(ENABLED)
ENABLE_KYRA = $(ENABLED) ENABLE_KYRA = $(ENABLED)
# ENABLE_LOL = $(ENABLED)
ENABLE_LURE = $(ENABLED) ENABLE_LURE = $(ENABLED)
# ENABLE_M4 = $(ENABLED) # ENABLE_M4 = $(ENABLED)
ENABLE_MADE = $(ENABLED) ENABLE_MADE = $(ENABLED)
ENABLE_MOHAWK = $(ENABLED)
ENABLE_PARALLACTION = $(ENABLED) ENABLE_PARALLACTION = $(ENABLED)
ENABLE_QUEEN = $(ENABLED) ENABLE_QUEEN = $(ENABLED)
ENABLE_SAGA = $(ENABLED) ENABLE_SAGA = $(ENABLED)
ENABLE_SAGA2 = $(ENABLED) # ENABLE_SAGA2 = $(ENABLED)
ENABLE_IHNM = $(ENABLED) ENABLE_SCI = $(ENABLED)
# ENABLE_SCI32 = $(ENABLED)
ENABLE_SKY = $(ENABLED) ENABLE_SKY = $(ENABLED)
ENABLE_SWORD1 = $(ENABLED) ENABLE_SWORD1 = $(ENABLED)
ENABLE_SWORD2 = $(ENABLED) ENABLE_SWORD2 = $(ENABLED)
# ENABLE_TINSEL = $(ENABLED) ENABLE_TEENAGENT = $(ENABLED)
ENABLE_TINSEL = $(ENABLED)
ENABLE_TOON = $(ENABLED)
ENABLE_TOUCHE = $(ENABLED) ENABLE_TOUCHE = $(ENABLED)
ENABLE_TUCKER = $(ENABLED)
HAVE_GCC3 = true HAVE_GCC3 = true
CC = ee-gcc CC = ee-gcc
CXX = ee-g++ CXX = ee-g++
AS = ee-gcc AS = ee-gcc
LD = ee-gcc LD = ee-gcc
@ -48,30 +61,32 @@ VPATH = $(srcdir)
INCDIR = ../../../ INCDIR = ../../../
# DEPDIR = .deps # DEPDIR = .deps
DEFINES = -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_ZLIB -DFORCE_RTL -D_EE -D__PLAYSTATION2__ -O2 -Wall -Wno-multichar DEFINES = -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_ZLIB -DFORCE_RTL -DDISABLE_SAVEGAME_SORTING -D_EE -D__PLAYSTATION2__ -G2 -O2 -Wall -Wno-multichar -fno-rtti -fno-exceptions # -DNO_ADAPTOR
DEFINES += -DRELEASE_BUILD
INCLUDES = $(addprefix -I$(PS2_EXTRA),$(PS2_EXTRA_INCS)) INCLUDES = $(addprefix -I$(PS2_EXTRA),$(PS2_EXTRA_INCS))
INCLUDES += -I $(PS2SDK)/ee/include -I $(PS2SDK)/common/include -I ./common -I . -I $(srcdir) -I $(srcdir)/engines INCLUDES += -I $(PS2SDK)/ee/include -I $(PS2SDK)/common/include -I ./common -I . -I $(srcdir) -I $(srcdir)/engines
CXX_UPDATE_DEP_FLAG = -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP
TARGET = elf/scummvm.elf TARGET = elf/scummvm.elf
OBJS := backends/platform/ps2/DmaPipe.o \ OBJS := $(srcdir)/backends/platform/ps2/DmaPipe.o \
backends/platform/ps2/Gs2dScreen.o \ $(srcdir)/backends/platform/ps2/Gs2dScreen.o \
backends/platform/ps2/irxboot.o \ $(srcdir)/backends/platform/ps2/irxboot.o \
backends/platform/ps2/ps2input.o \ $(srcdir)/backends/platform/ps2/ps2input.o \
backends/platform/ps2/ps2pad.o \ $(srcdir)/backends/platform/ps2/ps2pad.o \
backends/platform/ps2/savefilemgr.o \ $(srcdir)/backends/platform/ps2/savefilemgr.o \
backends/platform/ps2/fileio.o \ $(srcdir)/backends/platform/ps2/fileio.o \
backends/platform/ps2/asyncfio.o \ $(srcdir)/backends/platform/ps2/asyncfio.o \
backends/platform/ps2/icon.o \ $(srcdir)/backends/platform/ps2/icon.o \
backends/platform/ps2/cd.o \ $(srcdir)/backends/platform/ps2/cd.o \
backends/platform/ps2/eecodyvdfs.o \ $(srcdir)/backends/platform/ps2/eecodyvdfs.o \
backends/platform/ps2/rpckbd.o \ $(srcdir)/backends/platform/ps2/rpckbd.o \
backends/platform/ps2/systemps2.o \ $(srcdir)/backends/platform/ps2/systemps2.o \
backends/platform/ps2/ps2mutex.o \ $(srcdir)/backends/platform/ps2/ps2mutex.o \
backends/platform/ps2/ps2time.o \ $(srcdir)/backends/platform/ps2/ps2time.o \
backends/platform/ps2/ps2debug.o $(srcdir)/backends/platform/ps2/ps2debug.o
MODULE_DIRS += . MODULE_DIRS += .

6
backends/platform/samsungtv/main.cpp
View File

@ -22,12 +22,14 @@
#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h #define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h
#include "common/scummsys.h"
#if defined(SAMSUNGTV)
#include "backends/platform/samsungtv/samsungtv.h" #include "backends/platform/samsungtv/samsungtv.h"
#include "backends/plugins/sdl/sdl-provider.h" #include "backends/plugins/sdl/sdl-provider.h"
#include "base/main.h" #include "base/main.h"
#if defined(SAMSUNGTV)
#include <unistd.h> #include <unistd.h>
extern "C" int Game_Main(char *path, char *) { extern "C" int Game_Main(char *path, char *) {

7
backends/platform/samsungtv/samsungtv.cpp
View File

@ -20,11 +20,14 @@
* *
*/ */
#include "common/scummsys.h"
#if defined(SAMSUNGTV)
#include "backends/platform/samsungtv/samsungtv.h" #include "backends/platform/samsungtv/samsungtv.h"
#include "backends/events/samsungtvsdl/samsungtvsdl-events.h" #include "backends/events/samsungtvsdl/samsungtvsdl-events.h"
#include "backends/graphics/samsungtvsdl/samsungtvsdl-graphics.h" #include "backends/graphics/samsungtvsdl/samsungtvsdl-graphics.h"
#include "common/textconsole.h"
#if defined(SAMSUNGTV)
OSystem_SDL_SamsungTV::OSystem_SDL_SamsungTV() OSystem_SDL_SamsungTV::OSystem_SDL_SamsungTV()
: :

4
base/commandLine.cpp
View File

@ -52,7 +52,7 @@ static const char USAGE_STRING[] =
; ;
// DONT FIXME: DO NOT ORDER ALPHABETICALLY, THIS IS ORDERED BY IMPORTANCE/CATEGORY! :) // DONT FIXME: DO NOT ORDER ALPHABETICALLY, THIS IS ORDERED BY IMPORTANCE/CATEGORY! :)
#if defined(__SYMBIAN32__) || defined(__GP32__) || defined(ANDROID) #if defined(__SYMBIAN32__) || defined(__GP32__) || defined(ANDROID) || defined(__DS__)
static const char HELP_STRING[] = "NoUsageString"; // save more data segment space static const char HELP_STRING[] = "NoUsageString"; // save more data segment space
#else #else
static const char HELP_STRING[] = static const char HELP_STRING[] =
@ -146,7 +146,7 @@ static void usage(const char *s, ...) {
vsnprintf(buf, STRINGBUFLEN, s, va); vsnprintf(buf, STRINGBUFLEN, s, va);
va_end(va); va_end(va);
#if !(defined(__GP32__) || defined (__SYMBIAN32__)) #if !(defined(__GP32__) || defined (__SYMBIAN32__) || defined(__DS__))
printf(USAGE_STRING, s_appName, buf, s_appName, s_appName); printf(USAGE_STRING, s_appName, buf, s_appName, s_appName);
#endif #endif
exit(1); exit(1);

2
configure vendored
View File

@ -1934,6 +1934,8 @@ if test -n "$_host"; then
DEFINES="$DEFINES -DDISABLE_DEFAULT_SAVEFILEMANAGER" DEFINES="$DEFINES -DDISABLE_DEFAULT_SAVEFILEMANAGER"
DEFINES="$DEFINES -DDISABLE_TEXT_CONSOLE" DEFINES="$DEFINES -DDISABLE_TEXT_CONSOLE"
DEFINES="$DEFINES -DDISABLE_COMMAND_LINE" DEFINES="$DEFINES -DDISABLE_COMMAND_LINE"
# for release builds:
#DEFINES="$DEFINES -DNOSERIAL"
CXXFLAGS="$CXXFLAGS -O3" CXXFLAGS="$CXXFLAGS -O3"
CXXFLAGS="$CXXFLAGS -funroll-loops" CXXFLAGS="$CXXFLAGS -funroll-loops"
CXXFLAGS="$CXXFLAGS -fschedule-insns2" CXXFLAGS="$CXXFLAGS -fschedule-insns2"

32
engines/saga/font.cpp
View File

@ -40,6 +40,10 @@ Font::Font(SagaEngine *vm) : _vm(vm) {
_fonts.resize(_vm->getFontsCount()); _fonts.resize(_vm->getFontsCount());
for (i = 0; i < _vm->getFontsCount(); i++) { for (i = 0; i < _vm->getFontsCount(); i++) {
#ifdef __DS__
_fonts[i].outline.font = NULL;
_fonts[i].normal.font = NULL;
#endif
loadFont(&_fonts[i], _vm->getFontDescription(i)->fontResourceId); loadFont(&_fonts[i], _vm->getFontDescription(i)->fontResourceId);
} }
@ -48,6 +52,18 @@ Font::Font(SagaEngine *vm) : _vm(vm) {
Font::~Font() { Font::~Font() {
debug(8, "Font::~Font(): Freeing fonts."); debug(8, "Font::~Font(): Freeing fonts.");
#ifdef __DS__
for (int i = 0; i < _vm->getFontsCount(); i++) {
if (_fonts[i].outline.font) {
free(_fonts[i].outline.font);
}
if (_fonts[i].normal.font) {
free(_fonts[i].normal.font);
}
}
#endif
} }
@ -104,9 +120,17 @@ void Font::loadFont(FontData *font, uint32 fontResourceId) {
error("Invalid font resource size"); error("Invalid font resource size");
} }
#ifndef __DS__
font->normal.font.resize(fontResourceData.size() - FONT_DESCSIZE); font->normal.font.resize(fontResourceData.size() - FONT_DESCSIZE);
memcpy(font->normal.font.getBuffer(), fontResourceData.getBuffer() + FONT_DESCSIZE, fontResourceData.size() - FONT_DESCSIZE); memcpy(font->normal.font.getBuffer(), fontResourceData.getBuffer() + FONT_DESCSIZE, fontResourceData.size() - FONT_DESCSIZE);
#else
if (font->normal.font) {
free(font->normal.font);
}
font->normal.font = (byte *) malloc(fontResourceData.size() - FONT_DESCSIZE);
memcpy(font->normal.font, fontResourceData.getBuffer() + FONT_DESCSIZE, fontResourceData.size() - FONT_DESCSIZE);
#endif
// Create outline font style // Create outline font style
createOutline(font); createOutline(font);
@ -150,7 +174,15 @@ void Font::createOutline(FontData *font) {
font->outline.header.rowLength = newRowLength; font->outline.header.rowLength = newRowLength;
// Allocate new font representation storage // Allocate new font representation storage
#ifdef __DS__
if (font->outline.font) {
free(font->outline.font);
}
font->outline.font = (byte *) calloc(newRowLength * font->outline.header.charHeight, 1);
#else
font->outline.font.resize(newRowLength * font->outline.header.charHeight); font->outline.font.resize(newRowLength * font->outline.header.charHeight);
#endif
// Generate outline font representation // Generate outline font representation

4
engines/saga/font.h
View File

@ -117,7 +117,11 @@ struct FontCharEntry {
struct FontStyle { struct FontStyle {
FontHeader header; FontHeader header;
FontCharEntry fontCharEntry[256]; FontCharEntry fontCharEntry[256];
#ifndef __DS__
ByteArray font; ByteArray font;
#else
byte* font;
#endif
}; };
struct FontData { struct FontData {

9
gui/gui-manager.cpp
View File

@ -74,6 +74,14 @@ GuiManager::GuiManager() : _redrawStatus(kRedrawDisabled), _stateIsSaved(false),
ConfMan.registerDefault("gui_renderer", ThemeEngine::findModeConfigName(ThemeEngine::_defaultRendererMode)); ConfMan.registerDefault("gui_renderer", ThemeEngine::findModeConfigName(ThemeEngine::_defaultRendererMode));
ThemeEngine::GraphicsMode gfxMode = (ThemeEngine::GraphicsMode)ThemeEngine::findMode(ConfMan.get("gui_renderer")); ThemeEngine::GraphicsMode gfxMode = (ThemeEngine::GraphicsMode)ThemeEngine::findMode(ConfMan.get("gui_renderer"));
#ifdef __DS__
// Searching for the theme file takes ~10 seconds on the DS.
// Disable this search here because external themes are not supported.
if (!loadNewTheme("builtin", gfxMode)) {
// Loading the built-in theme failed as well. Bail out
error("Failed to load any GUI theme, aborting");
}
#else
// Try to load the theme // Try to load the theme
if (!loadNewTheme(themefile, gfxMode)) { if (!loadNewTheme(themefile, gfxMode)) {
// Loading the theme failed, try to load the built-in theme // Loading the theme failed, try to load the built-in theme
@ -82,6 +90,7 @@ GuiManager::GuiManager() : _redrawStatus(kRedrawDisabled), _stateIsSaved(false),
error("Failed to load any GUI theme, aborting"); error("Failed to load any GUI theme, aborting");
} }
} }
#endif
} }
GuiManager::~GuiManager() { GuiManager::~GuiManager() {

5
gui/launcher.cpp
View File

@ -718,6 +718,8 @@ void LauncherDialog::updateListing() {
void LauncherDialog::addGame() { void LauncherDialog::addGame() {
int modifiers = g_system->getEventManager()->getModifierState(); int modifiers = g_system->getEventManager()->getModifierState();
#ifndef DISABLE_MASS_ADD
const bool massAdd = (modifiers & Common::KBD_SHIFT) != 0; const bool massAdd = (modifiers & Common::KBD_SHIFT) != 0;
if (massAdd) { if (massAdd) {
@ -746,6 +748,7 @@ void LauncherDialog::addGame() {
updateButtons(); updateButtons();
return; return;
} }
#endif
// Allow user to add a new game to the list. // Allow user to add a new game to the list.
// 1) show a dir selection dialog which lets the user pick the directory // 1) show a dir selection dialog which lets the user pick the directory
@ -918,7 +921,7 @@ void LauncherDialog::loadGame(int item) {
gameId = _domains[item]; gameId = _domains[item];
const EnginePlugin *plugin = 0; const EnginePlugin *plugin = 0;
EngineMan.findGame(gameId, &plugin); EngineMan.findGame(gameId, &plugin);
String target = _domains[item]; String target = _domains[item];

3
gui/massadd.cpp
View File

@ -31,7 +31,7 @@
#include "gui/widget.h" #include "gui/widget.h"
#include "gui/widgets/list.h" #include "gui/widgets/list.h"
#ifndef DISABLE_MASS_ADD
namespace GUI { namespace GUI {
/* /*
@ -264,3 +264,4 @@ void MassAddDialog::handleTickle() {
} // End of namespace GUI } // End of namespace GUI
#endif // DISABLE_MASS_ADD

2
gui/options.cpp
View File

@ -138,7 +138,7 @@ void OptionsDialog::init() {
_subSpeedDesc = 0; _subSpeedDesc = 0;
_subSpeedSlider = 0; _subSpeedSlider = 0;
_subSpeedLabel = 0; _subSpeedLabel = 0;
_oldTheme = ConfMan.get("gui_theme"); _oldTheme = g_gui.theme()->getThemeId();
// Retrieve game GUI options // Retrieve game GUI options
_guioptions = 0; _guioptions = 0;

13
gui/saveload.cpp
View File

@ -359,8 +359,19 @@ void SaveLoadChooser::updateSaveList() {
} }
// Fill the rest of the save slots with empty saves // Fill the rest of the save slots with empty saves
int maximumSaveSlots = (*_plugin)->getMaximumSaveSlot();
#ifdef __DS__
// Low memory on the DS means too many save slots are impractical, so limit
// the maximum here.
if (maximumSaveSlots > 99) {
maximumSaveSlots = 99;
}
#endif
Common::String emptyDesc; Common::String emptyDesc;
for (int i = curSlot; i <= (*_plugin)->getMaximumSaveSlot(); i++) { for (int i = curSlot; i <= maximumSaveSlots; i++) {
saveNames.push_back(emptyDesc); saveNames.push_back(emptyDesc);
SaveStateDescriptor dummySave(i, ""); SaveStateDescriptor dummySave(i, "");
_saveList.push_back(dummySave); _saveList.push_back(dummySave);