[Scummvm-cvs-logs] SF.net SVN: scummvm:[51966] scummvm/branches/gsoc2010-plugins/backends/ platform
toneman1138 at users.sourceforge.net
toneman1138 at users.sourceforge.net
Wed Aug 11 04:44:11 CEST 2010
Revision: 51966
http://scummvm.svn.sourceforge.net/scummvm/?rev=51966&view=rev
Author: toneman1138
Date: 2010-08-11 02:44:11 +0000 (Wed, 11 Aug 2010)
Log Message:
-----------
manually merged trunk/backends into branch and removed some now redundant elf32.h files
Modified Paths:
--------------
scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm7/source/main.cpp
scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/makefile
scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/source/fat/io_nmmc.c
scummvm/branches/gsoc2010-plugins/backends/platform/gp2x/graphics.cpp
scummvm/branches/gsoc2010-plugins/backends/platform/gp2xwiz/gp2xwiz-graphics.cpp
scummvm/branches/gsoc2010-plugins/backends/platform/gp2xwiz/gp2xwiz-main.cpp
scummvm/branches/gsoc2010-plugins/backends/platform/gp2xwiz/module.mk
scummvm/branches/gsoc2010-plugins/backends/platform/linuxmoto/linuxmoto-graphics.cpp
scummvm/branches/gsoc2010-plugins/backends/platform/ps2/module.mk
scummvm/branches/gsoc2010-plugins/backends/platform/psp/Makefile
scummvm/branches/gsoc2010-plugins/backends/platform/samsungtv/main.cpp
scummvm/branches/gsoc2010-plugins/backends/platform/sdl/graphics.cpp
scummvm/branches/gsoc2010-plugins/backends/platform/sdl/main.cpp
scummvm/branches/gsoc2010-plugins/backends/platform/sdl/sdl.cpp
scummvm/branches/gsoc2010-plugins/backends/platform/sdl/sdl.h
Removed Paths:
-------------
scummvm/branches/gsoc2010-plugins/backends/platform/ps2/elf32.h
Modified: scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm7/source/main.cpp
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm7/source/main.cpp 2010-08-11 01:43:06 UTC (rev 51965)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm7/source/main.cpp 2010-08-11 02:44:11 UTC (rev 51966)
@@ -40,7 +40,7 @@
#include <system.h>
#include <stdlib.h>
#include <string.h>
-#include <registers_alt.h> // Needed for SOUND_CR
+#include <registers_alt.h> // Needed for SOUND_CR
#include <NDS/scummvm_ipc.h>
//////////////////////////////////////////////////////////////////////
#ifdef USE_DEBUGGER
@@ -592,7 +592,7 @@
IPC->reset = false;
- //fifoInit();
+ //fifoInit();
for (int r = 0; r < 8; r++) {
IPC->adpcm.arm7Buffer[r] = (u8 *) malloc(512);
Modified: scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/makefile
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/makefile 2010-08-11 01:43:06 UTC (rev 51965)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/makefile 2010-08-11 02:44:11 UTC (rev 51966)
@@ -354,9 +354,6 @@
MODULE_DIRS += .
-#ndsall: plugins
-# make -f makefile scummvm.nds
-
ndsall: plugins
make -f makefile scummvm.nds scummvm.ds.gba
Modified: scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/source/fat/io_nmmc.c
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/source/fat/io_nmmc.c 2010-08-11 01:43:06 UTC (rev 51965)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/source/fat/io_nmmc.c 2010-08-11 02:44:11 UTC (rev 51966)
@@ -170,7 +170,7 @@
Neo_EnableMMC( true ); // Open SPI port to MMC card
Neo_SendMMCCommand(MMC_SEND_CSD, 0);
- if( Neo_CheckMMCResponse( 0x00, 0xFF ) == false ) { // Make sure no errors occured
+ if( Neo_CheckMMCResponse( 0x00, 0xFF ) == false ) { // Make sure no errors occurred
Neo_EnableMMC( false );
return false;
}
@@ -227,14 +227,14 @@
// Set block length
Neo_SendMMCCommand(MMC_SET_BLOCKLEN, BYTE_PER_READ );
- if( Neo_CheckMMCResponse( 0x00, 0xFF ) == false ) { // Make sure no errors occured
+ if( Neo_CheckMMCResponse( 0x00, 0xFF ) == false ) { // Make sure no errors occurred
Neo_EnableMMC( false );
return false;
}
// Check if we can use a higher SPI frequency
Neo_SendMMCCommand(MMC_SEND_CSD, 0);
- if( Neo_CheckMMCResponse( 0x00, 0xFF ) == false ) { // Make sure no errors occured
+ if( Neo_CheckMMCResponse( 0x00, 0xFF ) == false ) { // Make sure no errors occurred
Neo_EnableMMC( false );
return false;
}
@@ -268,7 +268,7 @@
Neo_EnableMMC( true ); // Open SPI port to MMC card
Neo_SendMMCCommand( 25, sector );
- if( Neo_CheckMMCResponse( 0x00, 0xFF ) == false ) { // Make sure no errors occured
+ if( Neo_CheckMMCResponse( 0x00, 0xFF ) == false ) { // Make sure no errors occurred
Neo_EnableMMC( false );
return false;
}
@@ -318,7 +318,7 @@
while (totalSecs--) {
Neo_SendMMCCommand(MMC_READ_BLOCK, sector );
- if( Neo_CheckMMCResponse( 0x00, 0xFF ) == false ) { // Make sure no errors occured
+ if( Neo_CheckMMCResponse( 0x00, 0xFF ) == false ) { // Make sure no errors occurred
Neo_EnableMMC( false );
return false;
}
Modified: scummvm/branches/gsoc2010-plugins/backends/platform/gp2x/graphics.cpp
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/platform/gp2x/graphics.cpp 2010-08-11 01:43:06 UTC (rev 51965)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/gp2x/graphics.cpp 2010-08-11 02:44:11 UTC (rev 51966)
@@ -1405,7 +1405,6 @@
SDL_Rect zoomdst;
SDL_Rect dst;
int scale;
- int width, height;
int hotX, hotY;
int tmpScreenWidth, tmpScreenHeight;
@@ -1426,16 +1425,12 @@
if (!_overlayVisible) {
scale = _videoMode.scaleFactor;
- width = _videoMode.screenWidth;
- height = _videoMode.screenHeight;
dst.w = _mouseCurState.vW;
dst.h = _mouseCurState.vH;
hotX = _mouseCurState.vHotX;
hotY = _mouseCurState.vHotY;
} else {
scale = 1;
- width = _videoMode.overlayWidth;
- height = _videoMode.overlayHeight;
dst.w = _mouseCurState.rW;
dst.h = _mouseCurState.rH;
hotX = _mouseCurState.rHotX;
Modified: scummvm/branches/gsoc2010-plugins/backends/platform/gp2xwiz/gp2xwiz-graphics.cpp
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/platform/gp2xwiz/gp2xwiz-graphics.cpp 2010-08-11 01:43:06 UTC (rev 51965)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/gp2xwiz/gp2xwiz-graphics.cpp 2010-08-11 02:44:11 UTC (rev 51966)
@@ -149,7 +149,6 @@
SDL_Rect dst;
int scale;
- int width, height;
int hotX, hotY;
if (_videoMode.mode == GFX_HALF && !_overlayVisible){
@@ -162,16 +161,12 @@
if (!_overlayVisible) {
scale = _videoMode.scaleFactor;
- width = _videoMode.screenWidth;
- height = _videoMode.screenHeight;
dst.w = _mouseCurState.vW;
dst.h = _mouseCurState.vH;
hotX = _mouseCurState.vHotX;
hotY = _mouseCurState.vHotY;
} else {
scale = 1;
- width = _videoMode.overlayWidth;
- height = _videoMode.overlayHeight;
dst.w = _mouseCurState.rW;
dst.h = _mouseCurState.rH;
hotX = _mouseCurState.rHotX;
Modified: scummvm/branches/gsoc2010-plugins/backends/platform/gp2xwiz/gp2xwiz-main.cpp
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/platform/gp2xwiz/gp2xwiz-main.cpp 2010-08-11 01:43:06 UTC (rev 51965)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/gp2xwiz/gp2xwiz-main.cpp 2010-08-11 02:44:11 UTC (rev 51966)
@@ -42,6 +42,7 @@
#include "base/main.h"
#include "backends/saves/default/default-saves.h"
+
#include "backends/timer/default/default-timer.h"
#include "sound/mixer_intern.h"
@@ -63,7 +64,7 @@
#ifdef DYNAMIC_MODULES
PluginManager::instance().addPluginProvider(new POSIXPluginProvider());
-#endif /* DYNAMIC_MODULES */
+#endif
// Invoke the actual ScummVM main entry point:
int res = scummvm_main(argc, argv);
Modified: scummvm/branches/gsoc2010-plugins/backends/platform/gp2xwiz/module.mk
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/platform/gp2xwiz/module.mk 2010-08-11 01:43:06 UTC (rev 51965)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/gp2xwiz/module.mk 2010-08-11 02:44:11 UTC (rev 51966)
@@ -4,8 +4,7 @@
gp2xwiz-events.o \
gp2xwiz-graphics.o \
gp2xwiz-hw.o \
- gp2xwiz-main.o \
- gp2xwiz-loader.o
+ gp2xwiz-main.o
# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
Modified: scummvm/branches/gsoc2010-plugins/backends/platform/linuxmoto/linuxmoto-graphics.cpp
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/platform/linuxmoto/linuxmoto-graphics.cpp 2010-08-11 01:43:06 UTC (rev 51965)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/linuxmoto/linuxmoto-graphics.cpp 2010-08-11 02:44:11 UTC (rev 51966)
@@ -168,7 +168,6 @@
SDL_Rect dst;
int scale;
- int width, height;
int hotX, hotY;
if (_videoMode.mode == GFX_HALF && !_overlayVisible) {
@@ -181,16 +180,12 @@
if (!_overlayVisible) {
scale = _videoMode.scaleFactor;
- width = _videoMode.screenWidth;
- height = _videoMode.screenHeight;
dst.w = _mouseCurState.vW;
dst.h = _mouseCurState.vH;
hotX = _mouseCurState.vHotX;
hotY = _mouseCurState.vHotY;
} else {
scale = 1;
- width = _videoMode.overlayWidth;
- height = _videoMode.overlayHeight;
dst.w = _mouseCurState.rW;
dst.h = _mouseCurState.rH;
hotX = _mouseCurState.rHotX;
Deleted: scummvm/branches/gsoc2010-plugins/backends/platform/ps2/elf32.h
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/platform/ps2/elf32.h 2010-08-11 01:43:06 UTC (rev 51965)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/ps2/elf32.h 2010-08-11 02:44:11 UTC (rev 51966)
@@ -1,209 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifndef BACKENDS_ELF_H
-#define BACKENDS_ELF_H
-
-/* ELF stuff */
-
-typedef unsigned short Elf32_Half, Elf32_Section;
-typedef unsigned int Elf32_Word, Elf32_Addr, Elf32_Off;
-typedef signed int Elf32_Sword;
-typedef Elf32_Half Elf32_Versym;
-
-#define EI_NIDENT (16)
-#define SELFMAG 6
-
-/* ELF File format structures. Look up ELF structure for more details */
-
-// ELF header (contains info about the file)
-typedef struct {
- unsigned char e_ident[EI_NIDENT]; /* Magic number and other info */
- Elf32_Half e_type; /* Object file type */
- Elf32_Half e_machine; /* Architecture */
- Elf32_Word e_version; /* Object file version */
- Elf32_Addr e_entry; /* Entry point virtual address */
- Elf32_Off e_phoff; /* Program header table file offset */
- Elf32_Off e_shoff; /* Section header table file offset */
- Elf32_Word e_flags; /* Processor-specific flags */
- Elf32_Half e_ehsize; /* ELF header size in bytes */
- Elf32_Half e_phentsize; /* Program header table entry size */
- Elf32_Half e_phnum; /* Program header table entry count */
- Elf32_Half e_shentsize; /* Section header table entry size */
- Elf32_Half e_shnum; /* Section header table entry count */
- Elf32_Half e_shstrndx; /* Section header string table index */
-} Elf32_Ehdr;
-
-// Should be in e_ident
-#define ELFMAG "\177ELF\1\1" /* ELF Magic number */
-
-// e_type values
-#define ET_NONE 0 /* no file type */
-#define ET_REL 1 /* relocatable */
-#define ET_EXEC 2 /* executable */
-#define ET_DYN 3 /* shared object */
-#define ET_CORE 4 /* core file */
-
-// e_machine values
-#define EM_MIPS 8
-
-
-// Program header (contains info about segment)
-typedef struct {
- Elf32_Word p_type; /* Segment type */
- Elf32_Off p_offset; /* Segment file offset */
- Elf32_Addr p_vaddr; /* Segment virtual address */
- Elf32_Addr p_paddr; /* Segment physical address */
- Elf32_Word p_filesz; /* Segment size in file */
- Elf32_Word p_memsz; /* Segment size in memory */
- Elf32_Word p_flags; /* Segment flags */
- Elf32_Word p_align; /* Segment alignment */
-} Elf32_Phdr;
-
-// p_type values
-#define PT_NULL 0 /* ignored */
-#define PT_LOAD 1 /* loadable segment */
-#define PT_DYNAMIC 2 /* dynamic linking info */
-#define PT_INTERP 3 /* info about interpreter */
-#define PT_NOTE 4 /* note segment */
-#define PT_SHLIB 5 /* reserved */
-#define PT_PHDR 6 /* Program header table */
-#define PT_MIPS_REGINFO 0x70000000 /* register usage info */
-
-// p_flags value
-#define PF_X 1 /* execute */
-#define PF_W 2 /* write */
-#define PF_R 4 /* read */
-
-// Section header (contains info about section)
-typedef struct {
- Elf32_Word sh_name; /* Section name (string tbl index) */
- Elf32_Word sh_type; /* Section type */
- Elf32_Word sh_flags; /* Section flags */
- Elf32_Addr sh_addr; /* Section virtual addr at execution */
- Elf32_Off sh_offset; /* Section file offset */
- Elf32_Word sh_size; /* Section size in bytes */
- Elf32_Word sh_link; /* Link to another section */
- Elf32_Word sh_info; /* Additional section information */
- Elf32_Word sh_addralign; /* Section alignment */
- Elf32_Word sh_entsize; /* Entry size if section holds table */
-} Elf32_Shdr;
-
-// sh_type values
-#define SHT_NULL 0 /* Inactive section */
-#define SHT_PROGBITS 1 /* Proprietary */
-#define SHT_SYMTAB 2 /* Symbol table */
-#define SHT_STRTAB 3 /* String table */
-#define SHT_RELA 4 /* Relocation entries with addend */
-#define SHT_HASH 5 /* Symbol hash table */
-#define SHT_DYNAMIC 6 /* Info for dynamic linking */
-#define SHT_NOTE 7 /* Note section */
-#define SHT_NOBITS 8 /* Occupies no space */
-#define SHT_REL 9 /* Relocation entries without addend */
-#define SHT_SHLIB 10 /* Reserved */
-#define SHT_DYNSYM 11 /* Minimal set of dynamic linking symbols */
-#define SHT_MIPS_LIBLSIT 0x70000000 /* Info about dynamic shared object libs */
-#define SHT_MIPS_CONFLICT 0x70000002 /* Conflicts btw executables and shared objects */
-#define SHT_MIPS_GPTAB 0x70000003 /* Global pointer table */
-
-// sh_flags values
-#define SHF_WRITE 0 /* writable section */
-#define SHF_ALLOC 2 /* section occupies memory */
-#define SHF_EXECINSTR 4 /* machine instructions */
-#define SHF_MIPS_GPREL 0x10000000 /* Must be made part of global data area */
-
-
-// Symbol entry (contain info about a symbol)
-typedef struct {
- Elf32_Word st_name; /* Symbol name (string tbl index) */
- Elf32_Addr st_value; /* Symbol value */
- Elf32_Word st_size; /* Symbol size */
- unsigned char st_info; /* Symbol type and binding */
- unsigned char st_other; /* Symbol visibility */
- Elf32_Section st_shndx; /* Section index */
-} Elf32_Sym;
-
-// Extract from the st_info
-#define SYM_TYPE(x) ((x)&0xF)
-#define SYM_BIND(x) ((x)>>4)
-
-
-// Symbol binding values from st_info
-#define STB_LOCAL 0 /* Symbol not visible outside object */
-#define STB_GLOBAL 1 /* Symbol visible to all object files */
-#define STB_WEAK 2 /* Similar to STB_GLOBAL */
-
-// Symbol type values from st_info
-#define STT_NOTYPE 0 /* Not specified */
-#define STT_OBJECT 1 /* Data object e.g. variable */
-#define STT_FUNC 2 /* Function */
-#define STT_SECTION 3 /* Section */
-#define STT_FILE 4 /* Source file associated with object file */
-
-// Special section header index values from st_shndex
-#define SHN_UNDEF 0
-#define SHN_LOPROC 0xFF00 /* Extended values */
-#define SHN_ABS 0xFFF1 /* Absolute value: don't relocate */
-#define SHN_COMMON 0xFFF2 /* Common block. Not allocated yet */
-#define SHN_HIPROC 0xFF1F
-#define SHN_HIRESERVE 0xFFFF
-
-// Relocation entry (info about how to relocate)
-typedef struct {
- Elf32_Addr r_offset; /* Address */
- Elf32_Word r_info; /* Relocation type and symbol index */
-} Elf32_Rel;
-
-// Access macros for the relocation info
-#define REL_TYPE(x) ((x)&0xFF) /* Extract relocation type */
-#define REL_INDEX(x) ((x)>>8) /* Extract relocation index into symbol table */
-
-// MIPS relocation types
-#define R_MIPS_NONE 0
-#define R_MIPS_16 1
-#define R_MIPS_32 2
-#define R_MIPS_REL32 3
-#define R_MIPS_26 4
-#define R_MIPS_HI16 5
-#define R_MIPS_LO16 6
-#define R_MIPS_GPREL16 7
-#define R_MIPS_LITERAL 8
-#define R_MIPS_GOT16 9
-#define R_MIPS_PC16 10
-#define R_MIPS_CALL16 11
-#define R_MIPS_GPREL32 12
-#define R_MIPS_GOTHI16 13
-#define R_MIPS_GOTLO16 14
-#define R_MIPS_CALLHI16 15
-#define R_MIPS_CALLLO16 16
-
-// Mock function to get value of global pointer
-#define getGP() ({ \
- unsigned int __valgp; \
- __asm__ ("add %0, $gp, $0" : "=r"(__valgp) : ); \
- __valgp; \
-})
-
-#endif /* BACKENDS_ELF_H */
Modified: scummvm/branches/gsoc2010-plugins/backends/platform/ps2/module.mk
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/platform/ps2/module.mk 2010-08-11 01:43:06 UTC (rev 51965)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/ps2/module.mk 2010-08-11 02:44:11 UTC (rev 51966)
@@ -16,8 +16,7 @@
systemps2.o \
ps2mutex.o \
ps2time.o \
- ps2debug.o \
- ps2loader.o
+ ps2debug.o
# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
Modified: scummvm/branches/gsoc2010-plugins/backends/platform/psp/Makefile
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/platform/psp/Makefile 2010-08-11 01:43:06 UTC (rev 51965)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/psp/Makefile 2010-08-11 02:44:11 UTC (rev 51966)
@@ -125,8 +125,10 @@
# PSP LIBS
PSPLIBS = -lpspprof -lpspvfpu -lpspdebug -lpspgu -lpspge -lpspdisplay -lpspctrl -lpspsdk \
- -lpsputility -lpspuser -lpsppower -lpsphprm -lpspsdk -lpsprtc -lpspaudio -lpspkernel
+ -lpsputility -lpspuser -lpsppower -lpsphprm -lpspsdk -lpsprtc -lpspaudio -lpspaudiocodec \
+ -lpspkernel
+
# Add in PSPSDK includes and libraries.
LIBS += -lpng -lz -lstdc++ -lc -lm $(PSPLIBS)
Modified: scummvm/branches/gsoc2010-plugins/backends/platform/samsungtv/main.cpp
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/platform/samsungtv/main.cpp 2010-08-11 01:43:06 UTC (rev 51965)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/samsungtv/main.cpp 2010-08-11 02:44:11 UTC (rev 51966)
@@ -43,7 +43,7 @@
// Invoke the actual ScummVM main entry point:
int res = scummvm_main(0, 0);
- g_system->quit(); // TODO: Consider removing / replacing this!
+ ((OSystem_SDL *)g_system)->deinit();
return res;
}
Modified: scummvm/branches/gsoc2010-plugins/backends/platform/sdl/graphics.cpp
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/platform/sdl/graphics.cpp 2010-08-11 01:43:06 UTC (rev 51965)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/sdl/graphics.cpp 2010-08-11 02:44:11 UTC (rev 51966)
@@ -1693,7 +1693,6 @@
SDL_Rect dst;
int scale;
- int width, height;
int hotX, hotY;
dst.x = _mouseCurState.x;
@@ -1701,16 +1700,12 @@
if (!_overlayVisible) {
scale = _videoMode.scaleFactor;
- width = _videoMode.screenWidth;
- height = _videoMode.screenHeight;
dst.w = _mouseCurState.vW;
dst.h = _mouseCurState.vH;
hotX = _mouseCurState.vHotX;
hotY = _mouseCurState.vHotY;
} else {
scale = 1;
- width = _videoMode.overlayWidth;
- height = _videoMode.overlayHeight;
dst.w = _mouseCurState.rW;
dst.h = _mouseCurState.rH;
hotX = _mouseCurState.rHotX;
Modified: scummvm/branches/gsoc2010-plugins/backends/platform/sdl/main.cpp
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/platform/sdl/main.cpp 2010-08-11 01:43:06 UTC (rev 51965)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/sdl/main.cpp 2010-08-11 02:44:11 UTC (rev 51966)
@@ -64,7 +64,7 @@
// Invoke the actual ScummVM main entry point:
int res = scummvm_main(argc, argv);
- g_system->quit(); // TODO: Consider removing / replacing this!
+ ((OSystem_SDL *)g_system)->deinit();
return res;
}
Modified: scummvm/branches/gsoc2010-plugins/backends/platform/sdl/sdl.cpp
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/platform/sdl/sdl.cpp 2010-08-11 01:43:06 UTC (rev 51965)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/sdl/sdl.cpp 2010-08-11 02:44:11 UTC (rev 51966)
@@ -483,7 +483,7 @@
}
}
-void OSystem_SDL::quit() {
+void OSystem_SDL::deinit() {
if (_cdrom) {
SDL_CDStop(_cdrom);
SDL_CDClose(_cdrom);
@@ -505,11 +505,15 @@
SDL_Quit();
- // Even Manager requires save manager for storing
+ // Event Manager requires save manager for storing
// recorded events
delete getEventManager();
delete _savefile;
+}
+void OSystem_SDL::quit() {
+ deinit();
+
#if !defined(SAMSUNGTV)
exit(0);
#endif
Modified: scummvm/branches/gsoc2010-plugins/backends/platform/sdl/sdl.h
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/platform/sdl/sdl.h 2010-08-11 01:43:06 UTC (rev 51965)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/sdl/sdl.h 2010-08-11 02:44:11 UTC (rev 51966)
@@ -202,6 +202,8 @@
// Quit
virtual void quit(); // overloaded by CE backend
+ void deinit();
+
virtual void getTimeAndDate(TimeDate &t) const;
virtual Common::TimerManager *getTimerManager();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list