From 258901bab96f0050385a9912c8ea0fe2a41b2d6f Mon Sep 17 00:00:00 2001 From: Nicola Mettifogo Date: Wed, 19 Sep 2007 08:40:12 +0000 Subject: Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated. svn-id: r28966 --- Makefile.common | 2 +- backends/events/default/default-events.cpp | 7 +- backends/events/default/default-events.h | 1 - backends/fs/abstract-fs-factory.h | 15 +- backends/fs/amigaos4/amigaos4-fs.cpp | 2 - backends/fs/dc/dc-fs.cpp | 1 - backends/fs/ds/ds-fs.cpp | 1 - backends/fs/gp32/gp32-fs.cpp | 1 - backends/fs/morphos/abox-fs.cpp | 2 - backends/fs/palmos/palmos-fs.cpp | 1 - backends/fs/posix/posix-fs.cpp | 1 - backends/fs/symbian/symbian-fs.cpp | 1 - backends/fs/windows/windows-fs.cpp | 45 +- backends/midi/alsa.cpp | 2 - backends/midi/coreaudio.cpp | 1 - backends/midi/coremidi.cpp | 5 +- backends/midi/morphos.cpp | 1 - backends/midi/seq.cpp | 1 - backends/midi/windows.cpp | 1 - backends/midi/ypa1.cpp | 1 - backends/midi/zodiac.cpp | 3 +- backends/platform/PalmOS/Src/be_base.h | 1 - backends/platform/PalmOS/Src/be_save.h | 1 - backends/platform/PalmOS/Src/cd_aeroplayer.cpp | 1 - backends/platform/PalmOS/Src/cd_default.cpp | 1 - backends/platform/PalmOS/Src/cd_msa.cpp | 1 - backends/platform/PalmOS/Src/cd_pockettunes.cpp | 1 - .../PalmOS/Src/launcher/forms/formmain.cpp | 1 - backends/platform/PalmOS/Src/native/zodiacARM.cpp | 1 - backends/platform/dc/audio.cpp | 1 - backends/platform/dc/dcloader.cpp | 1 - backends/platform/dc/dcmain.cpp | 1 - backends/platform/dc/display.cpp | 1 - backends/platform/dc/input.cpp | 1 - backends/platform/dc/selector.cpp | 1 - backends/platform/dc/softkbd.cpp | 1 - backends/platform/dc/time.cpp | 1 - backends/platform/dc/vmsave.cpp | 1 - backends/platform/ds/arm9/source/blitters.cpp | 1 - backends/platform/ds/arm9/source/cdaudio.cpp | 1 - backends/platform/ds/arm9/source/dsmain.h | 1 - backends/platform/ds/arm9/source/dsoptions.h | 1 - backends/platform/ds/arm9/source/gbampsave.h | 1 - backends/platform/ds/arm9/source/osystem_ds.cpp | 1 - backends/platform/ds/arm9/source/portdefs.cpp | 1 - backends/platform/ds/arm9/source/ramsave.cpp | 1 - backends/platform/ds/arm9/source/scummhelp.cpp | 1 - backends/platform/ds/arm9/source/zipreader.cpp | 1 - backends/platform/ds/arm9/source/zipreader.h | 1 - backends/platform/gp2x/gp2x-common.h | 1 - backends/platform/gp32/gp32_launcher.cpp | 1 - backends/platform/gp32/gp32_launcher.h | 1 - backends/platform/gp32/gp32_main.cpp | 1 - backends/platform/gp32/gp32_osys.cpp | 1 - backends/platform/gp32/gp32_osys.h | 1 - backends/platform/gp32/gp32std.cpp | 1 - backends/platform/gp32/gp32std_file.cpp | 1 - backends/platform/gp32/gp32std_grap.cpp | 1 - backends/platform/gp32/gp32std_input.cpp | 1 - backends/platform/gp32/gp32std_input.h | 1 - backends/platform/gp32/gp32std_memory.cpp | 1 - backends/platform/gp32/gp32std_sound.cpp | 1 - backends/platform/maemo/maemo-sdl.cpp | 1 - backends/platform/maemo/maemo-sdl.h | 1 - backends/platform/maemo/main.cpp | 1 - backends/platform/null/null.cpp | 1 - backends/platform/ps2/systemps2.cpp | 1 - backends/platform/ps2/systemps2.h | 1 - backends/platform/psp/osys_psp.cpp | 1 - backends/platform/psp/osys_psp.h | 1 - backends/platform/psp/osys_psp_gu.h | 1 - backends/platform/psp/psp_main.cpp | 1 - backends/platform/sdl/sdl.h | 13 +- backends/platform/symbian/src/SymbianActions.cpp | 1 - backends/platform/symbian/src/SymbianActions.h | 1 - backends/platform/wince/CEActionsPocket.cpp | 1 - backends/platform/wince/CEActionsPocket.h | 1 - backends/platform/wince/CEActionsSmartphone.cpp | 1 - backends/platform/wince/CEActionsSmartphone.h | 1 - backends/platform/wince/CEDevice.cpp | 1 - backends/platform/wince/CEDevice.h | 1 - backends/platform/wince/CELauncherDialog.cpp | 1 - backends/platform/wince/CEScaler.cpp | 1 - backends/platform/wince/CEScaler.h | 1 - backends/platform/wince/CEgui/GUIElement.cpp | 1 - backends/platform/wince/CEgui/GUIElement.h | 1 - backends/platform/wince/CEgui/ItemAction.cpp | 1 - backends/platform/wince/CEgui/ItemAction.h | 1 - backends/platform/wince/CEgui/ItemSwitch.cpp | 1 - backends/platform/wince/CEgui/ItemSwitch.h | 1 - backends/platform/wince/CEgui/Panel.cpp | 1 - backends/platform/wince/CEgui/Panel.h | 1 - backends/platform/wince/CEgui/PanelItem.cpp | 1 - backends/platform/wince/CEgui/PanelItem.h | 1 - backends/platform/wince/CEgui/PanelKeyboard.cpp | 1 - backends/platform/wince/CEgui/PanelKeyboard.h | 1 - .../platform/wince/CEgui/SDL_ImageResource.cpp | 1 - backends/platform/wince/CEgui/SDL_ImageResource.h | 1 - backends/platform/wince/CEgui/Toolbar.cpp | 1 - backends/platform/wince/CEgui/Toolbar.h | 1 - backends/platform/wince/CEgui/ToolbarHandler.cpp | 1 - backends/platform/wince/CEgui/ToolbarHandler.h | 1 - backends/platform/wince/CEkeys/EventsBuffer.cpp | 1 - backends/platform/wince/CEkeys/EventsBuffer.h | 1 - backends/platform/wince/wince-sdl.cpp | 1 - backends/platform/wince/wince-sdl.h | 1 - backends/platform/x11/x11.cpp | 1 - backends/plugins/dc/dc-provider.h | 1 - backends/plugins/dynamic-plugin.h | 1 - backends/plugins/posix/posix-provider.h | 1 - backends/plugins/sdl/sdl-provider.h | 1 - backends/plugins/win32/win32-provider.h | 1 - backends/saves/compressed/compressed-saves.cpp | 21 +- backends/saves/compressed/compressed-saves.h | 1 - backends/saves/default/default-saves.cpp | 19 +- backends/saves/default/default-saves.h | 1 - backends/saves/savefile.cpp | 1 - backends/timer/default/default-timer.cpp | 21 +- base/commandLine.cpp | 18 +- base/game.h | 1 - base/main.cpp | 15 +- base/plugins.cpp | 16 +- base/plugins.h | 7 +- base/version.cpp | 3 +- common/advancedDetector.cpp | 6 +- common/array.h | 1 - common/config-file.cpp | 4 +- common/config-manager.cpp | 2 - common/file.h | 3 +- common/fs.cpp | 37 +- common/hashmap.h | 71 +- common/iff_container.h | 1 - common/mutex.cpp | 1 - common/savefile.h | 21 +- common/scummsys.h | 117 +- common/stdafx.h | 122 - common/str.cpp | 18 +- common/stream.cpp | 1 - common/stream.h | 3 +- common/system.cpp | 4 +- common/unzip.cpp | 1 - common/unzip.h | 1 - common/util.cpp | 3 +- dists/codeblocks/agi.cbp | 68 + dists/codeblocks/agi.layout | 99 + dists/codeblocks/agos.cbp | 12 +- dists/codeblocks/agos.layout | 128 +- dists/codeblocks/cine.cbp | 28 +- dists/codeblocks/cine.depend | 376 - dists/codeblocks/cine.layout | 57 + dists/codeblocks/gob.cbp | 58 + dists/codeblocks/gob.layout | 143 +- dists/codeblocks/kyra.cbp | 122 +- dists/codeblocks/kyra.layout | 57 +- dists/codeblocks/lure.cbp | 42 +- dists/codeblocks/lure.layout | 54 + dists/codeblocks/parallaction.cbp | 74 +- dists/codeblocks/parallaction.layout | 141 +- dists/codeblocks/queen.layout | 52 +- dists/codeblocks/saga.cbp | 30 +- dists/codeblocks/saga.layout | 7 +- dists/codeblocks/scumm.cbp | 20 + dists/codeblocks/scumm.layout | 285 +- dists/codeblocks/scummvm.cbp | 4288 +++++++++++- dists/codeblocks/scummvm.depend | 7378 ++++++++++++++++++++ dists/codeblocks/scummvm.layout | 426 +- dists/codeblocks/scummvm.workspace | 30 + dists/codeblocks/sky.layout | 90 + dists/codeblocks/sword1.layout | 54 + dists/codeblocks/sword2.layout | 93 + dists/codeblocks/touche.cbp | 8 +- dists/codeblocks/touche.layout | 27 + dists/devcpp/scummvm.dev | 10 - dists/msvc6/scummvm.dsp | 4 - dists/msvc7/scummvm.vcproj | 3 - dists/msvc71/scummvm.vcproj | 3 - dists/msvc8/scummvm.vcproj | 4 - engines/agi/agi.cpp | 4 +- engines/agi/agi.h | 8 +- engines/agi/checks.cpp | 4 +- engines/agi/console.cpp | 2 +- engines/agi/cycle.cpp | 2 +- engines/agi/detection.cpp | 10 +- engines/agi/font.h | 1020 +-- engines/agi/global.cpp | 2 +- engines/agi/graphics.cpp | 516 +- engines/agi/graphics.h | 2 +- engines/agi/id.cpp | 2 +- engines/agi/inv.cpp | 4 +- engines/agi/keyboard.cpp | 4 +- engines/agi/keyboard.h | 2 +- engines/agi/loader_v2.cpp | 1 - engines/agi/loader_v3.cpp | 2 - engines/agi/logic.cpp | 2 +- engines/agi/logic.h | 2 +- engines/agi/lzw.cpp | 2 +- engines/agi/menu.cpp | 8 +- engines/agi/motion.cpp | 2 +- engines/agi/objects.cpp | 2 +- engines/agi/op_cmd.cpp | 20 +- engines/agi/op_dbg.cpp | 2 +- engines/agi/op_test.cpp | 8 +- engines/agi/picture.cpp | 30 +- engines/agi/preagi.cpp | 6 +- engines/agi/preagi_common.cpp | 3 +- engines/agi/preagi_mickey.cpp | 69 +- engines/agi/saveload.cpp | 44 +- engines/agi/sound.cpp | 22 +- engines/agi/view.h | 2 +- engines/agi/wagparser.cpp | 8 +- engines/agos/agos.cpp | 6 +- engines/agos/animation.cpp | 6 +- engines/agos/charset.cpp | 4 +- engines/agos/contain.cpp | 2 +- engines/agos/cursor.cpp | 24 +- engines/agos/debug.cpp | 4 +- engines/agos/debug.h | 2 + engines/agos/debugger.cpp | 2 +- engines/agos/detection.cpp | 6 +- engines/agos/draw.cpp | 16 +- engines/agos/event.cpp | 10 +- engines/agos/gfx.cpp | 8 +- engines/agos/icons.cpp | 84 +- engines/agos/input.cpp | 18 +- engines/agos/items.cpp | 2 +- engines/agos/menus.cpp | 6 +- engines/agos/midi.cpp | 2 +- engines/agos/midiparser_s1d.cpp | 2 +- engines/agos/oracle.cpp | 10 +- engines/agos/res.cpp | 8 +- engines/agos/res_ami.cpp | 2 +- engines/agos/res_snd.cpp | 4 +- engines/agos/rooms.cpp | 10 +- engines/agos/saveload.cpp | 10 +- engines/agos/script.cpp | 4 +- engines/agos/script_e1.cpp | 20 +- engines/agos/script_e2.cpp | 10 +- engines/agos/script_ff.cpp | 2 +- engines/agos/script_pp.cpp | 2 +- engines/agos/script_s1.cpp | 4 +- engines/agos/script_s2.cpp | 2 +- engines/agos/script_ww.cpp | 2 +- engines/agos/sound.cpp | 8 +- engines/agos/string.cpp | 6 +- engines/agos/subroutine.cpp | 2 +- engines/agos/verb.cpp | 10 +- engines/agos/vga.cpp | 2 +- engines/agos/vga_e2.cpp | 2 +- engines/agos/vga_ff.cpp | 8 +- engines/agos/vga_s1.cpp | 4 +- engines/agos/vga_s2.cpp | 2 +- engines/agos/vga_ww.cpp | 2 +- engines/agos/window.cpp | 6 +- engines/agos/zones.cpp | 2 +- engines/cine/anim.cpp | 2 +- engines/cine/bg.cpp | 2 +- engines/cine/bg_list.cpp | 8 +- engines/cine/bg_list.h | 2 +- engines/cine/cine.cpp | 6 +- engines/cine/cine.h | 4 +- engines/cine/detection.cpp | 2 +- engines/cine/main_loop.cpp | 4 +- engines/cine/msg.cpp | 2 +- engines/cine/object.cpp | 2 +- engines/cine/prc.cpp | 4 +- engines/cine/rel.cpp | 4 +- engines/cine/script.cpp | 6 +- engines/cine/sound.cpp | 1 - engines/cine/texte.h | 2 +- engines/cine/unpack.cpp | 6 +- engines/cine/unpack.h | 2 +- engines/cine/various.cpp | 26 +- engines/cine/various.h | 4 +- engines/cruise/cell.h | 2 +- engines/cruise/cruise.cpp | 2 +- engines/cruise/cruise.h | 1 - engines/cruise/cruise_main.cpp | 22 +- engines/cruise/cruise_main.h | 2 +- engines/cruise/delphine-unpack.cpp | 6 +- engines/cruise/detection.cpp | 2 +- engines/cruise/gfxModule.cpp | 152 +- engines/drascula/detection.cpp | 4 +- engines/drascula/drascula.cpp | 64 +- engines/drascula/drascula.h | 1 - engines/engine.cpp | 1 - engines/engine.h | 9 +- engines/gob/cdrom.cpp | 2 +- engines/gob/coktelvideo.cpp | 5 +- engines/gob/dataio.cpp | 2 +- engines/gob/dataio.h | 2 +- engines/gob/detection.cpp | 2 +- engines/gob/draw.cpp | 6 +- engines/gob/draw_v1.cpp | 4 +- engines/gob/draw_v2.cpp | 10 +- engines/gob/driver_vga.cpp | 10 +- engines/gob/game.cpp | 4 +- engines/gob/game_v1.cpp | 2 +- engines/gob/game_v2.cpp | 2 +- engines/gob/gob.cpp | 2 +- engines/gob/gob.h | 2 +- engines/gob/goblin_v1.cpp | 2 +- engines/gob/goblin_v2.cpp | 2 +- engines/gob/init.cpp | 2 +- engines/gob/init_v1.cpp | 2 +- engines/gob/init_v2.cpp | 2 +- engines/gob/init_v3.cpp | 1 - engines/gob/inter.cpp | 2 +- engines/gob/inter_bargon.cpp | 2 +- engines/gob/inter_v1.cpp | 8 +- engines/gob/inter_v2.cpp | 20 +- engines/gob/inter_v3.cpp | 1 - engines/gob/inter_v4.cpp | 3 +- engines/gob/map.cpp | 2 +- engines/gob/map_v1.cpp | 4 +- engines/gob/map_v2.cpp | 2 +- engines/gob/map_v4.cpp | 1 - engines/gob/mult.cpp | 2 +- engines/gob/mult_v1.cpp | 2 +- engines/gob/mult_v2.cpp | 28 +- engines/gob/music.cpp | 14 +- engines/gob/parse.cpp | 2 +- engines/gob/parse_v1.cpp | 2 +- engines/gob/parse_v2.cpp | 2 +- engines/gob/saveload.cpp | 3 +- engines/gob/saveload_v2.cpp | 3 +- engines/gob/saveload_v3.cpp | 1 - engines/gob/scenery.cpp | 4 +- engines/gob/scenery_v1.cpp | 2 +- engines/gob/scenery_v2.cpp | 2 +- engines/gob/sound.cpp | 10 +- engines/gob/util.cpp | 2 +- engines/gob/video.cpp | 6 +- engines/gob/video_v1.cpp | 2 +- engines/gob/video_v2.cpp | 2 +- engines/kyra/animator_v1.cpp | 85 +- engines/kyra/debugger.cpp | 18 +- engines/kyra/kyra.cpp | 18 +- engines/kyra/resource.cpp | 22 +- engines/kyra/resource.h | 22 +- engines/kyra/saveload_v1.cpp | 23 +- engines/kyra/screen.cpp | 246 +- engines/kyra/screen_v2.cpp | 55 +- engines/kyra/script.cpp | 36 +- engines/kyra/script_v1.cpp | 94 +- engines/kyra/seqplayer.cpp | 8 +- engines/kyra/sound.cpp | 10 +- engines/kyra/sound.h | 2 +- engines/kyra/sound_adlib.cpp | 16 +- engines/kyra/sound_towns.cpp | 2 +- engines/kyra/sprites.cpp | 10 +- engines/kyra/staticres.cpp | 68 +- engines/kyra/text.cpp | 4 +- engines/kyra/vqa.cpp | 4 +- engines/kyra/wsamovie.cpp | 68 +- engines/lure/debugger.cpp | 68 +- engines/lure/decode.h | 4 +- engines/lure/detection.cpp | 8 +- engines/lure/disk.cpp | 18 +- engines/lure/disk.h | 2 +- engines/lure/events.cpp | 16 +- engines/lure/events.h | 6 +- engines/lure/game.h | 2 +- engines/lure/lure.cpp | 8 +- engines/lure/luredefs.h | 36 +- engines/lure/memory.h | 2 +- engines/lure/menu.h | 8 +- engines/lure/room.h | 6 +- engines/lure/screen.h | 2 +- engines/lure/surface.h | 10 +- engines/parallaction/callables_br.cpp | 2 - engines/parallaction/callables_ns.cpp | 1 - engines/parallaction/debug.cpp | 1 - engines/parallaction/defs.h | 1 - engines/parallaction/detection.cpp | 2 - engines/parallaction/dialogue.cpp | 2 - engines/parallaction/disk_br.cpp | 1 - engines/parallaction/disk_ns.cpp | 2 - engines/parallaction/exec_br.cpp | 1 - engines/parallaction/exec_ns.cpp | 1 - engines/parallaction/font.cpp | 1 - engines/parallaction/graphics.cpp | 1 - engines/parallaction/inventory.cpp | 1 - engines/parallaction/menu.cpp | 1 - engines/parallaction/objects.cpp | 1 - engines/parallaction/parallaction.cpp | 2 - engines/parallaction/parallaction_br.cpp | 2 +- engines/parallaction/parallaction_ns.cpp | 1 - engines/parallaction/parser.cpp | 2 - engines/parallaction/parser_br.cpp | 2 +- engines/parallaction/parser_ns.cpp | 1 - engines/parallaction/saveload.cpp | 1 - engines/parallaction/sound.cpp | 1 - engines/parallaction/staticres.cpp | 1 - engines/parallaction/walk.cpp | 2 - engines/queen/bankman.cpp | 2 +- engines/queen/command.cpp | 2 +- engines/queen/credits.cpp | 2 +- engines/queen/cutaway.cpp | 2 +- engines/queen/debug.cpp | 3 +- engines/queen/display.cpp | 2 +- engines/queen/graphics.cpp | 2 +- engines/queen/grid.cpp | 2 +- engines/queen/input.cpp | 2 +- engines/queen/journal.cpp | 2 +- engines/queen/logic.cpp | 2 +- engines/queen/music.cpp | 2 +- engines/queen/musicdata.cpp | 2 +- engines/queen/queen.cpp | 8 +- engines/queen/resource.cpp | 2 +- engines/queen/sound.cpp | 2 +- engines/queen/state.cpp | 2 +- engines/queen/talk.cpp | 2 +- engines/queen/walk.cpp | 4 +- engines/saga/saga.cpp | 6 +- engines/saga/saveload.cpp | 14 +- engines/scumm/actor.cpp | 16 +- engines/scumm/akos.cpp | 26 +- engines/scumm/base-costume.cpp | 2 +- engines/scumm/bomp.cpp | 2 +- engines/scumm/boxes.cpp | 4 +- engines/scumm/camera.cpp | 2 +- engines/scumm/charset.cpp | 12 +- engines/scumm/costume.cpp | 22 +- engines/scumm/cursor.cpp | 2 +- engines/scumm/debugger.cpp | 4 +- engines/scumm/detection.cpp | 76 +- engines/scumm/detection_tables.h | 8 +- engines/scumm/dialogs.cpp | 26 +- engines/scumm/gfx.cpp | 92 +- engines/scumm/he/animation_he.cpp | 8 +- engines/scumm/he/cup_player_he.cpp | 2 +- engines/scumm/he/floodfill_he.cpp | 30 +- engines/scumm/he/logic_he.cpp | 2 +- engines/scumm/he/logic_he.h | 2 +- engines/scumm/he/palette_he.cpp | 2 +- engines/scumm/he/resource_he.cpp | 14 +- engines/scumm/he/script_v100he.cpp | 4 +- engines/scumm/he/script_v60he.cpp | 2 +- engines/scumm/he/script_v70he.cpp | 4 +- engines/scumm/he/script_v72he.cpp | 4 +- engines/scumm/he/script_v80he.cpp | 2 +- engines/scumm/he/script_v90he.cpp | 2 +- engines/scumm/he/sound_he.cpp | 6 +- engines/scumm/he/sprite_he.cpp | 2 +- engines/scumm/he/wiz_he.cpp | 2 +- engines/scumm/help.cpp | 2 +- engines/scumm/imuse/imuse.cpp | 2 +- engines/scumm/imuse/imuse_part.cpp | 4 +- engines/scumm/imuse/imuse_player.cpp | 2 +- engines/scumm/imuse/instrument.cpp | 2 +- engines/scumm/imuse/instrument.h | 2 +- engines/scumm/imuse/sysex.h | 2 +- engines/scumm/imuse/sysex_samnmax.cpp | 2 +- engines/scumm/imuse/sysex_scumm.cpp | 2 +- engines/scumm/imuse_digi/dimuse.cpp | 2 +- engines/scumm/imuse_digi/dimuse_bndmgr.cpp | 2 +- engines/scumm/imuse_digi/dimuse_codecs.cpp | 2 +- engines/scumm/imuse_digi/dimuse_music.cpp | 2 +- engines/scumm/imuse_digi/dimuse_script.cpp | 4 +- engines/scumm/imuse_digi/dimuse_sndmgr.cpp | 2 +- engines/scumm/imuse_digi/dimuse_sndmgr.h | 2 +- engines/scumm/imuse_digi/dimuse_tables.cpp | 2 +- engines/scumm/imuse_digi/dimuse_track.cpp | 4 +- engines/scumm/input.cpp | 10 +- engines/scumm/insane/insane.cpp | 2 +- engines/scumm/insane/insane_ben.cpp | 2 +- engines/scumm/insane/insane_enemy.cpp | 50 +- engines/scumm/insane/insane_iact.cpp | 38 +- engines/scumm/insane/insane_scenes.cpp | 4 +- engines/scumm/midiparser_eup.cpp | 2 +- engines/scumm/midiparser_ro.cpp | 2 +- engines/scumm/nut_renderer.cpp | 4 +- engines/scumm/object.cpp | 14 +- engines/scumm/palette.cpp | 2 +- engines/scumm/player_mod.cpp | 2 +- engines/scumm/player_nes.cpp | 24 +- engines/scumm/player_v1.cpp | 2 +- engines/scumm/player_v2.cpp | 2 +- engines/scumm/player_v2a.cpp | 2 +- engines/scumm/player_v3a.cpp | 2 +- engines/scumm/resource.cpp | 6 +- engines/scumm/resource_v2.cpp | 2 +- engines/scumm/resource_v3.cpp | 2 +- engines/scumm/resource_v4.cpp | 2 +- engines/scumm/room.cpp | 12 +- engines/scumm/saveload.cpp | 30 +- engines/scumm/script.cpp | 4 +- engines/scumm/script_v0.cpp | 2 +- engines/scumm/script_v2.cpp | 2 +- engines/scumm/script_v5.cpp | 18 +- engines/scumm/script_v6.cpp | 6 +- engines/scumm/script_v8.cpp | 2 +- engines/scumm/scumm.cpp | 70 +- engines/scumm/smush/channel.cpp | 2 +- engines/scumm/smush/chunk.cpp | 4 +- engines/scumm/smush/codec1.cpp | 2 +- engines/scumm/smush/codec37.cpp | 2 +- engines/scumm/smush/codec47.cpp | 2 +- engines/scumm/smush/imuse_channel.cpp | 4 +- engines/scumm/smush/saud_channel.cpp | 4 +- engines/scumm/smush/smush_font.cpp | 2 +- engines/scumm/smush/smush_mixer.cpp | 2 +- engines/scumm/smush/smush_mixer.h | 2 +- engines/scumm/smush/smush_player.cpp | 2 +- engines/scumm/sound.cpp | 6 +- engines/scumm/string.cpp | 10 +- engines/scumm/thumbnail.cpp | 2 +- engines/scumm/usage_bits.cpp | 2 +- engines/scumm/util.h | 2 +- engines/scumm/vars.cpp | 2 +- engines/scumm/verbs.cpp | 2 +- engines/sky/autoroute.cpp | 2 +- engines/sky/autoroute.h | 2 +- engines/sky/compact.cpp | 12 +- engines/sky/control.cpp | 4 +- engines/sky/control.h | 2 +- engines/sky/debug.cpp | 2 +- engines/sky/debug.h | 2 +- engines/sky/disk.cpp | 2 +- engines/sky/disk.h | 2 +- engines/sky/grid.h | 2 +- engines/sky/intro.cpp | 2 +- engines/sky/intro.h | 2 +- engines/sky/logic.cpp | 6 +- engines/sky/logic.h | 4 +- engines/sky/mouse.cpp | 2 +- engines/sky/mouse.h | 2 +- engines/sky/music/adlibchannel.cpp | 4 +- engines/sky/music/adlibmusic.cpp | 12 +- engines/sky/music/musicbase.h | 2 +- engines/sky/rnc_deco.cpp | 2 +- engines/sky/rnc_deco.h | 2 +- engines/sky/screen.cpp | 2 +- engines/sky/screen.h | 2 +- engines/sky/sky.cpp | 2 +- engines/sky/sky.h | 2 +- engines/sky/skydefs.h | 2 +- engines/sky/sound.cpp | 4 +- engines/sky/sound.h | 2 +- engines/sky/text.cpp | 2 +- engines/sky/text.h | 4 +- engines/sword1/animation.cpp | 2 +- engines/sword1/control.cpp | 2 +- engines/sword1/credits.cpp | 2 +- engines/sword1/debug.cpp | 2 +- engines/sword1/eventman.cpp | 2 +- engines/sword1/logic.cpp | 6 +- engines/sword1/memman.cpp | 2 +- engines/sword1/menu.cpp | 2 +- engines/sword1/mouse.cpp | 2 +- engines/sword1/music.cpp | 12 +- engines/sword1/objectman.cpp | 2 +- engines/sword1/resman.cpp | 6 +- engines/sword1/router.cpp | 2 +- engines/sword1/screen.cpp | 4 +- engines/sword1/sound.cpp | 2 +- engines/sword1/staticres.cpp | 2 +- engines/sword1/sword1.cpp | 10 +- engines/sword1/text.cpp | 2 +- engines/sword2/animation.cpp | 2 +- engines/sword2/anims.cpp | 2 +- engines/sword2/console.cpp | 2 +- engines/sword2/controls.cpp | 2 +- engines/sword2/debug.cpp | 2 +- engines/sword2/events.cpp | 2 +- engines/sword2/function.cpp | 2 +- engines/sword2/icons.cpp | 2 +- engines/sword2/interpreter.cpp | 2 +- engines/sword2/layers.cpp | 2 +- engines/sword2/logic.cpp | 4 +- engines/sword2/maketext.cpp | 2 +- engines/sword2/memory.cpp | 2 +- engines/sword2/menu.cpp | 2 +- engines/sword2/mouse.cpp | 2 +- engines/sword2/music.cpp | 4 +- engines/sword2/palette.cpp | 2 +- engines/sword2/protocol.cpp | 2 +- engines/sword2/render.cpp | 2 +- engines/sword2/resman.cpp | 4 +- engines/sword2/router.cpp | 2 +- engines/sword2/saveload.cpp | 2 +- engines/sword2/screen.cpp | 2 +- engines/sword2/scroll.cpp | 2 +- engines/sword2/sound.cpp | 2 +- engines/sword2/speech.cpp | 2 +- engines/sword2/sprite.cpp | 2 +- engines/sword2/startup.cpp | 2 +- engines/sword2/sword2.cpp | 6 +- engines/sword2/sync.cpp | 2 +- engines/sword2/walker.cpp | 2 +- engines/touche/detection.cpp | 1 - engines/touche/graphics.cpp | 1 - engines/touche/midi.cpp | 1 - engines/touche/opcodes.cpp | 2 +- engines/touche/resource.cpp | 2 +- engines/touche/saveload.cpp | 2 +- engines/touche/staticres.cpp | 2 +- engines/touche/touche.cpp | 2 +- engines/touche/ui.cpp | 16 +- graphics/cursorman.h | 1 - graphics/dxa_player.cpp | 3 +- graphics/font.cpp | 21 +- graphics/fontman.h | 1 - graphics/fonts/consolefont.cpp | 1 - graphics/fonts/newfont.cpp | 1 - graphics/fonts/newfont_big.cpp | 1 - graphics/fonts/scummfont.cpp | 33 +- graphics/imagedec.h | 1 - graphics/imageman.h | 7 +- graphics/mpeg_player.cpp | 1 - graphics/primitives.cpp | 1 - graphics/scaler.h | 1 - graphics/scaler/intern.h | 1 - graphics/scaler/scale2x.cpp | 1 - graphics/scaler/scale3x.cpp | 1 - graphics/scaler/scalebit.cpp | 1 - graphics/scaler/thumbnail.cpp | 1 - graphics/surface.cpp | 1 - gui/Actions.cpp | 1 - gui/Actions.h | 3 +- gui/EditTextWidget.cpp | 1 - gui/Key.cpp | 1 - gui/Key.h | 1 - gui/KeysDialog.cpp | 5 +- gui/ListWidget.cpp | 5 +- gui/PopUpWidget.cpp | 1 - gui/ScrollBarWidget.cpp | 1 - gui/TabWidget.cpp | 7 +- gui/about.cpp | 1 - gui/browser.cpp | 1 - gui/chooser.cpp | 1 - gui/console.cpp | 5 +- gui/debugger.cpp | 6 +- gui/dialog.cpp | 3 +- gui/editable.cpp | 3 +- gui/eval.cpp | 3 +- gui/eval.h | 1 - gui/launcher.cpp | 18 +- gui/massadd.cpp | 24 +- gui/message.cpp | 1 - gui/newgui.cpp | 11 +- gui/object.cpp | 1 - gui/options.cpp | 9 +- gui/theme.h | 17 +- gui/themebrowser.cpp | 5 +- gui/widget.cpp | 1 - sound/adpcm.cpp | 4 +- sound/adpcm.h | 1 - sound/aiff.cpp | 1 - sound/aiff.h | 1 - sound/audiocd.cpp | 2 - sound/audiocd.h | 1 - sound/audiostream.cpp | 1 - sound/audiostream.h | 7 +- sound/flac.h | 5 +- sound/fmopl.cpp | 2 - sound/mididrv.cpp | 8 +- sound/midiparser.cpp | 1 - sound/midiparser_smf.cpp | 3 +- sound/midiparser_xmidi.cpp | 3 +- sound/mixer.cpp | 8 +- sound/mixer.h | 5 +- sound/mods/module.cpp | 4 +- sound/mods/protracker.cpp | 2 - sound/mods/protracker.h | 5 +- sound/mods/rjp1.cpp | 1 - sound/mods/soundfx.cpp | 1 - sound/mp3.h | 5 +- sound/mpu401.cpp | 1 - sound/mpu401.h | 1 - sound/null.cpp | 1 - sound/rate.cpp | 7 +- sound/rate_arm.cpp | 1 - sound/softsynth/emumidi.h | 1 - sound/softsynth/fluidsynth.cpp | 2 - sound/softsynth/mt32.cpp | 1 - sound/softsynth/mt32/freeverb.cpp | 1 - sound/softsynth/ym2612.h | 1 - sound/voc.cpp | 3 +- sound/voc.h | 1 - sound/vorbis.h | 5 +- sound/wave.cpp | 1 - sound/wave.h | 1 - test/common/array.h | 1 - test/common/hashmap.h | 1 - test/common/list.h | 1 - test/common/pack.h | 1 - test/common/seekablesubreadstream.h | 1 - test/common/str.h | 1 - test/common/subreadstream.h | 1 - tools/convbdf.c | 1 - tools/create_lure/create_lure_dat.h | 1 - tools/create_lure/process_actions.cpp | 1 - 693 files changed, 16278 insertions(+), 3946 deletions(-) delete mode 100644 common/stdafx.h diff --git a/Makefile.common b/Makefile.common index 38f0b2bf6f..33d4d661b4 100644 --- a/Makefile.common +++ b/Makefile.common @@ -87,7 +87,7 @@ clean: .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) diff --git a/backends/events/default/default-events.cpp b/backends/events/default/default-events.cpp index 6bd97c7f71..7730cb7df1 100644 --- a/backends/events/default/default-events.cpp +++ b/backends/events/default/default-events.cpp @@ -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 @@ DefaultEventManager::DefaultEventManager(OSystem *boss) : 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 @@ bool DefaultEventManager::pollEvent(Common::Event &event) { result = true; } } - + return result; } diff --git a/backends/events/default/default-events.h b/backends/events/default/default-events.h index 6e8ce6b77c..e7d70cb152 100644 --- a/backends/events/default/default-events.h +++ b/backends/events/default/default-events.h @@ -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" /* diff --git a/backends/fs/abstract-fs-factory.h b/backends/fs/abstract-fs-factory.h index 79ec3f7520..c4ce277505 100644 --- a/backends/fs/abstract-fs-factory.h +++ b/backends/fs/abstract-fs-factory.h @@ -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 @@ public: * 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 @@ public: * @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. diff --git a/backends/fs/amigaos4/amigaos4-fs.cpp b/backends/fs/amigaos4/amigaos4-fs.cpp index 3eefd6507e..4ad02e0655 100644 --- a/backends/fs/amigaos4/amigaos4-fs.cpp +++ b/backends/fs/amigaos4/amigaos4-fs.cpp @@ -35,8 +35,6 @@ #include #endif -#include - #include "common/util.h" #include "engines/engine.h" #include "backends/fs/abstract-fs.h" diff --git a/backends/fs/dc/dc-fs.cpp b/backends/fs/dc/dc-fs.cpp index 0b204dc309..a814d05cec 100644 --- a/backends/fs/dc/dc-fs.cpp +++ b/backends/fs/dc/dc-fs.cpp @@ -24,7 +24,6 @@ #if defined(__DC__) -#include "common/stdafx.h" #include "backends/fs/abstract-fs.h" #include diff --git a/backends/fs/ds/ds-fs.cpp b/backends/fs/ds/ds-fs.cpp index 11d373ea1e..891f0df636 100644 --- a/backends/fs/ds/ds-fs.cpp +++ b/backends/fs/ds/ds-fs.cpp @@ -20,7 +20,6 @@ * */ -#include "stdafx.h" #include "str.h" #include "common/util.h" //#include //basic print funcionality diff --git a/backends/fs/gp32/gp32-fs.cpp b/backends/fs/gp32/gp32-fs.cpp index 1585bd22f1..4fb88467ea 100644 --- a/backends/fs/gp32/gp32-fs.cpp +++ b/backends/fs/gp32/gp32-fs.cpp @@ -23,7 +23,6 @@ * */ -#include "stdafx.h" #include "backends/fs/abstract-fs.h" #define MAX_PATH_SIZE 256 diff --git a/backends/fs/morphos/abox-fs.cpp b/backends/fs/morphos/abox-fs.cpp index ef50a11e4e..05c13662bc 100644 --- a/backends/fs/morphos/abox-fs.cpp +++ b/backends/fs/morphos/abox-fs.cpp @@ -29,8 +29,6 @@ #include #include -#include - #include "common/util.h" #include "base/engine.h" #include "backends/fs/abstract-fs.h" diff --git a/backends/fs/palmos/palmos-fs.cpp b/backends/fs/palmos/palmos-fs.cpp index d44958254d..cda3ee3c33 100644 --- a/backends/fs/palmos/palmos-fs.cpp +++ b/backends/fs/palmos/palmos-fs.cpp @@ -27,7 +27,6 @@ #include "PalmVersion.h" #include "globals.h" -#include "common/stdafx.h" #include "backends/fs/abstract-fs.h" /** diff --git a/backends/fs/posix/posix-fs.cpp b/backends/fs/posix/posix-fs.cpp index 5871d1ef42..1f66d5639d 100644 --- a/backends/fs/posix/posix-fs.cpp +++ b/backends/fs/posix/posix-fs.cpp @@ -24,7 +24,6 @@ #if defined(UNIX) -#include "common/stdafx.h" #include "backends/fs/abstract-fs.h" #ifdef MACOSX diff --git a/backends/fs/symbian/symbian-fs.cpp b/backends/fs/symbian/symbian-fs.cpp index e8a9553927..0d7b37ee4d 100644 --- a/backends/fs/symbian/symbian-fs.cpp +++ b/backends/fs/symbian/symbian-fs.cpp @@ -23,7 +23,6 @@ */ #if defined (__SYMBIAN32__) -#include "common/stdafx.h" #include "backends/fs/abstract-fs.h" #include diff --git a/backends/fs/windows/windows-fs.cpp b/backends/fs/windows/windows-fs.cpp index c7f500f108..b2c3bc64fb 100644 --- a/backends/fs/windows/windows-fs.cpp +++ b/backends/fs/windows/windows-fs.cpp @@ -27,7 +27,6 @@ #ifdef _WIN32_WCE #include #endif -#include "common/stdafx.h" #include "backends/fs/abstract-fs.h" #include #include @@ -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 @@ protected: 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 @@ public: 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 @@ private: /** * 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 @@ WindowsFilesystemNode::WindowsFilesystemNode(const String &p, const bool current 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 @@ WindowsFilesystemNode::WindowsFilesystemNode(const String &p, const bool current AbstractFilesystemNode *WindowsFilesystemNode::getChild(const String &n) const { assert(_isDirectory); - + String newPath(_path); if (_path.lastChar() != '\\') newPath += '\\'; @@ -297,12 +296,12 @@ bool WindowsFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, b 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 @@ bool WindowsFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, b 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 @@ AbstractFilesystemNode *WindowsFilesystemNode::getParent() const { p->_displayName = lastPathComponent(p->_path); p->_isPseudoRoot = false; } - + return p; } diff --git a/backends/midi/alsa.cpp b/backends/midi/alsa.cpp index b077f333f1..174bb73f65 100644 --- a/backends/midi/alsa.cpp +++ b/backends/midi/alsa.cpp @@ -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" diff --git a/backends/midi/coreaudio.cpp b/backends/midi/coreaudio.cpp index e14ab24e79..54777f6c69 100644 --- a/backends/midi/coreaudio.cpp +++ b/backends/midi/coreaudio.cpp @@ -24,7 +24,6 @@ #ifdef MACOSX -#include "common/stdafx.h" #include "common/config-manager.h" #include "common/util.h" #include "sound/mpu401.h" diff --git a/backends/midi/coremidi.cpp b/backends/midi/coremidi.cpp index aa8790a83e..251b41a986 100644 --- a/backends/midi/coremidi.cpp +++ b/backends/midi/coremidi.cpp @@ -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 @@ int MidiDriver_CoreMIDI::open() { } else { return MERR_DEVICE_NOT_AVAILABLE; } - - if (err != noErr) + + if (err != noErr) return MERR_CANNOT_CONNECT; return 0; diff --git a/backends/midi/morphos.cpp b/backends/midi/morphos.cpp index 530967c331..1a322dc6e2 100644 --- a/backends/midi/morphos.cpp +++ b/backends/midi/morphos.cpp @@ -33,7 +33,6 @@ #include #include -#include "common/stdafx.h" #include "common/endian.h" #include "sound/mpu401.h" #include "common/util.h" diff --git a/backends/midi/seq.cpp b/backends/midi/seq.cpp index cb5aafd170..39c61dd85b 100644 --- a/backends/midi/seq.cpp +++ b/backends/midi/seq.cpp @@ -30,7 +30,6 @@ #if defined(UNIX) && !defined(__BEOS__) && !defined(__MAEMO__) -#include "common/stdafx.h" #include "sound/mpu401.h" #include "common/util.h" diff --git a/backends/midi/windows.cpp b/backends/midi/windows.cpp index 5f53c59173..db3ed50165 100644 --- a/backends/midi/windows.cpp +++ b/backends/midi/windows.cpp @@ -27,7 +27,6 @@ #include #include -#include "common/stdafx.h" #include "sound/mpu401.h" #include "common/util.h" diff --git a/backends/midi/ypa1.cpp b/backends/midi/ypa1.cpp index da84211753..ca77de7300 100644 --- a/backends/midi/ypa1.cpp +++ b/backends/midi/ypa1.cpp @@ -22,7 +22,6 @@ * $Id$ */ -#include "common/stdafx.h" #include "sound/mpu401.h" #include "common/util.h" diff --git a/backends/midi/zodiac.cpp b/backends/midi/zodiac.cpp index 349635f8b2..10a9d166b4 100644 --- a/backends/midi/zodiac.cpp +++ b/backends/midi/zodiac.cpp @@ -22,7 +22,6 @@ * $Id$ */ -#include "common/stdafx.h" #include "sound/mpu401.h" #include "common/util.h" @@ -113,7 +112,7 @@ void MidiDriver_Zodiac::send(uint32 b) { 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; diff --git a/backends/platform/PalmOS/Src/be_base.h b/backends/platform/PalmOS/Src/be_base.h index 0520d4bfdc..a4c27cf2da 100644 --- a/backends/platform/PalmOS/Src/be_base.h +++ b/backends/platform/PalmOS/Src/be_base.h @@ -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" diff --git a/backends/platform/PalmOS/Src/be_save.h b/backends/platform/PalmOS/Src/be_save.h index 56b1b5e7a0..cad5855551 100755 --- a/backends/platform/PalmOS/Src/be_save.h +++ b/backends/platform/PalmOS/Src/be_save.h @@ -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 { diff --git a/backends/platform/PalmOS/Src/cd_aeroplayer.cpp b/backends/platform/PalmOS/Src/cd_aeroplayer.cpp index 7e9ae5d1bd..e1785c9239 100644 --- a/backends/platform/PalmOS/Src/cd_aeroplayer.cpp +++ b/backends/platform/PalmOS/Src/cd_aeroplayer.cpp @@ -23,7 +23,6 @@ * */ -#include "stdafx.h" #include "common/system.h" #include "common/config-manager.h" diff --git a/backends/platform/PalmOS/Src/cd_default.cpp b/backends/platform/PalmOS/Src/cd_default.cpp index e103df6931..416701524d 100644 --- a/backends/platform/PalmOS/Src/cd_default.cpp +++ b/backends/platform/PalmOS/Src/cd_default.cpp @@ -22,7 +22,6 @@ * $Id$ * */ -#include "common/stdafx.h" #include "common/system.h" #include "cd_default.h" diff --git a/backends/platform/PalmOS/Src/cd_msa.cpp b/backends/platform/PalmOS/Src/cd_msa.cpp index 5fb1a0c12f..1a9752852e 100644 --- a/backends/platform/PalmOS/Src/cd_msa.cpp +++ b/backends/platform/PalmOS/Src/cd_msa.cpp @@ -23,7 +23,6 @@ * */ #include -#include "common/stdafx.h" #include "common/system.h" #include "cd_msa.h" #include "start.h" // for appFileCreat diff --git a/backends/platform/PalmOS/Src/cd_pockettunes.cpp b/backends/platform/PalmOS/Src/cd_pockettunes.cpp index 66483a6e87..b647114fb8 100644 --- a/backends/platform/PalmOS/Src/cd_pockettunes.cpp +++ b/backends/platform/PalmOS/Src/cd_pockettunes.cpp @@ -22,7 +22,6 @@ * $Id$ * */ -#include "common/stdafx.h" #include "common/system.h" #include "common/config-manager.h" diff --git a/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp b/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp index 78b9ac3256..f8c441e2e4 100644 --- a/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp +++ b/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp @@ -32,7 +32,6 @@ #include "scumm_globals.h" #include "globals.h" -#include "common/stdafx.h" #include "base/version.h" #include "formEditGame.h" diff --git a/backends/platform/PalmOS/Src/native/zodiacARM.cpp b/backends/platform/PalmOS/Src/native/zodiacARM.cpp index ad2f94605f..87de372943 100644 --- a/backends/platform/PalmOS/Src/native/zodiacARM.cpp +++ b/backends/platform/PalmOS/Src/native/zodiacARM.cpp @@ -36,7 +36,6 @@ //#include //#define DEBUG_ARM -#include "stdafx.h" #include "base/main.h" #ifdef COMPILE_ZODIAC # include "be_zodiac.h" diff --git a/backends/platform/dc/audio.cpp b/backends/platform/dc/audio.cpp index 7364b170e6..5f95a836e8 100644 --- a/backends/platform/dc/audio.cpp +++ b/backends/platform/dc/audio.cpp @@ -23,7 +23,6 @@ * */ -#include #include #include "engines/engine.h" #include "sound/mixer.h" diff --git a/backends/platform/dc/dcloader.cpp b/backends/platform/dc/dcloader.cpp index 7e5a068780..2aba1cddf5 100644 --- a/backends/platform/dc/dcloader.cpp +++ b/backends/platform/dc/dcloader.cpp @@ -23,7 +23,6 @@ * */ -#include #include #include #include diff --git a/backends/platform/dc/dcmain.cpp b/backends/platform/dc/dcmain.cpp index 9c11d0f9da..bada39180c 100644 --- a/backends/platform/dc/dcmain.cpp +++ b/backends/platform/dc/dcmain.cpp @@ -23,7 +23,6 @@ * */ -#include #include #include #include diff --git a/backends/platform/dc/display.cpp b/backends/platform/dc/display.cpp index 9d095e389d..062df16a7e 100644 --- a/backends/platform/dc/display.cpp +++ b/backends/platform/dc/display.cpp @@ -25,7 +25,6 @@ #define RONIN_TIMER_ACCESS -#include #include #include #include diff --git a/backends/platform/dc/input.cpp b/backends/platform/dc/input.cpp index 6d7178fc97..be2ac2f178 100644 --- a/backends/platform/dc/input.cpp +++ b/backends/platform/dc/input.cpp @@ -25,7 +25,6 @@ #define RONIN_TIMER_ACCESS -#include #include #include #include "dc.h" diff --git a/backends/platform/dc/selector.cpp b/backends/platform/dc/selector.cpp index 7c472ccf24..a734a9e13e 100644 --- a/backends/platform/dc/selector.cpp +++ b/backends/platform/dc/selector.cpp @@ -23,7 +23,6 @@ * */ -#include #include #include #include diff --git a/backends/platform/dc/softkbd.cpp b/backends/platform/dc/softkbd.cpp index 1f2bd619e1..112eb0c1c0 100644 --- a/backends/platform/dc/softkbd.cpp +++ b/backends/platform/dc/softkbd.cpp @@ -23,7 +23,6 @@ * */ -#include #include #include "common/events.h" #include "engines/engine.h" diff --git a/backends/platform/dc/time.cpp b/backends/platform/dc/time.cpp index 890e98f6b4..c87062d583 100644 --- a/backends/platform/dc/time.cpp +++ b/backends/platform/dc/time.cpp @@ -25,7 +25,6 @@ #define RONIN_TIMER_ACCESS -#include #include #include "dc.h" diff --git a/backends/platform/dc/vmsave.cpp b/backends/platform/dc/vmsave.cpp index 5b7eaf5f46..39526a48c3 100644 --- a/backends/platform/dc/vmsave.cpp +++ b/backends/platform/dc/vmsave.cpp @@ -23,7 +23,6 @@ * */ -#include #include #include "engines/engine.h" #include "dc.h" diff --git a/backends/platform/ds/arm9/source/blitters.cpp b/backends/platform/ds/arm9/source/blitters.cpp index 1ce8429a4d..9522dbc9cb 100644 --- a/backends/platform/ds/arm9/source/blitters.cpp +++ b/backends/platform/ds/arm9/source/blitters.cpp @@ -20,7 +20,6 @@ * */ -#include "stdafx.h" #include "blitters.h" #define CHARSET_MASK_TRANSPARENCY 253 diff --git a/backends/platform/ds/arm9/source/cdaudio.cpp b/backends/platform/ds/arm9/source/cdaudio.cpp index 3a012fc01a..a550ccf968 100644 --- a/backends/platform/ds/arm9/source/cdaudio.cpp +++ b/backends/platform/ds/arm9/source/cdaudio.cpp @@ -20,7 +20,6 @@ * */ -#include "stdafx.h" #include "cdaudio.h" #include "ds-fs.h" #include "config-manager.h" diff --git a/backends/platform/ds/arm9/source/dsmain.h b/backends/platform/ds/arm9/source/dsmain.h index 94f02145a2..a353a7cec8 100644 --- a/backends/platform/ds/arm9/source/dsmain.h +++ b/backends/platform/ds/arm9/source/dsmain.h @@ -24,7 +24,6 @@ #define _DSMAIN_H #include -#include "stdafx.h" #include "osystem_ds.h" #include "scummconsole.h" #include "NDS/scummvm_ipc.h" diff --git a/backends/platform/ds/arm9/source/dsoptions.h b/backends/platform/ds/arm9/source/dsoptions.h index 6976fb1a59..87282142f6 100644 --- a/backends/platform/ds/arm9/source/dsoptions.h +++ b/backends/platform/ds/arm9/source/dsoptions.h @@ -23,7 +23,6 @@ #ifndef _DSOPTIONS_H_ #define _DSOPTIONS_H_ -#include "stdafx.h" #include "common/scummsys.h" #include "common/str.h" diff --git a/backends/platform/ds/arm9/source/gbampsave.h b/backends/platform/ds/arm9/source/gbampsave.h index c7d9732d4c..b9589a29e6 100644 --- a/backends/platform/ds/arm9/source/gbampsave.h +++ b/backends/platform/ds/arm9/source/gbampsave.h @@ -23,7 +23,6 @@ #ifndef _GBAMPSAVE_H_ #define _GBAMPSAVE_H_ -#include "stdafx.h" #include "system.h" #define SAVE_BUFFER_SIZE 100000 diff --git a/backends/platform/ds/arm9/source/osystem_ds.cpp b/backends/platform/ds/arm9/source/osystem_ds.cpp index 39413d0723..ae5d116985 100644 --- a/backends/platform/ds/arm9/source/osystem_ds.cpp +++ b/backends/platform/ds/arm9/source/osystem_ds.cpp @@ -20,7 +20,6 @@ */ -#include "stdafx.h" #include "common/scummsys.h" #include "common/system.h" #include "system.h" diff --git a/backends/platform/ds/arm9/source/portdefs.cpp b/backends/platform/ds/arm9/source/portdefs.cpp index 28120e07b8..e669dd5b80 100644 --- a/backends/platform/ds/arm9/source/portdefs.cpp +++ b/backends/platform/ds/arm9/source/portdefs.cpp @@ -20,7 +20,6 @@ * */ -#include "stdafx.h" #include #include "nds/dma.h" #include "osystem_ds.h" diff --git a/backends/platform/ds/arm9/source/ramsave.cpp b/backends/platform/ds/arm9/source/ramsave.cpp index ea4bff9cc3..1cd7ff814b 100644 --- a/backends/platform/ds/arm9/source/ramsave.cpp +++ b/backends/platform/ds/arm9/source/ramsave.cpp @@ -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" diff --git a/backends/platform/ds/arm9/source/scummhelp.cpp b/backends/platform/ds/arm9/source/scummhelp.cpp index 2bbaac4b07..452f782dc5 100644 --- a/backends/platform/ds/arm9/source/scummhelp.cpp +++ b/backends/platform/ds/arm9/source/scummhelp.cpp @@ -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) diff --git a/backends/platform/ds/arm9/source/zipreader.cpp b/backends/platform/ds/arm9/source/zipreader.cpp index 0c86bd97ae..01321f44f5 100644 --- a/backends/platform/ds/arm9/source/zipreader.cpp +++ b/backends/platform/ds/arm9/source/zipreader.cpp @@ -21,7 +21,6 @@ */ -#include "stdafx.h" #include "zipreader.h" #define SWAP_U16(v) (((v & 0xFF) << 8) + (v & 0xFF00)) diff --git a/backends/platform/ds/arm9/source/zipreader.h b/backends/platform/ds/arm9/source/zipreader.h index d4390ab74d..19aa3d9f31 100644 --- a/backends/platform/ds/arm9/source/zipreader.h +++ b/backends/platform/ds/arm9/source/zipreader.h @@ -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 diff --git a/backends/platform/gp2x/gp2x-common.h b/backends/platform/gp2x/gp2x-common.h index 1812fdd8d9..4a688bbf9d 100644 --- a/backends/platform/gp2x/gp2x-common.h +++ b/backends/platform/gp2x/gp2x-common.h @@ -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" diff --git a/backends/platform/gp32/gp32_launcher.cpp b/backends/platform/gp32/gp32_launcher.cpp index 69c9b00e3e..9931118f08 100644 --- a/backends/platform/gp32/gp32_launcher.cpp +++ b/backends/platform/gp32/gp32_launcher.cpp @@ -23,7 +23,6 @@ * */ -#include "stdafx.h" #include "common/scummsys.h" #include "common/file.h" diff --git a/backends/platform/gp32/gp32_launcher.h b/backends/platform/gp32/gp32_launcher.h index d7384e4caa..fee9e9b60e 100644 --- a/backends/platform/gp32/gp32_launcher.h +++ b/backends/platform/gp32/gp32_launcher.h @@ -26,7 +26,6 @@ #ifndef __GP32_LAUNCHER_H #define __GP32_LAUNCHER_H -#include "stdafx.h" #include "common/scummsys.h" extern void readConfigVars(); diff --git a/backends/platform/gp32/gp32_main.cpp b/backends/platform/gp32/gp32_main.cpp index 578ef86e4e..e985993e5f 100644 --- a/backends/platform/gp32/gp32_main.cpp +++ b/backends/platform/gp32/gp32_main.cpp @@ -23,7 +23,6 @@ * */ -#include "stdafx.h" #include "common/scummsys.h" #include "common/config-manager.h" diff --git a/backends/platform/gp32/gp32_osys.cpp b/backends/platform/gp32/gp32_osys.cpp index f6e0a10bbc..56a9f103ed 100644 --- a/backends/platform/gp32/gp32_osys.cpp +++ b/backends/platform/gp32/gp32_osys.cpp @@ -23,7 +23,6 @@ * */ -#include "stdafx.h" #include "common/scummsys.h" #include "common/system.h" diff --git a/backends/platform/gp32/gp32_osys.h b/backends/platform/gp32/gp32_osys.h index 94578e8e15..3c6e0686f4 100644 --- a/backends/platform/gp32/gp32_osys.h +++ b/backends/platform/gp32/gp32_osys.h @@ -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" diff --git a/backends/platform/gp32/gp32std.cpp b/backends/platform/gp32/gp32std.cpp index 7218505436..898d4669b6 100644 --- a/backends/platform/gp32/gp32std.cpp +++ b/backends/platform/gp32/gp32std.cpp @@ -23,7 +23,6 @@ * */ -#include "stdafx.h" #include "common/scummsys.h" //#include "graphics/scaler.h" #include "common/system.h" diff --git a/backends/platform/gp32/gp32std_file.cpp b/backends/platform/gp32/gp32std_file.cpp index fcd9acf4da..61fe3da0ee 100644 --- a/backends/platform/gp32/gp32std_file.cpp +++ b/backends/platform/gp32/gp32std_file.cpp @@ -24,7 +24,6 @@ */ -#include "stdafx.h" #include "common/scummsys.h" //#include "graphics/scaler.h" #include "common/system.h" diff --git a/backends/platform/gp32/gp32std_grap.cpp b/backends/platform/gp32/gp32std_grap.cpp index 275513818d..50349d6708 100644 --- a/backends/platform/gp32/gp32std_grap.cpp +++ b/backends/platform/gp32/gp32std_grap.cpp @@ -23,7 +23,6 @@ * */ -#include "stdafx.h" #include "common/scummsys.h" #include "common/system.h" #include "backends/intern.h" diff --git a/backends/platform/gp32/gp32std_input.cpp b/backends/platform/gp32/gp32std_input.cpp index de82f8b0bc..a3ad7a00c8 100644 --- a/backends/platform/gp32/gp32std_input.cpp +++ b/backends/platform/gp32/gp32std_input.cpp @@ -23,7 +23,6 @@ * */ -#include "stdafx.h" #include "common/scummsys.h" #include "gp32std.h" diff --git a/backends/platform/gp32/gp32std_input.h b/backends/platform/gp32/gp32std_input.h index 6c765d840f..bd784d3432 100644 --- a/backends/platform/gp32/gp32std_input.h +++ b/backends/platform/gp32/gp32std_input.h @@ -26,7 +26,6 @@ #ifndef __GP32STD_INPUT_H #define __GP32STD_INPUT_H -#include "stdafx.h" #include "common/scummsys.h" #define BUTTON_DOWN 1 diff --git a/backends/platform/gp32/gp32std_memory.cpp b/backends/platform/gp32/gp32std_memory.cpp index 449fec9f95..607ea7659a 100644 --- a/backends/platform/gp32/gp32std_memory.cpp +++ b/backends/platform/gp32/gp32std_memory.cpp @@ -23,7 +23,6 @@ * */ -#include "stdafx.h" #include "common/scummsys.h" //#include "graphics/scaler.h" #include "common/system.h" diff --git a/backends/platform/gp32/gp32std_sound.cpp b/backends/platform/gp32/gp32std_sound.cpp index 70969bc1b7..71c09c900c 100644 --- a/backends/platform/gp32/gp32std_sound.cpp +++ b/backends/platform/gp32/gp32std_sound.cpp @@ -23,7 +23,6 @@ * */ -#include "stdafx.h" #include "common/scummsys.h" #include "gp32std.h" diff --git a/backends/platform/maemo/maemo-sdl.cpp b/backends/platform/maemo/maemo-sdl.cpp index 7d0c218ca8..cb0141924b 100644 --- a/backends/platform/maemo/maemo-sdl.cpp +++ b/backends/platform/maemo/maemo-sdl.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "backends/platform/maemo/maemo-sdl.h" diff --git a/backends/platform/maemo/maemo-sdl.h b/backends/platform/maemo/maemo-sdl.h index 530af27af6..f45648a9e6 100644 --- a/backends/platform/maemo/maemo-sdl.h +++ b/backends/platform/maemo/maemo-sdl.h @@ -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" diff --git a/backends/platform/maemo/main.cpp b/backends/platform/maemo/main.cpp index 73a5aff7bc..af5c6b4c10 100644 --- a/backends/platform/maemo/main.cpp +++ b/backends/platform/maemo/main.cpp @@ -23,7 +23,6 @@ * */ -#include #include #include #include diff --git a/backends/platform/null/null.cpp b/backends/platform/null/null.cpp index 250ca0fb29..194a7b6889 100644 --- a/backends/platform/null/null.cpp +++ b/backends/platform/null/null.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/system.h" #include "base/main.h" diff --git a/backends/platform/ps2/systemps2.cpp b/backends/platform/ps2/systemps2.cpp index 6572166e91..f842874850 100644 --- a/backends/platform/ps2/systemps2.cpp +++ b/backends/platform/ps2/systemps2.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include #include #include diff --git a/backends/platform/ps2/systemps2.h b/backends/platform/ps2/systemps2.h index 033431a6fd..beae62dc0e 100644 --- a/backends/platform/ps2/systemps2.h +++ b/backends/platform/ps2/systemps2.h @@ -26,7 +26,6 @@ #ifndef SYSTEMPS2_H #define SYSTEMPS2_H -#include "common/stdafx.h" #include "common/system.h" class Gs2dScreen; diff --git a/backends/platform/psp/osys_psp.cpp b/backends/platform/psp/osys_psp.cpp index 5144f5a401..ed615d7955 100644 --- a/backends/platform/psp/osys_psp.cpp +++ b/backends/platform/psp/osys_psp.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/config-manager.h" #include "common/events.h" #include "common/rect.h" diff --git a/backends/platform/psp/osys_psp.h b/backends/platform/psp/osys_psp.h index 7c0932dc20..a7a4834441 100644 --- a/backends/platform/psp/osys_psp.h +++ b/backends/platform/psp/osys_psp.h @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" #include "backends/intern.h" diff --git a/backends/platform/psp/osys_psp_gu.h b/backends/platform/psp/osys_psp_gu.h index 6486e7f3cc..af67be5185 100644 --- a/backends/platform/psp/osys_psp_gu.h +++ b/backends/platform/psp/osys_psp_gu.h @@ -22,7 +22,6 @@ */ #include -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/rect.h" diff --git a/backends/platform/psp/psp_main.cpp b/backends/platform/psp/psp_main.cpp index 8cfed7e573..92d6beea74 100644 --- a/backends/platform/psp/psp_main.cpp +++ b/backends/platform/psp/psp_main.cpp @@ -31,7 +31,6 @@ #include #endif -#include #include #include #include diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h index 35e6dde1cd..fde721c36a 100644 --- a/backends/platform/sdl/sdl.h +++ b/backends/platform/sdl/sdl.h @@ -28,7 +28,6 @@ #include -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" #include "graphics/scaler.h" @@ -215,7 +214,7 @@ protected: // 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 @@ protected: int _mode; int _transactionMode; bool _fullscreen; - + bool _screenIsLocked; Graphics::Surface _framebuffer; @@ -368,7 +367,7 @@ protected: Common::SaveFileManager *_savefile; Audio::Mixer *_mixer; - + SDL_TimerID _timerID; Common::TimerManager *_timer; @@ -382,7 +381,7 @@ protected: 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 @@ protected: 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(); diff --git a/backends/platform/symbian/src/SymbianActions.cpp b/backends/platform/symbian/src/SymbianActions.cpp index 3809253032..23b554c532 100644 --- a/backends/platform/symbian/src/SymbianActions.cpp +++ b/backends/platform/symbian/src/SymbianActions.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "backends/platform/symbian/src/SymbianActions.h" #include "gui/message.h" diff --git a/backends/platform/symbian/src/SymbianActions.h b/backends/platform/symbian/src/SymbianActions.h index cbd333e500..1e68fbbe46 100644 --- a/backends/platform/symbian/src/SymbianActions.h +++ b/backends/platform/symbian/src/SymbianActions.h @@ -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" diff --git a/backends/platform/wince/CEActionsPocket.cpp b/backends/platform/wince/CEActionsPocket.cpp index efada68ad9..43e2594ac5 100644 --- a/backends/platform/wince/CEActionsPocket.cpp +++ b/backends/platform/wince/CEActionsPocket.cpp @@ -24,7 +24,6 @@ */ -#include "common/stdafx.h" #include "CEActionsPocket.h" #include "EventsBuffer.h" #include "gui/message.h" diff --git a/backends/platform/wince/CEActionsPocket.h b/backends/platform/wince/CEActionsPocket.h index 9749ca60ef..ae0ed19975 100644 --- a/backends/platform/wince/CEActionsPocket.h +++ b/backends/platform/wince/CEActionsPocket.h @@ -26,7 +26,6 @@ #ifndef CEACTIONSPOCKET #define CEACTIONSPOCKET -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" #include "wince-sdl.h" diff --git a/backends/platform/wince/CEActionsSmartphone.cpp b/backends/platform/wince/CEActionsSmartphone.cpp index 227318d552..a04c818070 100644 --- a/backends/platform/wince/CEActionsSmartphone.cpp +++ b/backends/platform/wince/CEActionsSmartphone.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "CEActionsSmartphone.h" #include "EventsBuffer.h" #include "gui/message.h" diff --git a/backends/platform/wince/CEActionsSmartphone.h b/backends/platform/wince/CEActionsSmartphone.h index 590302ef26..eacc571a67 100644 --- a/backends/platform/wince/CEActionsSmartphone.h +++ b/backends/platform/wince/CEActionsSmartphone.h @@ -26,7 +26,6 @@ #ifndef CEACTIONSSMARTPHONE #define CEACTIONSSMARTPHONE -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" #include "wince-sdl.h" diff --git a/backends/platform/wince/CEDevice.cpp b/backends/platform/wince/CEDevice.cpp index 855c601741..7fda42d109 100644 --- a/backends/platform/wince/CEDevice.cpp +++ b/backends/platform/wince/CEDevice.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "CEDevice.h" #include diff --git a/backends/platform/wince/CEDevice.h b/backends/platform/wince/CEDevice.h index c2dab4e793..9fee8497c2 100644 --- a/backends/platform/wince/CEDevice.h +++ b/backends/platform/wince/CEDevice.h @@ -26,7 +26,6 @@ #ifndef CEDEVICE #define CEDEVICE -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" #include "common/str.h" diff --git a/backends/platform/wince/CELauncherDialog.cpp b/backends/platform/wince/CELauncherDialog.cpp index aef85ebf6c..aac2fdbe7c 100644 --- a/backends/platform/wince/CELauncherDialog.cpp +++ b/backends/platform/wince/CELauncherDialog.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "wince-sdl.h" diff --git a/backends/platform/wince/CEScaler.cpp b/backends/platform/wince/CEScaler.cpp index a09c4dcc65..bb1aaec0be 100644 --- a/backends/platform/wince/CEScaler.cpp +++ b/backends/platform/wince/CEScaler.cpp @@ -23,7 +23,6 @@ * */ #include "graphics/scaler/intern.h" -#include "common/stdafx.h" #include "CEScaler.h" int redblueMasks[] = { 0x7C1F, 0xF81F }; diff --git a/backends/platform/wince/CEScaler.h b/backends/platform/wince/CEScaler.h index b02b0555f1..7a8705a221 100644 --- a/backends/platform/wince/CEScaler.h +++ b/backends/platform/wince/CEScaler.h @@ -26,7 +26,6 @@ #ifndef CESCALER #define CESCALER -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" #include "graphics/scaler.h" diff --git a/backends/platform/wince/CEgui/GUIElement.cpp b/backends/platform/wince/CEgui/GUIElement.cpp index 6c74e7e7e7..a37182e69d 100644 --- a/backends/platform/wince/CEgui/GUIElement.cpp +++ b/backends/platform/wince/CEgui/GUIElement.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "Toolbar.h" #include "SDL_ImageResource.h" diff --git a/backends/platform/wince/CEgui/GUIElement.h b/backends/platform/wince/CEgui/GUIElement.h index ebf80320e7..beb9d95047 100644 --- a/backends/platform/wince/CEgui/GUIElement.h +++ b/backends/platform/wince/CEgui/GUIElement.h @@ -26,7 +26,6 @@ #ifndef CEGUI_GUIELEMENT #define CEGUI_GUIELEMENT -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" diff --git a/backends/platform/wince/CEgui/ItemAction.cpp b/backends/platform/wince/CEgui/ItemAction.cpp index f9bf903cd2..3808622b2e 100644 --- a/backends/platform/wince/CEgui/ItemAction.cpp +++ b/backends/platform/wince/CEgui/ItemAction.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "ItemAction.h" namespace CEGUI { diff --git a/backends/platform/wince/CEgui/ItemAction.h b/backends/platform/wince/CEgui/ItemAction.h index 35747374b9..e2cd5b2367 100644 --- a/backends/platform/wince/CEgui/ItemAction.h +++ b/backends/platform/wince/CEgui/ItemAction.h @@ -26,7 +26,6 @@ #ifndef CEGUI_ITEMACTION #define CEGUI_ITEMACTION -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" diff --git a/backends/platform/wince/CEgui/ItemSwitch.cpp b/backends/platform/wince/CEgui/ItemSwitch.cpp index 7fc32ac67f..445b3bb69b 100644 --- a/backends/platform/wince/CEgui/ItemSwitch.cpp +++ b/backends/platform/wince/CEgui/ItemSwitch.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "ItemSwitch.h" namespace CEGUI { diff --git a/backends/platform/wince/CEgui/ItemSwitch.h b/backends/platform/wince/CEgui/ItemSwitch.h index cd9dacbc83..1fa5732b6a 100644 --- a/backends/platform/wince/CEgui/ItemSwitch.h +++ b/backends/platform/wince/CEgui/ItemSwitch.h @@ -26,7 +26,6 @@ #ifndef CEGUI_ITEMSWITCH #define CEGUI_ITEMSWITCH -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" diff --git a/backends/platform/wince/CEgui/Panel.cpp b/backends/platform/wince/CEgui/Panel.cpp index 3d120d87bb..a2d965ca78 100644 --- a/backends/platform/wince/CEgui/Panel.cpp +++ b/backends/platform/wince/CEgui/Panel.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "Panel.h" namespace CEGUI { diff --git a/backends/platform/wince/CEgui/Panel.h b/backends/platform/wince/CEgui/Panel.h index 549f692ea0..0b55c00dee 100644 --- a/backends/platform/wince/CEgui/Panel.h +++ b/backends/platform/wince/CEgui/Panel.h @@ -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" diff --git a/backends/platform/wince/CEgui/PanelItem.cpp b/backends/platform/wince/CEgui/PanelItem.cpp index 12353f6d39..0898839c5d 100644 --- a/backends/platform/wince/CEgui/PanelItem.cpp +++ b/backends/platform/wince/CEgui/PanelItem.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "PanelItem.h" namespace CEGUI { diff --git a/backends/platform/wince/CEgui/PanelItem.h b/backends/platform/wince/CEgui/PanelItem.h index d11f943a6a..82e9b03e22 100644 --- a/backends/platform/wince/CEgui/PanelItem.h +++ b/backends/platform/wince/CEgui/PanelItem.h @@ -26,7 +26,6 @@ #ifndef CEGUI_PANELITEM #define CEGUI_PANELITEM -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" diff --git a/backends/platform/wince/CEgui/PanelKeyboard.cpp b/backends/platform/wince/CEgui/PanelKeyboard.cpp index 79b833f84b..369a75cae1 100644 --- a/backends/platform/wince/CEgui/PanelKeyboard.cpp +++ b/backends/platform/wince/CEgui/PanelKeyboard.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "PanelKeyboard.h" namespace CEGUI { diff --git a/backends/platform/wince/CEgui/PanelKeyboard.h b/backends/platform/wince/CEgui/PanelKeyboard.h index d0182ce5fe..5ef4adc73e 100644 --- a/backends/platform/wince/CEgui/PanelKeyboard.h +++ b/backends/platform/wince/CEgui/PanelKeyboard.h @@ -26,7 +26,6 @@ #ifndef CEGUI_PANELKEYBOARD #define CEGUI_PANELKEYBOARD -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" diff --git a/backends/platform/wince/CEgui/SDL_ImageResource.cpp b/backends/platform/wince/CEgui/SDL_ImageResource.cpp index de055f2e54..e1a9d911de 100644 --- a/backends/platform/wince/CEgui/SDL_ImageResource.cpp +++ b/backends/platform/wince/CEgui/SDL_ImageResource.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "SDL_ImageResource.h" namespace CEGUI { diff --git a/backends/platform/wince/CEgui/SDL_ImageResource.h b/backends/platform/wince/CEgui/SDL_ImageResource.h index 3dffbac281..140a11c356 100644 --- a/backends/platform/wince/CEgui/SDL_ImageResource.h +++ b/backends/platform/wince/CEgui/SDL_ImageResource.h @@ -26,7 +26,6 @@ #ifndef CEGUI_SDL_IMAGERESOURCE #define CEGUI_SDL_IMAGERESOURCE -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" diff --git a/backends/platform/wince/CEgui/Toolbar.cpp b/backends/platform/wince/CEgui/Toolbar.cpp index d8c23b3d08..0501249de9 100644 --- a/backends/platform/wince/CEgui/Toolbar.cpp +++ b/backends/platform/wince/CEgui/Toolbar.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "Toolbar.h" namespace CEGUI { diff --git a/backends/platform/wince/CEgui/Toolbar.h b/backends/platform/wince/CEgui/Toolbar.h index f60947925e..c23559d315 100644 --- a/backends/platform/wince/CEgui/Toolbar.h +++ b/backends/platform/wince/CEgui/Toolbar.h @@ -26,7 +26,6 @@ #ifndef CEGUI_TOOLBAR #define CEGUI_TOOLBAR -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" diff --git a/backends/platform/wince/CEgui/ToolbarHandler.cpp b/backends/platform/wince/CEgui/ToolbarHandler.cpp index eb65984778..94319901dc 100644 --- a/backends/platform/wince/CEgui/ToolbarHandler.cpp +++ b/backends/platform/wince/CEgui/ToolbarHandler.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "ToolbarHandler.h" namespace CEGUI { diff --git a/backends/platform/wince/CEgui/ToolbarHandler.h b/backends/platform/wince/CEgui/ToolbarHandler.h index 4606d59302..30a299d153 100644 --- a/backends/platform/wince/CEgui/ToolbarHandler.h +++ b/backends/platform/wince/CEgui/ToolbarHandler.h @@ -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" diff --git a/backends/platform/wince/CEkeys/EventsBuffer.cpp b/backends/platform/wince/CEkeys/EventsBuffer.cpp index 19978c23dc..92a21ab7ad 100644 --- a/backends/platform/wince/CEkeys/EventsBuffer.cpp +++ b/backends/platform/wince/CEkeys/EventsBuffer.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "EventsBuffer.h" namespace CEKEYS { diff --git a/backends/platform/wince/CEkeys/EventsBuffer.h b/backends/platform/wince/CEkeys/EventsBuffer.h index 541e1b15c8..2e13770d25 100644 --- a/backends/platform/wince/CEkeys/EventsBuffer.h +++ b/backends/platform/wince/CEkeys/EventsBuffer.h @@ -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" diff --git a/backends/platform/wince/wince-sdl.cpp b/backends/platform/wince/wince-sdl.cpp index c19ac3d898..5353c9e39d 100644 --- a/backends/platform/wince/wince-sdl.cpp +++ b/backends/platform/wince/wince-sdl.cpp @@ -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" diff --git a/backends/platform/wince/wince-sdl.h b/backends/platform/wince/wince-sdl.h index e74c438807..ab1e896bf9 100644 --- a/backends/platform/wince/wince-sdl.h +++ b/backends/platform/wince/wince-sdl.h @@ -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" diff --git a/backends/platform/x11/x11.cpp b/backends/platform/x11/x11.cpp index 56e9b2a79b..e82b4bf2d6 100644 --- a/backends/platform/x11/x11.cpp +++ b/backends/platform/x11/x11.cpp @@ -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" diff --git a/backends/plugins/dc/dc-provider.h b/backends/plugins/dc/dc-provider.h index e4db3090ee..bcf4305bba 100644 --- a/backends/plugins/dc/dc-provider.h +++ b/backends/plugins/dc/dc-provider.h @@ -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__) diff --git a/backends/plugins/dynamic-plugin.h b/backends/plugins/dynamic-plugin.h index dd3b84fb53..a7a8eb5b96 100644 --- a/backends/plugins/dynamic-plugin.h +++ b/backends/plugins/dynamic-plugin.h @@ -26,7 +26,6 @@ #ifndef BACKENDS_PLUGINS_DYNAMICPLUGIN_H #define BACKENDS_PLUGINS_DYNAMICPLUGIN_H -#include "common/stdafx.h" #include "base/plugins.h" diff --git a/backends/plugins/posix/posix-provider.h b/backends/plugins/posix/posix-provider.h index df9e81c741..5795ba811f 100644 --- a/backends/plugins/posix/posix-provider.h +++ b/backends/plugins/posix/posix-provider.h @@ -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) diff --git a/backends/plugins/sdl/sdl-provider.h b/backends/plugins/sdl/sdl-provider.h index 87607d6a19..5a82f26079 100644 --- a/backends/plugins/sdl/sdl-provider.h +++ b/backends/plugins/sdl/sdl-provider.h @@ -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) diff --git a/backends/plugins/win32/win32-provider.h b/backends/plugins/win32/win32-provider.h index d653c5b534..985ffa42c1 100644 --- a/backends/plugins/win32/win32-provider.h +++ b/backends/plugins/win32/win32-provider.h @@ -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) diff --git a/backends/saves/compressed/compressed-saves.cpp b/backends/saves/compressed/compressed-saves.cpp index dae2c707ef..150cf5c47d 100644 --- a/backends/saves/compressed/compressed-saves.cpp +++ b/backends/saves/compressed/compressed-saves.cpp @@ -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 @@ protected: enum { BUFSIZE = 16384 // 1 << MAX_WBITS }; - + byte _buf[BUFSIZE]; Common::InSaveFile *_wrapped; @@ -62,13 +61,13 @@ public: _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 @@ public: } _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 @@ public: _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 @@ public: } _zlibErr = inflate(&_stream, Z_NO_FLUSH); } - + // Update the position counter _pos += dataSize - _stream.avail_out; @@ -155,7 +154,7 @@ public: // 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 @@ protected: enum { BUFSIZE = 16384 // 1 << MAX_WBITS }; - + byte _buf[BUFSIZE]; Common::OutSaveFile *_wrapped; z_stream _stream; @@ -203,7 +202,7 @@ public: _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 @@ public: // of the const keyword. _stream.next_in = const_cast((const byte *)dataPtr); _stream.avail_in = dataSize; - + // ... and flush it to disk processData(Z_NO_FLUSH); diff --git a/backends/saves/compressed/compressed-saves.h b/backends/saves/compressed/compressed-saves.h index 031007ef8b..205c5db05b 100644 --- a/backends/saves/compressed/compressed-saves.h +++ b/backends/saves/compressed/compressed-saves.h @@ -26,7 +26,6 @@ #ifndef BACKEND_SAVES_COMPRESSED_H #define BACKEND_SAVES_COMPRESSED_H -#include "common/stdafx.h" #include "common/savefile.h" /** diff --git a/backends/saves/default/default-saves.cpp b/backends/saves/default/default-saves.cpp index f4742f15a0..702b404434 100644 --- a/backends/saves/default/default-saves.cpp +++ b/backends/saves/default/default-saves.cpp @@ -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 @@ Common::StringList DefaultSaveFileManager::listSavefiles(const char *regex) { 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 @@ Common::OutSaveFile *DefaultSaveFileManager::openForSaving(const char *filename) // 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 @@ Common::OutSaveFile *DefaultSaveFileManager::openForSaving(const char *filename) // 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 @@ Common::OutSaveFile *DefaultSaveFileManager::openForSaving(const char *filename) 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 @@ Common::OutSaveFile *DefaultSaveFileManager::openForSaving(const char *filename) delete sf; sf = 0; } - + return wrapOutSaveFile(sf); } diff --git a/backends/saves/default/default-saves.h b/backends/saves/default/default-saves.h index 9346e79700..8c4fe54bb7 100644 --- a/backends/saves/default/default-saves.h +++ b/backends/saves/default/default-saves.h @@ -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" diff --git a/backends/saves/savefile.cpp b/backends/saves/savefile.cpp index 4b50e9c57d..499edb0b28 100644 --- a/backends/saves/savefile.cpp +++ b/backends/saves/savefile.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/util.h" #include "common/config-manager.h" #include "common/savefile.h" diff --git a/backends/timer/default/default-timer.cpp b/backends/timer/default/default-timer.cpp index 5dfb3bdc83..8d766740c4 100644 --- a/backends/timer/default/default-timer.cpp +++ b/backends/timer/default/default-timer.cpp @@ -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 @@ struct TimerSlot { 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 @@ void insertPrioQueue(TimerSlot *head, TimerSlot *newSlot) { 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 @@ void DefaultTimerManager::handler() { 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 @@ void DefaultTimerManager::handler() { // Invoke the timer callback assert(slot->callback); slot->callback(slot->refCon); - + // Look at the next scheduled timer slot = _head->next; } @@ -117,7 +116,7 @@ void DefaultTimerManager::handler() { 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 @@ bool DefaultTimerManager::installTimerProc(TimerProc callback, int32 interval, v slot->nextFireTime = g_system->getMillis() + interval / 1000; slot->nextFireTimeMicro = interval % 1000; slot->next = 0; - + insertPrioQueue(_head, slot); return true; @@ -135,7 +134,7 @@ void DefaultTimerManager::removeTimerProc(TimerProc callback) { Common::StackLock lock(_mutex); TimerSlot *slot = _head; - + while (slot->next) { if (slot->next->callback == callback) { TimerSlot *next = slot->next->next; diff --git a/base/commandLine.cpp b/base/commandLine.cpp index b2cde4f7d9..20b6dfd053 100644 --- a/base/commandLine.cpp +++ b/base/commandLine.cpp @@ -23,8 +23,6 @@ * */ -#include "common/stdafx.h" - #include "engines/engine.h" #include "base/commandLine.h" #include "base/plugins.h" @@ -297,7 +295,7 @@ void registerDefaults() { 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 @@ Common::String parseCommandLine(Common::StringMap &settings, int argc, char **ar 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 @@ static void runDetectorTest() { // 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 @@ static void runDetectorTest() { if (gameid.empty()) { gameid = name; } - + FilesystemNode dir(path); FSList files; if (!dir.getChildren(files, FilesystemNode::kListAll)) { @@ -590,7 +588,7 @@ static void runDetectorTest() { 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 @@ static void runDetectorTest() { 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,7 +678,7 @@ bool processSettings(Common::String &command, Common::StringMap &settings) { 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 @@ -711,7 +709,7 @@ bool processSettings(Common::String &command, Common::StringMap &settings) { 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); } diff --git a/base/game.h b/base/game.h index ab52601752..0764b7fbac 100644 --- a/base/game.h +++ b/base/game.h @@ -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" diff --git a/base/main.cpp b/base/main.cpp index 7a90c15ec6..8030866e3d 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -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 @@ static const Plugin *detectPlugin() { 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 @@ static int runGame(const Plugin *plugin, OSystem &system, const Common::String & } // 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 @@ extern "C" int scummvm_main(int argc, char *argv[]) { // 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 @@ extern "C" int scummvm_main(int argc, char *argv[]) { // 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 @@ extern "C" int scummvm_main(int argc, char *argv[]) { // 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 @@ extern "C" int scummvm_main(int argc, char *argv[]) { // 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(""); diff --git a/base/plugins.cpp b/base/plugins.cpp index 84f1d22501..836ea14c41 100644 --- a/base/plugins.cpp +++ b/base/plugins.cpp @@ -35,7 +35,7 @@ public: : _plugin(plugin) { assert(_plugin); } - + ~StaticPlugin() { delete _plugin; } @@ -68,24 +68,24 @@ class StaticPluginProvider : public PluginProvider { 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() { 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 @@ bool PluginManager::tryLoadPlugin(Plugin *plugin) { 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 @@ bool PluginManager::tryLoadPlugin(Plugin *plugin) { // 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 diff --git a/base/plugins.h b/base/plugins.h index 2ac87882af..c89b590a73 100644 --- a/base/plugins.h +++ b/base/plugins.h @@ -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 @@ enum PluginError { kInvalidPathError, kNoGameDataFoundError, kUnsupportedGameidError, - + kUnknownError // Catch-all error, used if no other error code matches }; @@ -158,7 +157,7 @@ typedef Common::Array PluginList; 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 @@ private: public: ~PluginManager(); - + void addPluginProvider(PluginProvider *pp); void loadPlugins(); diff --git a/base/version.cpp b/base/version.cpp index b41ec00ea0..8de96d0b78 100644 --- a/base/version.cpp +++ b/base/version.cpp @@ -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 @@ const char *gScummVMFeatures = "" "Vorbis " #endif #endif - + #ifdef USE_FLAC "FLAC " #endif diff --git a/common/advancedDetector.cpp b/common/advancedDetector.cpp index f3e8671025..1a3ae13a9e 100644 --- a/common/advancedDetector.cpp +++ b/common/advancedDetector.cpp @@ -23,8 +23,6 @@ * */ -#include "common/stdafx.h" - #include "base/plugins.h" #include "common/util.h" @@ -316,7 +314,7 @@ static ADGameDescList detectGame(const FSList *fslist, const Common::ADParams &p File testFile; String tstr; - + uint i; char md5str[32+1]; @@ -458,7 +456,7 @@ static ADGameDescList detectGame(const FSList *fslist, const Common::ADParams &p } } - // We've found a match + // We've found a match if (!matched.empty()) return matched; diff --git a/common/array.h b/common/array.h index 6f16663e67..af9ec811da 100644 --- a/common/array.h +++ b/common/array.h @@ -25,7 +25,6 @@ #ifndef COMMON_ARRAY_H #define COMMON_ARRAY_H -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/algorithm.h" diff --git a/common/config-file.cpp b/common/config-file.cpp index c89c169b44..fe827e32dc 100644 --- a/common/config-file.cpp +++ b/common/config-file.cpp @@ -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 @@ bool ConfigFile::loadFromStream(SeekableReadStream &stream) { // 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] == '[') { diff --git a/common/config-manager.cpp b/common/config-manager.cpp index 5c0cd7c40f..da31161919 100644 --- a/common/config-manager.cpp +++ b/common/config-manager.cpp @@ -29,8 +29,6 @@ #undef ARRAYSIZE #endif -#include "common/stdafx.h" - #include "common/config-manager.h" #include "common/file.h" #include "common/util.h" diff --git a/common/file.h b/common/file.h index 416ca75ec7..4bec6605e7 100644 --- a/common/file.h +++ b/common/file.h @@ -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 @@ public: virtual bool remove(const String &filename); virtual bool remove(const FilesystemNode &node); - + /** * Checks if the object opened a file successfully. * diff --git a/common/fs.cpp b/common/fs.cpp index d395686be3..7d7aa363fc 100644 --- a/common/fs.cpp +++ b/common/fs.cpp @@ -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 FilesystemNode &node) { FilesystemNode::FilesystemNode(const Common::String &p) { AbstractFilesystemFactory *factory = AbstractFilesystemFactory::makeFSFactory(); - + if (p.empty() || p == ".") _realNode = factory->makeCurrentDirectoryFileNode(); else @@ -113,7 +112,7 @@ bool FilesystemNode::operator<(const FilesystemNode& node) const return true; if (!isDirectory() && node.isDirectory()) return false; - + return scumm_stricmp(getDisplayName().c_str(), node.getDisplayName().c_str()) < 0; } @@ -131,7 +130,7 @@ void FilesystemNode::decRefCount() { bool FilesystemNode::exists() const { if (_realNode == 0) return false; - + return _realNode->exists(); } @@ -149,15 +148,15 @@ bool FilesystemNode::getChildren(FSList &fslist, ListMode mode, bool hidden) con 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 @@ Common::String FilesystemNode::getPath() const { 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, FSList &fslist, Common::String 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 @@ int FilesystemNode::lookupFileRec(FSList &results, FilesystemNode &dir, Common:: 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 @@ int FilesystemNode::lookupFileRec(FSList &results, FilesystemNode &dir, Common:: 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; } diff --git a/common/hashmap.h b/common/hashmap.h index 28ba022e70..a4e7d6ab60 100644 --- a/common/hashmap.h +++ b/common/hashmap.h @@ -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 @@ uint nextTableSize(uint x); * 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 EqualFunc = EqualTo > class HashMap { friend class const_iterator; @@ -102,13 +101,13 @@ public: 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 @@ public: } 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 @@ public: 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 @@ HashMap::HashMap() memset(_arr, 0, _arrsize * sizeof(Node *)); _nele = 0; - + #ifdef DEBUG_HASH_COLLISIONS _collisions = 0; _lookups = 0; @@ -312,7 +311,7 @@ void HashMap::expand_array(uint newsize) { 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 @@ int HashMap::lookup(const Key &key) const { _collisions++; #endif } - + #ifdef DEBUG_HASH_COLLISIONS _lookups++; fprintf(stderr, "collisions %d, lookups %d, ratio %f in HashMap %p; size %d num elements %d\n", diff --git a/common/iff_container.h b/common/iff_container.h index cc55970591..10175d42e9 100644 --- a/common/iff_container.h +++ b/common/iff_container.h @@ -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" diff --git a/common/mutex.cpp b/common/mutex.cpp index 693b14db2f..7a2601477d 100644 --- a/common/mutex.cpp +++ b/common/mutex.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/mutex.h" #include "common/system.h" diff --git a/common/savefile.h b/common/savefile.h index 9fdd76ae15..31a9d98a19 100644 --- a/common/savefile.h +++ b/common/savefile.h @@ -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 @@ public: * 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 @@ public: * @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. diff --git a/common/scummsys.h b/common/scummsys.h index 25c5c166e3..46ead5f29a 100644 --- a/common/scummsys.h +++ b/common/scummsys.h @@ -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 + +#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 /* For strcasecmp */ + #endif + + #include + #include + #include + #include + #include + #include + #include + #include + +#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 - + #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 diff --git a/common/stdafx.h b/common/stdafx.h deleted file mode 100644 index 19f2bc8aef..0000000000 --- a/common/stdafx.h +++ /dev/null @@ -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 - -#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 /* For strcasecmp */ - #endif - - #include - #include - #include - #include - #include - #include - #include - #include - -#endif - -#endif diff --git a/common/str.cpp b/common/str.cpp index 88aca87bb4..9d40fe8902 100644 --- a/common/str.cpp +++ b/common/str.cpp @@ -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 @@ String::String(const char *str, uint32 len) 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 @@ String::String(const char *str, uint32 len) _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(const String &str) String::String(char c) : _len(0), _str(_storage) { - + _storage[0] = c; _storage[1] = 0; - + _len = (c == 0) ? 0 : 1; } @@ -145,7 +143,7 @@ String &String::operator =(const String &str) { } else { str.incRefCount(); decRefCount(_extern._refCount); - + _extern._refCount = str._extern._refCount; _extern._capacity = str._extern._capacity; _len = str._len; @@ -285,7 +283,7 @@ void String::ensureCapacity(uint32 new_len, bool keep_old) { uint32 curCapacity, newCapacity; char *newStorage; int *oldRefCount = _extern._refCount; - + if (isStorageIntern()) { isShared = false; curCapacity = _builtinCapacity - 1; @@ -293,7 +291,7 @@ void String::ensureCapacity(uint32 new_len, bool keep_old) { 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 @@ void String::ensureCapacity(uint32 new_len, bool keep_old) { uint String::hash() const { return hashit(c_str()); } - + #pragma mark - bool String::operator ==(const String &x) const { diff --git a/common/stream.cpp b/common/stream.cpp index c94faf7ec0..ab9804d7b6 100644 --- a/common/stream.cpp +++ b/common/stream.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/stream.h" #include "common/str.h" #include "common/util.h" diff --git a/common/stream.h b/common/stream.h index 9b3ac5a501..d7d96f3605 100644 --- a/common/stream.h +++ b/common/stream.h @@ -26,7 +26,6 @@ #ifndef COMMON_STREAM_H #define COMMON_STREAM_H -#include "common/stdafx.h" #include "common/scummsys.h" namespace Common { @@ -273,7 +272,7 @@ public: int32 readSint32BE() { return (int32)readUint32BE(); } - + /** * Read the specified amount of data into a malloc'ed buffer * which then is wrapped into a MemoryReadStream. diff --git a/common/system.cpp b/common/system.cpp index a1bdb4cdcc..9444c692d6 100644 --- a/common/system.cpp +++ b/common/system.cpp @@ -23,8 +23,6 @@ * */ -#include "common/stdafx.h" - #include "backends/intern.h" #include "backends/events/default/default-events.h" @@ -111,7 +109,7 @@ static Common::EventManager *s_eventManager = 0; Common::EventManager *OSystem::getEventManager() { // FIXME/TODO: Eventually this method should be turned into an abstract one, - // to force backends to implement this conciously (even if they + // to force backends to implement this conciously (even if they // end up returning the default event manager anyway). if (!s_eventManager) s_eventManager = new DefaultEventManager(this); diff --git a/common/unzip.cpp b/common/unzip.cpp index 379c20dc02..6af4653c5d 100644 --- a/common/unzip.cpp +++ b/common/unzip.cpp @@ -28,7 +28,6 @@ Read unzip.h for more info */ -#include "common/stdafx.h" #include "common/scummsys.h" #ifdef USE_ZLIB diff --git a/common/unzip.h b/common/unzip.h index 0152690516..af9f738880 100644 --- a/common/unzip.h +++ b/common/unzip.h @@ -65,7 +65,6 @@ #ifndef _unz_H #define _unz_H -#include "common/stdafx.h" #include "common/scummsys.h" #ifdef USE_ZLIB diff --git a/common/util.cpp b/common/util.cpp index 389e229a78..8bf704456a 100644 --- a/common/util.cpp +++ b/common/util.cpp @@ -22,7 +22,6 @@ * $Id$ */ -#include "common/stdafx.h" #include "engines/engine.h" #include "common/util.h" #include "common/system.h" @@ -51,7 +50,7 @@ extern bool isSmartphone(void); #define stdout ((DS::fileHandle*) -1) #define stderr ((DS::fileHandle*) -2) #define stdin ((DS::fileHandle*) -3) - + void std_fprintf(FILE* handle, const char* fmt, ...); void std_fflush(FILE* handle); diff --git a/dists/codeblocks/agi.cbp b/dists/codeblocks/agi.cbp index 2d29ff525b..6409d9e857 100644 --- a/dists/codeblocks/agi.cbp +++ b/dists/codeblocks/agi.cbp @@ -103,6 +103,14 @@