[Scummvm-cvs-logs] SF.net SVN: scummvm: [28966] scummvm/trunk
peres001 at users.sourceforge.net
peres001 at users.sourceforge.net
Wed Sep 19 10:40:13 CEST 2007
Revision: 28966
http://scummvm.svn.sourceforge.net/scummvm/?rev=28966&view=rev
Author: peres001
Date: 2007-09-19 01:40:12 -0700 (Wed, 19 Sep 2007)
Log Message:
-----------
Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.
Modified Paths:
--------------
scummvm/trunk/Makefile.common
scummvm/trunk/backends/events/default/default-events.cpp
scummvm/trunk/backends/events/default/default-events.h
scummvm/trunk/backends/fs/abstract-fs-factory.h
scummvm/trunk/backends/fs/amigaos4/amigaos4-fs.cpp
scummvm/trunk/backends/fs/dc/dc-fs.cpp
scummvm/trunk/backends/fs/ds/ds-fs.cpp
scummvm/trunk/backends/fs/gp32/gp32-fs.cpp
scummvm/trunk/backends/fs/morphos/abox-fs.cpp
scummvm/trunk/backends/fs/palmos/palmos-fs.cpp
scummvm/trunk/backends/fs/posix/posix-fs.cpp
scummvm/trunk/backends/fs/symbian/symbian-fs.cpp
scummvm/trunk/backends/fs/windows/windows-fs.cpp
scummvm/trunk/backends/midi/alsa.cpp
scummvm/trunk/backends/midi/coreaudio.cpp
scummvm/trunk/backends/midi/coremidi.cpp
scummvm/trunk/backends/midi/morphos.cpp
scummvm/trunk/backends/midi/seq.cpp
scummvm/trunk/backends/midi/windows.cpp
scummvm/trunk/backends/midi/ypa1.cpp
scummvm/trunk/backends/midi/zodiac.cpp
scummvm/trunk/backends/platform/PalmOS/Src/be_base.h
scummvm/trunk/backends/platform/PalmOS/Src/be_save.h
scummvm/trunk/backends/platform/PalmOS/Src/cd_aeroplayer.cpp
scummvm/trunk/backends/platform/PalmOS/Src/cd_default.cpp
scummvm/trunk/backends/platform/PalmOS/Src/cd_msa.cpp
scummvm/trunk/backends/platform/PalmOS/Src/cd_pockettunes.cpp
scummvm/trunk/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp
scummvm/trunk/backends/platform/PalmOS/Src/native/zodiacARM.cpp
scummvm/trunk/backends/platform/dc/audio.cpp
scummvm/trunk/backends/platform/dc/dcloader.cpp
scummvm/trunk/backends/platform/dc/dcmain.cpp
scummvm/trunk/backends/platform/dc/display.cpp
scummvm/trunk/backends/platform/dc/input.cpp
scummvm/trunk/backends/platform/dc/selector.cpp
scummvm/trunk/backends/platform/dc/softkbd.cpp
scummvm/trunk/backends/platform/dc/time.cpp
scummvm/trunk/backends/platform/dc/vmsave.cpp
scummvm/trunk/backends/platform/ds/arm9/source/blitters.cpp
scummvm/trunk/backends/platform/ds/arm9/source/cdaudio.cpp
scummvm/trunk/backends/platform/ds/arm9/source/dsmain.h
scummvm/trunk/backends/platform/ds/arm9/source/dsoptions.h
scummvm/trunk/backends/platform/ds/arm9/source/gbampsave.h
scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp
scummvm/trunk/backends/platform/ds/arm9/source/portdefs.cpp
scummvm/trunk/backends/platform/ds/arm9/source/ramsave.cpp
scummvm/trunk/backends/platform/ds/arm9/source/scummhelp.cpp
scummvm/trunk/backends/platform/ds/arm9/source/zipreader.cpp
scummvm/trunk/backends/platform/ds/arm9/source/zipreader.h
scummvm/trunk/backends/platform/gp2x/gp2x-common.h
scummvm/trunk/backends/platform/gp32/gp32_launcher.cpp
scummvm/trunk/backends/platform/gp32/gp32_launcher.h
scummvm/trunk/backends/platform/gp32/gp32_main.cpp
scummvm/trunk/backends/platform/gp32/gp32_osys.cpp
scummvm/trunk/backends/platform/gp32/gp32_osys.h
scummvm/trunk/backends/platform/gp32/gp32std.cpp
scummvm/trunk/backends/platform/gp32/gp32std_file.cpp
scummvm/trunk/backends/platform/gp32/gp32std_grap.cpp
scummvm/trunk/backends/platform/gp32/gp32std_input.cpp
scummvm/trunk/backends/platform/gp32/gp32std_input.h
scummvm/trunk/backends/platform/gp32/gp32std_memory.cpp
scummvm/trunk/backends/platform/gp32/gp32std_sound.cpp
scummvm/trunk/backends/platform/maemo/maemo-sdl.cpp
scummvm/trunk/backends/platform/maemo/maemo-sdl.h
scummvm/trunk/backends/platform/maemo/main.cpp
scummvm/trunk/backends/platform/null/null.cpp
scummvm/trunk/backends/platform/ps2/systemps2.cpp
scummvm/trunk/backends/platform/ps2/systemps2.h
scummvm/trunk/backends/platform/psp/osys_psp.cpp
scummvm/trunk/backends/platform/psp/osys_psp.h
scummvm/trunk/backends/platform/psp/osys_psp_gu.h
scummvm/trunk/backends/platform/psp/psp_main.cpp
scummvm/trunk/backends/platform/sdl/sdl.h
scummvm/trunk/backends/platform/symbian/src/SymbianActions.cpp
scummvm/trunk/backends/platform/symbian/src/SymbianActions.h
scummvm/trunk/backends/platform/wince/CEActionsPocket.cpp
scummvm/trunk/backends/platform/wince/CEActionsPocket.h
scummvm/trunk/backends/platform/wince/CEActionsSmartphone.cpp
scummvm/trunk/backends/platform/wince/CEActionsSmartphone.h
scummvm/trunk/backends/platform/wince/CEDevice.cpp
scummvm/trunk/backends/platform/wince/CEDevice.h
scummvm/trunk/backends/platform/wince/CELauncherDialog.cpp
scummvm/trunk/backends/platform/wince/CEScaler.cpp
scummvm/trunk/backends/platform/wince/CEScaler.h
scummvm/trunk/backends/platform/wince/CEgui/GUIElement.cpp
scummvm/trunk/backends/platform/wince/CEgui/GUIElement.h
scummvm/trunk/backends/platform/wince/CEgui/ItemAction.cpp
scummvm/trunk/backends/platform/wince/CEgui/ItemAction.h
scummvm/trunk/backends/platform/wince/CEgui/ItemSwitch.cpp
scummvm/trunk/backends/platform/wince/CEgui/ItemSwitch.h
scummvm/trunk/backends/platform/wince/CEgui/Panel.cpp
scummvm/trunk/backends/platform/wince/CEgui/Panel.h
scummvm/trunk/backends/platform/wince/CEgui/PanelItem.cpp
scummvm/trunk/backends/platform/wince/CEgui/PanelItem.h
scummvm/trunk/backends/platform/wince/CEgui/PanelKeyboard.cpp
scummvm/trunk/backends/platform/wince/CEgui/PanelKeyboard.h
scummvm/trunk/backends/platform/wince/CEgui/SDL_ImageResource.cpp
scummvm/trunk/backends/platform/wince/CEgui/SDL_ImageResource.h
scummvm/trunk/backends/platform/wince/CEgui/Toolbar.cpp
scummvm/trunk/backends/platform/wince/CEgui/Toolbar.h
scummvm/trunk/backends/platform/wince/CEgui/ToolbarHandler.cpp
scummvm/trunk/backends/platform/wince/CEgui/ToolbarHandler.h
scummvm/trunk/backends/platform/wince/CEkeys/EventsBuffer.cpp
scummvm/trunk/backends/platform/wince/CEkeys/EventsBuffer.h
scummvm/trunk/backends/platform/wince/wince-sdl.cpp
scummvm/trunk/backends/platform/wince/wince-sdl.h
scummvm/trunk/backends/platform/x11/x11.cpp
scummvm/trunk/backends/plugins/dc/dc-provider.h
scummvm/trunk/backends/plugins/dynamic-plugin.h
scummvm/trunk/backends/plugins/posix/posix-provider.h
scummvm/trunk/backends/plugins/sdl/sdl-provider.h
scummvm/trunk/backends/plugins/win32/win32-provider.h
scummvm/trunk/backends/saves/compressed/compressed-saves.cpp
scummvm/trunk/backends/saves/compressed/compressed-saves.h
scummvm/trunk/backends/saves/default/default-saves.cpp
scummvm/trunk/backends/saves/default/default-saves.h
scummvm/trunk/backends/saves/savefile.cpp
scummvm/trunk/backends/timer/default/default-timer.cpp
scummvm/trunk/base/commandLine.cpp
scummvm/trunk/base/game.h
scummvm/trunk/base/main.cpp
scummvm/trunk/base/plugins.cpp
scummvm/trunk/base/plugins.h
scummvm/trunk/base/version.cpp
scummvm/trunk/common/advancedDetector.cpp
scummvm/trunk/common/array.h
scummvm/trunk/common/config-file.cpp
scummvm/trunk/common/config-manager.cpp
scummvm/trunk/common/file.h
scummvm/trunk/common/fs.cpp
scummvm/trunk/common/hashmap.h
scummvm/trunk/common/iff_container.h
scummvm/trunk/common/mutex.cpp
scummvm/trunk/common/savefile.h
scummvm/trunk/common/scummsys.h
scummvm/trunk/common/str.cpp
scummvm/trunk/common/stream.cpp
scummvm/trunk/common/stream.h
scummvm/trunk/common/system.cpp
scummvm/trunk/common/unzip.cpp
scummvm/trunk/common/unzip.h
scummvm/trunk/common/util.cpp
scummvm/trunk/dists/codeblocks/agi.cbp
scummvm/trunk/dists/codeblocks/agi.layout
scummvm/trunk/dists/codeblocks/agos.cbp
scummvm/trunk/dists/codeblocks/agos.layout
scummvm/trunk/dists/codeblocks/cine.cbp
scummvm/trunk/dists/codeblocks/cine.depend
scummvm/trunk/dists/codeblocks/cine.layout
scummvm/trunk/dists/codeblocks/gob.cbp
scummvm/trunk/dists/codeblocks/gob.layout
scummvm/trunk/dists/codeblocks/kyra.cbp
scummvm/trunk/dists/codeblocks/kyra.layout
scummvm/trunk/dists/codeblocks/lure.cbp
scummvm/trunk/dists/codeblocks/lure.layout
scummvm/trunk/dists/codeblocks/parallaction.cbp
scummvm/trunk/dists/codeblocks/parallaction.layout
scummvm/trunk/dists/codeblocks/queen.layout
scummvm/trunk/dists/codeblocks/saga.cbp
scummvm/trunk/dists/codeblocks/saga.layout
scummvm/trunk/dists/codeblocks/scumm.cbp
scummvm/trunk/dists/codeblocks/scumm.layout
scummvm/trunk/dists/codeblocks/scummvm.cbp
scummvm/trunk/dists/codeblocks/scummvm.depend
scummvm/trunk/dists/codeblocks/scummvm.layout
scummvm/trunk/dists/codeblocks/scummvm.workspace
scummvm/trunk/dists/codeblocks/sky.layout
scummvm/trunk/dists/codeblocks/sword1.layout
scummvm/trunk/dists/codeblocks/sword2.layout
scummvm/trunk/dists/codeblocks/touche.cbp
scummvm/trunk/dists/codeblocks/touche.layout
scummvm/trunk/dists/devcpp/scummvm.dev
scummvm/trunk/dists/msvc6/scummvm.dsp
scummvm/trunk/dists/msvc7/scummvm.vcproj
scummvm/trunk/dists/msvc71/scummvm.vcproj
scummvm/trunk/dists/msvc8/scummvm.vcproj
scummvm/trunk/engines/agi/agi.cpp
scummvm/trunk/engines/agi/agi.h
scummvm/trunk/engines/agi/checks.cpp
scummvm/trunk/engines/agi/console.cpp
scummvm/trunk/engines/agi/cycle.cpp
scummvm/trunk/engines/agi/detection.cpp
scummvm/trunk/engines/agi/font.h
scummvm/trunk/engines/agi/global.cpp
scummvm/trunk/engines/agi/graphics.cpp
scummvm/trunk/engines/agi/graphics.h
scummvm/trunk/engines/agi/id.cpp
scummvm/trunk/engines/agi/inv.cpp
scummvm/trunk/engines/agi/keyboard.cpp
scummvm/trunk/engines/agi/keyboard.h
scummvm/trunk/engines/agi/loader_v2.cpp
scummvm/trunk/engines/agi/loader_v3.cpp
scummvm/trunk/engines/agi/logic.cpp
scummvm/trunk/engines/agi/logic.h
scummvm/trunk/engines/agi/lzw.cpp
scummvm/trunk/engines/agi/menu.cpp
scummvm/trunk/engines/agi/motion.cpp
scummvm/trunk/engines/agi/objects.cpp
scummvm/trunk/engines/agi/op_cmd.cpp
scummvm/trunk/engines/agi/op_dbg.cpp
scummvm/trunk/engines/agi/op_test.cpp
scummvm/trunk/engines/agi/picture.cpp
scummvm/trunk/engines/agi/preagi.cpp
scummvm/trunk/engines/agi/preagi_common.cpp
scummvm/trunk/engines/agi/preagi_mickey.cpp
scummvm/trunk/engines/agi/saveload.cpp
scummvm/trunk/engines/agi/sound.cpp
scummvm/trunk/engines/agi/view.h
scummvm/trunk/engines/agi/wagparser.cpp
scummvm/trunk/engines/agos/agos.cpp
scummvm/trunk/engines/agos/animation.cpp
scummvm/trunk/engines/agos/charset.cpp
scummvm/trunk/engines/agos/contain.cpp
scummvm/trunk/engines/agos/cursor.cpp
scummvm/trunk/engines/agos/debug.cpp
scummvm/trunk/engines/agos/debug.h
scummvm/trunk/engines/agos/debugger.cpp
scummvm/trunk/engines/agos/detection.cpp
scummvm/trunk/engines/agos/draw.cpp
scummvm/trunk/engines/agos/event.cpp
scummvm/trunk/engines/agos/gfx.cpp
scummvm/trunk/engines/agos/icons.cpp
scummvm/trunk/engines/agos/input.cpp
scummvm/trunk/engines/agos/items.cpp
scummvm/trunk/engines/agos/menus.cpp
scummvm/trunk/engines/agos/midi.cpp
scummvm/trunk/engines/agos/midiparser_s1d.cpp
scummvm/trunk/engines/agos/oracle.cpp
scummvm/trunk/engines/agos/res.cpp
scummvm/trunk/engines/agos/res_ami.cpp
scummvm/trunk/engines/agos/res_snd.cpp
scummvm/trunk/engines/agos/rooms.cpp
scummvm/trunk/engines/agos/saveload.cpp
scummvm/trunk/engines/agos/script.cpp
scummvm/trunk/engines/agos/script_e1.cpp
scummvm/trunk/engines/agos/script_e2.cpp
scummvm/trunk/engines/agos/script_ff.cpp
scummvm/trunk/engines/agos/script_pp.cpp
scummvm/trunk/engines/agos/script_s1.cpp
scummvm/trunk/engines/agos/script_s2.cpp
scummvm/trunk/engines/agos/script_ww.cpp
scummvm/trunk/engines/agos/sound.cpp
scummvm/trunk/engines/agos/string.cpp
scummvm/trunk/engines/agos/subroutine.cpp
scummvm/trunk/engines/agos/verb.cpp
scummvm/trunk/engines/agos/vga.cpp
scummvm/trunk/engines/agos/vga_e2.cpp
scummvm/trunk/engines/agos/vga_ff.cpp
scummvm/trunk/engines/agos/vga_s1.cpp
scummvm/trunk/engines/agos/vga_s2.cpp
scummvm/trunk/engines/agos/vga_ww.cpp
scummvm/trunk/engines/agos/window.cpp
scummvm/trunk/engines/agos/zones.cpp
scummvm/trunk/engines/cine/anim.cpp
scummvm/trunk/engines/cine/bg.cpp
scummvm/trunk/engines/cine/bg_list.cpp
scummvm/trunk/engines/cine/bg_list.h
scummvm/trunk/engines/cine/cine.cpp
scummvm/trunk/engines/cine/cine.h
scummvm/trunk/engines/cine/detection.cpp
scummvm/trunk/engines/cine/main_loop.cpp
scummvm/trunk/engines/cine/msg.cpp
scummvm/trunk/engines/cine/object.cpp
scummvm/trunk/engines/cine/prc.cpp
scummvm/trunk/engines/cine/rel.cpp
scummvm/trunk/engines/cine/script.cpp
scummvm/trunk/engines/cine/sound.cpp
scummvm/trunk/engines/cine/texte.h
scummvm/trunk/engines/cine/unpack.cpp
scummvm/trunk/engines/cine/unpack.h
scummvm/trunk/engines/cine/various.cpp
scummvm/trunk/engines/cine/various.h
scummvm/trunk/engines/cruise/cell.h
scummvm/trunk/engines/cruise/cruise.cpp
scummvm/trunk/engines/cruise/cruise.h
scummvm/trunk/engines/cruise/cruise_main.cpp
scummvm/trunk/engines/cruise/cruise_main.h
scummvm/trunk/engines/cruise/delphine-unpack.cpp
scummvm/trunk/engines/cruise/detection.cpp
scummvm/trunk/engines/cruise/gfxModule.cpp
scummvm/trunk/engines/drascula/detection.cpp
scummvm/trunk/engines/drascula/drascula.cpp
scummvm/trunk/engines/drascula/drascula.h
scummvm/trunk/engines/engine.cpp
scummvm/trunk/engines/engine.h
scummvm/trunk/engines/gob/cdrom.cpp
scummvm/trunk/engines/gob/coktelvideo.cpp
scummvm/trunk/engines/gob/dataio.cpp
scummvm/trunk/engines/gob/dataio.h
scummvm/trunk/engines/gob/detection.cpp
scummvm/trunk/engines/gob/draw.cpp
scummvm/trunk/engines/gob/draw_v1.cpp
scummvm/trunk/engines/gob/draw_v2.cpp
scummvm/trunk/engines/gob/driver_vga.cpp
scummvm/trunk/engines/gob/game.cpp
scummvm/trunk/engines/gob/game_v1.cpp
scummvm/trunk/engines/gob/game_v2.cpp
scummvm/trunk/engines/gob/gob.cpp
scummvm/trunk/engines/gob/gob.h
scummvm/trunk/engines/gob/goblin_v1.cpp
scummvm/trunk/engines/gob/goblin_v2.cpp
scummvm/trunk/engines/gob/init.cpp
scummvm/trunk/engines/gob/init_v1.cpp
scummvm/trunk/engines/gob/init_v2.cpp
scummvm/trunk/engines/gob/init_v3.cpp
scummvm/trunk/engines/gob/inter.cpp
scummvm/trunk/engines/gob/inter_bargon.cpp
scummvm/trunk/engines/gob/inter_v1.cpp
scummvm/trunk/engines/gob/inter_v2.cpp
scummvm/trunk/engines/gob/inter_v3.cpp
scummvm/trunk/engines/gob/inter_v4.cpp
scummvm/trunk/engines/gob/map.cpp
scummvm/trunk/engines/gob/map_v1.cpp
scummvm/trunk/engines/gob/map_v2.cpp
scummvm/trunk/engines/gob/map_v4.cpp
scummvm/trunk/engines/gob/mult.cpp
scummvm/trunk/engines/gob/mult_v1.cpp
scummvm/trunk/engines/gob/mult_v2.cpp
scummvm/trunk/engines/gob/music.cpp
scummvm/trunk/engines/gob/parse.cpp
scummvm/trunk/engines/gob/parse_v1.cpp
scummvm/trunk/engines/gob/parse_v2.cpp
scummvm/trunk/engines/gob/saveload.cpp
scummvm/trunk/engines/gob/saveload_v2.cpp
scummvm/trunk/engines/gob/saveload_v3.cpp
scummvm/trunk/engines/gob/scenery.cpp
scummvm/trunk/engines/gob/scenery_v1.cpp
scummvm/trunk/engines/gob/scenery_v2.cpp
scummvm/trunk/engines/gob/sound.cpp
scummvm/trunk/engines/gob/util.cpp
scummvm/trunk/engines/gob/video.cpp
scummvm/trunk/engines/gob/video_v1.cpp
scummvm/trunk/engines/gob/video_v2.cpp
scummvm/trunk/engines/kyra/animator_v1.cpp
scummvm/trunk/engines/kyra/debugger.cpp
scummvm/trunk/engines/kyra/kyra.cpp
scummvm/trunk/engines/kyra/resource.cpp
scummvm/trunk/engines/kyra/resource.h
scummvm/trunk/engines/kyra/saveload_v1.cpp
scummvm/trunk/engines/kyra/screen.cpp
scummvm/trunk/engines/kyra/screen_v2.cpp
scummvm/trunk/engines/kyra/script.cpp
scummvm/trunk/engines/kyra/script_v1.cpp
scummvm/trunk/engines/kyra/seqplayer.cpp
scummvm/trunk/engines/kyra/sound.cpp
scummvm/trunk/engines/kyra/sound.h
scummvm/trunk/engines/kyra/sound_adlib.cpp
scummvm/trunk/engines/kyra/sound_towns.cpp
scummvm/trunk/engines/kyra/sprites.cpp
scummvm/trunk/engines/kyra/staticres.cpp
scummvm/trunk/engines/kyra/text.cpp
scummvm/trunk/engines/kyra/vqa.cpp
scummvm/trunk/engines/kyra/wsamovie.cpp
scummvm/trunk/engines/lure/debugger.cpp
scummvm/trunk/engines/lure/decode.h
scummvm/trunk/engines/lure/detection.cpp
scummvm/trunk/engines/lure/disk.cpp
scummvm/trunk/engines/lure/disk.h
scummvm/trunk/engines/lure/events.cpp
scummvm/trunk/engines/lure/events.h
scummvm/trunk/engines/lure/game.h
scummvm/trunk/engines/lure/lure.cpp
scummvm/trunk/engines/lure/luredefs.h
scummvm/trunk/engines/lure/memory.h
scummvm/trunk/engines/lure/menu.h
scummvm/trunk/engines/lure/room.h
scummvm/trunk/engines/lure/screen.h
scummvm/trunk/engines/lure/surface.h
scummvm/trunk/engines/parallaction/callables_br.cpp
scummvm/trunk/engines/parallaction/callables_ns.cpp
scummvm/trunk/engines/parallaction/debug.cpp
scummvm/trunk/engines/parallaction/defs.h
scummvm/trunk/engines/parallaction/detection.cpp
scummvm/trunk/engines/parallaction/dialogue.cpp
scummvm/trunk/engines/parallaction/disk_br.cpp
scummvm/trunk/engines/parallaction/disk_ns.cpp
scummvm/trunk/engines/parallaction/exec_br.cpp
scummvm/trunk/engines/parallaction/exec_ns.cpp
scummvm/trunk/engines/parallaction/font.cpp
scummvm/trunk/engines/parallaction/graphics.cpp
scummvm/trunk/engines/parallaction/inventory.cpp
scummvm/trunk/engines/parallaction/menu.cpp
scummvm/trunk/engines/parallaction/objects.cpp
scummvm/trunk/engines/parallaction/parallaction.cpp
scummvm/trunk/engines/parallaction/parallaction_br.cpp
scummvm/trunk/engines/parallaction/parallaction_ns.cpp
scummvm/trunk/engines/parallaction/parser.cpp
scummvm/trunk/engines/parallaction/parser_br.cpp
scummvm/trunk/engines/parallaction/parser_ns.cpp
scummvm/trunk/engines/parallaction/saveload.cpp
scummvm/trunk/engines/parallaction/sound.cpp
scummvm/trunk/engines/parallaction/staticres.cpp
scummvm/trunk/engines/parallaction/walk.cpp
scummvm/trunk/engines/queen/bankman.cpp
scummvm/trunk/engines/queen/command.cpp
scummvm/trunk/engines/queen/credits.cpp
scummvm/trunk/engines/queen/cutaway.cpp
scummvm/trunk/engines/queen/debug.cpp
scummvm/trunk/engines/queen/display.cpp
scummvm/trunk/engines/queen/graphics.cpp
scummvm/trunk/engines/queen/grid.cpp
scummvm/trunk/engines/queen/input.cpp
scummvm/trunk/engines/queen/journal.cpp
scummvm/trunk/engines/queen/logic.cpp
scummvm/trunk/engines/queen/music.cpp
scummvm/trunk/engines/queen/musicdata.cpp
scummvm/trunk/engines/queen/queen.cpp
scummvm/trunk/engines/queen/resource.cpp
scummvm/trunk/engines/queen/sound.cpp
scummvm/trunk/engines/queen/state.cpp
scummvm/trunk/engines/queen/talk.cpp
scummvm/trunk/engines/queen/walk.cpp
scummvm/trunk/engines/saga/saga.cpp
scummvm/trunk/engines/saga/saveload.cpp
scummvm/trunk/engines/scumm/actor.cpp
scummvm/trunk/engines/scumm/akos.cpp
scummvm/trunk/engines/scumm/base-costume.cpp
scummvm/trunk/engines/scumm/bomp.cpp
scummvm/trunk/engines/scumm/boxes.cpp
scummvm/trunk/engines/scumm/camera.cpp
scummvm/trunk/engines/scumm/charset.cpp
scummvm/trunk/engines/scumm/costume.cpp
scummvm/trunk/engines/scumm/cursor.cpp
scummvm/trunk/engines/scumm/debugger.cpp
scummvm/trunk/engines/scumm/detection.cpp
scummvm/trunk/engines/scumm/detection_tables.h
scummvm/trunk/engines/scumm/dialogs.cpp
scummvm/trunk/engines/scumm/gfx.cpp
scummvm/trunk/engines/scumm/he/animation_he.cpp
scummvm/trunk/engines/scumm/he/cup_player_he.cpp
scummvm/trunk/engines/scumm/he/floodfill_he.cpp
scummvm/trunk/engines/scumm/he/logic_he.cpp
scummvm/trunk/engines/scumm/he/logic_he.h
scummvm/trunk/engines/scumm/he/palette_he.cpp
scummvm/trunk/engines/scumm/he/resource_he.cpp
scummvm/trunk/engines/scumm/he/script_v100he.cpp
scummvm/trunk/engines/scumm/he/script_v60he.cpp
scummvm/trunk/engines/scumm/he/script_v70he.cpp
scummvm/trunk/engines/scumm/he/script_v72he.cpp
scummvm/trunk/engines/scumm/he/script_v80he.cpp
scummvm/trunk/engines/scumm/he/script_v90he.cpp
scummvm/trunk/engines/scumm/he/sound_he.cpp
scummvm/trunk/engines/scumm/he/sprite_he.cpp
scummvm/trunk/engines/scumm/he/wiz_he.cpp
scummvm/trunk/engines/scumm/help.cpp
scummvm/trunk/engines/scumm/imuse/imuse.cpp
scummvm/trunk/engines/scumm/imuse/imuse_part.cpp
scummvm/trunk/engines/scumm/imuse/imuse_player.cpp
scummvm/trunk/engines/scumm/imuse/instrument.cpp
scummvm/trunk/engines/scumm/imuse/instrument.h
scummvm/trunk/engines/scumm/imuse/sysex.h
scummvm/trunk/engines/scumm/imuse/sysex_samnmax.cpp
scummvm/trunk/engines/scumm/imuse/sysex_scumm.cpp
scummvm/trunk/engines/scumm/imuse_digi/dimuse.cpp
scummvm/trunk/engines/scumm/imuse_digi/dimuse_bndmgr.cpp
scummvm/trunk/engines/scumm/imuse_digi/dimuse_codecs.cpp
scummvm/trunk/engines/scumm/imuse_digi/dimuse_music.cpp
scummvm/trunk/engines/scumm/imuse_digi/dimuse_script.cpp
scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.h
scummvm/trunk/engines/scumm/imuse_digi/dimuse_tables.cpp
scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.cpp
scummvm/trunk/engines/scumm/input.cpp
scummvm/trunk/engines/scumm/insane/insane.cpp
scummvm/trunk/engines/scumm/insane/insane_ben.cpp
scummvm/trunk/engines/scumm/insane/insane_enemy.cpp
scummvm/trunk/engines/scumm/insane/insane_iact.cpp
scummvm/trunk/engines/scumm/insane/insane_scenes.cpp
scummvm/trunk/engines/scumm/midiparser_eup.cpp
scummvm/trunk/engines/scumm/midiparser_ro.cpp
scummvm/trunk/engines/scumm/nut_renderer.cpp
scummvm/trunk/engines/scumm/object.cpp
scummvm/trunk/engines/scumm/palette.cpp
scummvm/trunk/engines/scumm/player_mod.cpp
scummvm/trunk/engines/scumm/player_nes.cpp
scummvm/trunk/engines/scumm/player_v1.cpp
scummvm/trunk/engines/scumm/player_v2.cpp
scummvm/trunk/engines/scumm/player_v2a.cpp
scummvm/trunk/engines/scumm/player_v3a.cpp
scummvm/trunk/engines/scumm/resource.cpp
scummvm/trunk/engines/scumm/resource_v2.cpp
scummvm/trunk/engines/scumm/resource_v3.cpp
scummvm/trunk/engines/scumm/resource_v4.cpp
scummvm/trunk/engines/scumm/room.cpp
scummvm/trunk/engines/scumm/saveload.cpp
scummvm/trunk/engines/scumm/script.cpp
scummvm/trunk/engines/scumm/script_v0.cpp
scummvm/trunk/engines/scumm/script_v2.cpp
scummvm/trunk/engines/scumm/script_v5.cpp
scummvm/trunk/engines/scumm/script_v6.cpp
scummvm/trunk/engines/scumm/script_v8.cpp
scummvm/trunk/engines/scumm/scumm.cpp
scummvm/trunk/engines/scumm/smush/channel.cpp
scummvm/trunk/engines/scumm/smush/chunk.cpp
scummvm/trunk/engines/scumm/smush/codec1.cpp
scummvm/trunk/engines/scumm/smush/codec37.cpp
scummvm/trunk/engines/scumm/smush/codec47.cpp
scummvm/trunk/engines/scumm/smush/imuse_channel.cpp
scummvm/trunk/engines/scumm/smush/saud_channel.cpp
scummvm/trunk/engines/scumm/smush/smush_font.cpp
scummvm/trunk/engines/scumm/smush/smush_mixer.cpp
scummvm/trunk/engines/scumm/smush/smush_mixer.h
scummvm/trunk/engines/scumm/smush/smush_player.cpp
scummvm/trunk/engines/scumm/sound.cpp
scummvm/trunk/engines/scumm/string.cpp
scummvm/trunk/engines/scumm/thumbnail.cpp
scummvm/trunk/engines/scumm/usage_bits.cpp
scummvm/trunk/engines/scumm/util.h
scummvm/trunk/engines/scumm/vars.cpp
scummvm/trunk/engines/scumm/verbs.cpp
scummvm/trunk/engines/sky/autoroute.cpp
scummvm/trunk/engines/sky/autoroute.h
scummvm/trunk/engines/sky/compact.cpp
scummvm/trunk/engines/sky/control.cpp
scummvm/trunk/engines/sky/control.h
scummvm/trunk/engines/sky/debug.cpp
scummvm/trunk/engines/sky/debug.h
scummvm/trunk/engines/sky/disk.cpp
scummvm/trunk/engines/sky/disk.h
scummvm/trunk/engines/sky/grid.h
scummvm/trunk/engines/sky/intro.cpp
scummvm/trunk/engines/sky/intro.h
scummvm/trunk/engines/sky/logic.cpp
scummvm/trunk/engines/sky/logic.h
scummvm/trunk/engines/sky/mouse.cpp
scummvm/trunk/engines/sky/mouse.h
scummvm/trunk/engines/sky/music/adlibchannel.cpp
scummvm/trunk/engines/sky/music/adlibmusic.cpp
scummvm/trunk/engines/sky/music/musicbase.h
scummvm/trunk/engines/sky/rnc_deco.cpp
scummvm/trunk/engines/sky/rnc_deco.h
scummvm/trunk/engines/sky/screen.cpp
scummvm/trunk/engines/sky/screen.h
scummvm/trunk/engines/sky/sky.cpp
scummvm/trunk/engines/sky/sky.h
scummvm/trunk/engines/sky/skydefs.h
scummvm/trunk/engines/sky/sound.cpp
scummvm/trunk/engines/sky/sound.h
scummvm/trunk/engines/sky/text.cpp
scummvm/trunk/engines/sky/text.h
scummvm/trunk/engines/sword1/animation.cpp
scummvm/trunk/engines/sword1/control.cpp
scummvm/trunk/engines/sword1/credits.cpp
scummvm/trunk/engines/sword1/debug.cpp
scummvm/trunk/engines/sword1/eventman.cpp
scummvm/trunk/engines/sword1/logic.cpp
scummvm/trunk/engines/sword1/memman.cpp
scummvm/trunk/engines/sword1/menu.cpp
scummvm/trunk/engines/sword1/mouse.cpp
scummvm/trunk/engines/sword1/music.cpp
scummvm/trunk/engines/sword1/objectman.cpp
scummvm/trunk/engines/sword1/resman.cpp
scummvm/trunk/engines/sword1/router.cpp
scummvm/trunk/engines/sword1/screen.cpp
scummvm/trunk/engines/sword1/sound.cpp
scummvm/trunk/engines/sword1/staticres.cpp
scummvm/trunk/engines/sword1/sword1.cpp
scummvm/trunk/engines/sword1/text.cpp
scummvm/trunk/engines/sword2/animation.cpp
scummvm/trunk/engines/sword2/anims.cpp
scummvm/trunk/engines/sword2/console.cpp
scummvm/trunk/engines/sword2/controls.cpp
scummvm/trunk/engines/sword2/debug.cpp
scummvm/trunk/engines/sword2/events.cpp
scummvm/trunk/engines/sword2/function.cpp
scummvm/trunk/engines/sword2/icons.cpp
scummvm/trunk/engines/sword2/interpreter.cpp
scummvm/trunk/engines/sword2/layers.cpp
scummvm/trunk/engines/sword2/logic.cpp
scummvm/trunk/engines/sword2/maketext.cpp
scummvm/trunk/engines/sword2/memory.cpp
scummvm/trunk/engines/sword2/menu.cpp
scummvm/trunk/engines/sword2/mouse.cpp
scummvm/trunk/engines/sword2/music.cpp
scummvm/trunk/engines/sword2/palette.cpp
scummvm/trunk/engines/sword2/protocol.cpp
scummvm/trunk/engines/sword2/render.cpp
scummvm/trunk/engines/sword2/resman.cpp
scummvm/trunk/engines/sword2/router.cpp
scummvm/trunk/engines/sword2/saveload.cpp
scummvm/trunk/engines/sword2/screen.cpp
scummvm/trunk/engines/sword2/scroll.cpp
scummvm/trunk/engines/sword2/sound.cpp
scummvm/trunk/engines/sword2/speech.cpp
scummvm/trunk/engines/sword2/sprite.cpp
scummvm/trunk/engines/sword2/startup.cpp
scummvm/trunk/engines/sword2/sword2.cpp
scummvm/trunk/engines/sword2/sync.cpp
scummvm/trunk/engines/sword2/walker.cpp
scummvm/trunk/engines/touche/detection.cpp
scummvm/trunk/engines/touche/graphics.cpp
scummvm/trunk/engines/touche/midi.cpp
scummvm/trunk/engines/touche/opcodes.cpp
scummvm/trunk/engines/touche/resource.cpp
scummvm/trunk/engines/touche/saveload.cpp
scummvm/trunk/engines/touche/staticres.cpp
scummvm/trunk/engines/touche/touche.cpp
scummvm/trunk/engines/touche/ui.cpp
scummvm/trunk/graphics/cursorman.h
scummvm/trunk/graphics/dxa_player.cpp
scummvm/trunk/graphics/font.cpp
scummvm/trunk/graphics/fontman.h
scummvm/trunk/graphics/fonts/consolefont.cpp
scummvm/trunk/graphics/fonts/newfont.cpp
scummvm/trunk/graphics/fonts/newfont_big.cpp
scummvm/trunk/graphics/fonts/scummfont.cpp
scummvm/trunk/graphics/imagedec.h
scummvm/trunk/graphics/imageman.h
scummvm/trunk/graphics/mpeg_player.cpp
scummvm/trunk/graphics/primitives.cpp
scummvm/trunk/graphics/scaler/intern.h
scummvm/trunk/graphics/scaler/scale2x.cpp
scummvm/trunk/graphics/scaler/scale3x.cpp
scummvm/trunk/graphics/scaler/scalebit.cpp
scummvm/trunk/graphics/scaler/thumbnail.cpp
scummvm/trunk/graphics/scaler.h
scummvm/trunk/graphics/surface.cpp
scummvm/trunk/gui/Actions.cpp
scummvm/trunk/gui/Actions.h
scummvm/trunk/gui/EditTextWidget.cpp
scummvm/trunk/gui/Key.cpp
scummvm/trunk/gui/Key.h
scummvm/trunk/gui/KeysDialog.cpp
scummvm/trunk/gui/ListWidget.cpp
scummvm/trunk/gui/PopUpWidget.cpp
scummvm/trunk/gui/ScrollBarWidget.cpp
scummvm/trunk/gui/TabWidget.cpp
scummvm/trunk/gui/about.cpp
scummvm/trunk/gui/browser.cpp
scummvm/trunk/gui/chooser.cpp
scummvm/trunk/gui/console.cpp
scummvm/trunk/gui/debugger.cpp
scummvm/trunk/gui/dialog.cpp
scummvm/trunk/gui/editable.cpp
scummvm/trunk/gui/eval.cpp
scummvm/trunk/gui/eval.h
scummvm/trunk/gui/launcher.cpp
scummvm/trunk/gui/massadd.cpp
scummvm/trunk/gui/message.cpp
scummvm/trunk/gui/newgui.cpp
scummvm/trunk/gui/object.cpp
scummvm/trunk/gui/options.cpp
scummvm/trunk/gui/theme.h
scummvm/trunk/gui/themebrowser.cpp
scummvm/trunk/gui/widget.cpp
scummvm/trunk/sound/adpcm.cpp
scummvm/trunk/sound/adpcm.h
scummvm/trunk/sound/aiff.cpp
scummvm/trunk/sound/aiff.h
scummvm/trunk/sound/audiocd.cpp
scummvm/trunk/sound/audiocd.h
scummvm/trunk/sound/audiostream.cpp
scummvm/trunk/sound/audiostream.h
scummvm/trunk/sound/flac.h
scummvm/trunk/sound/fmopl.cpp
scummvm/trunk/sound/mididrv.cpp
scummvm/trunk/sound/midiparser.cpp
scummvm/trunk/sound/midiparser_smf.cpp
scummvm/trunk/sound/midiparser_xmidi.cpp
scummvm/trunk/sound/mixer.cpp
scummvm/trunk/sound/mixer.h
scummvm/trunk/sound/mods/module.cpp
scummvm/trunk/sound/mods/protracker.cpp
scummvm/trunk/sound/mods/protracker.h
scummvm/trunk/sound/mods/rjp1.cpp
scummvm/trunk/sound/mods/soundfx.cpp
scummvm/trunk/sound/mp3.h
scummvm/trunk/sound/mpu401.cpp
scummvm/trunk/sound/mpu401.h
scummvm/trunk/sound/null.cpp
scummvm/trunk/sound/rate.cpp
scummvm/trunk/sound/rate_arm.cpp
scummvm/trunk/sound/softsynth/emumidi.h
scummvm/trunk/sound/softsynth/fluidsynth.cpp
scummvm/trunk/sound/softsynth/mt32/freeverb.cpp
scummvm/trunk/sound/softsynth/mt32.cpp
scummvm/trunk/sound/softsynth/ym2612.h
scummvm/trunk/sound/voc.cpp
scummvm/trunk/sound/voc.h
scummvm/trunk/sound/vorbis.h
scummvm/trunk/sound/wave.cpp
scummvm/trunk/sound/wave.h
scummvm/trunk/test/common/array.h
scummvm/trunk/test/common/hashmap.h
scummvm/trunk/test/common/list.h
scummvm/trunk/test/common/pack.h
scummvm/trunk/test/common/seekablesubreadstream.h
scummvm/trunk/test/common/str.h
scummvm/trunk/test/common/subreadstream.h
scummvm/trunk/tools/convbdf.c
scummvm/trunk/tools/create_lure/create_lure_dat.h
scummvm/trunk/tools/create_lure/process_actions.cpp
Removed Paths:
-------------
scummvm/trunk/common/stdafx.h
Modified: scummvm/trunk/Makefile.common
===================================================================
--- scummvm/trunk/Makefile.common 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/Makefile.common 2007-09-19 08:40:12 UTC (rev 28966)
@@ -87,7 +87,7 @@
.PHONY: all clean dist distclean plugins
# Old (dumb) compile & dependcy rules
-#INCS = scumm/scumm.h common/scummsys.h common/stdafx.h
+#INCS = scumm/scumm.h common/scummsys.h
#.cpp.o:
# $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
#$(OBJS): $(INCS)
Modified: scummvm/trunk/backends/events/default/default-events.cpp
===================================================================
--- scummvm/trunk/backends/events/default/default-events.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/events/default/default-events.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -25,7 +25,6 @@
#if !defined(DISABLE_DEFAULT_EVENTMANAGER)
-#include "common/stdafx.h"
#include "common/config-manager.h"
#include "common/system.h"
#include "backends/events/default/default-events.h"
@@ -48,9 +47,9 @@
bool DefaultEventManager::pollEvent(Common::Event &event) {
uint32 time = _boss->getMillis();
bool result;
-
+
result = _boss->pollEvent(event);
-
+
if (result) {
event.synthetic = false;
switch (event.type) {
@@ -124,7 +123,7 @@
result = true;
}
}
-
+
return result;
}
Modified: scummvm/trunk/backends/events/default/default-events.h
===================================================================
--- scummvm/trunk/backends/events/default/default-events.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/events/default/default-events.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -26,7 +26,6 @@
#if !defined(BACKEND_EVENTS_DEFAULT_H) && !defined(DISABLE_DEFAULT_EVENTMANAGER)
#define BACKEND_EVENTS_DEFAULT_H
-#include "common/stdafx.h"
#include "common/events.h"
/*
Modified: scummvm/trunk/backends/fs/abstract-fs-factory.h
===================================================================
--- scummvm/trunk/backends/fs/abstract-fs-factory.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/fs/abstract-fs-factory.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -25,7 +25,6 @@
#ifndef ABSTRACT_FILESYSTEM_FACTORY_H
#define ABSTRACT_FILESYSTEM_FACTORY_H
-#include "common/stdafx.h"
#include "common/str.h"
#include "backends/fs/abstract-fs.h"
@@ -35,12 +34,12 @@
class AbstractFilesystemFactory {
public:
typedef Common::String String;
-
+
/**
* Destructor.
*/
virtual ~AbstractFilesystemFactory() {}
-
+
/**
* Returns a node representing the "current directory".
* If your system does not support this concept, you can either try to
@@ -48,7 +47,7 @@
* e.g. the same value as getRoot() returns.
*/
virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const = 0;
-
+
/**
* Construct a node based on a path; the path is in the same format as it
* would be for calls to fopen().
@@ -60,17 +59,17 @@
* @param path The path string to create a FilesystemNode for.
*/
virtual AbstractFilesystemNode *makeFileNodePath(const String &path) const = 0;
-
+
/**
* Returns a special node representing the filesystem root.
* The starting point for any file system browsing.
- *
+ *
* On Unix, this will be simply the node for / (the root directory).
* On Windows, it will be a special node which "contains" all drives (C:, D:, E:).
*/
virtual AbstractFilesystemNode *makeRootFileNode() const = 0;
-
-
+
+
/**
* Meta-factory method which returns a concrete AbstractFilesystemFactory
* instance depending on the current architecture.
Modified: scummvm/trunk/backends/fs/amigaos4/amigaos4-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/amigaos4/amigaos4-fs.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/fs/amigaos4/amigaos4-fs.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -35,8 +35,6 @@
#include <strings.h>
#endif
-#include <common/stdafx.h>
-
#include "common/util.h"
#include "engines/engine.h"
#include "backends/fs/abstract-fs.h"
Modified: scummvm/trunk/backends/fs/dc/dc-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/dc/dc-fs.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/fs/dc/dc-fs.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -24,7 +24,6 @@
#if defined(__DC__)
-#include "common/stdafx.h"
#include "backends/fs/abstract-fs.h"
#include <ronin/cdfs.h>
Modified: scummvm/trunk/backends/fs/ds/ds-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/ds/ds-fs.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/fs/ds/ds-fs.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -20,7 +20,6 @@
*
*/
-#include "stdafx.h"
#include "str.h"
#include "common/util.h"
//#include <NDS/ARM9/console.h> //basic print funcionality
Modified: scummvm/trunk/backends/fs/gp32/gp32-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/gp32/gp32-fs.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/fs/gp32/gp32-fs.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include "stdafx.h"
#include "backends/fs/abstract-fs.h"
#define MAX_PATH_SIZE 256
Modified: scummvm/trunk/backends/fs/morphos/abox-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/morphos/abox-fs.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/fs/morphos/abox-fs.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -29,8 +29,6 @@
#include <stdio.h>
#include <sys/stat.h>
-#include <common/stdafx.h>
-
#include "common/util.h"
#include "base/engine.h"
#include "backends/fs/abstract-fs.h"
Modified: scummvm/trunk/backends/fs/palmos/palmos-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/palmos/palmos-fs.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/fs/palmos/palmos-fs.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -27,7 +27,6 @@
#include "PalmVersion.h"
#include "globals.h"
-#include "common/stdafx.h"
#include "backends/fs/abstract-fs.h"
/**
Modified: scummvm/trunk/backends/fs/posix/posix-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/posix/posix-fs.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/fs/posix/posix-fs.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -24,7 +24,6 @@
#if defined(UNIX)
-#include "common/stdafx.h"
#include "backends/fs/abstract-fs.h"
#ifdef MACOSX
Modified: scummvm/trunk/backends/fs/symbian/symbian-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/symbian/symbian-fs.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/fs/symbian/symbian-fs.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*/
#if defined (__SYMBIAN32__)
-#include "common/stdafx.h"
#include "backends/fs/abstract-fs.h"
#include <dirent.h>
Modified: scummvm/trunk/backends/fs/windows/windows-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/windows/windows-fs.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/fs/windows/windows-fs.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -27,7 +27,6 @@
#ifdef _WIN32_WCE
#include <windows.h>
#endif
-#include "common/stdafx.h"
#include "backends/fs/abstract-fs.h"
#include <io.h>
#include <stdio.h>
@@ -54,7 +53,7 @@
/**
* Implementation of the ScummVM file system API based on Windows API.
- *
+ *
* Parts of this class are documented in the base interface class, AbstractFilesystemNode.
*/
class WindowsFilesystemNode : public AbstractFilesystemNode {
@@ -68,25 +67,25 @@
public:
/**
* Creates a WindowsFilesystemNode with the root node as path.
- *
+ *
* In regular windows systems, a virtual root path is used "".
* In windows CE, the "\" root is used instead.
*/
WindowsFilesystemNode();
-
+
/**
* Creates a WindowsFilesystemNode for a given path.
- *
+ *
* Examples:
* path=c:\foo\bar.txt, currentDir=false -> c:\foo\bar.txt
* path=c:\foo\bar.txt, currentDir=true -> current directory
* path=NULL, currentDir=true -> current directory
- *
+ *
* @param path String with the path the new node should point to.
* @param currentDir if true, the path parameter will be ignored and the resulting node will point to the current directory.
*/
WindowsFilesystemNode(const String &path, const bool currentDir);
-
+
virtual bool exists() const { return _access(_path.c_str(), F_OK) == 0; }
virtual String getDisplayName() const { return _displayName; }
virtual String getName() const { return _displayName; }
@@ -103,26 +102,26 @@
private:
/**
* Adds a single WindowsFilesystemNode to a given list.
- * This method is used by getChildren() to populate the directory entries list.
- *
+ * This method is used by getChildren() to populate the directory entries list.
+ *
* @param list List to put the file entry node in.
* @param mode Mode to use while adding the file entry to the list.
* @param base String with the directory being listed.
* @param find_data Describes a file that the FindFirstFile, FindFirstFileEx, or FindNextFile functions find.
*/
static void addFile(AbstractFSList &list, ListMode mode, const char *base, WIN32_FIND_DATA* find_data);
-
+
/**
* Converts a Unicode string to Ascii format.
- *
+ *
* @param str String to convert from Unicode to Ascii.
* @return str in Ascii format.
*/
static char *toAscii(TCHAR *str);
-
+
/**
* Converts an Ascii string to Unicode format.
- *
+ *
* @param str String to convert from Ascii to Unicode.
* @return str in Unicode format.
*/
@@ -131,11 +130,11 @@
/**
* Returns the last component of a given path.
- *
+ *
* Examples:
* c:\foo\bar.txt would return "\bar.txt"
* c:\foo\bar\ would return "\bar\"
- *
+ *
* @param str Path to obtain the last component from.
* @return Pointer to the first char of the last component inside str.
*/
@@ -229,7 +228,7 @@
assert(p.size() > 0);
_path = p;
}
-
+
_displayName = lastPathComponent(_path);
// Check whether it is a directory, and whether the file actually exists
@@ -247,7 +246,7 @@
AbstractFilesystemNode *WindowsFilesystemNode::getChild(const String &n) const {
assert(_isDirectory);
-
+
String newPath(_path);
if (_path.lastChar() != '\\')
newPath += '\\';
@@ -297,12 +296,12 @@
sprintf(searchPath, "%s*", _path.c_str());
handle = FindFirstFile(toUnicode(searchPath), &desc);
-
+
if (handle == INVALID_HANDLE_VALUE)
return false;
-
+
addFile(myList, mode, _path.c_str(), &desc);
-
+
while (FindNextFile(handle, &desc))
addFile(myList, mode, _path.c_str(), &desc);
@@ -314,10 +313,10 @@
AbstractFilesystemNode *WindowsFilesystemNode::getParent() const {
assert(_isValid || _isPseudoRoot);
-
+
if (_isPseudoRoot)
return 0;
-
+
WindowsFilesystemNode *p = new WindowsFilesystemNode();
if (_path.size() > 3) {
const char *start = _path.c_str();
@@ -330,7 +329,7 @@
p->_displayName = lastPathComponent(p->_path);
p->_isPseudoRoot = false;
}
-
+
return p;
}
Modified: scummvm/trunk/backends/midi/alsa.cpp
===================================================================
--- scummvm/trunk/backends/midi/alsa.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/midi/alsa.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -22,14 +22,12 @@
* $Id$
*/
-#include "common/stdafx.h"
#include "common/scummsys.h"
#if defined(UNIX) && defined(USE_ALSA)
#include "sound/mpu401.h"
-#include "common/stdafx.h"
#include "common/util.h"
#include "common/config-manager.h"
Modified: scummvm/trunk/backends/midi/coreaudio.cpp
===================================================================
--- scummvm/trunk/backends/midi/coreaudio.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/midi/coreaudio.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -24,7 +24,6 @@
#ifdef MACOSX
-#include "common/stdafx.h"
#include "common/config-manager.h"
#include "common/util.h"
#include "sound/mpu401.h"
Modified: scummvm/trunk/backends/midi/coremidi.cpp
===================================================================
--- scummvm/trunk/backends/midi/coremidi.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/midi/coremidi.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -24,7 +24,6 @@
#ifdef MACOSX
-#include "common/stdafx.h"
#include "common/config-manager.h"
#include "common/util.h"
#include "sound/mpu401.h"
@@ -91,8 +90,8 @@
} else {
return MERR_DEVICE_NOT_AVAILABLE;
}
-
- if (err != noErr)
+
+ if (err != noErr)
return MERR_CANNOT_CONNECT;
return 0;
Modified: scummvm/trunk/backends/midi/morphos.cpp
===================================================================
--- scummvm/trunk/backends/midi/morphos.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/midi/morphos.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -33,7 +33,6 @@
#include <proto/dos.h>
#include <proto/etude.h>
-#include "common/stdafx.h"
#include "common/endian.h"
#include "sound/mpu401.h"
#include "common/util.h"
Modified: scummvm/trunk/backends/midi/seq.cpp
===================================================================
--- scummvm/trunk/backends/midi/seq.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/midi/seq.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -30,7 +30,6 @@
#if defined(UNIX) && !defined(__BEOS__) && !defined(__MAEMO__)
-#include "common/stdafx.h"
#include "sound/mpu401.h"
#include "common/util.h"
Modified: scummvm/trunk/backends/midi/windows.cpp
===================================================================
--- scummvm/trunk/backends/midi/windows.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/midi/windows.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -27,7 +27,6 @@
#include <windows.h>
#include <mmsystem.h>
-#include "common/stdafx.h"
#include "sound/mpu401.h"
#include "common/util.h"
Modified: scummvm/trunk/backends/midi/ypa1.cpp
===================================================================
--- scummvm/trunk/backends/midi/ypa1.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/midi/ypa1.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -22,7 +22,6 @@
* $Id$
*/
-#include "common/stdafx.h"
#include "sound/mpu401.h"
#include "common/util.h"
Modified: scummvm/trunk/backends/midi/zodiac.cpp
===================================================================
--- scummvm/trunk/backends/midi/zodiac.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/midi/zodiac.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -22,7 +22,6 @@
* $Id$
*/
-#include "common/stdafx.h"
#include "sound/mpu401.h"
#include "common/util.h"
@@ -113,7 +112,7 @@
void MidiDriver_Zodiac::sysEx(const byte *msg, uint16 length) {
unsigned char buf[256];
-
+
buf[0] = 0xF0;
memcpy(buf + 1, msg, length);
buf[length + 1] = 0xF7;
Modified: scummvm/trunk/backends/platform/PalmOS/Src/be_base.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/be_base.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/PalmOS/Src/be_base.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -29,7 +29,6 @@
#include "PalmVersion.h"
#include "globals.h"
-#include "common/stdafx.h"
#include "common/scummsys.h"
#include "common/system.h"
#include "common/events.h"
Modified: scummvm/trunk/backends/platform/PalmOS/Src/be_save.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/be_save.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/PalmOS/Src/be_save.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -26,7 +26,6 @@
#ifndef BACKEND_SAVES_PALM_H
#define BACKEND_SAVES_PALM_H
-#include "common/stdafx.h"
#include "saves/default/default-saves.h"
class PalmSaveFileManager : public DefaultSaveFileManager {
Modified: scummvm/trunk/backends/platform/PalmOS/Src/cd_aeroplayer.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/cd_aeroplayer.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/PalmOS/Src/cd_aeroplayer.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include "stdafx.h"
#include "common/system.h"
#include "common/config-manager.h"
Modified: scummvm/trunk/backends/platform/PalmOS/Src/cd_default.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/cd_default.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/PalmOS/Src/cd_default.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -22,7 +22,6 @@
* $Id$
*
*/
-#include "common/stdafx.h"
#include "common/system.h"
#include "cd_default.h"
Modified: scummvm/trunk/backends/platform/PalmOS/Src/cd_msa.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/cd_msa.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/PalmOS/Src/cd_msa.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
#include <SonyClie.h>
-#include "common/stdafx.h"
#include "common/system.h"
#include "cd_msa.h"
#include "start.h" // for appFileCreat
Modified: scummvm/trunk/backends/platform/PalmOS/Src/cd_pockettunes.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/cd_pockettunes.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/PalmOS/Src/cd_pockettunes.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -22,7 +22,6 @@
* $Id$
*
*/
-#include "common/stdafx.h"
#include "common/system.h"
#include "common/config-manager.h"
Modified: scummvm/trunk/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -32,7 +32,6 @@
#include "scumm_globals.h"
#include "globals.h"
-#include "common/stdafx.h"
#include "base/version.h"
#include "formEditGame.h"
Modified: scummvm/trunk/backends/platform/PalmOS/Src/native/zodiacARM.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/native/zodiacARM.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/PalmOS/Src/native/zodiacARM.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -36,7 +36,6 @@
//#include <AdnDebugMgr.h>
//#define DEBUG_ARM
-#include "stdafx.h"
#include "base/main.h"
#ifdef COMPILE_ZODIAC
# include "be_zodiac.h"
Modified: scummvm/trunk/backends/platform/dc/audio.cpp
===================================================================
--- scummvm/trunk/backends/platform/dc/audio.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/dc/audio.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include <common/stdafx.h>
#include <common/scummsys.h>
#include "engines/engine.h"
#include "sound/mixer.h"
Modified: scummvm/trunk/backends/platform/dc/dcloader.cpp
===================================================================
--- scummvm/trunk/backends/platform/dc/dcloader.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/dc/dcloader.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include <common/stdafx.h>
#include <ronin/ronin.h>
#include <string.h>
#include <stdarg.h>
Modified: scummvm/trunk/backends/platform/dc/dcmain.cpp
===================================================================
--- scummvm/trunk/backends/platform/dc/dcmain.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/dc/dcmain.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include <common/stdafx.h>
#include <common/scummsys.h>
#include <engines/engine.h>
#include <base/main.h>
Modified: scummvm/trunk/backends/platform/dc/display.cpp
===================================================================
--- scummvm/trunk/backends/platform/dc/display.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/dc/display.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -25,7 +25,6 @@
#define RONIN_TIMER_ACCESS
-#include <common/stdafx.h>
#include <common/scummsys.h>
#include <graphics/scaler/intern.h>
#include <graphics/surface.h>
Modified: scummvm/trunk/backends/platform/dc/input.cpp
===================================================================
--- scummvm/trunk/backends/platform/dc/input.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/dc/input.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -25,7 +25,6 @@
#define RONIN_TIMER_ACCESS
-#include <common/stdafx.h>
#include <common/scummsys.h>
#include <common/events.h>
#include "dc.h"
Modified: scummvm/trunk/backends/platform/dc/selector.cpp
===================================================================
--- scummvm/trunk/backends/platform/dc/selector.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/dc/selector.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include <common/stdafx.h>
#include <common/scummsys.h>
#include <engines/engine.h>
#include <base/plugins.h>
Modified: scummvm/trunk/backends/platform/dc/softkbd.cpp
===================================================================
--- scummvm/trunk/backends/platform/dc/softkbd.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/dc/softkbd.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include <common/stdafx.h>
#include <common/scummsys.h>
#include "common/events.h"
#include "engines/engine.h"
Modified: scummvm/trunk/backends/platform/dc/time.cpp
===================================================================
--- scummvm/trunk/backends/platform/dc/time.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/dc/time.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -25,7 +25,6 @@
#define RONIN_TIMER_ACCESS
-#include <common/stdafx.h>
#include <common/scummsys.h>
#include "dc.h"
Modified: scummvm/trunk/backends/platform/dc/vmsave.cpp
===================================================================
--- scummvm/trunk/backends/platform/dc/vmsave.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/dc/vmsave.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include <common/stdafx.h>
#include <common/scummsys.h>
#include "engines/engine.h"
#include "dc.h"
Modified: scummvm/trunk/backends/platform/ds/arm9/source/blitters.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/blitters.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/ds/arm9/source/blitters.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -20,7 +20,6 @@
*
*/
-#include "stdafx.h"
#include "blitters.h"
#define CHARSET_MASK_TRANSPARENCY 253
Modified: scummvm/trunk/backends/platform/ds/arm9/source/cdaudio.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/cdaudio.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/ds/arm9/source/cdaudio.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -20,7 +20,6 @@
*
*/
-#include "stdafx.h"
#include "cdaudio.h"
#include "ds-fs.h"
#include "config-manager.h"
Modified: scummvm/trunk/backends/platform/ds/arm9/source/dsmain.h
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/dsmain.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/ds/arm9/source/dsmain.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -24,7 +24,6 @@
#define _DSMAIN_H
#include <nds.h>
-#include "stdafx.h"
#include "osystem_ds.h"
#include "scummconsole.h"
#include "NDS/scummvm_ipc.h"
Modified: scummvm/trunk/backends/platform/ds/arm9/source/dsoptions.h
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/dsoptions.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/ds/arm9/source/dsoptions.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
#ifndef _DSOPTIONS_H_
#define _DSOPTIONS_H_
-#include "stdafx.h"
#include "common/scummsys.h"
#include "common/str.h"
Modified: scummvm/trunk/backends/platform/ds/arm9/source/gbampsave.h
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/gbampsave.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/ds/arm9/source/gbampsave.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
#ifndef _GBAMPSAVE_H_
#define _GBAMPSAVE_H_
-#include "stdafx.h"
#include "system.h"
#define SAVE_BUFFER_SIZE 100000
Modified: scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -20,7 +20,6 @@
*/
-#include "stdafx.h"
#include "common/scummsys.h"
#include "common/system.h"
#include "system.h"
Modified: scummvm/trunk/backends/platform/ds/arm9/source/portdefs.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/portdefs.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/ds/arm9/source/portdefs.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -20,7 +20,6 @@
*
*/
-#include "stdafx.h"
#include <string.h>
#include "nds/dma.h"
#include "osystem_ds.h"
Modified: scummvm/trunk/backends/platform/ds/arm9/source/ramsave.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/ramsave.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/ds/arm9/source/ramsave.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -20,7 +20,6 @@
*
*/
// Save in order 1,2,3,4,larger 2,5
-#include "stdafx.h"
#include "system.h"
#include "ramsave.h"
#include "nds.h"
Modified: scummvm/trunk/backends/platform/ds/arm9/source/scummhelp.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/scummhelp.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/ds/arm9/source/scummhelp.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -20,7 +20,6 @@
*
*/
-#include "stdafx.h"
#include "scummhelp.h"
#define ADD_BIND(k,d) do { key[i] = k; dsc[i] = d; i++; } while (0)
Modified: scummvm/trunk/backends/platform/ds/arm9/source/zipreader.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/zipreader.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/ds/arm9/source/zipreader.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -21,7 +21,6 @@
*/
-#include "stdafx.h"
#include "zipreader.h"
#define SWAP_U16(v) (((v & 0xFF) << 8) + (v & 0xFF00))
Modified: scummvm/trunk/backends/platform/ds/arm9/source/zipreader.h
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/zipreader.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/ds/arm9/source/zipreader.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -22,7 +22,6 @@
#ifndef _ZIPREADER_H_
#define _ZIPREADER_H_
-#include "stdafx.h"
#include "portdefs.h"
#define ZF_SEARCH_START 0x08000000
#define ZF_SEARCH_END 0x09000000
Modified: scummvm/trunk/backends/platform/gp2x/gp2x-common.h
===================================================================
--- scummvm/trunk/backends/platform/gp2x/gp2x-common.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/gp2x/gp2x-common.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -29,7 +29,6 @@
#define __GP2X__
#define USE_OSD
-#include "common/stdafx.h"
#include "common/scummsys.h"
#include "common/system.h"
#include "graphics/scaler.h"
Modified: scummvm/trunk/backends/platform/gp32/gp32_launcher.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp32/gp32_launcher.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/gp32/gp32_launcher.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include "stdafx.h"
#include "common/scummsys.h"
#include "common/file.h"
Modified: scummvm/trunk/backends/platform/gp32/gp32_launcher.h
===================================================================
--- scummvm/trunk/backends/platform/gp32/gp32_launcher.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/gp32/gp32_launcher.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -26,7 +26,6 @@
#ifndef __GP32_LAUNCHER_H
#define __GP32_LAUNCHER_H
-#include "stdafx.h"
#include "common/scummsys.h"
extern void readConfigVars();
Modified: scummvm/trunk/backends/platform/gp32/gp32_main.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp32/gp32_main.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/gp32/gp32_main.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include "stdafx.h"
#include "common/scummsys.h"
#include "common/config-manager.h"
Modified: scummvm/trunk/backends/platform/gp32/gp32_osys.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp32/gp32_osys.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/gp32/gp32_osys.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include "stdafx.h"
#include "common/scummsys.h"
#include "common/system.h"
Modified: scummvm/trunk/backends/platform/gp32/gp32_osys.h
===================================================================
--- scummvm/trunk/backends/platform/gp32/gp32_osys.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/gp32/gp32_osys.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -27,7 +27,6 @@
#define GP32_OSYS_H
//Standard ScummVM includes.
-#include "common/stdafx.h"
#include "common/scummsys.h"
#include "common/system.h"
#include "backends/intern.h"
Modified: scummvm/trunk/backends/platform/gp32/gp32std.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp32/gp32std.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/gp32/gp32std.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include "stdafx.h"
#include "common/scummsys.h"
//#include "graphics/scaler.h"
#include "common/system.h"
Modified: scummvm/trunk/backends/platform/gp32/gp32std_file.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp32/gp32std_file.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/gp32/gp32std_file.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -24,7 +24,6 @@
*/
-#include "stdafx.h"
#include "common/scummsys.h"
//#include "graphics/scaler.h"
#include "common/system.h"
Modified: scummvm/trunk/backends/platform/gp32/gp32std_grap.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp32/gp32std_grap.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/gp32/gp32std_grap.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include "stdafx.h"
#include "common/scummsys.h"
#include "common/system.h"
#include "backends/intern.h"
Modified: scummvm/trunk/backends/platform/gp32/gp32std_input.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp32/gp32std_input.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/gp32/gp32std_input.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include "stdafx.h"
#include "common/scummsys.h"
#include "gp32std.h"
Modified: scummvm/trunk/backends/platform/gp32/gp32std_input.h
===================================================================
--- scummvm/trunk/backends/platform/gp32/gp32std_input.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/gp32/gp32std_input.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -26,7 +26,6 @@
#ifndef __GP32STD_INPUT_H
#define __GP32STD_INPUT_H
-#include "stdafx.h"
#include "common/scummsys.h"
#define BUTTON_DOWN 1
Modified: scummvm/trunk/backends/platform/gp32/gp32std_memory.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp32/gp32std_memory.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/gp32/gp32std_memory.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include "stdafx.h"
#include "common/scummsys.h"
//#include "graphics/scaler.h"
#include "common/system.h"
Modified: scummvm/trunk/backends/platform/gp32/gp32std_sound.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp32/gp32std_sound.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/gp32/gp32std_sound.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include "stdafx.h"
#include "common/scummsys.h"
#include "gp32std.h"
Modified: scummvm/trunk/backends/platform/maemo/maemo-sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/maemo/maemo-sdl.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/maemo/maemo-sdl.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include "common/stdafx.h"
#include "backends/platform/maemo/maemo-sdl.h"
Modified: scummvm/trunk/backends/platform/maemo/maemo-sdl.h
===================================================================
--- scummvm/trunk/backends/platform/maemo/maemo-sdl.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/maemo/maemo-sdl.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -26,7 +26,6 @@
#ifndef MAEMO_SDL_H
#define MAEMO_SDL_H
-#include "common/stdafx.h"
#include "backends/platform/sdl/sdl-common.h"
//#include "CEkeys.h"
Modified: scummvm/trunk/backends/platform/maemo/main.cpp
===================================================================
--- scummvm/trunk/backends/platform/maemo/main.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/maemo/main.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include <common/stdafx.h>
#include <common/scummsys.h>
#include <X11/Xlib.h>
#include <X11/extensions/Xsp.h>
Modified: scummvm/trunk/backends/platform/null/null.cpp
===================================================================
--- scummvm/trunk/backends/platform/null/null.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/null/null.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include "common/stdafx.h"
#include "common/system.h"
#include "base/main.h"
Modified: scummvm/trunk/backends/platform/ps2/systemps2.cpp
===================================================================
--- scummvm/trunk/backends/platform/ps2/systemps2.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/ps2/systemps2.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include "common/stdafx.h"
#include <kernel.h>
#include <stdio.h>
#include <stdlib.h>
Modified: scummvm/trunk/backends/platform/ps2/systemps2.h
===================================================================
--- scummvm/trunk/backends/platform/ps2/systemps2.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/ps2/systemps2.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -26,7 +26,6 @@
#ifndef SYSTEMPS2_H
#define SYSTEMPS2_H
-#include "common/stdafx.h"
#include "common/system.h"
class Gs2dScreen;
Modified: scummvm/trunk/backends/platform/psp/osys_psp.cpp
===================================================================
--- scummvm/trunk/backends/platform/psp/osys_psp.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/psp/osys_psp.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include "common/stdafx.h"
#include "common/config-manager.h"
#include "common/events.h"
#include "common/rect.h"
Modified: scummvm/trunk/backends/platform/psp/osys_psp.h
===================================================================
--- scummvm/trunk/backends/platform/psp/osys_psp.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/psp/osys_psp.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include "common/stdafx.h"
#include "common/scummsys.h"
#include "common/system.h"
#include "backends/intern.h"
Modified: scummvm/trunk/backends/platform/psp/osys_psp_gu.h
===================================================================
--- scummvm/trunk/backends/platform/psp/osys_psp_gu.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/psp/osys_psp_gu.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -22,7 +22,6 @@
*/
#include <pspgu.h>
-#include "common/stdafx.h"
#include "common/scummsys.h"
#include "common/rect.h"
Modified: scummvm/trunk/backends/platform/psp/psp_main.cpp
===================================================================
--- scummvm/trunk/backends/platform/psp/psp_main.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/psp/psp_main.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -31,7 +31,6 @@
#include <pspdebug.h>
#endif
-#include <common/stdafx.h>
#include <common/system.h>
#include <engines/engine.h>
#include <base/main.h>
Modified: scummvm/trunk/backends/platform/sdl/sdl.h
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/sdl/sdl.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -28,7 +28,6 @@
#include <SDL.h>
-#include "common/stdafx.h"
#include "common/scummsys.h"
#include "common/system.h"
#include "graphics/scaler.h"
@@ -215,7 +214,7 @@
// unseen game screen
SDL_Surface *_screen;
-
+
// TODO: We could get rid of the following two vars and just use _screen instead
int _screenWidth, _screenHeight;
@@ -272,7 +271,7 @@
int _mode;
int _transactionMode;
bool _fullscreen;
-
+
bool _screenIsLocked;
Graphics::Surface _framebuffer;
@@ -368,7 +367,7 @@
Common::SaveFileManager *_savefile;
Audio::Mixer *_mixer;
-
+
SDL_TimerID _timerID;
Common::TimerManager *_timer;
@@ -382,7 +381,7 @@
virtual void drawMouse(); // overloaded by CE backend
virtual void undrawMouse(); // overloaded by CE backend (FIXME)
virtual void blitCursor(); // overloaded by CE backend (FIXME)
-
+
/** Set the position of the virtual mouse cursor. */
void setMousePos(int x, int y);
virtual void fillMouseEvent(Common::Event &event, int x, int y); // overloaded by CE backend
@@ -400,8 +399,8 @@
virtual bool saveScreenshot(const char *filename); // overloaded by CE backend
int effectiveScreenHeight() const {
- return (_adjustAspectRatio ? real2Aspect(_screenHeight) : _screenHeight)
- * _scaleFactor;
+ return (_adjustAspectRatio ? real2Aspect(_screenHeight) : _screenHeight)
+ * _scaleFactor;
}
void setupIcon();
Modified: scummvm/trunk/backends/platform/symbian/src/SymbianActions.cpp
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/SymbianActions.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/symbian/src/SymbianActions.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include "common/stdafx.h"
#include "backends/platform/symbian/src/SymbianActions.h"
#include "gui/message.h"
Modified: scummvm/trunk/backends/platform/symbian/src/SymbianActions.h
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/SymbianActions.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/symbian/src/SymbianActions.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -26,7 +26,6 @@
#ifndef SYMBIANACTIONS_H
#define SYMBIANACTIONS_H
-#include "common/stdafx.h"
#include "common/scummsys.h"
#include "common/system.h"
#include "gui/Key.h"
Modified: scummvm/trunk/backends/platform/wince/CEActionsPocket.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEActionsPocket.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/wince/CEActionsPocket.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -24,7 +24,6 @@
*/
-#include "common/stdafx.h"
#include "CEActionsPocket.h"
#include "EventsBuffer.h"
#include "gui/message.h"
Modified: scummvm/trunk/backends/platform/wince/CEActionsPocket.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEActionsPocket.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/wince/CEActionsPocket.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -26,7 +26,6 @@
#ifndef CEACTIONSPOCKET
#define CEACTIONSPOCKET
-#include "common/stdafx.h"
#include "common/scummsys.h"
#include "common/system.h"
#include "wince-sdl.h"
Modified: scummvm/trunk/backends/platform/wince/CEActionsSmartphone.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEActionsSmartphone.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/wince/CEActionsSmartphone.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include "common/stdafx.h"
#include "CEActionsSmartphone.h"
#include "EventsBuffer.h"
#include "gui/message.h"
Modified: scummvm/trunk/backends/platform/wince/CEActionsSmartphone.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEActionsSmartphone.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/wince/CEActionsSmartphone.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -26,7 +26,6 @@
#ifndef CEACTIONSSMARTPHONE
#define CEACTIONSSMARTPHONE
-#include "common/stdafx.h"
#include "common/scummsys.h"
#include "common/system.h"
#include "wince-sdl.h"
Modified: scummvm/trunk/backends/platform/wince/CEDevice.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEDevice.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/wince/CEDevice.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include "common/stdafx.h"
#include "CEDevice.h"
#include <SDL.h>
Modified: scummvm/trunk/backends/platform/wince/CEDevice.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEDevice.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/wince/CEDevice.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -26,7 +26,6 @@
#ifndef CEDEVICE
#define CEDEVICE
-#include "common/stdafx.h"
#include "common/scummsys.h"
#include "common/system.h"
#include "common/str.h"
Modified: scummvm/trunk/backends/platform/wince/CELauncherDialog.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CELauncherDialog.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/wince/CELauncherDialog.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include "common/stdafx.h"
#include "wince-sdl.h"
Modified: scummvm/trunk/backends/platform/wince/CEScaler.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEScaler.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/wince/CEScaler.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
#include "graphics/scaler/intern.h"
-#include "common/stdafx.h"
#include "CEScaler.h"
int redblueMasks[] = { 0x7C1F, 0xF81F };
Modified: scummvm/trunk/backends/platform/wince/CEScaler.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEScaler.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/wince/CEScaler.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -26,7 +26,6 @@
#ifndef CESCALER
#define CESCALER
-#include "common/stdafx.h"
#include "common/scummsys.h"
#include "common/system.h"
#include "graphics/scaler.h"
Modified: scummvm/trunk/backends/platform/wince/CEgui/GUIElement.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/GUIElement.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/wince/CEgui/GUIElement.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include "common/stdafx.h"
#include "Toolbar.h"
#include "SDL_ImageResource.h"
Modified: scummvm/trunk/backends/platform/wince/CEgui/GUIElement.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/GUIElement.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/wince/CEgui/GUIElement.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -26,7 +26,6 @@
#ifndef CEGUI_GUIELEMENT
#define CEGUI_GUIELEMENT
-#include "common/stdafx.h"
#include "common/scummsys.h"
#include "common/system.h"
Modified: scummvm/trunk/backends/platform/wince/CEgui/ItemAction.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/ItemAction.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/wince/CEgui/ItemAction.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include "common/stdafx.h"
#include "ItemAction.h"
namespace CEGUI {
Modified: scummvm/trunk/backends/platform/wince/CEgui/ItemAction.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/ItemAction.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/wince/CEgui/ItemAction.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -26,7 +26,6 @@
#ifndef CEGUI_ITEMACTION
#define CEGUI_ITEMACTION
-#include "common/stdafx.h"
#include "common/scummsys.h"
#include "common/system.h"
Modified: scummvm/trunk/backends/platform/wince/CEgui/ItemSwitch.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/ItemSwitch.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/wince/CEgui/ItemSwitch.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include "common/stdafx.h"
#include "ItemSwitch.h"
namespace CEGUI {
Modified: scummvm/trunk/backends/platform/wince/CEgui/ItemSwitch.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/ItemSwitch.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/wince/CEgui/ItemSwitch.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -26,7 +26,6 @@
#ifndef CEGUI_ITEMSWITCH
#define CEGUI_ITEMSWITCH
-#include "common/stdafx.h"
#include "common/scummsys.h"
#include "common/system.h"
Modified: scummvm/trunk/backends/platform/wince/CEgui/Panel.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/Panel.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/wince/CEgui/Panel.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include "common/stdafx.h"
#include "Panel.h"
namespace CEGUI {
Modified: scummvm/trunk/backends/platform/wince/CEgui/Panel.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/Panel.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/wince/CEgui/Panel.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -26,7 +26,6 @@
#ifndef CEGUI_PANEL
#define CEGUI_PANEL
-#include "common/stdafx.h"
#include "common/scummsys.h"
#include "common/system.h"
#include "common/hashmap.h"
Modified: scummvm/trunk/backends/platform/wince/CEgui/PanelItem.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/PanelItem.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/wince/CEgui/PanelItem.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include "common/stdafx.h"
#include "PanelItem.h"
namespace CEGUI {
Modified: scummvm/trunk/backends/platform/wince/CEgui/PanelItem.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/PanelItem.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/wince/CEgui/PanelItem.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -26,7 +26,6 @@
#ifndef CEGUI_PANELITEM
#define CEGUI_PANELITEM
-#include "common/stdafx.h"
#include "common/scummsys.h"
#include "common/system.h"
Modified: scummvm/trunk/backends/platform/wince/CEgui/PanelKeyboard.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/PanelKeyboard.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/wince/CEgui/PanelKeyboard.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include "common/stdafx.h"
#include "PanelKeyboard.h"
namespace CEGUI {
Modified: scummvm/trunk/backends/platform/wince/CEgui/PanelKeyboard.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/PanelKeyboard.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/wince/CEgui/PanelKeyboard.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -26,7 +26,6 @@
#ifndef CEGUI_PANELKEYBOARD
#define CEGUI_PANELKEYBOARD
-#include "common/stdafx.h"
#include "common/scummsys.h"
#include "common/system.h"
Modified: scummvm/trunk/backends/platform/wince/CEgui/SDL_ImageResource.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/SDL_ImageResource.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/wince/CEgui/SDL_ImageResource.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include "common/stdafx.h"
#include "SDL_ImageResource.h"
namespace CEGUI {
Modified: scummvm/trunk/backends/platform/wince/CEgui/SDL_ImageResource.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/SDL_ImageResource.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/wince/CEgui/SDL_ImageResource.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -26,7 +26,6 @@
#ifndef CEGUI_SDL_IMAGERESOURCE
#define CEGUI_SDL_IMAGERESOURCE
-#include "common/stdafx.h"
#include "common/scummsys.h"
#include "common/system.h"
Modified: scummvm/trunk/backends/platform/wince/CEgui/Toolbar.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/Toolbar.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/wince/CEgui/Toolbar.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include "common/stdafx.h"
#include "Toolbar.h"
namespace CEGUI {
Modified: scummvm/trunk/backends/platform/wince/CEgui/Toolbar.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/Toolbar.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/wince/CEgui/Toolbar.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -26,7 +26,6 @@
#ifndef CEGUI_TOOLBAR
#define CEGUI_TOOLBAR
-#include "common/stdafx.h"
#include "common/scummsys.h"
#include "common/system.h"
Modified: scummvm/trunk/backends/platform/wince/CEgui/ToolbarHandler.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/ToolbarHandler.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/wince/CEgui/ToolbarHandler.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include "common/stdafx.h"
#include "ToolbarHandler.h"
namespace CEGUI {
Modified: scummvm/trunk/backends/platform/wince/CEgui/ToolbarHandler.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/ToolbarHandler.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/wince/CEgui/ToolbarHandler.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -26,7 +26,6 @@
#ifndef CEGUI_TOOLBARHANDLER
#define CEGUI_TOOLBARHANDLER
-#include "common/stdafx.h"
#include "common/scummsys.h"
#include "common/system.h"
#include "common/str.h"
Modified: scummvm/trunk/backends/platform/wince/CEkeys/EventsBuffer.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEkeys/EventsBuffer.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/wince/CEkeys/EventsBuffer.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include "common/stdafx.h"
#include "EventsBuffer.h"
namespace CEKEYS {
Modified: scummvm/trunk/backends/platform/wince/CEkeys/EventsBuffer.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEkeys/EventsBuffer.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/wince/CEkeys/EventsBuffer.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -26,7 +26,6 @@
#ifndef CEKEYS_EVENTSBUFFER
#define CEKEYS_EVENTSBUFFER
-#include "common/stdafx.h"
#include "common/scummsys.h"
#include "common/system.h"
#include "common/list.h"
Modified: scummvm/trunk/backends/platform/wince/wince-sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/wince-sdl.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/wince/wince-sdl.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -25,7 +25,6 @@
// NOTE: formatted for tabstop=4
-#include "common/stdafx.h"
#include "backends/platform/wince/wince-sdl.h"
#include "common/config-manager.h"
Modified: scummvm/trunk/backends/platform/wince/wince-sdl.h
===================================================================
--- scummvm/trunk/backends/platform/wince/wince-sdl.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/wince/wince-sdl.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -26,7 +26,6 @@
#ifndef WINCE_SDL_H
#define WINCE_SDL_H
-#include "common/stdafx.h"
#include "common/scummsys.h"
#include "common/system.h"
#include "graphics/scaler.h"
Modified: scummvm/trunk/backends/platform/x11/x11.cpp
===================================================================
--- scummvm/trunk/backends/platform/x11/x11.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/platform/x11/x11.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -25,7 +25,6 @@
/* The bare pure X11 port done by Lionel 'BBrox' Ulmer */
-#include "common/stdafx.h"
#include "common/scummsys.h"
#include "common/events.h"
#include "common/system.h"
Modified: scummvm/trunk/backends/plugins/dc/dc-provider.h
===================================================================
--- scummvm/trunk/backends/plugins/dc/dc-provider.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/plugins/dc/dc-provider.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -26,7 +26,6 @@
#ifndef BACKENDS_PLUGINS_DC_H
#define BACKENDS_PLUGINS_DC_H
-#include "common/stdafx.h"
#include "base/plugins.h"
#if defined(DYNAMIC_MODULES) && defined(__DC__)
Modified: scummvm/trunk/backends/plugins/dynamic-plugin.h
===================================================================
--- scummvm/trunk/backends/plugins/dynamic-plugin.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/plugins/dynamic-plugin.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -26,7 +26,6 @@
#ifndef BACKENDS_PLUGINS_DYNAMICPLUGIN_H
#define BACKENDS_PLUGINS_DYNAMICPLUGIN_H
-#include "common/stdafx.h"
#include "base/plugins.h"
Modified: scummvm/trunk/backends/plugins/posix/posix-provider.h
===================================================================
--- scummvm/trunk/backends/plugins/posix/posix-provider.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/plugins/posix/posix-provider.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -26,7 +26,6 @@
#ifndef BACKENDS_PLUGINS_POSIX_H
#define BACKENDS_PLUGINS_POSIX_H
-#include "common/stdafx.h"
#include "base/plugins.h"
#if defined(DYNAMIC_MODULES) && defined(UNIX)
Modified: scummvm/trunk/backends/plugins/sdl/sdl-provider.h
===================================================================
--- scummvm/trunk/backends/plugins/sdl/sdl-provider.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/plugins/sdl/sdl-provider.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -26,7 +26,6 @@
#ifndef BACKENDS_PLUGINS_SDL_H
#define BACKENDS_PLUGINS_SDL_H
-#include "common/stdafx.h"
#include "base/plugins.h"
#if defined(DYNAMIC_MODULES) && defined(SDL_BACKEND)
Modified: scummvm/trunk/backends/plugins/win32/win32-provider.h
===================================================================
--- scummvm/trunk/backends/plugins/win32/win32-provider.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/plugins/win32/win32-provider.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -26,7 +26,6 @@
#ifndef BACKENDS_PLUGINS_WIN32_H
#define BACKENDS_PLUGINS_WIN32_H
-#include "common/stdafx.h"
#include "base/plugins.h"
#if defined(DYNAMIC_MODULES) && defined(_WIN32)
Modified: scummvm/trunk/backends/saves/compressed/compressed-saves.cpp
===================================================================
--- scummvm/trunk/backends/saves/compressed/compressed-saves.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/saves/compressed/compressed-saves.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include "common/stdafx.h"
#include "common/savefile.h"
#include "common/util.h"
#include "backends/saves/compressed/compressed-saves.h"
@@ -45,7 +44,7 @@
enum {
BUFSIZE = 16384 // 1 << MAX_WBITS
};
-
+
byte _buf[BUFSIZE];
Common::InSaveFile *_wrapped;
@@ -62,13 +61,13 @@
_stream.zalloc = Z_NULL;
_stream.zfree = Z_NULL;
_stream.opaque = Z_NULL;
-
+
// Verify file header is correct once more
w->seek(0, SEEK_SET);
uint16 header = w->readUint16BE();
assert(header == 0x1F8B ||
((header & 0x0F00) == 0x0800 && header % 31 == 0));
-
+
if (header == 0x1F8B) {
// Retrieve the original file size
w->seek(-4, SEEK_END);
@@ -79,7 +78,7 @@
}
_pos = 0;
w->seek(0, SEEK_SET);
-
+
// Adding 32 to windowBits indicates to zlib that it is supposed to
// automatically detect whether gzip or zlib headers are used for
// the compressed file. This feature was added in zlib 1.2.0.4,
@@ -88,7 +87,7 @@
_zlibErr = inflateInit2(&_stream, MAX_WBITS + 32);
if (_zlibErr != Z_OK)
return;
-
+
// Setup input buffer
_stream.next_in = _buf;
_stream.avail_in = 0;
@@ -115,7 +114,7 @@
}
_zlibErr = inflate(&_stream, Z_NO_FLUSH);
}
-
+
// Update the position counter
_pos += dataSize - _stream.avail_out;
@@ -155,7 +154,7 @@
// in the constructor, and wrap it into a MemoryReadStream -- but that
// would be rather wasteful. As long as we don't need it, I'd rather not
// implement this at all. -- Fingolfin
-
+
// Skip the given amount of data (very inefficient if one tries to skip
// huge amounts of data, but usually client code will only skip a few
// bytes, so this should be fine.
@@ -176,7 +175,7 @@
enum {
BUFSIZE = 16384 // 1 << MAX_WBITS
};
-
+
byte _buf[BUFSIZE];
Common::OutSaveFile *_wrapped;
z_stream _stream;
@@ -203,7 +202,7 @@
_stream.zalloc = Z_NULL;
_stream.zfree = Z_NULL;
_stream.opaque = Z_NULL;
-
+
// Adding 16 to windowBits indicates to zlib that it is supposed to
// write gzip headers. This feature was added in zlib 1.2.0.4,
// released 10 August 2003.
@@ -267,7 +266,7 @@
// of the const keyword.
_stream.next_in = const_cast<byte *>((const byte *)dataPtr);
_stream.avail_in = dataSize;
-
+
// ... and flush it to disk
processData(Z_NO_FLUSH);
Modified: scummvm/trunk/backends/saves/compressed/compressed-saves.h
===================================================================
--- scummvm/trunk/backends/saves/compressed/compressed-saves.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/saves/compressed/compressed-saves.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -26,7 +26,6 @@
#ifndef BACKEND_SAVES_COMPRESSED_H
#define BACKEND_SAVES_COMPRESSED_H
-#include "common/stdafx.h"
#include "common/savefile.h"
/**
Modified: scummvm/trunk/backends/saves/default/default-saves.cpp
===================================================================
--- scummvm/trunk/backends/saves/default/default-saves.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/saves/default/default-saves.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -25,7 +25,6 @@
#if !defined(DISABLE_DEFAULT_SAVEFILEMANAGER)
-#include "common/stdafx.h"
#include "common/savefile.h"
#include "common/util.h"
#include "common/fs.h"
@@ -119,13 +118,13 @@
FSList savefiles;
Common::StringList results;
Common::String search(regex);
-
+
if (savePath.lookupFile(savefiles, savePath, search, false, true)) {
for (FSList::const_iterator file = savefiles.begin(); file != savefiles.end(); file++) {
results.push_back(file->getPath());
}
}
-
+
return results;
}
@@ -148,11 +147,11 @@
// Ensure that the savepath exists and is writeable. If not, generate
// an appropriate error
const char *savePath = getSavePath();
-
+
#if defined(UNIX) || defined(__SYMBIAN32__)
struct stat sb;
clearError();
-
+
// Check whether the dir exists
if (stat(savePath, &sb) == -1) {
// The dir does not exist, or stat failed for some other reason.
@@ -174,7 +173,7 @@
// or is not writeable, the path could be completly bogus, etc.
warning("mkdir for '%s' failed!", savePath);
perror("mkdir");
-
+
switch (errno) {
case EACCES:
setError(SFM_DIR_ACCESS, Common::String("Search or write permission denied"));
@@ -198,19 +197,19 @@
setError(SFM_DIR_ROFS, Common::String("The parent directory resides on a read-only file system"));
break;
}
-
+
return 0;
}
break;
case ENOTDIR:
setError(SFM_DIR_NOTDIR, Common::String("A component of the path prefix is not a directory"));
break;
- }
+ }
} else {
// So stat() succeeded. But is the path actually pointing to a directory?
if (!S_ISDIR(sb.st_mode)) {
setError(SFM_DIR_NOTDIR, Common::String("The given savepath is not a directory"));
-
+
return 0;
}
}
@@ -225,7 +224,7 @@
delete sf;
sf = 0;
}
-
+
return wrapOutSaveFile(sf);
}
Modified: scummvm/trunk/backends/saves/default/default-saves.h
===================================================================
--- scummvm/trunk/backends/saves/default/default-saves.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/saves/default/default-saves.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -26,7 +26,6 @@
#if !defined(BACKEND_SAVES_DEFAULT_H) && !defined(DISABLE_DEFAULT_SAVEFILEMANAGER)
#define BACKEND_SAVES_DEFAULT_H
-#include "common/stdafx.h"
#include "common/savefile.h"
#include "common/str.h"
Modified: scummvm/trunk/backends/saves/savefile.cpp
===================================================================
--- scummvm/trunk/backends/saves/savefile.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/saves/savefile.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include "common/stdafx.h"
#include "common/util.h"
#include "common/config-manager.h"
#include "common/savefile.h"
Modified: scummvm/trunk/backends/timer/default/default-timer.cpp
===================================================================
--- scummvm/trunk/backends/timer/default/default-timer.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/backends/timer/default/default-timer.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -22,7 +22,6 @@
* $Id$
*/
-#include "common/stdafx.h"
#include "common/scummsys.h"
#include "backends/timer/default/default-timer.h"
#include "common/util.h"
@@ -36,14 +35,14 @@
uint32 nextFireTime; // in milliseconds
uint32 nextFireTimeMicro; // mircoseconds part of nextFire
-
+
TimerSlot *next;
};
void insertPrioQueue(TimerSlot *head, TimerSlot *newSlot) {
// The head points to a fake anchor TimerSlot; this common
// trick allows us to get rid of many special cases.
-
+
const uint32 nextFireTime = newSlot->nextFireTime;
TimerSlot *slot = head;
newSlot->next = 0;
@@ -65,14 +64,14 @@
DefaultTimerManager::DefaultTimerManager() :
_timerHandler(0),
_head(0) {
-
+
_head = new TimerSlot();
memset(_head, 0, sizeof(TimerSlot));
}
DefaultTimerManager::~DefaultTimerManager() {
Common::StackLock lock(_mutex);
-
+
TimerSlot *slot = _head;
while (slot) {
TimerSlot *next = slot->next;
@@ -86,13 +85,13 @@
Common::StackLock lock(_mutex);
const uint32 curTime = g_system->getMillis();
-
+
// Repeat as long as there is a TimerSlot that is scheduled to fire.
TimerSlot *slot = _head->next;
while (slot && slot->nextFireTime < curTime) {
// Remove the slot from the priority queue
_head->next = slot->next;
-
+
// Update the fire time and reinsert the TimerSlot into the priority
// queue. Has to be done before the timer callback is invoked, in case
// the callback wants to remove itself.
@@ -108,7 +107,7 @@
// Invoke the timer callback
assert(slot->callback);
slot->callback(slot->refCon);
-
+
// Look at the next scheduled timer
slot = _head->next;
}
@@ -117,7 +116,7 @@
bool DefaultTimerManager::installTimerProc(TimerProc callback, int32 interval, void *refCon) {
assert(interval > 0);
Common::StackLock lock(_mutex);
-
+
TimerSlot *slot = new TimerSlot;
slot->callback = callback;
slot->refCon = refCon;
@@ -125,7 +124,7 @@
slot->nextFireTime = g_system->getMillis() + interval / 1000;
slot->nextFireTimeMicro = interval % 1000;
slot->next = 0;
-
+
insertPrioQueue(_head, slot);
return true;
@@ -135,7 +134,7 @@
Common::StackLock lock(_mutex);
TimerSlot *slot = _head;
-
+
while (slot->next) {
if (slot->next->callback == callback) {
TimerSlot *next = slot->next->next;
Modified: scummvm/trunk/base/commandLine.cpp
===================================================================
--- scummvm/trunk/base/commandLine.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/base/commandLine.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,8 +23,6 @@
*
*/
-#include "common/stdafx.h"
-
#include "engines/engine.h"
#include "base/commandLine.h"
#include "base/plugins.h"
@@ -297,7 +295,7 @@
Common::String parseCommandLine(Common::StringMap &settings, int argc, char **argv) {
const char *s, *s2;
-
+
// argv[0] contains the name of the executable.
if (argv && argv[0]) {
s = strrchr(argv[0], '/');
@@ -310,7 +308,7 @@
for (int i = 1; i < argc; ++i) {
s = argv[i];
s2 = (i < argc-1) ? argv[i+1] : 0;
-
+
if (s[0] != '-') {
// The argument doesn't start with a dash, so it's not an option.
// Hence it must be the target name. We currently enforce that
@@ -559,7 +557,7 @@
// engines. Basically, it loops over all targets, and calls the detector
// for the given path. It then prints out the result and also checks
// whether the result agrees with the settings of the target.
-
+
const Common::ConfigManager::DomainMap &domains = ConfMan.getGameDomains();
Common::ConfigManager::DomainMap::const_iterator iter = domains.begin();
int success = 0, failure = 0;
@@ -576,7 +574,7 @@
if (gameid.empty()) {
gameid = name;
}
-
+
FilesystemNode dir(path);
FSList files;
if (!dir.getChildren(files, FilesystemNode::kListAll)) {
@@ -590,7 +588,7 @@
for (x = candidates.begin(); x != candidates.end(); ++x) {
gameidDiffers |= (scumm_stricmp(gameid.c_str(), x->gameid().c_str()) != 0);
}
-
+
if (candidates.empty()) {
printf(" FAILURE: No games detected\n");
failure++;
@@ -608,7 +606,7 @@
printf(" SUCCESS: Game was detected correctly\n");
success++;
}
-
+
for (x = candidates.begin(); x != candidates.end(); ++x) {
printf(" gameid '%s', desc '%s', language '%s', platform '%s'\n",
x->gameid().c_str(),
@@ -680,8 +678,8 @@
usage("Unrecognized game target '%s'", command.c_str());
}
}
-
+
// The user can override the savepath with the SCUMMVM_SAVEPATH
// environment variable. This is weaker than a --savepath on the
// command line, but overrides the default savepath, hence it is
@@ -711,7 +709,7 @@
for (Common::String::iterator c = key.begin(); c != key.end(); ++c)
if (*c == '-')
*c = '_';
-
+
// Store it into ConfMan.
ConfMan.set(key, value, Common::ConfigManager::kTransientDomain);
}
Modified: scummvm/trunk/base/game.h
===================================================================
--- scummvm/trunk/base/game.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/base/game.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -26,7 +26,6 @@
#ifndef BASE_GAME_H
#define BASE_GAME_H
-#include "common/stdafx.h"
#include "common/str.h"
#include "common/array.h"
#include "common/hash-str.h"
Modified: scummvm/trunk/base/main.cpp
===================================================================
--- scummvm/trunk/base/main.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/base/main.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -31,7 +31,6 @@
* of almost all the classes, methods and variables, and how they interact.
*/
-#include "common/stdafx.h"
#include "engines/engine.h"
#include "base/commandLine.h"
#include "base/plugins.h"
@@ -99,9 +98,9 @@
return 0;
}
- // FIXME: Do we really need this one?
+ // FIXME: Do we really need this one?
printf("Trying to start game '%s'\n", game.description().c_str());
-
+
return plugin;
}
@@ -119,7 +118,7 @@
}
// We add the game "path" to the file search path via File::addDefaultDirectory(),
- // so that MD5-based detection will be able to properly find files with mixed case
+ // so that MD5-based detection will be able to properly find files with mixed case
// filenames.
// FIXME/TODO: Fingolfin still doesn't like this; if those MD5-based detectors used
// FSNodes instead of File::open, they wouldn't have to do this.
@@ -238,7 +237,7 @@
// Verify that the backend has been initialized (i.e. g_system has been set).
assert(g_system);
OSystem &system = *g_system;
-
+
// Register config manager defaults
Base::registerDefaults();
@@ -259,7 +258,7 @@
// Load and setup the debuglevel and the debug flags. We do this at the
- // soonest possible moment to ensure debug output starts early on, if
+ // soonest possible moment to ensure debug output starts early on, if
// requested.
if (settings.contains("debuglevel")) {
gDebugLevel = (int)strtol(settings["debuglevel"].c_str(), 0, 10);
@@ -275,7 +274,7 @@
// Load the plugins.
PluginManager::instance().loadPlugins();
-
+
// Process the remaining command line settings. Must be done after the
// config file and the plugins have been loaded.
if (!Base::processSettings(command, settings))
@@ -318,7 +317,7 @@
// Discard any command line options. It's unlikely that the user
// wanted to apply them to *all* games ever launched.
ConfMan.getDomain(Common::ConfigManager::kTransientDomain)->clear();
-
+
// Clear the active config domain
ConfMan.setActiveDomain("");
Modified: scummvm/trunk/base/plugins.cpp
===================================================================
--- scummvm/trunk/base/plugins.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/base/plugins.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -35,7 +35,7 @@
: _plugin(plugin) {
assert(_plugin);
}
-
+
~StaticPlugin() {
delete _plugin;
}
@@ -68,24 +68,24 @@
public:
StaticPluginProvider() {
}
-
+
~StaticPluginProvider() {
}
virtual PluginList getPlugins() {
PluginList pl;
-
+
#define LINK_PLUGIN(ID) \
extern PluginRegistrator *g_##ID##_PluginReg; \
extern void g_##ID##_PluginReg_alloc(); \
g_##ID##_PluginReg_alloc(); \
plugin = g_##ID##_PluginReg; \
pl.push_back(new StaticPlugin(plugin));
-
+
// "Loader" for the static plugins.
// Iterate over all registered (static) plugins and load them.
PluginRegistrator *plugin;
-
+
#ifndef DISABLE_SCUMM
LINK_PLUGIN(SCUMM)
#endif
@@ -157,7 +157,7 @@
PluginManager::~PluginManager() {
// Explicitly unload all loaded plugins
unloadPlugins();
-
+
// Delete the plugin providers
for (ProviderList::iterator pp = _providers.begin();
pp != _providers.end();
@@ -208,7 +208,7 @@
if (plugin->loadPlugin()) {
// If successful, add it to the list of known plugins and return.
_plugins.push_back(plugin);
-
+
// TODO/FIXME: We should perform some additional checks here:
// * Check for some kind of "API version" (possibly derived from the
// SVN tree revision?)
@@ -216,7 +216,7 @@
// To detect this situation, we could just compare the plugin name.
// To handle it, simply prefer modules loaded earlier to those coming.
// Or vice versa... to be determined... :-)
-
+
return true;
} else {
// Failed to load the plugin
Modified: scummvm/trunk/base/plugins.h
===================================================================
--- scummvm/trunk/base/plugins.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/base/plugins.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -26,7 +26,6 @@
#ifndef BASE_PLUGINS_H
#define BASE_PLUGINS_H
-#include "common/stdafx.h"
#include "common/array.h"
#include "common/list.h"
#include "common/singleton.h"
@@ -46,7 +45,7 @@
kInvalidPathError,
kNoGameDataFoundError,
kUnsupportedGameidError,
-
+
kUnknownError // Catch-all error, used if no other error code matches
};
@@ -158,7 +157,7 @@
class PluginProvider {
public:
virtual ~PluginProvider() {}
-
+
/**
* Return a list of Plugin objects. The caller is responsible for actually
* loading/unloading them (by invoking the appropriate methods).
@@ -189,7 +188,7 @@
public:
~PluginManager();
-
+
void addPluginProvider(PluginProvider *pp);
void loadPlugins();
Modified: scummvm/trunk/base/version.cpp
===================================================================
--- scummvm/trunk/base/version.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/base/version.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include "common/stdafx.h"
#include "common/scummsys.h"
#include "base/internal_version.h"
#include "base/version.h"
@@ -69,7 +68,7 @@
"Vorbis "
#endif
#endif
-
+
#ifdef USE_FLAC
"FLAC "
#endif
Modified: scummvm/trunk/common/advancedDetector.cpp
===================================================================
--- scummvm/trunk/common/advancedDetector.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/common/advancedDetector.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,8 +23,6 @@
*
*/
-#include "common/stdafx.h"
-
#include "base/plugins.h"
#include "common/util.h"
@@ -316,7 +314,7 @@
File testFile;
String tstr;
-
+
uint i;
char md5str[32+1];
@@ -458,7 +456,7 @@
}
}
- // We've found a match
+ // We've found a match
if (!matched.empty())
return matched;
Modified: scummvm/trunk/common/array.h
===================================================================
--- scummvm/trunk/common/array.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/common/array.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -25,7 +25,6 @@
#ifndef COMMON_ARRAY_H
#define COMMON_ARRAY_H
-#include "common/stdafx.h"
#include "common/scummsys.h"
#include "common/algorithm.h"
Modified: scummvm/trunk/common/config-file.cpp
===================================================================
--- scummvm/trunk/common/config-file.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/common/config-file.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,8 +23,6 @@
*
*/
-#include "common/stdafx.h"
-
#include "common/config-file.h"
#include "common/file.h"
#include "common/savefile.h"
@@ -106,7 +104,7 @@
// It would be nice if this hack could be restricted to that game,
// but the current design of this class doesn't allow to do that
// in a nice fashion (a "isMustard" parameter is *not* a nice
- // solution).
+ // solution).
comment += buf;
comment += "\n";
} else if (buf[0] == '[') {
Modified: scummvm/trunk/common/config-manager.cpp
===================================================================
--- scummvm/trunk/common/config-manager.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/common/config-manager.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -29,8 +29,6 @@
#undef ARRAYSIZE
#endif
-#include "common/stdafx.h"
-
#include "common/config-manager.h"
#include "common/file.h"
#include "common/util.h"
Modified: scummvm/trunk/common/file.h
===================================================================
--- scummvm/trunk/common/file.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/common/file.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -26,7 +26,6 @@
#ifndef COMMON_FILE_H
#define COMMON_FILE_H
-#include "common/stdafx.h"
#include "common/scummsys.h"
#include "common/str.h"
#include "common/stream.h"
@@ -88,7 +87,7 @@
virtual bool remove(const String &filename);
virtual bool remove(const FilesystemNode &node);
-
+
/**
* Checks if the object opened a file successfully.
*
Modified: scummvm/trunk/common/fs.cpp
===================================================================
--- scummvm/trunk/common/fs.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/common/fs.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -22,7 +22,6 @@
* $Id$
*/
-#include "common/stdafx.h"
#include "common/util.h"
#include "backends/fs/abstract-fs.h"
#include "backends/fs/abstract-fs-factory.h"
@@ -34,7 +33,7 @@
static bool matchString(const char *str, const char *pat) {
const char *p = 0;
const char *q = 0;
-
+
for (;;) {
switch (*pat) {
case '*':
@@ -83,7 +82,7 @@
FilesystemNode::FilesystemNode(const Common::String &p) {
AbstractFilesystemFactory *factory = AbstractFilesystemFactory::makeFSFactory();
-
+
if (p.empty() || p == ".")
_realNode = factory->makeCurrentDirectoryFileNode();
else
@@ -113,7 +112,7 @@
return true;
if (!isDirectory() && node.isDirectory())
return false;
-
+
return scumm_stricmp(getDisplayName().c_str(), node.getDisplayName().c_str()) < 0;
}
@@ -131,7 +130,7 @@
bool FilesystemNode::exists() const {
if (_realNode == 0)
return false;
-
+
return _realNode->exists();
}
@@ -149,15 +148,15 @@
return false;
AbstractFSList tmp;
-
+
if (!_realNode->getChildren(tmp, mode, hidden))
return false;
-
+
fslist.clear();
for (AbstractFSList::iterator i = tmp.begin(); i != tmp.end(); ++i) {
fslist.push_back(FilesystemNode(*i));
}
-
+
return true;
}
@@ -191,28 +190,28 @@
bool FilesystemNode::isDirectory() const {
if (_realNode == 0)
return false;
-
+
return _realNode->isDirectory();
}
bool FilesystemNode::isReadable() const {
if (_realNode == 0)
return false;
-
+
return _realNode->isReadable();
}
bool FilesystemNode::isWritable() const {
if (_realNode == 0)
return false;
-
+
return _realNode->isWritable();
}
bool FilesystemNode::lookupFile(FSList &results, FSList &fslist, Common::String &filename, bool hidden, bool exhaustive) const
{
int matches = 0;
-
+
for (FSList::iterator entry = fslist.begin(); entry != fslist.end(); ++entry) {
if (entry->isDirectory()) {
matches += lookupFileRec(results, *entry, filename, hidden, exhaustive);
@@ -225,12 +224,12 @@
bool FilesystemNode::lookupFile(FSList &results, FilesystemNode &dir, Common::String &filename, bool hidden, bool exhaustive) const
{
int matches;
-
+
if (!dir.isDirectory())
return false;
-
+
matches = lookupFileRec(results, dir, filename, hidden, exhaustive);
-
+
return ((matches > 0) ? true : false);
}
@@ -243,7 +242,7 @@
FSList children;
int matches = 0;
dir.getChildren(entries, FilesystemNode::kListAll, hidden);
-
+
//Breadth search (entries in the same level)
for (FSList::iterator entry = entries.begin(); entry != entries.end(); ++entry) {
if (entry->isDirectory()) {
@@ -255,17 +254,17 @@
if (matchString(lastPathComponent(entry->getPath()), filename.c_str())) {
results.push_back(*entry);
matches++;
-
+
if (!exhaustive)
break;
}
}
}
-
+
//Depth search (entries in lower levels)
for (FSList::iterator child = children.begin(); child != children.end(); ++child) {
matches += lookupFileRec(results, *child, filename, hidden, exhaustive);
}
-
+
return matches;
}
Modified: scummvm/trunk/common/hashmap.h
===================================================================
--- scummvm/trunk/common/hashmap.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/common/hashmap.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -26,40 +26,39 @@
// The hash map (associative array) implementation in this file is
// based on code by Andrew Y. Ng, 1996:
-/*
- * Copyright (c) 1998-2003 Massachusetts Institute of Technology.
- * This code was developed as part of the Haystack research project
- * (http://haystack.lcs.mit.edu/). Permission is hereby granted,
- * free of charge, to any person obtaining a copy of this software
- * and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute,
- * sublicense, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
+/*
+ * Copyright (c) 1998-2003 Massachusetts Institute of Technology.
+ * This code was developed as part of the Haystack research project
+ * (http://haystack.lcs.mit.edu/). Permission is hereby granted,
+ * free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit
+ * persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
*/
#ifndef COMMON_HASHMAP_H
#define COMMON_HASHMAP_H
-#include "common/stdafx.h"
#include "common/func.h"
#include "common/str.h"
#include "common/util.h"
-namespace Common {
+namespace Common {
// The table sizes ideally are primes. We use a helper function to find
// suitable table sizes.
@@ -83,7 +82,7 @@
* referenced, for a new key. If the object is const, then an assertion is
* triggered instead. Hence if you are not sure whether a key is contained in
* the map, use contains() first to check for its presence.
- */
+ */
template <class Key, class Val, class HashFunc = Hash<Key>, class EqualFunc = EqualTo<Key> >
class HashMap {
friend class const_iterator;
@@ -102,13 +101,13 @@
Node **_arr; // hashtable of size arrsize.
uint _arrsize, _nele;
-
+
HashFunc _hash;
EqualFunc _equal;
-
+
// Default value, returned by the const getVal.
const Val _defaultVal;
-
+
#ifdef DEBUG_HASH_COLLISIONS
mutable int _collisions, _lookups;
#endif
@@ -148,11 +147,11 @@
} while (_idx < _hashmap->_arrsize && _hashmap->_arr[_idx] == 0);
if (_idx >= _hashmap->_arrsize)
_idx = (uint)-1;
-
+
return *this;
}
};
-
+
HashMap();
HashMap(const HM_t& map);
~HashMap();
@@ -195,14 +194,14 @@
const_iterator end() const {
return const_iterator((uint)-1, this);
}
-
+
const_iterator find(const Key &key) const {
uint ctr = lookup(key);
if (_arr[ctr])
return const_iterator(ctr, this);
return end();
}
-
+
// TODO: insert() method?
bool empty() const {
@@ -225,7 +224,7 @@
memset(_arr, 0, _arrsize * sizeof(Node *));
_nele = 0;
-
+
#ifdef DEBUG_HASH_COLLISIONS
_collisions = 0;
_lookups = 0;
@@ -312,7 +311,7 @@
const uint old_arrsize = _arrsize;
Node **old_arr = _arr;
- // allocate a new array
+ // allocate a new array
_nele = 0;
_arrsize = newsize;
_arr = new Node *[_arrsize];
@@ -357,7 +356,7 @@
_collisions++;
#endif
}
-
+
#ifdef DEBUG_HASH_COLLISIONS
_lookups++;
fprintf(stderr, "collisions %d, lookups %d, ratio %f in HashMap %p; size %d num elements %d\n",
Modified: scummvm/trunk/common/iff_container.h
===================================================================
--- scummvm/trunk/common/iff_container.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/common/iff_container.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -25,7 +25,6 @@
#ifndef COMMON_IFF_CONTAINER_H
#define COMMON_IFF_CONTAINER_H
-#include "common/stdafx.h"
#include "common/scummsys.h"
#include "common/endian.h"
#include "common/stream.h"
Modified: scummvm/trunk/common/mutex.cpp
===================================================================
--- scummvm/trunk/common/mutex.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/common/mutex.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -23,7 +23,6 @@
*
*/
-#include "common/stdafx.h"
#include "common/mutex.h"
#include "common/system.h"
Modified: scummvm/trunk/common/savefile.h
===================================================================
--- scummvm/trunk/common/savefile.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/common/savefile.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -26,7 +26,6 @@
#ifndef COMMON_SAVEFILE_H
#define COMMON_SAVEFILE_H
-#include "common/stdafx.h"
#include "common/noncopyable.h"
#include "common/scummsys.h"
#include "common/stream.h"
@@ -77,40 +76,40 @@
* returning the single SaveFileManager instances to be used.
*/
class SaveFileManager : NonCopyable {
-
+
protected:
SFMError _error;
String _errorDesc;
-
+
public:
virtual ~SaveFileManager() {}
-
+
/**
* Clears the last set error code and string.
*/
virtual void clearError() { _error = SFM_NO_ERROR; _errorDesc = ""; }
-
+
/**
* Returns the last ocurred error code. If none ocurred, returns SFM_NO_ERROR.
- *
+ *
* @return A SFMError indicating the type of the last error.
*/
virtual SFMError getError() { return _error; }
-
+
/**
* Returns the last ocurred error description. If none ocurred, returns 0.
- *
+ *
* @return A string describing the last error.
*/
virtual String getErrorDesc() { return _errorDesc; }
-
+
/**
* Sets the last ocurred error.
* @param error Code identifying the last error.
* @param errorDesc String describing the last error.
*/
virtual void setError(SFMError error, String errorDesc) { _error = error; _errorDesc = errorDesc; }
-
+
/**
* Open the file with name filename in the given directory for saving.
* @param filename the filename
@@ -131,7 +130,7 @@
* @return true if no error ocurred. false otherwise.
*/
virtual bool removeSavefile(const char *filename) = 0;
-
+
/**
* Request a list of available savegames with a given regex.
* @param regex Regular expression to match. Wildcards like * or ? are available.
Modified: scummvm/trunk/common/scummsys.h
===================================================================
--- scummvm/trunk/common/scummsys.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/common/scummsys.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -26,10 +26,101 @@
#ifndef COMMON_SCUMMSYS_H
#define COMMON_SCUMMSYS_H
-#if !defined(COMMON_STDAFX_H) && !defined(__PLAYSTATION2__)
-#error Included scummsys.h without including stdafx.h first!
+#if defined(_WIN32_WCE) && _WIN32_WCE < 300
+ #define NONSTANDARD_PORT
#endif
+#if defined(NONSTANDARD_PORT)
+
+ // Ports which need to perform #includes and #defines visible in
+ // virtually all the source of ScummVM should do so by providing a
+ // "portdefs.h" header file (and not by directly modifying this
+ // header file).
+ #include <portdefs.h>
+
+#else // defined(NONSTANDARD_PORT)
+
+ #if defined(WIN32)
+
+ #ifdef _MSC_VER
+ #pragma once
+ #pragma warning( disable : 4068 ) // turn off "unknown pragma" warning
+ #pragma warning( disable : 4100 ) // turn off "unreferenced formal parameter" warning
+ #pragma warning( disable : 4127 ) // turn off "conditional expression is constant" warning
+ #pragma warning( disable : 4201 ) // turn off "nonstandard extension used : nameless struct/union" warning
+ #pragma warning( disable : 4244 ) // turn off "conversion type" warning
+ #pragma warning( disable : 4310 ) // turn off "cast truncates constant value" warning
+ #pragma warning( disable : 4355 ) // turn off "base member init" warning
+ #pragma warning( disable : 4390 ) // turn off "empty statement" warning for BS2 code
+ #pragma warning( disable : 4250 ) // turn off "inherits via dominance" warning
+ #pragma warning( disable : 4103 ) // turn off "alignement changed after including header" warning. We use pack-start.h file
+ #pragma warning( disable : 4121 ) // turn off "alignment of a member was sensitive to packing" warning
+ #pragma warning( disable : 4511 ) // turn off "copy constructor could not be generated" warning
+ #pragma warning( disable : 4512 ) // turn off "assignment operator could not be generated" warning
+ #pragma warning( disable : 4351 ) // turn off "new behavior ... will be default initialized" warning
+ #pragma warning( disable : 4505 ) // turn off "unreferenced local function has been removed"
+ #pragma warning( disable : 4510 ) // turn off "default constructor could not be generated"
+ #pragma warning( disable : 4610 ) // turn off "struct can never be instantiated - user defined constructor required"
+
+ // FIXME: 4702 & 4706 - may be enabled
+ #pragma warning( disable : 4702 ) // turn off "unreachable code" warning
+ #pragma warning( disable : 4706 ) // turn off "assignment within conditional expression" warning
+
+ #define vsnprintf _vsnprintf
+ #endif
+
+ #if !defined(_WIN32_WCE)
+
+ #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
+ #define NOGDICAPMASKS
+ #define OEMRESOURCE
+ #define NONLS
+ #define NOICONS
+ #define NOMCX
+ #define NOPROFILER
+ #define NOKANJI
+ #define NOSERVICE
+ #define NOMETAFILE
+ #define NOCOMM
+ #define NOCRYPT
+ #define NOIME
+ #define NOATOM
+ #define NOCTLMGR
+ #define NOCLIPBOARD
+ #define NOMEMMGR
+ #define NOSYSMETRICS
+ #define NOMENUS
+ #define NOOPENFILE
+ #define NOWH
+ #define NOSOUND
+ #define NODRAWTEXT
+
+ #endif
+
+ #if defined(ARRAYSIZE)
+ // VS2005beta2 introduces new stuff in winnt.h
+ #undef ARRAYSIZE
+ #endif
+
+ #endif
+
+ #if defined(__QNXNTO__)
+ #include <strings.h> /* For strcasecmp */
+ #endif
+
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdarg.h>
+ #include <assert.h>
+ #include <ctype.h>
+ #include <time.h>
+ #include <math.h>
+
+#endif
+
+
+
// Use config.h, generated by configure
#if defined(HAVE_CONFIG_H)
#include "config.h"
@@ -71,7 +162,7 @@
//
// By default we try to use pragma push/pop to ensure various structs we use
-// are "packed". If your compiler doesn't support this pragma, you are in for
+// are "packed". If your compiler doesn't support this pragma, you are in for
// a problem. If you are lucky, there is a compiler switch, or another pragma,
// doing the same thing -- in that case, try to modify common/pack-begin.h and
// common/pack-end.h accordingly. Or maybe your port simply *always* packs
@@ -88,7 +179,7 @@
#define scumm_stricmp strcasecmp
#define scumm_strnicmp strncasecmp
- #define SCUMM_LITTLE_ENDIAN
+ #define SCUMM_LITTLE_ENDIAN
#define SCUMM_NEED_ALIGNMENT
#define SMALL_SCREEN_DEVICE
@@ -172,14 +263,14 @@
#ifndef CONFIG_H
#ifdef X11_BACKEND
-
+
// You need to set this manually if necessary
// #define SCUMM_LITTLE_ENDIAN
-
+
#else
/* need this for the SDL_BYTEORDER define */
#include <SDL_byteorder.h>
-
+
#if SDL_BYTEORDER == SDL_LIL_ENDIAN
#define SCUMM_LITTLE_ENDIAN
#elif SDL_BYTEORDER == SDL_BIG_ENDIAN
@@ -208,7 +299,7 @@
#define SCUMM_NEED_ALIGNMENT
#define STRINGBUFLEN 256
-
+
extern const char *SCUMMVM_SAVEPATH;
#if !defined(COMPILE_ZODIAC) && !defined(COMPILE_OS5)
@@ -238,7 +329,7 @@
#define scumm_stricmp stricmp
#define scumm_strnicmp strnicmp
- #define SCUMM_LITTLE_ENDIAN
+ #define SCUMM_LITTLE_ENDIAN
#define SCUMM_NEED_ALIGNMENT
// Override typenames. uint is already defined by system header files.
@@ -259,7 +350,7 @@
#define scumm_stricmp strcasecmp
#define scumm_strnicmp strncasecmp
- #define SCUMM_LITTLE_ENDIAN
+ #define SCUMM_LITTLE_ENDIAN
#define SCUMM_NEED_ALIGNMENT
#elif defined(__PSP__)
@@ -284,7 +375,7 @@
#define scumm_strnicmp strnicmp
#define SCUMM_NEED_ALIGNMENT
- #define SCUMM_LITTLE_ENDIAN
+ #define SCUMM_LITTLE_ENDIAN
#include "nds/jtypes.h"
@@ -302,8 +393,8 @@
// GCC specific stuff
//
#if defined(__GNUC__)
- #define NORETURN __attribute__((__noreturn__))
- #define PACKED_STRUCT __attribute__((packed))
+ #define NORETURN __attribute__((__noreturn__))
+ #define PACKED_STRUCT __attribute__((packed))
#define GCC_PRINTF(x,y) __attribute__((format(printf, x, y)))
#else
#define PACKED_STRUCT
Deleted: scummvm/trunk/common/stdafx.h
===================================================================
--- scummvm/trunk/common/stdafx.h 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/common/stdafx.h 2007-09-19 08:40:12 UTC (rev 28966)
@@ -1,122 +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 COMMON_STDAFX_H
-#define COMMON_STDAFX_H
-
-#if defined(_WIN32_WCE) && _WIN32_WCE < 300
- #define NONSTANDARD_PORT
-#endif
-
-#if defined(NONSTANDARD_PORT)
-
- // Ports which need to perform #includes and #defines visible in
- // virtually all the source of ScummVM should do so by providing a
- // "portdefs.h" header file (and not by directly modifying this
- // header file).
- #include <portdefs.h>
-
-#else // defined(NONSTANDARD_PORT)
-
- #if defined(WIN32)
-
- #ifdef _MSC_VER
- #pragma once
- #pragma warning( disable : 4068 ) // turn off "unknown pragma" warning
- #pragma warning( disable : 4100 ) // turn off "unreferenced formal parameter" warning
- #pragma warning( disable : 4127 ) // turn off "conditional expression is constant" warning
- #pragma warning( disable : 4201 ) // turn off "nonstandard extension used : nameless struct/union" warning
- #pragma warning( disable : 4244 ) // turn off "conversion type" warning
- #pragma warning( disable : 4310 ) // turn off "cast truncates constant value" warning
- #pragma warning( disable : 4355 ) // turn off "base member init" warning
- #pragma warning( disable : 4390 ) // turn off "empty statement" warning for BS2 code
- #pragma warning( disable : 4250 ) // turn off "inherits via dominance" warning
- #pragma warning( disable : 4103 ) // turn off "alignement changed after including header" warning. We use pack-start.h file
- #pragma warning( disable : 4121 ) // turn off "alignment of a member was sensitive to packing" warning
- #pragma warning( disable : 4511 ) // turn off "copy constructor could not be generated" warning
- #pragma warning( disable : 4512 ) // turn off "assignment operator could not be generated" warning
- #pragma warning( disable : 4351 ) // turn off "new behavior ... will be default initialized" warning
- #pragma warning( disable : 4505 ) // turn off "unreferenced local function has been removed"
- #pragma warning( disable : 4510 ) // turn off "default constructor could not be generated"
- #pragma warning( disable : 4610 ) // turn off "struct can never be instantiated - user defined constructor required"
-
- // FIXME: 4702 & 4706 - may be enabled
- #pragma warning( disable : 4702 ) // turn off "unreachable code" warning
- #pragma warning( disable : 4706 ) // turn off "assignment within conditional expression" warning
-
- #define vsnprintf _vsnprintf
- #endif
-
- #if !defined(_WIN32_WCE)
-
- #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
- #define NOGDICAPMASKS
- #define OEMRESOURCE
- #define NONLS
- #define NOICONS
- #define NOMCX
- #define NOPROFILER
- #define NOKANJI
- #define NOSERVICE
- #define NOMETAFILE
- #define NOCOMM
- #define NOCRYPT
- #define NOIME
- #define NOATOM
- #define NOCTLMGR
- #define NOCLIPBOARD
- #define NOMEMMGR
- #define NOSYSMETRICS
- #define NOMENUS
- #define NOOPENFILE
- #define NOWH
- #define NOSOUND
- #define NODRAWTEXT
-
- #endif
-
- #if defined(ARRAYSIZE)
- // VS2005beta2 introduces new stuff in winnt.h
- #undef ARRAYSIZE
- #endif
-
- #endif
-
- #if defined(__QNXNTO__)
- #include <strings.h> /* For strcasecmp */
- #endif
-
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
- #include <stdarg.h>
- #include <assert.h>
- #include <ctype.h>
- #include <time.h>
- #include <math.h>
-
-#endif
-
-#endif
Modified: scummvm/trunk/common/str.cpp
===================================================================
--- scummvm/trunk/common/str.cpp 2007-09-19 08:27:32 UTC (rev 28965)
+++ scummvm/trunk/common/str.cpp 2007-09-19 08:40:12 UTC (rev 28966)
@@ -22,8 +22,6 @@
* $Id$
*/
-#include "common/stdafx.h"
-
#include "common/str.h"
#include "common/hash-str.h"
#include "common/util.h"
@@ -58,7 +56,7 @@
if (len <= 0)
len = tmp;
_len = len;
-
+
if (len >= _builtinCapacity) {
// Not enough internal storage, so allocate more
_extern._capacity = computeCapacity(len);
@@ -66,7 +64,7 @@
_str = (char *)malloc(_extern._capacity+1);
assert(_str != 0);
}
-
+
// Copy the string into the storage area
memcpy(_str, str, len);
_str[len] = 0;
@@ -89,10 +87,10 @@
String::String(char c)
: _len(0), _str(_storage) {
-
+
_storage[0] = c;
_storage[1] = 0;
-
+
_len = (c == 0) ? 0 : 1;
}
@@ -145,7 +143,7 @@
} else {
str.incRefCount();
decRefCount(_extern._refCount);
-
+
_extern._refCount = str._extern._refCount;
_extern._capacity = str._extern._capacity;
_len = str._len;
@@ -285,7 +283,7 @@
uint32 curCapacity, newCapacity;
char *newStorage;
int *oldRefCount = _extern._refCount;
-
+
if (isStorageIntern()) {
isShared = false;
curCapacity = _builtinCapacity - 1;
@@ -293,7 +291,7 @@
isShared = (oldRefCount && *oldRefCount > 1);
curCapacity = _extern._capacity;
}
-
+
// Special case: If there is enough space, and we do not share
// the storage, then there is nothing to do.
if (!isShared && new_len <= curCapacity)
@@ -341,7 +339,7 @@
uint String::hash() const {
return hashit(c_str());
}
-
+
#pragma mark -
bool String::operator ==(const String &x) const {
Modified: scummvm/trunk/common/stream.cpp
@@ Diff output truncated at 100000 characters. @@
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