[Scummvm-git-logs] scummvm master -> 5e7fe2dc5793406e0f1fd62786a5fd5830ef494d
sev-
sev at scummvm.org
Thu Apr 15 19:20:48 UTC 2021
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
55ed48afba GRAPHICS: Fix 16-bpp rendering for AmigaFont
71888ad4db GUI: Switch to Amiga font in EE rendering
5e7fe2dc57 JANITORIAL: Replace spaces in indentation with tabs
Commit: 55ed48afbaf872bf3aeccd8ae0de30d42c46cc3c
https://github.com/scummvm/scummvm/commit/55ed48afbaf872bf3aeccd8ae0de30d42c46cc3c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-04-15T21:20:35+02:00
Commit Message:
GRAPHICS: Fix 16-bpp rendering for AmigaFont
Changed paths:
graphics/fonts/amigafont.cpp
diff --git a/graphics/fonts/amigafont.cpp b/graphics/fonts/amigafont.cpp
index bbfd4508bc..5c051e36f4 100644
--- a/graphics/fonts/amigafont.cpp
+++ b/graphics/fonts/amigafont.cpp
@@ -293,7 +293,7 @@ void drawCharIntern(byte *ptr, uint32 pitch, int num, int bitOffset, byte *charD
}
s += modulo;
- d += pitch - num;
+ d = (PixelType *)((byte *)d + pitch) - num;
}
}
Commit: 71888ad4db3c26c8410e315a94f7c25e9606c586
https://github.com/scummvm/scummvm/commit/71888ad4db3c26c8410e315a94f7c25e9606c586
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-04-15T21:20:35+02:00
Commit Message:
GUI: Switch to Amiga font in EE rendering
Changed paths:
gui/about.cpp
diff --git a/gui/about.cpp b/gui/about.cpp
index d62b03e862..63635929db 100644
--- a/gui/about.cpp
+++ b/gui/about.cpp
@@ -28,6 +28,7 @@
#include "common/translation.h"
#include "common/util.h"
#include "graphics/managed_surface.h"
+#include "graphics/fonts/amigafont.h"
#include "gui/about.h"
#include "gui/gui-manager.h"
#include "gui/ThemeEval.h"
@@ -389,6 +390,8 @@ private:
int _opts;
int _opt;
+ Graphics::AmigaFont _font;
+
Graphics::Surface _sp[10];
Graphics::PixelFormat _format;
@@ -417,7 +420,7 @@ private:
void playSound(int d);
void genSprites();
- void drawStatus(Common::String str, int x, uint32 color, int y = 0, int color2 = 0, int w = 16);
+ void drawStatus(Common::String str, int x, uint32 color, int y = 2, int color2 = 0, int w = 184);
};
bool EEHandler::handleKeyDown(Common::KeyState &state) {
@@ -1078,7 +1081,7 @@ void EE::init() {
void EE::drawStatus(Common::String str, int x, uint32 color, int y, int color2, int w) {
if (color2)
_back.fillRect(Common::Rect(x, y, x + w, y + 10), color2);
- g_gui.theme()->getFont(ThemeEngine::kFontStyleConsole)->drawString(&_back, str, x, y, 160, color);
+ _font.drawString(&_back, str, x, y + 1, w, color, Graphics::kTextAlignLeft, 0, false);
}
void EE::draw(int sn, int x, int y) {
@@ -1201,11 +1204,11 @@ void EE::putshapes() {
buf[c] = codes[c + 23 * i] - 3 - c % 6;
buf[c] = 0;
- int sx = i == 0 ? 110 : 92;
- int sy = i == 0 ? 0 : 20;
+ int sx = i == 0 ? 92 : 80;
+ int sy = i == 0 ? 2 : 20;
int c1 = i == 0 ? _colorOrange : (i - 1 == _opt) ? 0 : _colorBlue;
int c2 = i - 1 == _opt ? _colorBlue : 0;
- drawStatus(buf, sx, c1, sy + i * 10, c2, 135);
+ drawStatus(buf, sx, c1, sy + i * 10, c2);
if (_mode != kModeMenu)
break;
@@ -1216,14 +1219,14 @@ void EE::putshapes() {
MIN<int>(_windowX, g_system->getOverlayWidth()),
MIN<int>(_windowY, g_system->getOverlayHeight()),
MIN<int>(320, g_system->getOverlayWidth() - MIN<int>(_windowX, g_system->getOverlayWidth())),
- MIN<int>(10, g_system->getOverlayHeight() - MIN<int>(_windowY, g_system->getOverlayHeight()) ));
+ MIN<int>(12, g_system->getOverlayHeight() - MIN<int>(_windowY, g_system->getOverlayHeight()) ));
if (_mode == kModeMenu) {
- g_system->copyRectToOverlay(_back.getBasePtr(92, 30),
+ g_system->copyRectToOverlay(_back.getBasePtr(80, 30),
_back.pitch,
- MIN<int>(_windowX + 92, g_system->getOverlayWidth()),
+ MIN<int>(_windowX + 80, g_system->getOverlayWidth()),
MIN<int>(_windowY + 30, g_system->getOverlayHeight()),
- MIN<int>(135, g_system->getOverlayWidth() - MIN<int>(_windowX + 92, g_system->getOverlayWidth())),
+ MIN<int>(250, g_system->getOverlayWidth() - MIN<int>(_windowX + 80, g_system->getOverlayWidth())),
MIN<int>(5 * 10, g_system->getOverlayHeight() - MIN<int>(_windowY + 30, g_system->getOverlayHeight()) ));
}
}
Commit: 5e7fe2dc5793406e0f1fd62786a5fd5830ef494d
https://github.com/scummvm/scummvm/commit/5e7fe2dc5793406e0f1fd62786a5fd5830ef494d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-04-15T21:20:36+02:00
Commit Message:
JANITORIAL: Replace spaces in indentation with tabs
Changed paths:
audio/adlib.cpp
audio/audiostream.cpp
audio/decoders/ac3.cpp
audio/decoders/adpcm.h
audio/decoders/qdm2.cpp
audio/decoders/qdm2.h
audio/decoders/raw.cpp
audio/decoders/raw.h
audio/decoders/util.h
audio/decoders/wma.cpp
audio/mixer.cpp
backends/audiocd/sdl/sdl-audiocd.cpp
backends/audiocd/win32/msvc/ntddcdrm.h
backends/dialogs/morphos/morphos-dialogs.cpp
backends/events/riscossdl/riscossdl-events.cpp
backends/events/sdl/sdl-events.cpp
backends/events/symbiansdl/symbiansdl-events.cpp
backends/fs/amigaos/amigaos-fs.cpp
backends/fs/chroot/chroot-fs-factory.cpp
backends/fs/morphos/morphos-fs.cpp
backends/fs/posix/posix-fs.cpp
backends/graphics/opengl/framebuffer.cpp
backends/graphics/opengl/opengl-graphics.cpp
backends/graphics/opengl/pipelines/clut8.cpp
backends/graphics/opengl/pipelines/pipeline.cpp
backends/graphics/opengl/pipelines/shader.cpp
backends/graphics/opengl/shader.cpp
backends/graphics/opengl/texture.cpp
backends/graphics/openglsdl/openglsdl-graphics.cpp
backends/graphics/surfacesdl/surfacesdl-graphics.cpp
backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp
backends/keymapper/hardware-input.cpp
backends/log/log.cpp
backends/platform/3ds/osystem-events.cpp
backends/platform/3ds/osystem-graphics.cpp
backends/platform/android3d/events.cpp
backends/platform/dc/audio.cpp
backends/platform/dc/dcloader.cpp
backends/platform/dc/dcloader.h
backends/platform/dc/dcmain.cpp
backends/platform/dc/display.cpp
backends/platform/dc/icon.cpp
backends/platform/dc/input.cpp
backends/platform/dc/label.cpp
backends/platform/dc/plugins.cpp
backends/platform/dc/selector.cpp
backends/platform/dc/softkbd.cpp
backends/platform/dc/time.cpp
backends/platform/dc/vmsave.cpp
backends/platform/ds/background.cpp
backends/platform/ds/osystem_ds.cpp
backends/platform/ios7/ios7_osys_main.h
backends/platform/psp/mp3.cpp
backends/platform/psp/psppixelformat.cpp
backends/platform/psp/thread.cpp
backends/platform/psp/trace.h
backends/platform/sdl/macosx/macosx.cpp
backends/platform/sdl/ps3/ps3.cpp
backends/platform/sdl/psp2/psp2.cpp
backends/platform/sdl/sdl.cpp
backends/platform/sdl/switch/switch.cpp
backends/platform/symbian/src/SymbianActions.h
backends/platform/symbian/src/portdefs.h
backends/platform/symbian/src/vsnprintf.h
backends/platform/wii/main.cpp
backends/taskbar/unity/unity-taskbar.h
backends/updates/win32/win32-updates.cpp
backends/vkeybd/virtual-keyboard-parser.h
backends/vkeybd/virtual-keyboard.cpp
base/commandLine.cpp
base/detection/detection.cpp
base/detection/detection.h
common/algorithm.h
common/archive.cpp
common/array.h
common/base-str.cpp
common/config-manager.h
common/coroutines.cpp
common/coroutines.h
common/error.h
common/events.h
common/fs.cpp
common/hashmap.h
common/list.h
common/math.h
common/rect.h
common/safe-bool.h
common/savefile.h
common/str-enc.cpp
common/system.h
common/translation.h
common/unzip.cpp
common/ustr.h
common/util.h
common/zlib.cpp
devtools/create_cryomni3d/create_cryomni3d_dat.cpp
devtools/create_cryomni3d/create_cryomni3d_dat.h
devtools/create_cryomni3d/versailles.cpp
devtools/create_cryomni3d/versailles.h
devtools/create_project/cmake.cpp
devtools/create_project/codeblocks.cpp
devtools/create_project/create_project.cpp
devtools/create_project/msbuild.cpp
devtools/create_project/msvc.cpp
devtools/create_project/visualstudio.cpp
devtools/create_project/xcode.cpp
devtools/create_titanic/zlib.cpp
devtools/sci/scidisasm.cpp
devtools/skycpt/cptcompiler.cpp
engines/access/metaengine.cpp
engines/adl/metaengine.cpp
engines/agi/loader_v3.cpp
engines/agi/saveload.cpp
engines/agi/sound_2gs.cpp
engines/agi/wagparser.cpp
engines/agi/wagparser.h
engines/agos/drivers/simon1/adlib.cpp
engines/agos/metaengine.cpp
engines/ags/engine/ac/dialog.cpp
engines/ags/engine/ac/draw.cpp
engines/ags/engine/game/savegame_components.cpp
engines/ags/engine/script/cc_instance.cpp
engines/ags/lib/aastr-0.1.1/aautil.cpp
engines/ags/lib/aastr-0.1.1/aautil.h
engines/ags/lib/allegro/base.h
engines/ags/lib/allegro/color.cpp
engines/ags/lib/allegro/gfx.h
engines/ags/lib/std/map.h
engines/ags/plugins/ags_galaxy_steam/ags_wadjeteye_steam.h
engines/ags/plugins/ags_pal_render/ags_pal_render.cpp
engines/ags/plugins/ags_pal_render/raycast.cpp
engines/ags/shared/util/misc.cpp
engines/ags/shared/util/misc.h
engines/avalanche/parser.cpp
engines/bbvs/metaengine.cpp
engines/bladerunner/debugger.cpp
engines/bladerunner/metaengine.cpp
engines/bladerunner/obstacles.cpp
engines/bladerunner/script/scene/ma07.cpp
engines/bladerunner/ui/kia_section_base.cpp
engines/bladerunner/ui/kia_section_crimes.cpp
engines/bladerunner/ui/ui_image_picker.cpp
engines/bladerunner/ui/vk.cpp
engines/cge/metaengine.cpp
engines/cge2/snail.cpp
engines/cge2/vga13h.cpp
engines/chewy/metaengine.cpp
engines/cine/anim.cpp
engines/cine/saveload.h
engines/cine/script_fw.cpp
engines/cine/various.cpp
engines/composer/metaengine.cpp
engines/cruise/cruise_main.cpp
engines/cruise/decompiler.cpp
engines/cruise/font.cpp
engines/cruise/font.h
engines/cruise/menu.h
engines/cruise/metaengine.cpp
engines/cruise/perso.cpp
engines/cryo/cryolib.cpp
engines/cryo/cryolib.h
engines/cryo/defs.h
engines/cryo/metaengine.cpp
engines/cryomni3d/cryomni3d.cpp
engines/cryomni3d/datstream.cpp
engines/cryomni3d/detection_tables.h
engines/cryomni3d/dialogs_manager.cpp
engines/cryomni3d/fixed_image.cpp
engines/cryomni3d/font_manager.cpp
engines/cryomni3d/image/codecs/hlz.cpp
engines/cryomni3d/metaengine.cpp
engines/cryomni3d/mouse_boxes.cpp
engines/cryomni3d/sprites.cpp
engines/cryomni3d/versailles/data.cpp
engines/cryomni3d/versailles/dialogs_manager.cpp
engines/cryomni3d/versailles/documentation.cpp
engines/cryomni3d/versailles/engine.cpp
engines/cryomni3d/versailles/logic.cpp
engines/cryomni3d/versailles/menus.cpp
engines/cryomni3d/versailles/music.cpp
engines/cryomni3d/versailles/saveload.cpp
engines/cryomni3d/versailles/toolbar.cpp
engines/cryomni3d/video/hnm_decoder.cpp
engines/director/lingo/lingo-code.cpp
engines/director/util.h
engines/dm/gfx.cpp
engines/draci/metaengine.cpp
engines/draci/sprite.cpp
engines/drascula/metaengine.cpp
engines/engine.cpp
engines/engine.h
engines/glk/adrift/os_glk.cpp
engines/glk/adrift/scare.h
engines/glk/adrift/scgamest.cpp
engines/glk/adrift/scinterf.cpp
engines/glk/adrift/sclibrar.cpp
engines/glk/adrift/scprintf.cpp
engines/glk/adrift/scprotos.h
engines/glk/adrift/scresour.cpp
engines/glk/adrift/sctaffil.cpp
engines/glk/adrift/sxprotos.h
engines/glk/adrift/sxstubs.cpp
engines/glk/agt/agil.cpp
engines/glk/agt/agility.h
engines/glk/agt/agtread.cpp
engines/glk/agt/agxfile.cpp
engines/glk/agt/auxfile.cpp
engines/glk/agt/config.h
engines/glk/agt/debugcmd.cpp
engines/glk/agt/exec.cpp
engines/glk/agt/exec.h
engines/glk/agt/filename.cpp
engines/glk/agt/gamedata.cpp
engines/glk/agt/interface.cpp
engines/glk/agt/interp.h
engines/glk/agt/metacommand.cpp
engines/glk/agt/object.cpp
engines/glk/agt/os_glk.cpp
engines/glk/agt/parser.cpp
engines/glk/agt/runverb.cpp
engines/glk/agt/savegame.cpp
engines/glk/agt/token.cpp
engines/glk/agt/util.cpp
engines/glk/alan2/debug.cpp
engines/glk/alan2/exe.cpp
engines/glk/alan2/main.cpp
engines/glk/alan2/sysdep.cpp
engines/glk/alan2/sysdep.h
engines/glk/alan3/acode.h
engines/glk/alan3/alt_info.h
engines/glk/alan3/container.cpp
engines/glk/alan3/output.cpp
engines/glk/alan3/parse.cpp
engines/glk/alan3/set.h
engines/glk/alan3/sysdep.cpp
engines/glk/alan3/sysdep.h
engines/glk/archetype/interpreter.cpp
engines/glk/archetype/semantic.cpp
engines/glk/archetype/sys_object.cpp
engines/glk/comprehend/debugger_dumper.cpp
engines/glk/comprehend/dictionary.cpp
engines/glk/comprehend/dictionary.h
engines/glk/comprehend/game_data.cpp
engines/glk/comprehend/game_data.h
engines/glk/comprehend/game_tr1.cpp
engines/glk/comprehend/game_tr2.cpp
engines/glk/comprehend/pics.cpp
engines/glk/glk_api.cpp
engines/glk/glk_dispa.cpp
engines/glk/glulx/glkop.cpp
engines/glk/glulx/search.cpp
engines/glk/hugo/heexpr.cpp
engines/glk/hugo/hemisc.cpp
engines/glk/hugo/heobject.cpp
engines/glk/hugo/heset.cpp
engines/glk/jacl/csv.h
engines/glk/jacl/jacl_main.cpp
engines/glk/jacl/jpp.cpp
engines/glk/jacl/libcsv.cpp
engines/glk/jacl/loader.cpp
engines/glk/jacl/parser.cpp
engines/glk/level9/bitmap.cpp
engines/glk/level9/level9_main.cpp
engines/glk/level9/os_glk.cpp
engines/glk/magnetic/glk.cpp
engines/glk/magnetic/magnetic_defs.h
engines/glk/metaengine.cpp
engines/glk/picture.cpp
engines/glk/quest/geas_glk.h
engines/glk/quest/geas_impl.h
engines/glk/quest/geas_runner.cpp
engines/glk/quest/read_file.cpp
engines/glk/tads/os_banners.cpp
engines/glk/tads/os_banners.h
engines/glk/tads/os_buffer.cpp
engines/glk/tads/os_frob_tads.h
engines/glk/tads/os_glk.cpp
engines/glk/tads/os_glk.h
engines/glk/tads/os_parse.cpp
engines/glk/tads/tads2/appctx.h
engines/glk/tads/tads2/built_in.cpp
engines/glk/tads/tads2/built_in.h
engines/glk/tads/tads2/character_map.cpp
engines/glk/tads/tads2/character_map.h
engines/glk/tads/tads2/command_line.cpp
engines/glk/tads/tads2/command_line.h
engines/glk/tads/tads2/data.cpp
engines/glk/tads/tads2/debug.cpp
engines/glk/tads/tads2/debug.h
engines/glk/tads/tads2/error.cpp
engines/glk/tads/tads2/error_handling.cpp
engines/glk/tads/tads2/error_handling.h
engines/glk/tads/tads2/execute_command.cpp
engines/glk/tads/tads2/file_io.cpp
engines/glk/tads/tads2/file_io.h
engines/glk/tads/tads2/get_string.cpp
engines/glk/tads/tads2/lib.h
engines/glk/tads/tads2/line_source.h
engines/glk/tads/tads2/line_source_file.cpp
engines/glk/tads/tads2/line_source_file.h
engines/glk/tads/tads2/ltk.cpp
engines/glk/tads/tads2/memory_cache.cpp
engines/glk/tads/tads2/memory_cache.h
engines/glk/tads/tads2/memory_cache_heap.cpp
engines/glk/tads/tads2/memory_cache_loader.h
engines/glk/tads/tads2/memory_cache_swap.cpp
engines/glk/tads/tads2/memory_cache_swap.h
engines/glk/tads/tads2/object.cpp
engines/glk/tads/tads2/object.h
engines/glk/tads/tads2/opcode.h
engines/glk/tads/tads2/os.h
engines/glk/tads/tads2/output.cpp
engines/glk/tads/tads2/play.cpp
engines/glk/tads/tads2/post_compilation.h
engines/glk/tads/tads2/qa_scriptor.cpp
engines/glk/tads/tads2/regex.cpp
engines/glk/tads/tads2/regex.h
engines/glk/tads/tads2/run.cpp
engines/glk/tads/tads2/run.h
engines/glk/tads/tads2/runstat.cpp
engines/glk/tads/tads2/runtime_driver.cpp
engines/glk/tads/tads2/text_io.h
engines/glk/tads/tads2/tokenizer.cpp
engines/glk/tads/tads2/tokenizer.h
engines/glk/tads/tads2/tokenizer_hash.cpp
engines/glk/tads/tads2/vocabulary.cpp
engines/glk/tads/tads2/vocabulary.h
engines/glk/tads/tads2/vocabulary_parser.cpp
engines/glk/window_graphics.cpp
engines/gob/anifile.cpp
engines/gob/aniobject.cpp
engines/gob/cmpfile.cpp
engines/gob/decfile.cpp
engines/gob/metaengine.cpp
engines/gob/minigames/geisha/evilfish.cpp
engines/gob/minigames/geisha/meter.cpp
engines/gob/minigames/geisha/mouth.cpp
engines/gob/pregob/gctfile.cpp
engines/gob/pregob/onceupon/onceupon.cpp
engines/gob/pregob/onceupon/parents.cpp
engines/gob/pregob/pregob.cpp
engines/gob/pregob/txtfile.cpp
engines/gob/video.cpp
engines/griffon/metaengine.cpp
engines/grim/emi/lua_v2.cpp
engines/grim/gfx_base.cpp
engines/grim/lua/lapi.cpp
engines/grim/md5check.cpp
engines/grim/movie/codecs/blocky8.cpp
engines/grim/remastered/lua_remastered.cpp
engines/grim/textobject.h
engines/groovie/metaengine.cpp
engines/hadesch/ambient.h
engines/hadesch/rooms/ferry.cpp
engines/hadesch/rooms/medisle.cpp
engines/hadesch/rooms/riverstyx.cpp
engines/hadesch/rooms/seriphos.cpp
engines/hadesch/video.cpp
engines/hadesch/video.h
engines/hopkins/files.h
engines/hopkins/metaengine.cpp
engines/icb/actor_fx_pc.cpp
engines/icb/actor_pc.cpp
engines/icb/actor_pc.h
engines/icb/actor_view_pc.h
engines/icb/animation_mega_set.cpp
engines/icb/bone.cpp
engines/icb/cluster_manager_pc.cpp
engines/icb/common/pc_props.h
engines/icb/common/px_common.h
engines/icb/common/px_route_barriers.h
engines/icb/common/px_scriptengine.cpp
engines/icb/common/px_scriptengine.h
engines/icb/common/px_staticlayers.h
engines/icb/common/px_walkarea_integer.h
engines/icb/console_pc.cpp
engines/icb/fn_routines.cpp
engines/icb/game_volume.cpp
engines/icb/gfx/gfxstub.h
engines/icb/gfx/gfxstub_rev.cpp
engines/icb/gfx/psx_pchmd.h
engines/icb/gfx/psx_props.h
engines/icb/global_objects.cpp
engines/icb/graphic_prims.h
engines/icb/graphic_prims_pc.cpp
engines/icb/icon_menu.h
engines/icb/jpeg.cpp
engines/icb/object_structs.h
engines/icb/options_manager_pc.cpp
engines/icb/remora_pc.cpp
engines/icb/res_man.cpp
engines/icb/set_pc.cpp
engines/icb/shadow_pc.cpp
engines/icb/shadow_pc.h
engines/icb/softskin_pc.cpp
engines/icb/softskin_pc.h
engines/icb/sound.cpp
engines/icb/sound.h
engines/icb/speech.cpp
engines/icb/speech.h
engines/icb/stage_view.h
engines/icb/surface_manager.cpp
engines/icb/text_sprites.cpp
engines/icb/timer_func.cpp
engines/icb/tracer.cpp
engines/illusions/metaengine.cpp
engines/illusions/sound.cpp
engines/kingdom/detection.cpp
engines/kyra/engine/timer_eob.cpp
engines/kyra/graphics/screen_eob.cpp
engines/kyra/graphics/screen_mr.cpp
engines/kyra/graphics/screen_v2.cpp
engines/kyra/metaengine.cpp
engines/lastexpress/detection.cpp
engines/lure/metaengine.cpp
engines/made/metaengine.cpp
engines/mads/compression.h
engines/mads/metaengine.cpp
engines/mohawk/metaengine.cpp
engines/mohawk/myst_areas.h
engines/mohawk/myst_metaengine.h
engines/mohawk/myst_stacks/menu.cpp
engines/mohawk/myst_stacks/stoneship.cpp
engines/mohawk/riven_card.cpp
engines/mohawk/riven_metaengine.h
engines/mohawk/riven_saveload.cpp
engines/mohawk/riven_scripts.cpp
engines/mohawk/riven_stacks/jspit.cpp
engines/myst3/archive.cpp
engines/myst3/hotspot.cpp
engines/myst3/myst3.cpp
engines/neverhood/graphics.h
engines/neverhood/metaengine.cpp
engines/neverhood/scene.h
engines/petka/metaengine.cpp
engines/pink/metaengine.cpp
engines/plumbers/plumbers.h
engines/prince/detection.cpp
engines/prince/detection.h
engines/prince/hero_set.h
engines/prince/inventory.cpp
engines/prince/metaengine.cpp
engines/prince/videoplayer.cpp
engines/queen/metaengine.cpp
engines/saga/metaengine.cpp
engines/sci/detection_tables.h
engines/sci/engine/file.cpp
engines/sci/engine/kpathing.cpp
engines/sci/engine/script_patches.cpp
engines/sci/graphics/frameout.cpp
engines/sci/graphics/screen.cpp
engines/sci/graphics/text32.cpp
engines/sci/metaengine.cpp
engines/sci/parser/said.cpp
engines/sci/parser/vocabulary.cpp
engines/sci/resource/decompressor.cpp
engines/sci/resource/resource.cpp
engines/sci/sci.cpp
engines/scumm/costume.cpp
engines/scumm/dialogs.cpp
engines/scumm/he/logic/football.cpp
engines/scumm/metaengine.cpp
engines/scumm/metaengine.h
engines/scumm/script_v2.cpp
engines/scumm/smush/codec47.cpp
engines/sherlock/metaengine.cpp
engines/sherlock/scalpel/scalpel_user_interface.h
engines/sky/compact.cpp
engines/sky/metaengine.cpp
engines/sky/sky.cpp
engines/stark/formats/biffmesh.cpp
engines/stark/formats/tm.cpp
engines/stark/formats/xrc.cpp
engines/stark/gfx/driver.cpp
engines/stark/movement/shortestpath.cpp
engines/stark/resources/animscript.cpp
engines/stark/resources/animsoundtrigger.cpp
engines/stark/resources/command.cpp
engines/stark/resources/floor.cpp
engines/stark/resources/lipsync.cpp
engines/stark/resources/pattable.h
engines/stark/services/diary.cpp
engines/stark/services/gameinterface.cpp
engines/stark/ui/menu/locationscreen.cpp
engines/startrek/bridge.cpp
engines/startrek/lzss.h
engines/startrek/metaengine.cpp
engines/startrek/rooms/demon0.cpp
engines/startrek/rooms/demon1.cpp
engines/startrek/rooms/demon2.cpp
engines/startrek/rooms/demon3.cpp
engines/startrek/rooms/demon4.cpp
engines/startrek/rooms/demon5.cpp
engines/startrek/rooms/demon6.cpp
engines/startrek/rooms/feather0.cpp
engines/startrek/rooms/feather1.cpp
engines/startrek/rooms/feather2.cpp
engines/startrek/rooms/feather3.cpp
engines/startrek/rooms/feather4.cpp
engines/startrek/rooms/feather5.cpp
engines/startrek/rooms/feather6.cpp
engines/startrek/rooms/feather7.cpp
engines/startrek/rooms/love0.cpp
engines/startrek/rooms/love1.cpp
engines/startrek/rooms/love2.cpp
engines/startrek/rooms/love3.cpp
engines/startrek/rooms/love4.cpp
engines/startrek/rooms/lovea.cpp
engines/startrek/rooms/mudd0.cpp
engines/startrek/rooms/mudd1.cpp
engines/startrek/rooms/mudd2.cpp
engines/startrek/rooms/mudd4.cpp
engines/startrek/rooms/mudd5.cpp
engines/startrek/rooms/sins0.cpp
engines/startrek/rooms/sins1.cpp
engines/startrek/rooms/sins2.cpp
engines/startrek/rooms/sins3.cpp
engines/startrek/rooms/sins4.cpp
engines/startrek/rooms/sins5.cpp
engines/startrek/rooms/trial0.cpp
engines/startrek/rooms/trial1.cpp
engines/startrek/rooms/trial2.cpp
engines/startrek/rooms/trial3.cpp
engines/startrek/rooms/trial4.cpp
engines/startrek/rooms/trial5.cpp
engines/startrek/rooms/tug0.cpp
engines/startrek/rooms/tug1.cpp
engines/startrek/rooms/tug2.cpp
engines/startrek/rooms/tug3.cpp
engines/startrek/rooms/veng0.cpp
engines/startrek/rooms/veng1.cpp
engines/startrek/rooms/veng2.cpp
engines/startrek/rooms/veng3.cpp
engines/startrek/rooms/veng4.cpp
engines/startrek/rooms/veng5.cpp
engines/startrek/rooms/veng6.cpp
engines/startrek/rooms/veng7.cpp
engines/startrek/rooms/veng8.cpp
engines/supernova/game-manager.cpp
engines/supernova/metaengine.cpp
engines/sword1/metaengine.cpp
engines/sword1/resman.h
engines/sword1/screen.h
engines/sword2/metaengine.cpp
engines/sword25/gfx/image/art.cpp
engines/sword25/gfx/image/art.h
engines/sword25/gfx/image/image.h
engines/sword25/gfx/image/swimage.cpp
engines/sword25/gfx/image/vectorimage.cpp
engines/sword25/gfx/image/vectorimage.h
engines/sword25/gfx/image/vectorimagerenderer.cpp
engines/sword25/gfx/renderobject.h
engines/sword25/gfx/renderobjectmanager.h
engines/sword25/gfx/timedrenderobject.h
engines/sword25/math/line.h
engines/sword25/math/polygon.h
engines/sword25/math/vertex.h
engines/sword25/math/walkregion.cpp
engines/sword25/metaengine.cpp
engines/teenagent/metaengine.cpp
engines/testbed/metaengine.cpp
engines/tinsel/cursor.h
engines/tinsel/dialogs.cpp
engines/tinsel/metaengine.cpp
engines/titanic/star_control/matrix_inv.h
engines/toltecs/metaengine.cpp
engines/toltecs/render.h
engines/tony/metaengine.cpp
engines/tony/mpal/mpal.h
engines/tony/tonychar.cpp
engines/toon/metaengine.cpp
engines/tsage/metaengine.cpp
engines/tucker/metaengine.cpp
engines/twine/menu/menu.cpp
engines/twine/renderer/shadeangletab.h
engines/twine/scene/animations.cpp
engines/twine/scene/movements.cpp
engines/twine/script/script_life_v1.cpp
engines/twine/script/script_move_v1.cpp
engines/twine/twine.cpp
engines/twine/twine.h
engines/ultima/detection.cpp
engines/ultima/nuvie/actors/actor.cpp
engines/ultima/nuvie/actors/u6_actor.cpp
engines/ultima/nuvie/conf/configuration.cpp
engines/ultima/nuvie/conf/configuration.h
engines/ultima/nuvie/core/anim_manager.cpp
engines/ultima/nuvie/core/converse.cpp
engines/ultima/nuvie/core/debugger.h
engines/ultima/nuvie/core/effect.cpp
engines/ultima/nuvie/core/events.cpp
engines/ultima/nuvie/core/map.cpp
engines/ultima/nuvie/core/obj_manager.cpp
engines/ultima/nuvie/core/tile_manager.cpp
engines/ultima/nuvie/core/timed_event.cpp
engines/ultima/nuvie/files/u6_lzw.cpp
engines/ultima/nuvie/files/utils.cpp
engines/ultima/nuvie/files/utils.h
engines/ultima/nuvie/fonts/bmp_font.cpp
engines/ultima/nuvie/fonts/conv_font.cpp
engines/ultima/nuvie/fonts/u6_font.cpp
engines/ultima/nuvie/fonts/wou_font.cpp
engines/ultima/nuvie/gui/gui_area.cpp
engines/ultima/nuvie/gui/gui_button.cpp
engines/ultima/nuvie/gui/gui_load_image.h
engines/ultima/nuvie/gui/gui_text_input.cpp
engines/ultima/nuvie/gui/gui_text_toggle_button.cpp
engines/ultima/nuvie/gui/gui_yes_no_dialog.h
engines/ultima/nuvie/gui/widgets/command_bar.cpp
engines/ultima/nuvie/gui/widgets/command_bar_new_ui.cpp
engines/ultima/nuvie/gui/widgets/converse_gump.cpp
engines/ultima/nuvie/gui/widgets/map_window.cpp
engines/ultima/nuvie/keybinding/keys.cpp
engines/ultima/nuvie/misc/iavl_tree.cpp
engines/ultima/nuvie/misc/u6_misc.cpp
engines/ultima/nuvie/nuvie.h
engines/ultima/nuvie/pathfinder/actor_path_finder.h
engines/ultima/nuvie/pathfinder/astar_path.cpp
engines/ultima/nuvie/pathfinder/path_finder.h
engines/ultima/nuvie/pathfinder/seek_path.cpp
engines/ultima/nuvie/screen/scale.cpp
engines/ultima/nuvie/screen/screen.cpp
engines/ultima/nuvie/script/script.cpp
engines/ultima/nuvie/script/script_actor.cpp
engines/ultima/nuvie/sound/adplug/fm_opl.cpp
engines/ultima/nuvie/sound/adplug/opl_class.cpp
engines/ultima/nuvie/sound/decoder/wave/adpcm.h
engines/ultima/nuvie/sound/decoder/wave/raw.cpp
engines/ultima/nuvie/sound/decoder/wave/raw.h
engines/ultima/nuvie/sound/decoder/wave/stream.cpp
engines/ultima/nuvie/sound/decoder/wave/wave.h
engines/ultima/nuvie/sound/song.cpp
engines/ultima/nuvie/sound/sound_manager.cpp
engines/ultima/nuvie/views/view_manager.h
engines/ultima/shared/conf/xml_node.cpp
engines/ultima/shared/conf/xml_tree.cpp
engines/ultima/shared/engine/data_archive.h
engines/ultima/shared/engine/debugger.h
engines/ultima/shared/std/containers.h
engines/ultima/ultima1/core/debugger.h
engines/ultima/ultima4/controllers/game_controller.cpp
engines/ultima/ultima4/game/script.h
engines/ultima/ultima4/game/spell.h
engines/ultima/ultima4/gfx/image.cpp
engines/ultima/ultima4/gfx/screen.cpp
engines/ultima/ultima4/map/location.cpp
engines/ultima/ultima4/views/menuitem.cpp
engines/ultima/ultima8/audio/audio_process.cpp
engines/ultima/ultima8/audio/music_process.cpp
engines/ultima/ultima8/audio/raw_audio_sample.cpp
engines/ultima/ultima8/audio/sonarc_audio_sample.cpp
engines/ultima/ultima8/audio/speech_flex.cpp
engines/ultima/ultima8/games/treasure_loader.cpp
engines/ultima/ultima8/graphics/fonts/font.cpp
engines/ultima/ultima8/graphics/fonts/font_manager.cpp
engines/ultima/ultima8/graphics/fonts/jp_font.cpp
engines/ultima/ultima8/graphics/fonts/jp_rendered_text.cpp
engines/ultima/ultima8/graphics/fonts/shape_font.cpp
engines/ultima/ultima8/graphics/fonts/shape_rendered_text.cpp
engines/ultima/ultima8/graphics/fonts/tt_font.cpp
engines/ultima/ultima8/graphics/inverter_process.cpp
engines/ultima/ultima8/graphics/palette_fader_process.cpp
engines/ultima/ultima8/graphics/raw_shape_frame.cpp
engines/ultima/ultima8/graphics/shape.cpp
engines/ultima/ultima8/graphics/skf_player.cpp
engines/ultima/ultima8/graphics/texture.h
engines/ultima/ultima8/graphics/wpn_ovlay_dat.cpp
engines/ultima/ultima8/gumps/container_gump.cpp
engines/ultima/ultima8/gumps/credits_gump.cpp
engines/ultima/ultima8/gumps/cru_pickup_area_gump.h
engines/ultima/ultima8/gumps/game_map_gump.cpp
engines/ultima/ultima8/gumps/gump.cpp
engines/ultima/ultima8/gumps/item_relative_gump.cpp
engines/ultima/ultima8/gumps/message_box_gump.cpp
engines/ultima/ultima8/gumps/modal_gump.cpp
engines/ultima/ultima8/gumps/movie_gump.cpp
engines/ultima/ultima8/gumps/paperdoll_gump.cpp
engines/ultima/ultima8/gumps/shape_viewer_gump.cpp
engines/ultima/ultima8/gumps/slider_gump.cpp
engines/ultima/ultima8/gumps/widgets/button_widget.cpp
engines/ultima/ultima8/gumps/widgets/edit_widget.cpp
engines/ultima/ultima8/gumps/widgets/text_widget.cpp
engines/ultima/ultima8/kernel/object.cpp
engines/ultima/ultima8/kernel/object_manager.cpp
engines/ultima/ultima8/misc/util.cpp
engines/ultima/ultima8/misc/util.h
engines/ultima/ultima8/usecode/byte_set.cpp
engines/ultima/ultima8/usecode/remorse_intrinsics.h
engines/ultima/ultima8/usecode/uc_machine.cpp
engines/ultima/ultima8/usecode/uc_process.cpp
engines/ultima/ultima8/world/actors/actor.cpp
engines/ultima/ultima8/world/actors/actor_anim_process.cpp
engines/ultima/ultima8/world/actors/anim_action.cpp
engines/ultima/ultima8/world/actors/animation.cpp
engines/ultima/ultima8/world/actors/animation_tracker.cpp
engines/ultima/ultima8/world/actors/animation_tracker.h
engines/ultima/ultima8/world/actors/battery_charger_process.cpp
engines/ultima/ultima8/world/actors/combat_dat.h
engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp
engines/ultima/ultima8/world/actors/cru_healer_process.cpp
engines/ultima/ultima8/world/actors/grant_peace_process.cpp
engines/ultima/ultima8/world/actors/main_actor.cpp
engines/ultima/ultima8/world/actors/npc_dat.h
engines/ultima/ultima8/world/actors/pathfinder.cpp
engines/ultima/ultima8/world/actors/u8_avatar_mover_process.cpp
engines/ultima/ultima8/world/container.cpp
engines/ultima/ultima8/world/create_item_process.cpp
engines/ultima/ultima8/world/current_map.cpp
engines/ultima/ultima8/world/current_map.h
engines/ultima/ultima8/world/fireball_process.cpp
engines/ultima/ultima8/world/item.cpp
engines/ultima/ultima8/world/item_factory.cpp
engines/ultima/ultima8/world/item_selection_process.h
engines/ultima/ultima8/world/item_sorter.cpp
engines/ultima/ultima8/world/map.cpp
engines/ultima/ultima8/world/missile_tracker.cpp
engines/ultima/ultima8/world/sprite_process.cpp
engines/ultima/ultima8/world/target_reticle_process.h
engines/ultima/ultima8/world/world.cpp
engines/voyeur/detection_tables.h
engines/voyeur/metaengine.cpp
engines/wage/design.h
engines/wage/metaengine.cpp
engines/wintermute/ad/ad_actor_3dx.cpp
engines/wintermute/ad/ad_block.cpp
engines/wintermute/ad/ad_entity.cpp
engines/wintermute/ad/ad_generic.cpp
engines/wintermute/ad/ad_geom_ext_node.cpp
engines/wintermute/ad/ad_object_3d.cpp
engines/wintermute/ad/ad_path_point3d.cpp
engines/wintermute/ad/ad_walkplane.cpp
engines/wintermute/base/base_keyboard_state.cpp
engines/wintermute/base/base_surface_storage.cpp
engines/wintermute/base/file/dcpackage.h
engines/wintermute/base/gfx/3ds/camera3d.cpp
engines/wintermute/base/gfx/3ds/light3d.cpp
engines/wintermute/base/gfx/3ds/loader3ds.cpp
engines/wintermute/base/gfx/3ds/loader3ds.h
engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
engines/wintermute/base/gfx/x/material.cpp
engines/wintermute/base/gfx/x/modelx.cpp
engines/wintermute/math/math_util.cpp
engines/wintermute/math/math_util.h
engines/wintermute/metaengine.cpp
engines/wintermute/utils/convert_utf.cpp
engines/wintermute/utils/string_util.cpp
engines/wintermute/video/subtitle_card.cpp
engines/zvision/graphics/cursors/cursor_manager.cpp
engines/zvision/metaengine.cpp
engines/zvision/sound/zork_raw.cpp
engines/zvision/sound/zork_raw.h
graphics/conversion.cpp
graphics/conversion.h
graphics/fonts/ttf.cpp
graphics/macgui/mactext.cpp
graphics/nanosvg/nanosvg.h
graphics/nanosvg/nanosvgrast.h
graphics/scaler/aspect.h
graphics/scaler/downscaler.h
graphics/scaler/edge.cpp
graphics/scaler/normal.cpp
graphics/scalerplugin.cpp
graphics/tinygl/zline.cpp
graphics/tinygl/ztriangle.cpp
graphics/transparent_surface.h
gui/EventRecorder.cpp
gui/ThemeEngine.cpp
gui/gui-manager.cpp
gui/widget.cpp
image/codecs/msvideo1.cpp
image/png.cpp
math/matrix3.cpp
math/matrix3.h
math/matrix4.cpp
math/matrix4.h
math/rect2d.cpp
test/common/hashmap.h
test/common/str.h
video/bink_decoder.cpp
diff --git a/audio/adlib.cpp b/audio/adlib.cpp
index 89a15b475f..dc48c74f91 100644
--- a/audio/adlib.cpp
+++ b/audio/adlib.cpp
@@ -1405,7 +1405,7 @@ MidiDriver_ADLIB::MidiDriver_ADLIB() {
_timerThreshold = 0x411B;
_opl = 0;
_adlibTimerProc = 0;
- _adlibTimerParam = 0;
+ _adlibTimerParam = 0;
_isOpen = false;
}
diff --git a/audio/audiostream.cpp b/audio/audiostream.cpp
index a556f1266d..7c8b01464c 100644
--- a/audio/audiostream.cpp
+++ b/audio/audiostream.cpp
@@ -92,7 +92,7 @@ SeekableAudioStream *SeekableAudioStream::openStreamFile(const Common::String &b
#pragma mark -
LoopingAudioStream::LoopingAudioStream(RewindableAudioStream *stream, uint loops, DisposeAfterUse::Flag disposeAfterUse, bool rewind)
- : _parent(stream, disposeAfterUse), _loops(loops), _completeIterations(0) {
+ : _parent(stream, disposeAfterUse), _loops(loops), _completeIterations(0) {
assert(stream);
if (rewind && !stream->rewind()) {
@@ -171,15 +171,15 @@ AudioStream *makeLoopingAudioStream(SeekableAudioStream *stream, Timestamp start
#pragma mark -
SubLoopingAudioStream::SubLoopingAudioStream(SeekableAudioStream *stream,
- uint loops,
- const Timestamp loopStart,
- const Timestamp loopEnd,
- DisposeAfterUse::Flag disposeAfterUse)
- : _parent(stream, disposeAfterUse), _loops(loops),
- _pos(0, getRate() * (isStereo() ? 2 : 1)),
- _loopStart(convertTimeToStreamPos(loopStart, getRate(), isStereo())),
- _loopEnd(convertTimeToStreamPos(loopEnd, getRate(), isStereo())),
- _done(false) {
+ uint loops,
+ const Timestamp loopStart,
+ const Timestamp loopEnd,
+ DisposeAfterUse::Flag disposeAfterUse)
+ : _parent(stream, disposeAfterUse), _loops(loops),
+ _pos(0, getRate() * (isStereo() ? 2 : 1)),
+ _loopStart(convertTimeToStreamPos(loopStart, getRate(), isStereo())),
+ _loopEnd(convertTimeToStreamPos(loopEnd, getRate(), isStereo())),
+ _done(false) {
assert(loopStart < loopEnd);
if (!_parent->rewind())
@@ -238,10 +238,10 @@ bool SubLoopingAudioStream::endOfStream() const {
#pragma mark -
SubSeekableAudioStream::SubSeekableAudioStream(SeekableAudioStream *parent, const Timestamp start, const Timestamp end, DisposeAfterUse::Flag disposeAfterUse)
- : _parent(parent, disposeAfterUse),
- _start(convertTimeToStreamPos(start, getRate(), isStereo())),
- _pos(0, getRate() * (isStereo() ? 2 : 1)),
- _length(convertTimeToStreamPos(end, getRate(), isStereo()) - _start) {
+ : _parent(parent, disposeAfterUse),
+ _start(convertTimeToStreamPos(start, getRate(), isStereo())),
+ _pos(0, getRate() * (isStereo() ? 2 : 1)),
+ _length(convertTimeToStreamPos(end, getRate(), isStereo()) - _start) {
assert(_length.totalNumberOfFrames() % (isStereo() ? 2 : 1) == 0);
_parent->seek(_start);
@@ -472,10 +472,10 @@ AudioStream *makeLimitingAudioStream(AudioStream *parentStream, const Timestamp
*/
class NullAudioStream : public AudioStream {
public:
- bool isStereo() const { return false; }
- int getRate() const;
- int readBuffer(int16 *data, const int numSamples) { return 0; }
- bool endOfData() const { return true; }
+ bool isStereo() const { return false; }
+ int getRate() const;
+ int readBuffer(int16 *data, const int numSamples) { return 0; }
+ bool endOfData() const { return true; }
};
int NullAudioStream::getRate() const {
diff --git a/audio/decoders/ac3.cpp b/audio/decoders/ac3.cpp
index cc0b530a88..aa06f71019 100644
--- a/audio/decoders/ac3.cpp
+++ b/audio/decoders/ac3.cpp
@@ -82,7 +82,7 @@ bool AC3Stream::init(Common::SeekableReadStream &firstPacket) {
deinit();
// In theory, I should pass mm_accel() to a52_init(), but I don't know
- // where that's supposed to be defined.
+ // where that's supposed to be defined.
_a52State = a52_init(0);
// Go through the header to find sync
diff --git a/audio/decoders/adpcm.h b/audio/decoders/adpcm.h
index 4c75915ea8..3b693e99f0 100644
--- a/audio/decoders/adpcm.h
+++ b/audio/decoders/adpcm.h
@@ -77,12 +77,12 @@ enum ADPCMType {
* @return a new RewindableAudioStream, or NULL, if an error occurred
*/
SeekableAudioStream *makeADPCMStream(
- Common::SeekableReadStream *stream,
- DisposeAfterUse::Flag disposeAfterUse,
- uint32 size, ADPCMType type,
- int rate,
- int channels,
- uint32 blockAlign = 0);
+ Common::SeekableReadStream *stream,
+ DisposeAfterUse::Flag disposeAfterUse,
+ uint32 size, ADPCMType type,
+ int rate,
+ int channels,
+ uint32 blockAlign = 0);
/**
* Creates a PacketizedAudioStream that will automatically queue
diff --git a/audio/decoders/qdm2.cpp b/audio/decoders/qdm2.cpp
index a9cf30e9ef..d5eba536f2 100644
--- a/audio/decoders/qdm2.cpp
+++ b/audio/decoders/qdm2.cpp
@@ -253,9 +253,9 @@ private:
// half mpeg encoding window (full precision)
const int32 ff_mpa_enwindow[257] = {
- 0, -1, -1, -1, -1, -1, -1, -2,
- -2, -2, -2, -3, -3, -4, -4, -5,
- -5, -6, -7, -7, -8, -9, -10, -11,
+ 0, -1, -1, -1, -1, -1, -1, -2,
+ -2, -2, -2, -3, -3, -4, -4, -5,
+ -5, -6, -7, -7, -8, -9, -10, -11,
-13, -14, -16, -17, -19, -21, -24, -26,
-29, -31, -35, -38, -41, -45, -49, -53,
-58, -63, -68, -73, -79, -85, -91, -97,
@@ -278,7 +278,7 @@ const int32 ff_mpa_enwindow[257] = {
-9727, -9838, -9916, -9959, -9966, -9935, -9863, -9750,
-9592, -9389, -9139, -8840, -8492, -8092, -7640, -7134,
6574, 5959, 5288, 4561, 3776, 2935, 2037, 1082,
- 70, -998, -2122, -3300, -4533, -5818, -7154, -8540,
+ 70, -998, -2122, -3300, -4533, -5818, -7154, -8540,
-9975,-11455,-12980,-14548,-16155,-17799,-19478,-21189,
-22929,-24694,-26482,-28289,-30112,-31947,-33791,-35640,
-37489,-39336,-41176,-43006,-44821,-46617,-48390,-50137,
@@ -595,9 +595,9 @@ static void dct32(int32 *out, int32 *tab) {
// 32 samples.
// XXX: optimize by avoiding ring buffer usage
void ff_mpa_synth_filter(int16 *synth_buf_ptr, int *synth_buf_offset,
- int16 *window, int *dither_state,
- int16 *samples, int incr,
- int32 sb_samples[32])
+ int16 *window, int *dither_state,
+ int16 *samples, int incr,
+ int32 sb_samples[32])
{
int16 *synth_buf;
const int16 *w, *w2, *p;
@@ -733,11 +733,11 @@ static int allocTable(VLC *vlc, int size, int use_static) {
}
static int build_table(VLC *vlc, int table_nb_bits,
- int nb_codes,
- const void *bits, int bits_wrap, int bits_size,
- const void *codes, int codes_wrap, int codes_size,
- const void *symbols, int symbols_wrap, int symbols_size,
- int code_prefix, int n_prefix, int flags)
+ int nb_codes,
+ const void *bits, int bits_wrap, int bits_size,
+ const void *codes, int codes_wrap, int codes_size,
+ const void *symbols, int symbols_wrap, int symbols_size,
+ int code_prefix, int n_prefix, int flags)
{
int i, j, k, n, table_size, table_index, nb, n1, index, code_prefix2, symbol;
uint32 code;
@@ -1479,8 +1479,8 @@ void QDM2Stream::fill_tone_level_array(int flag) {
* @param cm_table_select q->cm_table_select
*/
void QDM2Stream::fill_coding_method_array(sb_int8_array tone_level_idx, sb_int8_array tone_level_idx_temp,
- sb_int8_array coding_method, int nb_channels,
- int c, int superblocktype_2_3, int cm_table_select) {
+ sb_int8_array coding_method, int nb_channels,
+ int c, int superblocktype_2_3, int cm_table_select) {
int ch, sb, j;
int tmp, acc, esp_40, comp;
int add1, add2, add3, add4;
@@ -2160,7 +2160,7 @@ void QDM2Stream::qdm2_decode_super_block(void) {
}
void QDM2Stream::qdm2_fft_init_coefficient(int sub_packet, int offset, int duration,
- int channel, int exp, int phase) {
+ int channel, int exp, int phase) {
if (_fftCoefsMinIndex[duration] < 0)
_fftCoefsMinIndex[duration] = _fftCoefsIndex;
diff --git a/audio/decoders/qdm2.h b/audio/decoders/qdm2.h
index 7f1ab8ffde..a119ae705e 100644
--- a/audio/decoders/qdm2.h
+++ b/audio/decoders/qdm2.h
@@ -44,7 +44,7 @@ class Codec;
* @return a new Codec, or NULL, if an error occurred
*/
Codec *makeQDM2Decoder(Common::SeekableReadStream *extraData,
- DisposeAfterUse::Flag disposeExtraData = DisposeAfterUse::NO);
+ DisposeAfterUse::Flag disposeExtraData = DisposeAfterUse::NO);
} // End of namespace Audio
diff --git a/audio/decoders/raw.cpp b/audio/decoders/raw.cpp
index 2ecc791870..d512ef93dd 100644
--- a/audio/decoders/raw.cpp
+++ b/audio/decoders/raw.cpp
@@ -201,8 +201,8 @@ bool RawStream<bytesPerSample, isUnsigned, isLE>::seek(const Timestamp &where) {
return new RawStream<1, UNSIGNED, false>(rate, isStereo, disposeAfterUse, stream)
SeekableAudioStream *makeRawStream(Common::SeekableReadStream *stream,
- int rate, byte flags,
- DisposeAfterUse::Flag disposeAfterUse) {
+ int rate, byte flags,
+ DisposeAfterUse::Flag disposeAfterUse) {
const bool isStereo = (flags & Audio::FLAG_STEREO) != 0;
const int bytesPerSample = (flags & Audio::FLAG_24BITS ? 3 : (flags & Audio::FLAG_16BITS ? 2 : 1));
const bool isUnsigned = (flags & Audio::FLAG_UNSIGNED) != 0;
@@ -218,8 +218,8 @@ SeekableAudioStream *makeRawStream(Common::SeekableReadStream *stream,
}
SeekableAudioStream *makeRawStream(const byte *buffer, uint32 size,
- int rate, byte flags,
- DisposeAfterUse::Flag disposeAfterUse) {
+ int rate, byte flags,
+ DisposeAfterUse::Flag disposeAfterUse) {
return makeRawStream(new Common::MemoryReadStream(buffer, size, disposeAfterUse), rate, flags, DisposeAfterUse::YES);
}
diff --git a/audio/decoders/raw.h b/audio/decoders/raw.h
index a13f4fe444..efd9fc095f 100644
--- a/audio/decoders/raw.h
+++ b/audio/decoders/raw.h
@@ -76,8 +76,8 @@ enum RawFlags {
* @return The new SeekableAudioStream (or 0 on failure).
*/
SeekableAudioStream *makeRawStream(const byte *buffer, uint32 size,
- int rate, byte flags,
- DisposeAfterUse::Flag disposeAfterUse = DisposeAfterUse::YES);
+ int rate, byte flags,
+ DisposeAfterUse::Flag disposeAfterUse = DisposeAfterUse::YES);
/**
* Creates an audio stream, which plays from the given stream.
@@ -90,8 +90,8 @@ SeekableAudioStream *makeRawStream(const byte *buffer, uint32 size,
* @return The new SeekableAudioStream (or 0 on failure).
*/
SeekableAudioStream *makeRawStream(Common::SeekableReadStream *stream,
- int rate, byte flags,
- DisposeAfterUse::Flag disposeAfterUse = DisposeAfterUse::YES);
+ int rate, byte flags,
+ DisposeAfterUse::Flag disposeAfterUse = DisposeAfterUse::YES);
/**
* Creates a PacketizedAudioStream that will automatically queue
diff --git a/audio/decoders/util.h b/audio/decoders/util.h
index d5e2eda575..7db17db809 100644
--- a/audio/decoders/util.h
+++ b/audio/decoders/util.h
@@ -35,7 +35,7 @@ static inline int16 floatToInt16(float src) {
// Convert planar float samples into interleaved int16 samples
static inline void floatToInt16Interleave(int16 *dst, const float **src,
- uint32 length, uint8 channels) {
+ uint32 length, uint8 channels) {
if (channels == 2) {
for (uint32 i = 0; i < length; i++) {
dst[2 * i ] = floatToInt16(src[0][i]);
diff --git a/audio/decoders/wma.cpp b/audio/decoders/wma.cpp
index 032934addf..6f9fdf2aea 100644
--- a/audio/decoders/wma.cpp
+++ b/audio/decoders/wma.cpp
@@ -50,13 +50,13 @@ static inline void butterflyFloats(float *v1, float *v2, int len) {
}
static inline void vectorFMulAdd(float *dst, const float *src0,
- const float *src1, const float *src2, int len) {
+ const float *src1, const float *src2, int len) {
while (len-- > 0)
*dst++ = *src0++ * *src1++ + *src2++;
}
static inline void vectorFMulReverse(float *dst, const float *src0,
- const float *src1, int len) {
+ const float *src1, int len) {
src1 += len - 1;
while (len-- > 0)
@@ -767,7 +767,7 @@ int WMACodec::decodeBlock(Common::BitStream8MSB &bits) {
}
bool WMACodec::decodeChannels(Common::BitStream8MSB &bits, int bSize,
- bool msStereo, bool *hasChannel) {
+ bool msStereo, bool *hasChannel) {
int totalGain = readTotalGain(bits);
int coefBitCount = totalGainToBits(totalGain);
@@ -899,7 +899,7 @@ void WMACodec::calculateCoefCount(int *coefCount, int bSize) const {
}
bool WMACodec::decodeNoise(Common::BitStream8MSB &bits, int bSize,
- bool *hasChannel, int *coefCount) {
+ bool *hasChannel, int *coefCount) {
if (!_useNoiseCoding)
return true;
@@ -973,7 +973,7 @@ bool WMACodec::decodeExponents(Common::BitStream8MSB &bits, int bSize, bool *has
}
bool WMACodec::decodeSpectralCoef(Common::BitStream8MSB &bits, bool msStereo, bool *hasChannel,
- int *coefCount, int coefBitCount) {
+ int *coefCount, int coefBitCount) {
// Simple RLE encoding
for (int i = 0; i < _channels; i++) {
@@ -1009,7 +1009,7 @@ float WMACodec::getNormalizedMDCTLength() const {
}
void WMACodec::calculateMDCTCoefficients(int bSize, bool *hasChannel,
- int *coefCount, int totalGain, float mdctNorm) {
+ int *coefCount, int totalGain, float mdctNorm) {
for (int i = 0; i < _channels; i++) {
if (!hasChannel[i])
@@ -1132,84 +1132,84 @@ void WMACodec::calculateMDCTCoefficients(int bSize, bool *hasChannel,
}
static const float powTab[] = {
- 1.7782794100389e-04, 2.0535250264571e-04,
- 2.3713737056617e-04, 2.7384196342644e-04,
- 3.1622776601684e-04, 3.6517412725484e-04,
- 4.2169650342858e-04, 4.8696752516586e-04,
- 5.6234132519035e-04, 6.4938163157621e-04,
- 7.4989420933246e-04, 8.6596432336006e-04,
- 1.0000000000000e-03, 1.1547819846895e-03,
- 1.3335214321633e-03, 1.5399265260595e-03,
- 1.7782794100389e-03, 2.0535250264571e-03,
- 2.3713737056617e-03, 2.7384196342644e-03,
- 3.1622776601684e-03, 3.6517412725484e-03,
- 4.2169650342858e-03, 4.8696752516586e-03,
- 5.6234132519035e-03, 6.4938163157621e-03,
- 7.4989420933246e-03, 8.6596432336006e-03,
- 1.0000000000000e-02, 1.1547819846895e-02,
- 1.3335214321633e-02, 1.5399265260595e-02,
- 1.7782794100389e-02, 2.0535250264571e-02,
- 2.3713737056617e-02, 2.7384196342644e-02,
- 3.1622776601684e-02, 3.6517412725484e-02,
- 4.2169650342858e-02, 4.8696752516586e-02,
- 5.6234132519035e-02, 6.4938163157621e-02,
- 7.4989420933246e-02, 8.6596432336007e-02,
- 1.0000000000000e-01, 1.1547819846895e-01,
- 1.3335214321633e-01, 1.5399265260595e-01,
- 1.7782794100389e-01, 2.0535250264571e-01,
- 2.3713737056617e-01, 2.7384196342644e-01,
- 3.1622776601684e-01, 3.6517412725484e-01,
- 4.2169650342858e-01, 4.8696752516586e-01,
- 5.6234132519035e-01, 6.4938163157621e-01,
- 7.4989420933246e-01, 8.6596432336007e-01,
- 1.0000000000000e+00, 1.1547819846895e+00,
- 1.3335214321633e+00, 1.5399265260595e+00,
- 1.7782794100389e+00, 2.0535250264571e+00,
- 2.3713737056617e+00, 2.7384196342644e+00,
- 3.1622776601684e+00, 3.6517412725484e+00,
- 4.2169650342858e+00, 4.8696752516586e+00,
- 5.6234132519035e+00, 6.4938163157621e+00,
- 7.4989420933246e+00, 8.6596432336007e+00,
- 1.0000000000000e+01, 1.1547819846895e+01,
- 1.3335214321633e+01, 1.5399265260595e+01,
- 1.7782794100389e+01, 2.0535250264571e+01,
- 2.3713737056617e+01, 2.7384196342644e+01,
- 3.1622776601684e+01, 3.6517412725484e+01,
- 4.2169650342858e+01, 4.8696752516586e+01,
- 5.6234132519035e+01, 6.4938163157621e+01,
- 7.4989420933246e+01, 8.6596432336007e+01,
- 1.0000000000000e+02, 1.1547819846895e+02,
- 1.3335214321633e+02, 1.5399265260595e+02,
- 1.7782794100389e+02, 2.0535250264571e+02,
- 2.3713737056617e+02, 2.7384196342644e+02,
- 3.1622776601684e+02, 3.6517412725484e+02,
- 4.2169650342858e+02, 4.8696752516586e+02,
- 5.6234132519035e+02, 6.4938163157621e+02,
- 7.4989420933246e+02, 8.6596432336007e+02,
- 1.0000000000000e+03, 1.1547819846895e+03,
- 1.3335214321633e+03, 1.5399265260595e+03,
- 1.7782794100389e+03, 2.0535250264571e+03,
- 2.3713737056617e+03, 2.7384196342644e+03,
- 3.1622776601684e+03, 3.6517412725484e+03,
- 4.2169650342858e+03, 4.8696752516586e+03,
- 5.6234132519035e+03, 6.4938163157621e+03,
- 7.4989420933246e+03, 8.6596432336007e+03,
- 1.0000000000000e+04, 1.1547819846895e+04,
- 1.3335214321633e+04, 1.5399265260595e+04,
- 1.7782794100389e+04, 2.0535250264571e+04,
- 2.3713737056617e+04, 2.7384196342644e+04,
- 3.1622776601684e+04, 3.6517412725484e+04,
- 4.2169650342858e+04, 4.8696752516586e+04,
- 5.6234132519035e+04, 6.4938163157621e+04,
- 7.4989420933246e+04, 8.6596432336007e+04,
- 1.0000000000000e+05, 1.1547819846895e+05,
- 1.3335214321633e+05, 1.5399265260595e+05,
- 1.7782794100389e+05, 2.0535250264571e+05,
- 2.3713737056617e+05, 2.7384196342644e+05,
- 3.1622776601684e+05, 3.6517412725484e+05,
- 4.2169650342858e+05, 4.8696752516586e+05,
- 5.6234132519035e+05, 6.4938163157621e+05,
- 7.4989420933246e+05, 8.6596432336007e+05,
+ 1.7782794100389e-04, 2.0535250264571e-04,
+ 2.3713737056617e-04, 2.7384196342644e-04,
+ 3.1622776601684e-04, 3.6517412725484e-04,
+ 4.2169650342858e-04, 4.8696752516586e-04,
+ 5.6234132519035e-04, 6.4938163157621e-04,
+ 7.4989420933246e-04, 8.6596432336006e-04,
+ 1.0000000000000e-03, 1.1547819846895e-03,
+ 1.3335214321633e-03, 1.5399265260595e-03,
+ 1.7782794100389e-03, 2.0535250264571e-03,
+ 2.3713737056617e-03, 2.7384196342644e-03,
+ 3.1622776601684e-03, 3.6517412725484e-03,
+ 4.2169650342858e-03, 4.8696752516586e-03,
+ 5.6234132519035e-03, 6.4938163157621e-03,
+ 7.4989420933246e-03, 8.6596432336006e-03,
+ 1.0000000000000e-02, 1.1547819846895e-02,
+ 1.3335214321633e-02, 1.5399265260595e-02,
+ 1.7782794100389e-02, 2.0535250264571e-02,
+ 2.3713737056617e-02, 2.7384196342644e-02,
+ 3.1622776601684e-02, 3.6517412725484e-02,
+ 4.2169650342858e-02, 4.8696752516586e-02,
+ 5.6234132519035e-02, 6.4938163157621e-02,
+ 7.4989420933246e-02, 8.6596432336007e-02,
+ 1.0000000000000e-01, 1.1547819846895e-01,
+ 1.3335214321633e-01, 1.5399265260595e-01,
+ 1.7782794100389e-01, 2.0535250264571e-01,
+ 2.3713737056617e-01, 2.7384196342644e-01,
+ 3.1622776601684e-01, 3.6517412725484e-01,
+ 4.2169650342858e-01, 4.8696752516586e-01,
+ 5.6234132519035e-01, 6.4938163157621e-01,
+ 7.4989420933246e-01, 8.6596432336007e-01,
+ 1.0000000000000e+00, 1.1547819846895e+00,
+ 1.3335214321633e+00, 1.5399265260595e+00,
+ 1.7782794100389e+00, 2.0535250264571e+00,
+ 2.3713737056617e+00, 2.7384196342644e+00,
+ 3.1622776601684e+00, 3.6517412725484e+00,
+ 4.2169650342858e+00, 4.8696752516586e+00,
+ 5.6234132519035e+00, 6.4938163157621e+00,
+ 7.4989420933246e+00, 8.6596432336007e+00,
+ 1.0000000000000e+01, 1.1547819846895e+01,
+ 1.3335214321633e+01, 1.5399265260595e+01,
+ 1.7782794100389e+01, 2.0535250264571e+01,
+ 2.3713737056617e+01, 2.7384196342644e+01,
+ 3.1622776601684e+01, 3.6517412725484e+01,
+ 4.2169650342858e+01, 4.8696752516586e+01,
+ 5.6234132519035e+01, 6.4938163157621e+01,
+ 7.4989420933246e+01, 8.6596432336007e+01,
+ 1.0000000000000e+02, 1.1547819846895e+02,
+ 1.3335214321633e+02, 1.5399265260595e+02,
+ 1.7782794100389e+02, 2.0535250264571e+02,
+ 2.3713737056617e+02, 2.7384196342644e+02,
+ 3.1622776601684e+02, 3.6517412725484e+02,
+ 4.2169650342858e+02, 4.8696752516586e+02,
+ 5.6234132519035e+02, 6.4938163157621e+02,
+ 7.4989420933246e+02, 8.6596432336007e+02,
+ 1.0000000000000e+03, 1.1547819846895e+03,
+ 1.3335214321633e+03, 1.5399265260595e+03,
+ 1.7782794100389e+03, 2.0535250264571e+03,
+ 2.3713737056617e+03, 2.7384196342644e+03,
+ 3.1622776601684e+03, 3.6517412725484e+03,
+ 4.2169650342858e+03, 4.8696752516586e+03,
+ 5.6234132519035e+03, 6.4938163157621e+03,
+ 7.4989420933246e+03, 8.6596432336007e+03,
+ 1.0000000000000e+04, 1.1547819846895e+04,
+ 1.3335214321633e+04, 1.5399265260595e+04,
+ 1.7782794100389e+04, 2.0535250264571e+04,
+ 2.3713737056617e+04, 2.7384196342644e+04,
+ 3.1622776601684e+04, 3.6517412725484e+04,
+ 4.2169650342858e+04, 4.8696752516586e+04,
+ 5.6234132519035e+04, 6.4938163157621e+04,
+ 7.4989420933246e+04, 8.6596432336007e+04,
+ 1.0000000000000e+05, 1.1547819846895e+05,
+ 1.3335214321633e+05, 1.5399265260595e+05,
+ 1.7782794100389e+05, 2.0535250264571e+05,
+ 2.3713737056617e+05, 2.7384196342644e+05,
+ 3.1622776601684e+05, 3.6517412725484e+05,
+ 4.2169650342858e+05, 4.8696752516586e+05,
+ 5.6234132519035e+05, 6.4938163157621e+05,
+ 7.4989420933246e+05, 8.6596432336007e+05,
};
bool WMACodec::decodeExpHuffman(Common::BitStream8MSB &bits, int ch) {
diff --git a/audio/mixer.cpp b/audio/mixer.cpp
index beda136acf..28b569eb6b 100644
--- a/audio/mixer.cpp
+++ b/audio/mixer.cpp
@@ -497,11 +497,11 @@ int MixerImpl::getVolumeForSoundType(SoundType type) const {
#pragma mark -
Channel::Channel(Mixer *mixer, Mixer::SoundType type, AudioStream *stream,
- DisposeAfterUse::Flag autofreeStream, bool reverseStereo, int id, bool permanent)
- : _type(type), _mixer(mixer), _id(id), _permanent(permanent), _volume(Mixer::kMaxChannelVolume),
- _balance(0), _pauseLevel(0), _samplesConsumed(0), _samplesDecoded(0), _mixerTimeStamp(0),
- _pauseStartTime(0), _pauseTime(0), _converter(0), _volL(0), _volR(0),
- _stream(stream, autofreeStream) {
+ DisposeAfterUse::Flag autofreeStream, bool reverseStereo, int id, bool permanent)
+ : _type(type), _mixer(mixer), _id(id), _permanent(permanent), _volume(Mixer::kMaxChannelVolume),
+ _balance(0), _pauseLevel(0), _samplesConsumed(0), _samplesDecoded(0), _mixerTimeStamp(0),
+ _pauseStartTime(0), _pauseTime(0), _converter(0), _volL(0), _volR(0),
+ _stream(stream, autofreeStream) {
assert(mixer);
assert(stream);
diff --git a/backends/audiocd/sdl/sdl-audiocd.cpp b/backends/audiocd/sdl/sdl-audiocd.cpp
index e2e4f1d069..149e4139a9 100644
--- a/backends/audiocd/sdl/sdl-audiocd.cpp
+++ b/backends/audiocd/sdl/sdl-audiocd.cpp
@@ -77,10 +77,10 @@ void SdlAudioCDManager::close() {
DefaultAudioCDManager::close();
if (_cdrom) {
- SDL_CDStop(_cdrom);
- SDL_CDClose(_cdrom);
+ SDL_CDStop(_cdrom);
+ SDL_CDClose(_cdrom);
_cdrom = 0;
- }
+ }
}
void SdlAudioCDManager::stop() {
diff --git a/backends/audiocd/win32/msvc/ntddcdrm.h b/backends/audiocd/win32/msvc/ntddcdrm.h
index 18527e2675..02ff609259 100644
--- a/backends/audiocd/win32/msvc/ntddcdrm.h
+++ b/backends/audiocd/win32/msvc/ntddcdrm.h
@@ -230,8 +230,8 @@ typedef struct _CDROM_TOC_CD_TEXT_DATA_BLOCK {
UCHAR BlockNumber : 3;
UCHAR Unicode : 1;
_ANONYMOUS_UNION union {
- UCHAR Text[12];
- WCHAR WText[6];
+ UCHAR Text[12];
+ WCHAR WText[6];
} DUMMYUNIONNAME;
UCHAR CRC[2];
} CDROM_TOC_CD_TEXT_DATA_BLOCK, *PCDROM_TOC_CD_TEXT_DATA_BLOCK;
diff --git a/backends/dialogs/morphos/morphos-dialogs.cpp b/backends/dialogs/morphos/morphos-dialogs.cpp
index 5fe063b3b1..735a77c5c8 100644
--- a/backends/dialogs/morphos/morphos-dialogs.cpp
+++ b/backends/dialogs/morphos/morphos-dialogs.cpp
@@ -71,7 +71,7 @@ Common::DialogManager::DialogResult MorphosDialogManager::showFileBrowser(const
Common::String utf8Title = title.encode();
struct Library *AslBase = OpenLibrary(AslName, 39);
- if (AslBase) {
+ if (AslBase) {
struct FileRequester *fr = NULL;
diff --git a/backends/events/riscossdl/riscossdl-events.cpp b/backends/events/riscossdl/riscossdl-events.cpp
index 201bca94bc..8e053cff7b 100644
--- a/backends/events/riscossdl/riscossdl-events.cpp
+++ b/backends/events/riscossdl/riscossdl-events.cpp
@@ -32,7 +32,7 @@
#include <swis.h>
RISCOSSdlEventSource::RISCOSSdlEventSource()
- : SdlEventSource() {
+ : SdlEventSource() {
int messages[2];
messages[0] = 3; // Message_DataLoad
messages[1] = 0;
diff --git a/backends/events/sdl/sdl-events.cpp b/backends/events/sdl/sdl-events.cpp
index 764899ad52..e89d411011 100644
--- a/backends/events/sdl/sdl-events.cpp
+++ b/backends/events/sdl/sdl-events.cpp
@@ -73,12 +73,12 @@ void SdlEventSource::loadGameControllerMappingFile() {
#endif
SdlEventSource::SdlEventSource()
- : EventSource(), _scrollLock(false), _joystick(0), _lastScreenID(0), _graphicsManager(0), _queuedFakeMouseMove(false),
- _lastHatPosition(SDL_HAT_CENTERED), _mouseX(0), _mouseY(0), _engineRunning(false)
+ : EventSource(), _scrollLock(false), _joystick(0), _lastScreenID(0), _graphicsManager(0), _queuedFakeMouseMove(false),
+ _lastHatPosition(SDL_HAT_CENTERED), _mouseX(0), _mouseY(0), _engineRunning(false)
#if SDL_VERSION_ATLEAST(2, 0, 0)
- , _queuedFakeKeyUp(false), _fakeKeyUp(), _controller(nullptr)
+ , _queuedFakeKeyUp(false), _fakeKeyUp(), _controller(nullptr)
#endif
- {
+ {
int joystick_num = ConfMan.getInt("joystick_num");
if (joystick_num >= 0) {
// Initialize SDL joystick subsystem
@@ -757,9 +757,9 @@ void SdlEventSource::openJoystick(int joystickIndex) {
_joystick = SDL_JoystickOpen(joystickIndex);
debug("Using joystick: %s",
#if SDL_VERSION_ATLEAST(2, 0, 0)
- SDL_JoystickName(_joystick)
+ SDL_JoystickName(_joystick)
#else
- SDL_JoystickName(joystickIndex)
+ SDL_JoystickName(joystickIndex)
#endif
);
}
diff --git a/backends/events/symbiansdl/symbiansdl-events.cpp b/backends/events/symbiansdl/symbiansdl-events.cpp
index 2377fa49bf..a44025cc89 100644
--- a/backends/events/symbiansdl/symbiansdl-events.cpp
+++ b/backends/events/symbiansdl/symbiansdl-events.cpp
@@ -34,9 +34,9 @@
#define JOY_DEADZONE 3200
SymbianSdlEventSource::zoneDesc SymbianSdlEventSource::_zones[TOTAL_ZONES] = {
- { 0, 0, 320, 145 },
- { 0, 145, 150, 55 },
- { 150, 145, 170, 55 }
+ { 0, 0, 320, 145 },
+ { 0, 145, 150, 55 },
+ { 150, 145, 170, 55 }
};
SymbianSdlEventSource::SymbianSdlEventSource()
diff --git a/backends/fs/amigaos/amigaos-fs.cpp b/backends/fs/amigaos/amigaos-fs.cpp
index 6404e357b1..5f1ed71da0 100644
--- a/backends/fs/amigaos/amigaos-fs.cpp
+++ b/backends/fs/amigaos/amigaos-fs.cpp
@@ -171,10 +171,10 @@ AmigaOSFilesystemNode::AmigaOSFilesystemNode(BPTR pLock, const char *pDisplayNam
_bIsValid = true;
}
- IDOS->FreeDosObject(DOS_EXAMINEDATA, pExd);
+ IDOS->FreeDosObject(DOS_EXAMINEDATA, pExd);
} else {
debug(6, "IDOS->ExamineData() failed - ExamineDosObject returned NULL!");
- }
+ }
LEAVE();
}
diff --git a/backends/fs/chroot/chroot-fs-factory.cpp b/backends/fs/chroot/chroot-fs-factory.cpp
index ac8d9b65f0..4312773799 100644
--- a/backends/fs/chroot/chroot-fs-factory.cpp
+++ b/backends/fs/chroot/chroot-fs-factory.cpp
@@ -35,7 +35,7 @@
#include "backends/fs/chroot/chroot-fs.h"
ChRootFilesystemFactory::ChRootFilesystemFactory(const Common::String &root)
- : _root(root) {
+ : _root(root) {
}
AbstractFSNode *ChRootFilesystemFactory::makeRootFileNode() const {
diff --git a/backends/fs/morphos/morphos-fs.cpp b/backends/fs/morphos/morphos-fs.cpp
index 9a14def638..a15f5fc30e 100644
--- a/backends/fs/morphos/morphos-fs.cpp
+++ b/backends/fs/morphos/morphos-fs.cpp
@@ -149,7 +149,7 @@ MorphOSFilesystemNode::MorphOSFilesystemNode(BPTR pLock, const char *pDisplayNam
} else {
_bIsValid = true;
}
- }
+ }
FreeDosObject(DOS_FIB, fib);
}
diff --git a/backends/fs/posix/posix-fs.cpp b/backends/fs/posix/posix-fs.cpp
index df3af43f63..9a97850820 100644
--- a/backends/fs/posix/posix-fs.cpp
+++ b/backends/fs/posix/posix-fs.cpp
@@ -157,7 +157,7 @@ bool POSIXFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, boo
char drive_root[] = "A:/";
drive_root[0] += i;
- POSIXFilesystemNode *entry = new POSIXFilesystemNode();
+ POSIXFilesystemNode *entry = new POSIXFilesystemNode();
entry->_isDirectory = true;
entry->_isValid = true;
entry->_path = drive_root;
diff --git a/backends/graphics/opengl/framebuffer.cpp b/backends/graphics/opengl/framebuffer.cpp
index 02c913c830..b7eb136abb 100644
--- a/backends/graphics/opengl/framebuffer.cpp
+++ b/backends/graphics/opengl/framebuffer.cpp
@@ -27,8 +27,8 @@
namespace OpenGL {
Framebuffer::Framebuffer()
- : _viewport(), _projectionMatrix(), _isActive(false), _clearColor(),
- _blendState(kBlendModeDisabled), _scissorTestState(false), _scissorBox() {
+ : _viewport(), _projectionMatrix(), _isActive(false), _clearColor(),
+ _blendState(kBlendModeDisabled), _scissorTestState(false), _scissorBox() {
}
void Framebuffer::activate() {
@@ -187,7 +187,7 @@ void Backbuffer::setDimensions(uint width, uint height) {
#if !USE_FORCED_GLES
TextureTarget::TextureTarget()
- : _texture(new GLTexture(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE)), _glFBO(0), _needUpdate(true) {
+ : _texture(new GLTexture(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE)), _glFBO(0), _needUpdate(true) {
}
TextureTarget::~TextureTarget() {
diff --git a/backends/graphics/opengl/opengl-graphics.cpp b/backends/graphics/opengl/opengl-graphics.cpp
index 086375cd07..1163ebbb1c 100644
--- a/backends/graphics/opengl/opengl-graphics.cpp
+++ b/backends/graphics/opengl/opengl-graphics.cpp
@@ -59,19 +59,19 @@
namespace OpenGL {
OpenGLGraphicsManager::OpenGLGraphicsManager()
- : _currentState(), _oldState(), _transactionMode(kTransactionNone), _screenChangeID(1 << (sizeof(int) * 8 - 2)),
- _pipeline(nullptr), _stretchMode(STRETCH_FIT),
- _defaultFormat(), _defaultFormatAlpha(),
- _gameScreen(nullptr), _overlay(nullptr),
- _cursor(nullptr),
- _cursorHotspotX(0), _cursorHotspotY(0),
- _cursorHotspotXScaled(0), _cursorHotspotYScaled(0), _cursorWidthScaled(0), _cursorHeightScaled(0),
- _cursorKeyColor(0), _cursorDontScale(false), _cursorPaletteEnabled(false)
+ : _currentState(), _oldState(), _transactionMode(kTransactionNone), _screenChangeID(1 << (sizeof(int) * 8 - 2)),
+ _pipeline(nullptr), _stretchMode(STRETCH_FIT),
+ _defaultFormat(), _defaultFormatAlpha(),
+ _gameScreen(nullptr), _overlay(nullptr),
+ _cursor(nullptr),
+ _cursorHotspotX(0), _cursorHotspotY(0),
+ _cursorHotspotXScaled(0), _cursorHotspotYScaled(0), _cursorWidthScaled(0), _cursorHeightScaled(0),
+ _cursorKeyColor(0), _cursorDontScale(false), _cursorPaletteEnabled(false)
#ifdef USE_OSD
- , _osdMessageChangeRequest(false), _osdMessageAlpha(0), _osdMessageFadeStartTime(0), _osdMessageSurface(nullptr),
- _osdIconSurface(nullptr)
+ , _osdMessageChangeRequest(false), _osdMessageAlpha(0), _osdMessageFadeStartTime(0), _osdMessageSurface(nullptr),
+ _osdIconSurface(nullptr)
#endif
- {
+ {
memset(_gamePalette, 0, sizeof(_gamePalette));
g_context.reset();
}
@@ -655,8 +655,8 @@ void OpenGLGraphicsManager::grabOverlay(void *buf, int pitch) const {
namespace {
template<typename SrcColor, typename DstColor>
void multiplyColorWithAlpha(const byte *src, byte *dst, const uint w, const uint h,
- const Graphics::PixelFormat &srcFmt, const Graphics::PixelFormat &dstFmt,
- const uint srcPitch, const uint dstPitch, const SrcColor keyColor) {
+ const Graphics::PixelFormat &srcFmt, const Graphics::PixelFormat &dstFmt,
+ const uint srcPitch, const uint dstPitch, const SrcColor keyColor) {
for (uint y = 0; y < h; ++y) {
for (uint x = 0; x < w; ++x) {
const uint32 color = *(const SrcColor *)src;
diff --git a/backends/graphics/opengl/pipelines/clut8.cpp b/backends/graphics/opengl/pipelines/clut8.cpp
index fca40074f0..172fba69be 100644
--- a/backends/graphics/opengl/pipelines/clut8.cpp
+++ b/backends/graphics/opengl/pipelines/clut8.cpp
@@ -28,7 +28,7 @@ namespace OpenGL {
#if !USE_FORCED_GLES
CLUT8LookUpPipeline::CLUT8LookUpPipeline()
- : ShaderPipeline(ShaderMan.query(ShaderManager::kCLUT8LookUp)), _paletteTexture(nullptr) {
+ : ShaderPipeline(ShaderMan.query(ShaderManager::kCLUT8LookUp)), _paletteTexture(nullptr) {
}
void CLUT8LookUpPipeline::drawTexture(const GLTexture &texture, const GLfloat *coordinates) {
diff --git a/backends/graphics/opengl/pipelines/pipeline.cpp b/backends/graphics/opengl/pipelines/pipeline.cpp
index 6a59cd28e7..921641ba48 100644
--- a/backends/graphics/opengl/pipelines/pipeline.cpp
+++ b/backends/graphics/opengl/pipelines/pipeline.cpp
@@ -26,7 +26,7 @@
namespace OpenGL {
Pipeline::Pipeline()
- : _activeFramebuffer(nullptr), _isActive(false) {
+ : _activeFramebuffer(nullptr), _isActive(false) {
}
void Pipeline::activate() {
diff --git a/backends/graphics/opengl/pipelines/shader.cpp b/backends/graphics/opengl/pipelines/shader.cpp
index a2dabb7c22..8a2db45d57 100644
--- a/backends/graphics/opengl/pipelines/shader.cpp
+++ b/backends/graphics/opengl/pipelines/shader.cpp
@@ -28,7 +28,7 @@ namespace OpenGL {
#if !USE_FORCED_GLES
ShaderPipeline::ShaderPipeline(Shader *shader)
- : _activeShader(shader), _colorAttributes() {
+ : _activeShader(shader), _colorAttributes() {
_vertexAttribLocation = shader->getAttributeLocation("position");
_texCoordAttribLocation = shader->getAttributeLocation("texCoordIn");
_colorAttribLocation = shader->getAttributeLocation("blendColorIn");
diff --git a/backends/graphics/opengl/shader.cpp b/backends/graphics/opengl/shader.cpp
index 80b746b7b3..1f3586dc87 100644
--- a/backends/graphics/opengl/shader.cpp
+++ b/backends/graphics/opengl/shader.cpp
@@ -111,7 +111,7 @@ void ShaderUniformMatrix44::set(GLint location) const {
#pragma mark - Shader Implementation -
Shader::Shader(const Common::String &vertex, const Common::String &fragment)
- : _vertex(vertex), _fragment(fragment), _isActive(false), _program(0), _uniforms() {
+ : _vertex(vertex), _fragment(fragment), _isActive(false), _program(0), _uniforms() {
recreate();
}
diff --git a/backends/graphics/opengl/texture.cpp b/backends/graphics/opengl/texture.cpp
index 2b6f9ce0a1..5001aab82b 100644
--- a/backends/graphics/opengl/texture.cpp
+++ b/backends/graphics/opengl/texture.cpp
@@ -34,10 +34,10 @@
namespace OpenGL {
GLTexture::GLTexture(GLenum glIntFormat, GLenum glFormat, GLenum glType)
- : _glIntFormat(glIntFormat), _glFormat(glFormat), _glType(glType),
- _width(0), _height(0), _logicalWidth(0), _logicalHeight(0),
- _texCoords(), _glFilter(GL_NEAREST),
- _glTexture(0) {
+ : _glIntFormat(glIntFormat), _glFormat(glFormat), _glType(glType),
+ _width(0), _height(0), _logicalWidth(0), _logicalHeight(0),
+ _texCoords(), _glFilter(GL_NEAREST),
+ _glTexture(0) {
create();
}
@@ -162,7 +162,7 @@ void GLTexture::updateArea(const Common::Rect &area, const Graphics::Surface &sr
//
Surface::Surface()
- : _allDirty(false), _dirtyArea() {
+ : _allDirty(false), _dirtyArea() {
}
void Surface::copyRectToTexture(uint x, uint y, uint w, uint h, const void *srcPtr, uint srcPitch) {
@@ -216,8 +216,8 @@ Common::Rect Surface::getDirtyArea() const {
//
Texture::Texture(GLenum glIntFormat, GLenum glFormat, GLenum glType, const Graphics::PixelFormat &format)
- : Surface(), _format(format), _glTexture(glIntFormat, glFormat, glType),
- _textureData(), _userPixelData() {
+ : Surface(), _format(format), _glTexture(glIntFormat, glFormat, glType),
+ _textureData(), _userPixelData() {
}
Texture::~Texture() {
@@ -306,7 +306,7 @@ void Texture::updateGLTexture() {
}
TextureCLUT8::TextureCLUT8(GLenum glIntFormat, GLenum glFormat, GLenum glType, const Graphics::PixelFormat &format)
- : Texture(glIntFormat, glFormat, glType, format), _clut8Data(), _palette(new byte[256 * format.bytesPerPixel]) {
+ : Texture(glIntFormat, glFormat, glType, format), _clut8Data(), _palette(new byte[256 * format.bytesPerPixel]) {
memset(_palette, 0, sizeof(byte) * format.bytesPerPixel);
}
@@ -421,8 +421,8 @@ void TextureCLUT8::updateGLTexture() {
#if !USE_FORCED_GL
FakeTexture::FakeTexture(GLenum glIntFormat, GLenum glFormat, GLenum glType, const Graphics::PixelFormat &format)
- : Texture(glIntFormat, glFormat, glType, format),
- _rgbData() {
+ : Texture(glIntFormat, glFormat, glType, format),
+ _rgbData() {
}
FakeTexture::~FakeTexture() {
@@ -443,7 +443,7 @@ void FakeTexture::allocate(uint width, uint height) {
}
TextureRGB555::TextureRGB555()
- : FakeTexture(GL_RGB, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0)) {
+ : FakeTexture(GL_RGB, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0)) {
}
Graphics::PixelFormat TextureRGB555::getFormat() const {
@@ -485,11 +485,11 @@ void TextureRGB555::updateGLTexture() {
TextureRGBA8888Swap::TextureRGBA8888Swap()
#ifdef SCUMM_LITTLE_ENDIAN
- : FakeTexture(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, Graphics::PixelFormat(4, 8, 8, 8, 8, 0, 8, 16, 24)) // ABGR8888
+ : FakeTexture(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, Graphics::PixelFormat(4, 8, 8, 8, 8, 0, 8, 16, 24)) // ABGR8888
#else
- : FakeTexture(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, Graphics::PixelFormat(4, 8, 8, 8, 8, 24, 16, 8, 0)) // RGBA8888
+ : FakeTexture(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, Graphics::PixelFormat(4, 8, 8, 8, 8, 24, 16, 8, 0)) // RGBA8888
#endif
- {
+ {
}
Graphics::PixelFormat TextureRGBA8888Swap::getFormat() const {
@@ -540,11 +540,11 @@ void TextureRGBA8888Swap::updateGLTexture() {
// problems, we need to switch to GL_R8 and GL_RED, but that is only supported
// for ARB_texture_rg and GLES3+ (EXT_rexture_rg does not support GL_R8).
TextureCLUT8GPU::TextureCLUT8GPU()
- : _clut8Texture(GL_ALPHA, GL_ALPHA, GL_UNSIGNED_BYTE),
- _paletteTexture(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE),
- _target(new TextureTarget()), _clut8Pipeline(new CLUT8LookUpPipeline()),
- _clut8Vertices(), _clut8Data(), _userPixelData(), _palette(),
- _paletteDirty(false) {
+ : _clut8Texture(GL_ALPHA, GL_ALPHA, GL_UNSIGNED_BYTE),
+ _paletteTexture(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE),
+ _target(new TextureTarget()), _clut8Pipeline(new CLUT8LookUpPipeline()),
+ _clut8Vertices(), _clut8Data(), _userPixelData(), _palette(),
+ _paletteDirty(false) {
// Allocate space for 256 colors.
_paletteTexture.setSize(256, 1);
diff --git a/backends/graphics/openglsdl/openglsdl-graphics.cpp b/backends/graphics/openglsdl/openglsdl-graphics.cpp
index fcb643f228..4d1a437c5e 100644
--- a/backends/graphics/openglsdl/openglsdl-graphics.cpp
+++ b/backends/graphics/openglsdl/openglsdl-graphics.cpp
@@ -33,14 +33,14 @@
#endif
OpenGLSdlGraphicsManager::OpenGLSdlGraphicsManager(SdlEventSource *eventSource, SdlWindow *window)
- : SdlGraphicsManager(eventSource, window), _lastRequestedHeight(0),
+ : SdlGraphicsManager(eventSource, window), _lastRequestedHeight(0),
#if SDL_VERSION_ATLEAST(2, 0, 0)
- _glContext(),
+ _glContext(),
#else
- _lastVideoModeLoad(0),
+ _lastVideoModeLoad(0),
#endif
- _graphicsScale(2), _ignoreLoadVideoMode(false), _gotResize(false), _wantsFullScreen(false), _ignoreResizeEvents(0),
- _desiredFullscreenWidth(0), _desiredFullscreenHeight(0) {
+ _graphicsScale(2), _ignoreLoadVideoMode(false), _gotResize(false), _wantsFullScreen(false), _ignoreResizeEvents(0),
+ _desiredFullscreenWidth(0), _desiredFullscreenHeight(0) {
// Setup OpenGL attributes for SDL
SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
index e89040548d..bf36ca8339 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
@@ -275,7 +275,7 @@ static void initGraphicsModes() {
// 0 should be the normal1x mode
s_defaultGraphicsMode = 0;
for (uint i = 0; i < plugins.size(); ++i) {
- ScalerPluginObject &plugin = plugins[i]->get<ScalerPluginObject>();
+ ScalerPluginObject &plugin = plugins[i]->get<ScalerPluginObject>();
const Common::Array<uint> &factors = plugin.getFactors();
const char *name = plugin.getName();
const char *prettyName = plugin.getPrettyName();
@@ -1891,7 +1891,7 @@ void SurfaceSdlGraphicsManager::setMouseCursor(const void *buf, uint w, uint h,
} else {
assert(!_mouseOrigSurface);
- // Allocate bigger surface because scalers will read past the boudaries.
+ // Allocate bigger surface because scalers will read past the boudaries.
_mouseOrigSurface = SDL_CreateRGBSurface(SDL_SWSURFACE | SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA,
_mouseCurState.w + _maxExtraPixels * 2,
_mouseCurState.h + _maxExtraPixels * 2,
@@ -2108,10 +2108,10 @@ void SurfaceSdlGraphicsManager::blitCursor() {
// HACK: AdvMame4x requires a height of at least 4 pixels, so we
// fall back on the Normal scaler when a smaller cursor is supplied.
if (_scalerPlugin->canDrawCursor() && (uint)_mouseCurState.h >= _extraPixels) {
- _scalerPlugin->scale(
- (byte *)_mouseOrigSurface->pixels + _mouseOrigSurface->pitch * _maxExtraPixels + _maxExtraPixels * _mouseOrigSurface->format->BytesPerPixel,
- _mouseOrigSurface->pitch, (byte *)_mouseSurface->pixels, _mouseSurface->pitch,
- _mouseCurState.w, _mouseCurState.h, 0, 0);
+ _scalerPlugin->scale(
+ (byte *)_mouseOrigSurface->pixels + _mouseOrigSurface->pitch * _maxExtraPixels + _maxExtraPixels * _mouseOrigSurface->format->BytesPerPixel,
+ _mouseOrigSurface->pitch, (byte *)_mouseSurface->pixels, _mouseSurface->pitch,
+ _mouseCurState.w, _mouseCurState.h, 0, 0);
} else
#endif
{
diff --git a/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp b/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp
index 7ba75a991b..7b69292a9a 100644
--- a/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp
+++ b/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp
@@ -305,7 +305,7 @@ void OpenGLSdlGraphics3dManager::createOrUpdateScreen() {
}
Math::Rect2d OpenGLSdlGraphics3dManager::computeGameRect(bool renderToFrameBuffer, uint gameWidth, uint gameHeight,
- uint screenWidth, uint screenHeight) {
+ uint screenWidth, uint screenHeight) {
if (renderToFrameBuffer) {
if (_lockAspectRatio) {
// The game is scaled to fit the screen, keeping the same aspect ratio
@@ -382,9 +382,9 @@ OpenGLSdlGraphics3dManager::OpenGLPixelFormat::OpenGLPixelFormat(uint screenByte
}
bool OpenGLSdlGraphics3dManager::createOrUpdateGLContext(uint gameWidth, uint gameHeight,
- uint effectiveWidth, uint effectiveHeight,
- bool renderToFramebuffer,
- bool engineSupportsArbitraryResolutions) {
+ uint effectiveWidth, uint effectiveHeight,
+ bool renderToFramebuffer,
+ bool engineSupportsArbitraryResolutions) {
// Build a list of OpenGL pixel formats usable by ScummVM
Common::Array<OpenGLPixelFormat> pixelFormats;
if (_antialiasing > 0 && !renderToFramebuffer) {
diff --git a/backends/keymapper/hardware-input.cpp b/backends/keymapper/hardware-input.cpp
index f3e6c7923f..ba8cce6492 100644
--- a/backends/keymapper/hardware-input.cpp
+++ b/backends/keymapper/hardware-input.cpp
@@ -242,43 +242,43 @@ const ModifierTableEntry defaultModifiers[] = {
};
const HardwareInputTableEntry defaultMouseButtons[] = {
- { "MOUSE_LEFT", MOUSE_BUTTON_LEFT, _s("Left Mouse Button") },
- { "MOUSE_RIGHT", MOUSE_BUTTON_RIGHT, _s("Right Mouse Button") },
- { "MOUSE_MIDDLE", MOUSE_BUTTON_MIDDLE, _s("Middle Mouse Button") },
- { "MOUSE_WHEEL_UP", MOUSE_WHEEL_UP, _s("Mouse Wheel Up") },
- { "MOUSE_WHEEL_DOWN", MOUSE_WHEEL_DOWN, _s("Mouse Wheel Down") },
- { "MOUSE_X1", MOUSE_BUTTON_X1, _s("X1 Mouse Button") },
- { "MOUSE_X2", MOUSE_BUTTON_X2, _s("X2 Mouse Button") },
- { nullptr, 0, nullptr }
+ { "MOUSE_LEFT", MOUSE_BUTTON_LEFT, _s("Left Mouse Button") },
+ { "MOUSE_RIGHT", MOUSE_BUTTON_RIGHT, _s("Right Mouse Button") },
+ { "MOUSE_MIDDLE", MOUSE_BUTTON_MIDDLE, _s("Middle Mouse Button") },
+ { "MOUSE_WHEEL_UP", MOUSE_WHEEL_UP, _s("Mouse Wheel Up") },
+ { "MOUSE_WHEEL_DOWN", MOUSE_WHEEL_DOWN, _s("Mouse Wheel Down") },
+ { "MOUSE_X1", MOUSE_BUTTON_X1, _s("X1 Mouse Button") },
+ { "MOUSE_X2", MOUSE_BUTTON_X2, _s("X2 Mouse Button") },
+ { nullptr, 0, nullptr }
};
const HardwareInputTableEntry defaultJoystickButtons[] = {
- { "JOY_A", JOYSTICK_BUTTON_A, _s("Joy A") },
- { "JOY_B", JOYSTICK_BUTTON_B, _s("Joy B") },
- { "JOY_X", JOYSTICK_BUTTON_X, _s("Joy X") },
- { "JOY_Y", JOYSTICK_BUTTON_Y, _s("Joy Y") },
- { "JOY_BACK", JOYSTICK_BUTTON_BACK, _s("Joy Back") },
- { "JOY_GUIDE", JOYSTICK_BUTTON_GUIDE, _s("Joy Guide") },
- { "JOY_START", JOYSTICK_BUTTON_START, _s("Joy Start") },
- { "JOY_LEFT_STICK", JOYSTICK_BUTTON_LEFT_STICK, _s("Left Stick") },
- { "JOY_RIGHT_STICK", JOYSTICK_BUTTON_RIGHT_STICK, _s("Right Stick") },
- { "JOY_LEFT_SHOULDER", JOYSTICK_BUTTON_LEFT_SHOULDER, _s("Left Shoulder") },
- { "JOY_RIGHT_SHOULDER", JOYSTICK_BUTTON_RIGHT_SHOULDER, _s("Right Shoulder") },
- { "JOY_UP", JOYSTICK_BUTTON_DPAD_UP, _s("D-pad Up") },
- { "JOY_DOWN", JOYSTICK_BUTTON_DPAD_DOWN, _s("D-pad Down") },
- { "JOY_LEFT", JOYSTICK_BUTTON_DPAD_LEFT, _s("D-pad Left") },
- { "JOY_RIGHT", JOYSTICK_BUTTON_DPAD_RIGHT, _s("D-pad Right") },
- { nullptr, 0, nullptr }
+ { "JOY_A", JOYSTICK_BUTTON_A, _s("Joy A") },
+ { "JOY_B", JOYSTICK_BUTTON_B, _s("Joy B") },
+ { "JOY_X", JOYSTICK_BUTTON_X, _s("Joy X") },
+ { "JOY_Y", JOYSTICK_BUTTON_Y, _s("Joy Y") },
+ { "JOY_BACK", JOYSTICK_BUTTON_BACK, _s("Joy Back") },
+ { "JOY_GUIDE", JOYSTICK_BUTTON_GUIDE, _s("Joy Guide") },
+ { "JOY_START", JOYSTICK_BUTTON_START, _s("Joy Start") },
+ { "JOY_LEFT_STICK", JOYSTICK_BUTTON_LEFT_STICK, _s("Left Stick") },
+ { "JOY_RIGHT_STICK", JOYSTICK_BUTTON_RIGHT_STICK, _s("Right Stick") },
+ { "JOY_LEFT_SHOULDER", JOYSTICK_BUTTON_LEFT_SHOULDER, _s("Left Shoulder") },
+ { "JOY_RIGHT_SHOULDER", JOYSTICK_BUTTON_RIGHT_SHOULDER, _s("Right Shoulder") },
+ { "JOY_UP", JOYSTICK_BUTTON_DPAD_UP, _s("D-pad Up") },
+ { "JOY_DOWN", JOYSTICK_BUTTON_DPAD_DOWN, _s("D-pad Down") },
+ { "JOY_LEFT", JOYSTICK_BUTTON_DPAD_LEFT, _s("D-pad Left") },
+ { "JOY_RIGHT", JOYSTICK_BUTTON_DPAD_RIGHT, _s("D-pad Right") },
+ { nullptr, 0, nullptr }
};
const AxisTableEntry defaultJoystickAxes[] = {
- { "JOY_LEFT_TRIGGER", JOYSTICK_AXIS_LEFT_TRIGGER, kAxisTypeHalf, _s("Left Trigger") },
- { "JOY_RIGHT_TRIGGER", JOYSTICK_AXIS_RIGHT_TRIGGER, kAxisTypeHalf, _s("Right Trigger") },
- { "JOY_LEFT_STICK_X", JOYSTICK_AXIS_LEFT_STICK_X, kAxisTypeFull, _s("Left Stick X") },
- { "JOY_LEFT_STICK_Y", JOYSTICK_AXIS_LEFT_STICK_Y, kAxisTypeFull, _s("Left Stick Y") },
- { "JOY_RIGHT_STICK_X", JOYSTICK_AXIS_RIGHT_STICK_X, kAxisTypeFull, _s("Right Stick X") },
- { "JOY_RIGHT_STICK_Y", JOYSTICK_AXIS_RIGHT_STICK_Y, kAxisTypeFull, _s("Right Stick Y") },
- { nullptr, 0, kAxisTypeFull, nullptr }
+ { "JOY_LEFT_TRIGGER", JOYSTICK_AXIS_LEFT_TRIGGER, kAxisTypeHalf, _s("Left Trigger") },
+ { "JOY_RIGHT_TRIGGER", JOYSTICK_AXIS_RIGHT_TRIGGER, kAxisTypeHalf, _s("Right Trigger") },
+ { "JOY_LEFT_STICK_X", JOYSTICK_AXIS_LEFT_STICK_X, kAxisTypeFull, _s("Left Stick X") },
+ { "JOY_LEFT_STICK_Y", JOYSTICK_AXIS_LEFT_STICK_Y, kAxisTypeFull, _s("Left Stick Y") },
+ { "JOY_RIGHT_STICK_X", JOYSTICK_AXIS_RIGHT_STICK_X, kAxisTypeFull, _s("Right Stick X") },
+ { "JOY_RIGHT_STICK_Y", JOYSTICK_AXIS_RIGHT_STICK_Y, kAxisTypeFull, _s("Right Stick Y") },
+ { nullptr, 0, kAxisTypeFull, nullptr }
};
HardwareInputSet::~HardwareInputSet() {
diff --git a/backends/log/log.cpp b/backends/log/log.cpp
index e37296aada..51d6ea636b 100644
--- a/backends/log/log.cpp
+++ b/backends/log/log.cpp
@@ -32,7 +32,7 @@ namespace Backends {
namespace Log {
Log::Log(OSystem *system)
- : _system(system), _stream(0), _startOfLine(true) {
+ : _system(system), _stream(0), _startOfLine(true) {
assert(system);
}
diff --git a/backends/platform/3ds/osystem-events.cpp b/backends/platform/3ds/osystem-events.cpp
index 4e8d25ffae..05af2daced 100644
--- a/backends/platform/3ds/osystem-events.cpp
+++ b/backends/platform/3ds/osystem-events.cpp
@@ -45,32 +45,32 @@ static InputMode savedInputMode = MODE_DRAG;
static aptHookCookie cookie;
static const Common::HardwareInputTableEntry ctrJoystickButtons[] = {
- { "JOY_A", Common::JOYSTICK_BUTTON_A, _s("A") },
- { "JOY_B", Common::JOYSTICK_BUTTON_B, _s("B") },
- { "JOY_X", Common::JOYSTICK_BUTTON_X, _s("X") },
- { "JOY_Y", Common::JOYSTICK_BUTTON_Y, _s("Y") },
- { "JOY_BACK", Common::JOYSTICK_BUTTON_BACK, _s("Select") },
- { "JOY_START", Common::JOYSTICK_BUTTON_START, _s("Start") },
- { "JOY_LEFT_STICK", Common::JOYSTICK_BUTTON_LEFT_STICK, _s("ZL") },
- { "JOY_RIGHT_STICK", Common::JOYSTICK_BUTTON_RIGHT_STICK, _s("ZR") },
- { "JOY_LEFT_SHOULDER", Common::JOYSTICK_BUTTON_LEFT_SHOULDER, _s("L") },
- { "JOY_RIGHT_SHOULDER", Common::JOYSTICK_BUTTON_RIGHT_SHOULDER, _s("R") },
- { "JOY_UP", Common::JOYSTICK_BUTTON_DPAD_UP, _s("D-pad Up") },
- { "JOY_DOWN", Common::JOYSTICK_BUTTON_DPAD_DOWN, _s("D-pad Down") },
- { "JOY_LEFT", Common::JOYSTICK_BUTTON_DPAD_LEFT, _s("D-pad Left") },
- { "JOY_RIGHT", Common::JOYSTICK_BUTTON_DPAD_RIGHT, _s("D-pad Right") },
- { nullptr, 0, nullptr }
+ { "JOY_A", Common::JOYSTICK_BUTTON_A, _s("A") },
+ { "JOY_B", Common::JOYSTICK_BUTTON_B, _s("B") },
+ { "JOY_X", Common::JOYSTICK_BUTTON_X, _s("X") },
+ { "JOY_Y", Common::JOYSTICK_BUTTON_Y, _s("Y") },
+ { "JOY_BACK", Common::JOYSTICK_BUTTON_BACK, _s("Select") },
+ { "JOY_START", Common::JOYSTICK_BUTTON_START, _s("Start") },
+ { "JOY_LEFT_STICK", Common::JOYSTICK_BUTTON_LEFT_STICK, _s("ZL") },
+ { "JOY_RIGHT_STICK", Common::JOYSTICK_BUTTON_RIGHT_STICK, _s("ZR") },
+ { "JOY_LEFT_SHOULDER", Common::JOYSTICK_BUTTON_LEFT_SHOULDER, _s("L") },
+ { "JOY_RIGHT_SHOULDER", Common::JOYSTICK_BUTTON_RIGHT_SHOULDER, _s("R") },
+ { "JOY_UP", Common::JOYSTICK_BUTTON_DPAD_UP, _s("D-pad Up") },
+ { "JOY_DOWN", Common::JOYSTICK_BUTTON_DPAD_DOWN, _s("D-pad Down") },
+ { "JOY_LEFT", Common::JOYSTICK_BUTTON_DPAD_LEFT, _s("D-pad Left") },
+ { "JOY_RIGHT", Common::JOYSTICK_BUTTON_DPAD_RIGHT, _s("D-pad Right") },
+ { nullptr, 0, nullptr }
};
static const Common::AxisTableEntry ctrJoystickAxes[] = {
- { "JOY_LEFT_STICK_X", Common::JOYSTICK_AXIS_LEFT_STICK_X, Common::kAxisTypeFull, _s("C-Pad X") },
- { "JOY_LEFT_STICK_Y", Common::JOYSTICK_AXIS_LEFT_STICK_Y, Common::kAxisTypeFull, _s("C-Pad Y") },
- { nullptr, 0, Common::kAxisTypeFull, nullptr }
+ { "JOY_LEFT_STICK_X", Common::JOYSTICK_AXIS_LEFT_STICK_X, Common::kAxisTypeFull, _s("C-Pad X") },
+ { "JOY_LEFT_STICK_Y", Common::JOYSTICK_AXIS_LEFT_STICK_Y, Common::kAxisTypeFull, _s("C-Pad Y") },
+ { nullptr, 0, Common::kAxisTypeFull, nullptr }
};
const Common::HardwareInputTableEntry ctrMouseButtons[] = {
- { "MOUSE_LEFT", Common::MOUSE_BUTTON_LEFT, _s("Touch") },
- { nullptr, 0, nullptr }
+ { "MOUSE_LEFT", Common::MOUSE_BUTTON_LEFT, _s("Touch") },
+ { nullptr, 0, nullptr }
};
static const int16 CIRCLE_MAX = 160;
diff --git a/backends/platform/3ds/osystem-graphics.cpp b/backends/platform/3ds/osystem-graphics.cpp
index abbc3882aa..34a73b5d47 100644
--- a/backends/platform/3ds/osystem-graphics.cpp
+++ b/backends/platform/3ds/osystem-graphics.cpp
@@ -31,27 +31,27 @@
// Used to transfer the final rendered display to the framebuffer
#define DISPLAY_TRANSFER_FLAGS \
- (GX_TRANSFER_FLIP_VERT(0) | GX_TRANSFER_OUT_TILED(0) | \
- GX_TRANSFER_RAW_COPY(0) | GX_TRANSFER_IN_FORMAT(GX_TRANSFER_FMT_RGBA8) | \
- GX_TRANSFER_OUT_FORMAT(GX_TRANSFER_FMT_RGB8) | \
- GX_TRANSFER_SCALING(GX_TRANSFER_SCALE_NO))
+ (GX_TRANSFER_FLIP_VERT(0) | GX_TRANSFER_OUT_TILED(0) | \
+ GX_TRANSFER_RAW_COPY(0) | GX_TRANSFER_IN_FORMAT(GX_TRANSFER_FMT_RGBA8) | \
+ GX_TRANSFER_OUT_FORMAT(GX_TRANSFER_FMT_RGB8) | \
+ GX_TRANSFER_SCALING(GX_TRANSFER_SCALE_NO))
#define TEXTURE_TRANSFER_FLAGS(fmt) \
- (GX_TRANSFER_FLIP_VERT(1) | GX_TRANSFER_OUT_TILED(1) | \
- GX_TRANSFER_RAW_COPY(0) | GX_TRANSFER_IN_FORMAT(fmt) | \
- GX_TRANSFER_OUT_FORMAT(fmt) | GX_TRANSFER_SCALING(GX_TRANSFER_SCALE_NO))
+ (GX_TRANSFER_FLIP_VERT(1) | GX_TRANSFER_OUT_TILED(1) | \
+ GX_TRANSFER_RAW_COPY(0) | GX_TRANSFER_IN_FORMAT(fmt) | \
+ GX_TRANSFER_OUT_FORMAT(fmt) | GX_TRANSFER_SCALING(GX_TRANSFER_SCALE_NO))
#define DEFAULT_MODE _modeRGBA8
namespace N3DS {
/* Group the various enums, values, etc. needed for
* each graphics mode into instaces of GfxMode3DS */
static const GfxMode3DS _modeRGBA8 = { Graphics::PixelFormat(4, 8, 8, 8, 8, 24, 16, 8, 0),
- GPU_RGBA8, TEXTURE_TRANSFER_FLAGS(GX_TRANSFER_FMT_RGBA8) };
+ GPU_RGBA8, TEXTURE_TRANSFER_FLAGS(GX_TRANSFER_FMT_RGBA8) };
static const GfxMode3DS _modeRGB565 = { Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0),
- GPU_RGB565, TEXTURE_TRANSFER_FLAGS(GX_TRANSFER_FMT_RGB565) };
+ GPU_RGB565, TEXTURE_TRANSFER_FLAGS(GX_TRANSFER_FMT_RGB565) };
static const GfxMode3DS _modeRGB555 = { Graphics::PixelFormat(2, 5, 5, 5, 1, 11, 6, 1, 0),
- GPU_RGBA5551, TEXTURE_TRANSFER_FLAGS(GX_TRANSFER_FMT_RGB5A1) };
+ GPU_RGBA5551, TEXTURE_TRANSFER_FLAGS(GX_TRANSFER_FMT_RGB5A1) };
static const GfxMode3DS _modeRGB5A1 = { Graphics::PixelFormat(2, 5, 5, 5, 1, 11, 6, 1, 0),
- GPU_RGBA5551, TEXTURE_TRANSFER_FLAGS(GX_TRANSFER_FMT_RGB5A1) };
+ GPU_RGBA5551, TEXTURE_TRANSFER_FLAGS(GX_TRANSFER_FMT_RGB5A1) };
static const GfxMode3DS _modeCLUT8 = _modeRGBA8;
static const GfxMode3DS *gfxModes[] = { &_modeRGBA8, &_modeRGB565, &_modeRGB555, &_modeRGB5A1, &_modeCLUT8 };
@@ -187,7 +187,7 @@ bool OSystem_3DS::setGraphicsMode(GraphicsModeID modeID) {
}
void OSystem_3DS::initSize(uint width, uint height,
- const Graphics::PixelFormat *format) {
+ const Graphics::PixelFormat *format) {
debug("3ds initsize w:%d h:%d", width, height);
int oldScreen = config.screen;
loadConfig();
@@ -361,7 +361,7 @@ static void copyRect555To5551(const Graphics::Surface &srcSurface, Graphics::Sur
}
void OSystem_3DS::copyRectToScreen(const void *buf, int pitch, int x,
- int y, int w, int h) {
+ int y, int w, int h) {
Common::Rect rect(x, y, x+w, y+h);
_gameScreen.copyRectToSurface(buf, pitch, x, y, w, h);
Graphics::Surface subSurface = _gameScreen.getSubArea(rect);
@@ -636,7 +636,7 @@ void OSystem_3DS::grabOverlay(void *buf, int pitch) {
}
void OSystem_3DS::copyRectToOverlay(const void *buf, int pitch, int x,
- int y, int w, int h) {
+ int y, int w, int h) {
_overlay.copyRectToSurface(buf, pitch, x, y, w, h);
_overlay.markDirty();
}
@@ -760,9 +760,9 @@ void OSystem_3DS::setCursorDelta(float deltaX, float deltaY) {
}
void OSystem_3DS::setMouseCursor(const void *buf, uint w, uint h,
- int hotspotX, int hotspotY,
- uint32 keycolor, bool dontScale,
- const Graphics::PixelFormat *format) {
+ int hotspotX, int hotspotY,
+ uint32 keycolor, bool dontScale,
+ const Graphics::PixelFormat *format) {
_cursorScalable = !dontScale;
_cursorHotspotX = hotspotX;
_cursorHotspotY = hotspotY;
diff --git a/backends/platform/android3d/events.cpp b/backends/platform/android3d/events.cpp
index 5f18bb4966..19c4e96ade 100644
--- a/backends/platform/android3d/events.cpp
+++ b/backends/platform/android3d/events.cpp
@@ -100,10 +100,10 @@ void OSystem_Android::scaleMouse(Common::Point &p, int x, int y, bool touchpadMo
}
void OSystem_Android::updateEventScale(const GLESBaseTexture *tex) {
- if (tex && (tex->height() != 0) && (tex->width() != 0)) {
+ if (tex && (tex->height() != 0) && (tex->width() != 0)) {
_eventScaleY = 100 * 480 / tex->height();
_eventScaleX = 100 * 640 / tex->width();
- }
+ }
}
void OSystem_Android::pushEvent(int type, int arg1, int arg2, int arg3,
diff --git a/backends/platform/dc/audio.cpp b/backends/platform/dc/audio.cpp
index 4759ddb799..9a1122df26 100644
--- a/backends/platform/dc/audio.cpp
+++ b/backends/platform/dc/audio.cpp
@@ -42,35 +42,35 @@ void OSystem_Dreamcast::checkSound()
int curr_ring_buffer_samples;
if (!_mixer)
- return;
+ return;
if (read_sound_int(&SOUNDSTATUS->mode) != MODE_PLAY)
- start_sound();
+ start_sound();
curr_ring_buffer_samples = read_sound_int(&SOUNDSTATUS->ring_length);
n = read_sound_int(&SOUNDSTATUS->samplepos);
if ((n-=fillpos)<0)
- n += curr_ring_buffer_samples;
+ n += curr_ring_buffer_samples;
n = ADJUST_BUFFER_SIZE(n-10);
if (n<100)
- return;
+ return;
_mixer->mixCallback((byte *)temp_sound_buffer,
2*SAMPLES_TO_BYTES(n));
if (fillpos+n > curr_ring_buffer_samples) {
- int r = curr_ring_buffer_samples - fillpos;
- memcpy4s(RING_BUF+fillpos, temp_sound_buffer, SAMPLES_TO_BYTES(r));
- fillpos = 0;
- n -= r;
- memcpy4s(RING_BUF, temp_sound_buffer+r, SAMPLES_TO_BYTES(n));
+ int r = curr_ring_buffer_samples - fillpos;
+ memcpy4s(RING_BUF+fillpos, temp_sound_buffer, SAMPLES_TO_BYTES(r));
+ fillpos = 0;
+ n -= r;
+ memcpy4s(RING_BUF, temp_sound_buffer+r, SAMPLES_TO_BYTES(n));
} else {
- memcpy4s(RING_BUF+fillpos, temp_sound_buffer, SAMPLES_TO_BYTES(n));
+ memcpy4s(RING_BUF+fillpos, temp_sound_buffer, SAMPLES_TO_BYTES(n));
}
if ((fillpos += n) >= curr_ring_buffer_samples)
- fillpos = 0;
+ fillpos = 0;
}
diff --git a/backends/platform/dc/dcloader.cpp b/backends/platform/dc/dcloader.cpp
index 2627773b13..0b592258ed 100644
--- a/backends/platform/dc/dcloader.cpp
+++ b/backends/platform/dc/dcloader.cpp
@@ -115,17 +115,17 @@ static void purge_copyback()
{
int i;
for (i=0; i!=(1<<14); i+=(1<<5))
- *(volatile unsigned int *)(0xf4000000+i) &= ~3;
+ *(volatile unsigned int *)(0xf4000000+i) &= ~3;
}
void DLObject::seterror(const char *fmt, ...)
{
if (errbuf) {
- va_list va;
- va_start(va, fmt);
- vsnprintf(errbuf, MAXDLERRLEN, fmt, va);
- va_end(va);
+ va_list va;
+ va_start(va, fmt);
+ vsnprintf(errbuf, MAXDLERRLEN, fmt, va);
+ va_end(va);
}
}
@@ -150,34 +150,34 @@ bool DLObject::relocate(int fd, unsigned long offset, unsigned long size)
Elf32_Rela *rela;
if (!(rela = (Elf32_Rela *)malloc(size))) {
- seterror("Out of memory.");
- return false;
+ seterror("Out of memory.");
+ return false;
}
if (lseek(fd, offset, SEEK_SET)<0 ||
- read(fd, rela, size) != (ssize_t)size) {
- seterror("Relocation table load failed.");
- free(rela);
- return false;
+ read(fd, rela, size) != (ssize_t)size) {
+ seterror("Relocation table load failed.");
+ free(rela);
+ return false;
}
int cnt = size / sizeof(*rela);
for (int i=0; i<cnt; i++) {
- Elf32_Sym *sym = (Elf32_Sym *)(void *)(((char *)symtab)+(rela[i].r_info>>4));
+ Elf32_Sym *sym = (Elf32_Sym *)(void *)(((char *)symtab)+(rela[i].r_info>>4));
- void *target = ((char *)segment)+rela[i].r_offset;
+ void *target = ((char *)segment)+rela[i].r_offset;
- switch(rela[i].r_info & 0xf) {
- case 1: /* DIR32 */
- if (sym->st_shndx < 0xff00)
+ switch(rela[i].r_info & 0xf) {
+ case 1: /* DIR32 */
+ if (sym->st_shndx < 0xff00)
*(unsigned long *)target += (unsigned long)segment;
- break;
- default:
- seterror("Unknown relocation type %d.", rela[i].r_info & 0xf);
- free(rela);
- return false;
- }
+ break;
+ default:
+ seterror("Unknown relocation type %d.", rela[i].r_info & 0xf);
+ free(rela);
+ return false;
+ }
}
@@ -194,105 +194,105 @@ bool DLObject::load(int fd)
int symtab_sect = -1;
if (read(fd, &ehdr, sizeof(ehdr)) != sizeof(ehdr) ||
- memcmp(ehdr.e_ident, ELFMAG, SELFMAG) ||
- ehdr.e_type != 2 || ehdr.e_machine != 42 ||
- ehdr.e_phentsize < sizeof(phdr) || ehdr.e_shentsize != sizeof(*shdr) ||
- ehdr.e_phnum != 1) {
- seterror("Invalid file type.");
- return false;
+ memcmp(ehdr.e_ident, ELFMAG, SELFMAG) ||
+ ehdr.e_type != 2 || ehdr.e_machine != 42 ||
+ ehdr.e_phentsize < sizeof(phdr) || ehdr.e_shentsize != sizeof(*shdr) ||
+ ehdr.e_phnum != 1) {
+ seterror("Invalid file type.");
+ return false;
}
DBG(("phoff = %d, phentsz = %d, phnum = %d\n",
- ehdr.e_phoff, ehdr.e_phentsize, ehdr.e_phnum));
+ ehdr.e_phoff, ehdr.e_phentsize, ehdr.e_phnum));
if (lseek(fd, ehdr.e_phoff, SEEK_SET)<0 ||
- read(fd, &phdr, sizeof(phdr)) != sizeof(phdr)) {
- seterror("Program header load failed.");
- return false;
+ read(fd, &phdr, sizeof(phdr)) != sizeof(phdr)) {
+ seterror("Program header load failed.");
+ return false;
}
if (phdr.p_type != 1 || phdr.p_vaddr != 0 || phdr.p_paddr != 0 ||
- phdr.p_filesz > phdr.p_memsz) {
- seterror("Invalid program header.");
- return false;
+ phdr.p_filesz > phdr.p_memsz) {
+ seterror("Invalid program header.");
+ return false;
}
DBG(("offs = %d, filesz = %d, memsz = %d, align = %d\n",
- phdr.p_offset, phdr.p_filesz, phdr.p_memsz, phdr.p_align));
+ phdr.p_offset, phdr.p_filesz, phdr.p_memsz, phdr.p_align));
if (!(segment = memalign(phdr.p_align, phdr.p_memsz))) {
- seterror("Out of memory.");
- return false;
+ seterror("Out of memory.");
+ return false;
}
DBG(("segment @ %p\n", segment));
if (phdr.p_memsz > phdr.p_filesz)
- memset(((char *)segment) + phdr.p_filesz, 0, phdr.p_memsz - phdr.p_filesz);
+ memset(((char *)segment) + phdr.p_filesz, 0, phdr.p_memsz - phdr.p_filesz);
if (lseek(fd, phdr.p_offset, SEEK_SET)<0 ||
- read(fd, segment, phdr.p_filesz) != (ssize_t)phdr.p_filesz) {
- seterror("Segment load failed.");
- return false;
+ read(fd, segment, phdr.p_filesz) != (ssize_t)phdr.p_filesz) {
+ seterror("Segment load failed.");
+ return false;
}
DBG(("shoff = %d, shentsz = %d, shnum = %d\n",
- ehdr.e_shoff, ehdr.e_shentsize, ehdr.e_shnum));
+ ehdr.e_shoff, ehdr.e_shentsize, ehdr.e_shnum));
if (!(shdr = (Elf32_Shdr *)malloc(ehdr.e_shnum * sizeof(*shdr)))) {
- seterror("Out of memory.");
- return false;
+ seterror("Out of memory.");
+ return false;
}
if (lseek(fd, ehdr.e_shoff, SEEK_SET)<0 ||
- read(fd, shdr, ehdr.e_shnum * sizeof(*shdr)) !=
- (ssize_t)(ehdr.e_shnum * sizeof(*shdr))) {
- seterror("Section headers load failed.");
- free(shdr);
- return false;
+ read(fd, shdr, ehdr.e_shnum * sizeof(*shdr)) !=
+ (ssize_t)(ehdr.e_shnum * sizeof(*shdr))) {
+ seterror("Section headers load failed.");
+ free(shdr);
+ return false;
}
for (int i=0; i<ehdr.e_shnum; i++) {
- DBG(("Section %d: type = %d, size = %d, entsize = %d, link = %d\n",
+ DBG(("Section %d: type = %d, size = %d, entsize = %d, link = %d\n",
i, shdr[i].sh_type, shdr[i].sh_size, shdr[i].sh_entsize, shdr[i].sh_link));
- if (shdr[i].sh_type == 2 && shdr[i].sh_entsize == sizeof(Elf32_Sym) &&
- shdr[i].sh_link < ehdr.e_shnum && shdr[shdr[i].sh_link].sh_type == 3 &&
- symtab_sect < 0)
- symtab_sect = i;
+ if (shdr[i].sh_type == 2 && shdr[i].sh_entsize == sizeof(Elf32_Sym) &&
+ shdr[i].sh_link < ehdr.e_shnum && shdr[shdr[i].sh_link].sh_type == 3 &&
+ symtab_sect < 0)
+ symtab_sect = i;
}
if (symtab_sect < 0) {
- seterror("No symbol table.");
- free(shdr);
- return false;
+ seterror("No symbol table.");
+ free(shdr);
+ return false;
}
if (!(symtab = malloc(shdr[symtab_sect].sh_size))) {
- seterror("Out of memory.");
- free(shdr);
- return false;
+ seterror("Out of memory.");
+ free(shdr);
+ return false;
}
if (lseek(fd, shdr[symtab_sect].sh_offset, SEEK_SET)<0 ||
- read(fd, symtab, shdr[symtab_sect].sh_size) !=
- (ssize_t)shdr[symtab_sect].sh_size){
- seterror("Symbol table load failed.");
- free(shdr);
- return false;
+ read(fd, symtab, shdr[symtab_sect].sh_size) !=
+ (ssize_t)shdr[symtab_sect].sh_size){
+ seterror("Symbol table load failed.");
+ free(shdr);
+ return false;
}
if (!(strtab = (char *)malloc(shdr[shdr[symtab_sect].sh_link].sh_size))) {
- seterror("Out of memory.");
- free(shdr);
- return false;
+ seterror("Out of memory.");
+ free(shdr);
+ return false;
}
if (lseek(fd, shdr[shdr[symtab_sect].sh_link].sh_offset, SEEK_SET)<0 ||
- read(fd, strtab, shdr[shdr[symtab_sect].sh_link].sh_size) !=
- (ssize_t)shdr[shdr[symtab_sect].sh_link].sh_size){
- seterror("Symbol table strings load failed.");
- free(shdr);
- return false;
+ read(fd, strtab, shdr[shdr[symtab_sect].sh_link].sh_size) !=
+ (ssize_t)shdr[shdr[symtab_sect].sh_link].sh_size){
+ seterror("Symbol table strings load failed.");
+ free(shdr);
+ return false;
}
symbol_cnt = shdr[symtab_sect].sh_size / sizeof(Elf32_Sym);
@@ -300,17 +300,17 @@ bool DLObject::load(int fd)
Elf32_Sym *s = (Elf32_Sym *)symtab;
for (int c = symbol_cnt; c--; s++)
- if (s->st_shndx < 0xff00)
- s->st_value += (Elf32_Addr)segment;
+ if (s->st_shndx < 0xff00)
+ s->st_value += (Elf32_Addr)segment;
for (int i=0; i<ehdr.e_shnum; i++)
- if (shdr[i].sh_type == 4 && shdr[i].sh_entsize == sizeof(Elf32_Rela) &&
+ if (shdr[i].sh_type == 4 && shdr[i].sh_entsize == sizeof(Elf32_Rela) &&
(int)shdr[i].sh_link == symtab_sect && shdr[i].sh_info < ehdr.e_shnum &&
(shdr[shdr[i].sh_info].sh_flags & 2))
- if (!relocate(fd, shdr[i].sh_offset, shdr[i].sh_size)) {
+ if (!relocate(fd, shdr[i].sh_offset, shdr[i].sh_size)) {
free(shdr);
return false;
- }
+ }
free(shdr);
@@ -325,14 +325,14 @@ bool DLObject::open(const char *path)
DBG(("open(\"%s\")\n", path));
if ((fd = ::open(path, O_RDONLY))<0) {
- seterror("%s not found.", path);
- return false;
+ seterror("%s not found.", path);
+ return false;
}
if (!load(fd)) {
- ::close(fd);
- unload();
- return false;
+ ::close(fd);
+ unload();
+ return false;
}
::close(fd);
@@ -350,16 +350,16 @@ bool DLObject::open(const char *path)
dso_handle = symbol("__dso_handle");
if (ctors_start == NULL || ctors_end == NULL || dtors_start == NULL ||
- dtors_end == NULL) {
- seterror("Missing ctors/dtors.");
- dtors_start = dtors_end = NULL;
- unload();
- return false;
+ dtors_end == NULL) {
+ seterror("Missing ctors/dtors.");
+ dtors_start = dtors_end = NULL;
+ unload();
+ return false;
}
DBG(("Calling constructors.\n"));
for (void (**f)(void) = (void (**)(void))ctors_start; f != ctors_end; f++)
- (**f)();
+ (**f)();
DBG(("%s opened ok.\n", path));
return true;
@@ -368,12 +368,12 @@ bool DLObject::open(const char *path)
bool DLObject::close()
{
if (dso_handle != NULL) {
- __cxxabiv1::__cxa_finalize(dso_handle);
- dso_handle = NULL;
+ __cxxabiv1::__cxa_finalize(dso_handle);
+ dso_handle = NULL;
}
if (dtors_start != NULL && dtors_end != NULL)
- for (void (**f)(void) = (void (**)(void))dtors_start; f != dtors_end; f++)
- (**f)();
+ for (void (**f)(void) = (void (**)(void))dtors_start; f != dtors_end; f++)
+ (**f)();
dtors_start = dtors_end = NULL;
unload();
return true;
@@ -384,17 +384,17 @@ void *DLObject::symbol(const char *name)
DBG(("symbol(\"%s\")\n", name));
if (symtab == NULL || strtab == NULL || symbol_cnt < 1) {
- seterror("No symbol table loaded.");
- return NULL;
+ seterror("No symbol table loaded.");
+ return NULL;
}
Elf32_Sym *s = (Elf32_Sym *)symtab;
for (int c = symbol_cnt; c--; s++)
- if ((s->st_info>>4 == 1 || s->st_info>>4 == 2) &&
- strtab[s->st_name] == '_' && !strcmp(name, strtab+s->st_name+1)) {
- DBG(("=> %p\n", (void *)s->st_value));
- return (void *)s->st_value;
- }
+ if ((s->st_info>>4 == 1 || s->st_info>>4 == 2) &&
+ strtab[s->st_name] == '_' && !strcmp(name, strtab+s->st_name+1)) {
+ DBG(("=> %p\n", (void *)s->st_value));
+ return (void *)s->st_value;
+ }
seterror("Symbol \"%s\" not found.", name);
return NULL;
@@ -407,7 +407,7 @@ void *dlopen(const char *filename, int flags)
{
DLObject *obj = new DLObject(dlerr);
if (obj->open(filename))
- return (void *)obj;
+ return (void *)obj;
delete obj;
return NULL;
}
@@ -416,12 +416,12 @@ int dlclose(void *handle)
{
DLObject *obj = (DLObject *)handle;
if (obj == NULL) {
- strcpy(dlerr, "Handle is NULL.");
- return -1;
+ strcpy(dlerr, "Handle is NULL.");
+ return -1;
}
if (obj->close()) {
- delete obj;
- return 0;
+ delete obj;
+ return 0;
}
return -1;
}
@@ -429,8 +429,8 @@ int dlclose(void *handle)
void *dlsym(void *handle, const char *symbol)
{
if (handle == NULL) {
- strcpy(dlerr, "Handle is NULL.");
- return NULL;
+ strcpy(dlerr, "Handle is NULL.");
+ return NULL;
}
return ((DLObject *)handle)->symbol(symbol);
}
@@ -443,5 +443,5 @@ const char *dlerror()
void dlforgetsyms(void *handle)
{
if (handle != NULL)
- ((DLObject *)handle)->discard_symtab();
+ ((DLObject *)handle)->discard_symtab();
}
diff --git a/backends/platform/dc/dcloader.h b/backends/platform/dc/dcloader.h
index daa2802ec4..9e5a25b8ae 100644
--- a/backends/platform/dc/dcloader.h
+++ b/backends/platform/dc/dcloader.h
@@ -48,7 +48,7 @@ class DLObject {
void discard_symtab();
DLObject(char *_errbuf = NULL) : errbuf(_errbuf), segment(NULL),symtab(NULL),
- strtab(NULL), symbol_cnt(0), dtors_start(NULL), dtors_end(NULL) {}
+ strtab(NULL), symbol_cnt(0), dtors_start(NULL), dtors_end(NULL) {}
};
#define RTLD_LAZY 0
diff --git a/backends/platform/dc/dcmain.cpp b/backends/platform/dc/dcmain.cpp
index cd2330c526..c58eafcbc7 100644
--- a/backends/platform/dc/dcmain.cpp
+++ b/backends/platform/dc/dcmain.cpp
@@ -42,9 +42,9 @@ char gGameName[32];
OSystem_Dreamcast::OSystem_Dreamcast()
: _devpoll(0), screen(NULL), mouse(NULL), overlay(NULL), _softkbd(this),
- _ms_buf(NULL), _mixer(NULL),
- _current_shake_x_pos(0), _current_shake_y_pos(0), _aspect_stretch(false), _softkbd_on(false),
- _softkbd_motion(0), _enable_cursor_palette(false), _screenFormat(0)
+ _ms_buf(NULL), _mixer(NULL),
+ _current_shake_x_pos(0), _current_shake_y_pos(0), _aspect_stretch(false), _softkbd_on(false),
+ _softkbd_motion(0), _enable_cursor_palette(false), _screenFormat(0)
{
memset(screen_tx, 0, sizeof(screen_tx));
memset(mouse_tx, 0, sizeof(mouse_tx));
@@ -73,21 +73,21 @@ static bool find_track(int track, int &first_sec, int &last_sec)
{
struct TOC *toc = cdfs_gettoc();
if (!toc)
- return false;
+ return false;
int i, first, last;
first = TOC_TRACK(toc->first);
last = TOC_TRACK(toc->last);
if (first < 1 || last > 99 || first > last)
- return false;
+ return false;
for (i=first; i<=last; i++)
- if (!(TOC_CTRL(toc->entry[i-1])&4)) {
- if (track==1) {
+ if (!(TOC_CTRL(toc->entry[i-1])&4)) {
+ if (track==1) {
first_sec = TOC_LBA(toc->entry[i-1]);
last_sec = TOC_LBA(toc->entry[i]);
return true;
- } else
+ } else
--track;
- }
+ }
return false;
}
@@ -179,9 +179,9 @@ bool OSystem_Dreamcast::hasFeature(Feature f)
case kFeatureVirtualKeyboard:
case kFeatureOverlaySupportsAlpha:
case kFeatureCursorPalette:
- return true;
+ return true;
default:
- return false;
+ return false;
}
}
@@ -189,18 +189,18 @@ void OSystem_Dreamcast::setFeatureState(Feature f, bool enable)
{
switch(f) {
case kFeatureAspectRatioCorrection:
- _aspect_stretch = enable;
- if (screen)
- setScaling();
- break;
+ _aspect_stretch = enable;
+ if (screen)
+ setScaling();
+ break;
case kFeatureVirtualKeyboard:
- _softkbd_on = enable;
- break;
+ _softkbd_on = enable;
+ break;
case kFeatureCursorPalette:
- _enable_cursor_palette = enable;
- break;
+ _enable_cursor_palette = enable;
+ break;
default:
- break;
+ break;
}
}
@@ -208,13 +208,13 @@ bool OSystem_Dreamcast::getFeatureState(Feature f)
{
switch(f) {
case kFeatureAspectRatioCorrection:
- return _aspect_stretch;
+ return _aspect_stretch;
case kFeatureVirtualKeyboard:
- return _softkbd_on;
+ return _softkbd_on;
case kFeatureCursorPalette:
- return _enable_cursor_palette;
+ return _enable_cursor_palette;
default:
- return false;
+ return false;
}
}
@@ -250,53 +250,53 @@ void OSystem_Dreamcast::logMessage(LogMessageType::Type type, const char *messag
namespace DC_Flash {
static int syscall_info_flash(int sect, int *info)
{
- return (*(int (**)(int, void*, int, int))0x8c0000b8)(sect,info,0,0);
+ return (*(int (**)(int, void*, int, int))0x8c0000b8)(sect,info,0,0);
}
static int syscall_read_flash(int offs, void *buf, int cnt)
{
- return (*(int (**)(int, void*, int, int))0x8c0000b8)(offs,buf,cnt,1);
+ return (*(int (**)(int, void*, int, int))0x8c0000b8)(offs,buf,cnt,1);
}
static int flash_crc(const char *buf, int size)
{
- int i, c, n = -1;
- for(i=0; i<size; i++) {
- n ^= (buf[i]<<8);
- for(c=0; c<8; c++)
+ int i, c, n = -1;
+ for(i=0; i<size; i++) {
+ n ^= (buf[i]<<8);
+ for(c=0; c<8; c++)
if(n & 0x8000)
n = (n << 1) ^ 4129;
else
n <<= 1;
- }
- return (unsigned short)~n;
+ }
+ return (unsigned short)~n;
}
static int flash_read_sector(int partition, int sec, unsigned char *dst)
{
- int s, r, n, b, bmb, got=0;
- int info[2];
- char buf[64];
- char bm[64];
+ int s, r, n, b, bmb, got=0;
+ int info[2];
+ char buf[64];
+ char bm[64];
- if((r = syscall_info_flash(partition, info))<0)
- return r;
+ if((r = syscall_info_flash(partition, info))<0)
+ return r;
- if((r = syscall_read_flash(info[0], buf, 64))<0)
- return r;
+ if((r = syscall_read_flash(info[0], buf, 64))<0)
+ return r;
- if(memcmp(buf, "KATANA_FLASH", 12) ||
- buf[16] != partition || buf[17] != 0)
- return -2;
+ if(memcmp(buf, "KATANA_FLASH", 12) ||
+ buf[16] != partition || buf[17] != 0)
+ return -2;
- n = (info[1]>>6)-1-((info[1] + 0x7fff)>>15);
- bmb = n+1;
- for(b = 0; b < n; b++) {
- if(!(b&511)) {
+ n = (info[1]>>6)-1-((info[1] + 0x7fff)>>15);
+ bmb = n+1;
+ for(b = 0; b < n; b++) {
+ if(!(b&511)) {
if((r = syscall_read_flash(info[0] + (bmb++ << 6), bm, 64))<0)
return r;
- }
- if(!(bm[(b>>3)&63] & (0x80>>(b&7)))) {
+ }
+ if(!(bm[(b>>3)&63] & (0x80>>(b&7)))) {
if((r = syscall_read_flash(info[0] + ((b+1) << 6), buf, 64))<0)
return r;
else if((s=READ_LE_UINT16(buf+0)) == sec &&
@@ -304,33 +304,33 @@ namespace DC_Flash {
memcpy(dst+(s-sec)*60, buf+2, 60);
got=1;
}
- }
- }
- return got;
+ }
+ }
+ return got;
}
static int get_locale_setting()
{
- unsigned char data[60];
- if (flash_read_sector(2,5,data) == 1)
- return data[5];
- else
- return -1;
+ unsigned char data[60];
+ if (flash_read_sector(2,5,data) == 1)
+ return data[5];
+ else
+ return -1;
}
} // End of namespace DC_Flash
Common::String OSystem_Dreamcast::getSystemLanguage() const {
static const char *languages[] = {
- "ja_JP",
- "en_US",
- "de_DE",
- "fr_FR",
- "es_ES",
- "it_IT"
+ "ja_JP",
+ "en_US",
+ "de_DE",
+ "fr_FR",
+ "es_ES",
+ "it_IT"
};
int l = DC_Flash::get_locale_setting();
if (l<0 || ((unsigned)l)>=sizeof(languages)/sizeof(languages[0]))
- l = 1;
+ l = 1;
return Common::String(languages[l]);
}
@@ -374,7 +374,7 @@ int DCLauncherDialog::runModal()
Common::Platform platform = Common::kPlatformUnknown;
if (!selectGame(engineId, gameId, dir, language, platform, icon))
- g_system->quit();
+ g_system->quit();
// Set the game path.
ConfMan.addGameDomain(gameId);
@@ -382,15 +382,15 @@ int DCLauncherDialog::runModal()
ConfMan.set("gameid", gameId, gameId);
if (dir != NULL)
- ConfMan.set("path", dir, gameId);
+ ConfMan.set("path", dir, gameId);
// Set the game language.
if (language != Common::UNK_LANG)
- ConfMan.set("language", Common::getLanguageCode(language), gameId);
+ ConfMan.set("language", Common::getLanguageCode(language), gameId);
// Set the game platform.
if (platform != Common::kPlatformUnknown)
- ConfMan.set("platform", Common::getPlatformCode(platform), gameId);
+ ConfMan.set("platform", Common::getPlatformCode(platform), gameId);
// Set the target.
ConfMan.setActiveDomain(gameId);
diff --git a/backends/platform/dc/display.cpp b/backends/platform/dc/display.cpp
index bb7919a519..c1ddbaa945 100644
--- a/backends/platform/dc/display.cpp
+++ b/backends/platform/dc/display.cpp
@@ -44,8 +44,8 @@ static const struct {
operator const Graphics::PixelFormat&() const { return pixelFormat; }
} screenFormats[] = {
/* Note: These are ordered by _increasing_ preference, so that
- CLUT8 appears at index 0. getSupportedFormats() will return
- them in reversed order. */
+ CLUT8 appears at index 0. getSupportedFormats() will return
+ them in reversed order. */
{ Graphics::PixelFormat::createFormatCLUT8(), TA_TEXTUREMODE_ARGB1555 },
{ Graphics::PixelFormat(2,4,4,4,4,8,4,0,12), TA_TEXTUREMODE_ARGB4444 },
{ Graphics::PixelFormat(2,5,5,5,1,10,5,0,15), TA_TEXTUREMODE_ARGB1555 },
@@ -67,32 +67,32 @@ static void texture_memcpy64_pal(void *dest, void *src, int cnt, unsigned short
{
unsigned char *s = (unsigned char *)src;
unsigned int *d = (unsigned int *)(void *)
- (0xe0000000 | (((unsigned long)dest) & 0x03ffffc0));
+ (0xe0000000 | (((unsigned long)dest) & 0x03ffffc0));
QACR0 = ((0xa4000000>>26)<<2)&0x1c;
QACR1 = ((0xa4000000>>26)<<2)&0x1c;
while (cnt--) {
- COPYPIXEL(0);
- COPYPIXEL(1);
- COPYPIXEL(2);
- COPYPIXEL(3);
- asm("pref @%0" : : "r" (s+4*16));
- COPYPIXEL(4);
- COPYPIXEL(5);
- COPYPIXEL(6);
- COPYPIXEL(7);
- asm("pref @%0" : : "r" (d));
- d += 8;
- COPYPIXEL(0);
- COPYPIXEL(1);
- COPYPIXEL(2);
- COPYPIXEL(3);
- asm("pref @%0" : : "r" (s+4*16));
- COPYPIXEL(4);
- COPYPIXEL(5);
- COPYPIXEL(6);
- COPYPIXEL(7);
- asm("pref @%0" : : "r" (d));
- d += 8;
+ COPYPIXEL(0);
+ COPYPIXEL(1);
+ COPYPIXEL(2);
+ COPYPIXEL(3);
+ asm("pref @%0" : : "r" (s+4*16));
+ COPYPIXEL(4);
+ COPYPIXEL(5);
+ COPYPIXEL(6);
+ COPYPIXEL(7);
+ asm("pref @%0" : : "r" (d));
+ d += 8;
+ COPYPIXEL(0);
+ COPYPIXEL(1);
+ COPYPIXEL(2);
+ COPYPIXEL(3);
+ asm("pref @%0" : : "r" (s+4*16));
+ COPYPIXEL(4);
+ COPYPIXEL(5);
+ COPYPIXEL(6);
+ COPYPIXEL(7);
+ asm("pref @%0" : : "r" (d));
+ d += 8;
}
}
@@ -100,32 +100,32 @@ static void texture_memcpy64(void *dest, void *src, int cnt)
{
unsigned int *s = (unsigned int *)src;
unsigned int *d = (unsigned int *)(void *)
- (0xe0000000 | (((unsigned long)dest) & 0x03ffffc0));
+ (0xe0000000 | (((unsigned long)dest) & 0x03ffffc0));
QACR0 = ((0xa4000000>>26)<<2)&0x1c;
QACR1 = ((0xa4000000>>26)<<2)&0x1c;
while (cnt--) {
- d[0] = *s++;
- d[1] = *s++;
- d[2] = *s++;
- d[3] = *s++;
- asm("pref @%0" : : "r" (s+16));
- d[4] = *s++;
- d[5] = *s++;
- d[6] = *s++;
- d[7] = *s++;
- asm("pref @%0" : : "r" (d));
- d += 8;
- d[0] = *s++;
- d[1] = *s++;
- d[2] = *s++;
- d[3] = *s++;
- asm("pref @%0" : : "r" (s+16));
- d[4] = *s++;
- d[5] = *s++;
- d[6] = *s++;
- d[7] = *s++;
- asm("pref @%0" : : "r" (d));
- d += 8;
+ d[0] = *s++;
+ d[1] = *s++;
+ d[2] = *s++;
+ d[3] = *s++;
+ asm("pref @%0" : : "r" (s+16));
+ d[4] = *s++;
+ d[5] = *s++;
+ d[6] = *s++;
+ d[7] = *s++;
+ asm("pref @%0" : : "r" (d));
+ d += 8;
+ d[0] = *s++;
+ d[1] = *s++;
+ d[2] = *s++;
+ d[3] = *s++;
+ asm("pref @%0" : : "r" (s+16));
+ d[4] = *s++;
+ d[5] = *s++;
+ d[6] = *s++;
+ d[7] = *s++;
+ asm("pref @%0" : : "r" (d));
+ d += 8;
}
}
@@ -134,12 +134,12 @@ void commit_dummy_transpoly()
struct polygon_list mypoly;
mypoly.cmd =
- TA_CMD_POLYGON|TA_CMD_POLYGON_TYPE_TRANSPARENT|TA_CMD_POLYGON_SUBLIST|
- TA_CMD_POLYGON_STRIPLENGTH_2|TA_CMD_POLYGON_PACKED_COLOUR;
+ TA_CMD_POLYGON|TA_CMD_POLYGON_TYPE_TRANSPARENT|TA_CMD_POLYGON_SUBLIST|
+ TA_CMD_POLYGON_STRIPLENGTH_2|TA_CMD_POLYGON_PACKED_COLOUR;
mypoly.mode1 = TA_POLYMODE1_Z_ALWAYS|TA_POLYMODE1_NO_Z_UPDATE;
mypoly.mode2 =
- TA_POLYMODE2_BLEND_SRC_ALPHA|TA_POLYMODE2_BLEND_DST_INVALPHA|
- TA_POLYMODE2_FOG_DISABLED|TA_POLYMODE2_ENABLE_ALPHA;
+ TA_POLYMODE2_BLEND_SRC_ALPHA|TA_POLYMODE2_BLEND_DST_INVALPHA|
+ TA_POLYMODE2_FOG_DISABLED|TA_POLYMODE2_ENABLE_ALPHA;
mypoly.texture = 0;
mypoly.red = mypoly.green = mypoly.blue = mypoly.alpha = 0;
ta_commit_list(&mypoly);
@@ -150,12 +150,12 @@ void OSystem_Dreamcast::setPalette(const byte *colors, uint start, uint num)
{
unsigned short *dst = palette + start;
if (num>0)
- while ( num-- ) {
- *dst++ = ((colors[0]<<7)&0x7c00)|
+ while ( num-- ) {
+ *dst++ = ((colors[0]<<7)&0x7c00)|
((colors[1]<<2)&0x03e0)|
((colors[2]>>3)&0x001f);
- colors += 3;
- }
+ colors += 3;
+ }
_screen_dirty = true;
}
@@ -163,12 +163,12 @@ void OSystem_Dreamcast::setCursorPalette(const byte *colors, uint start, uint nu
{
unsigned short *dst = cursor_palette + start;
if (num>0)
- while ( num-- ) {
- *dst++ = ((colors[0]<<7)&0x7c00)|
+ while ( num-- ) {
+ *dst++ = ((colors[0]<<7)&0x7c00)|
((colors[1]<<2)&0x03e0)|
((colors[2]>>3)&0x001f);
- colors += 3;
- }
+ colors += 3;
+ }
_enable_cursor_palette = true;
}
@@ -176,13 +176,13 @@ void OSystem_Dreamcast::grabPalette(byte *colors, uint start, uint num) const
{
const unsigned short *src = palette + start;
if (num>0)
- while ( num-- ) {
- unsigned short p = *src++;
- colors[0] = ((p&0x7c00)>>7)|((p&0x7000)>>12);
- colors[1] = ((p&0x03e0)>>2)|((p&0x0380)>>7);
- colors[2] = ((p&0x001f)<<3)|((p&0x001c)>>2);
- colors += 3;
- }
+ while ( num-- ) {
+ unsigned short p = *src++;
+ colors[0] = ((p&0x7c00)>>7)|((p&0x7000)>>12);
+ colors[1] = ((p&0x03e0)>>2)|((p&0x0380)>>7);
+ colors[2] = ((p&0x001f)<<3)|((p&0x001c)>>2);
+ colors += 3;
+ }
}
Graphics::PixelFormat OSystem_Dreamcast::getScreenFormat() const
@@ -195,22 +195,22 @@ Common::List<Graphics::PixelFormat> OSystem_Dreamcast::getSupportedFormats() con
Common::List<Graphics::PixelFormat> list;
unsigned i;
for (i=0; i<NUM_FORMATS; i++)
- list.push_front(screenFormats[i]);
+ list.push_front(screenFormats[i]);
return list;
}
void OSystem_Dreamcast::setScaling()
{
if (_screen_w > 400) {
- _xscale = _yscale = 1.0;
- _top_offset = (SCREEN_H-_screen_h)>>1;
+ _xscale = _yscale = 1.0;
+ _top_offset = (SCREEN_H-_screen_h)>>1;
} else if (_aspect_stretch && _screen_w == 320 && _screen_h == 200) {
- _xscale = SCREEN_W/320.0;
- _yscale = SCREEN_H/200.0;
- _top_offset = 0;
+ _xscale = SCREEN_W/320.0;
+ _yscale = SCREEN_H/200.0;
+ _top_offset = 0;
} else {
- _xscale = _yscale = 2.0;
- _top_offset = (SCREEN_H>>1)-_screen_h;
+ _xscale = _yscale = 2.0;
+ _top_offset = (SCREEN_H>>1)-_screen_h;
}
}
@@ -220,8 +220,8 @@ void OSystem_Dreamcast::initSize(uint w, uint h, const Graphics::PixelFormat *fo
int i = 0;
if (format != NULL)
- for (i=NUM_FORMATS-1; i>0; --i)
- if (*format == screenFormats[i])
+ for (i=NUM_FORMATS-1; i>0; --i)
+ if (*format == screenFormats[i])
break;
_screenFormat = i;
@@ -236,18 +236,18 @@ void OSystem_Dreamcast::initSize(uint w, uint h, const Graphics::PixelFormat *fo
setScaling();
ta_sync();
if (!screen)
- screen = new unsigned char[SCREEN_W*SCREEN_H*2];
+ screen = new unsigned char[SCREEN_W*SCREEN_H*2];
if (!overlay)
- overlay = new unsigned short[OVL_W*OVL_H];
+ overlay = new unsigned short[OVL_W*OVL_H];
for (i=0; i<NUM_BUFFERS; i++)
- if (!screen_tx[i])
- screen_tx[i] = ta_txalloc(SCREEN_W*SCREEN_H*2);
+ if (!screen_tx[i])
+ screen_tx[i] = ta_txalloc(SCREEN_W*SCREEN_H*2);
for (i=0; i<NUM_BUFFERS; i++)
- if (!mouse_tx[i])
- mouse_tx[i] = ta_txalloc(MOUSE_W*MOUSE_H*2);
+ if (!mouse_tx[i])
+ mouse_tx[i] = ta_txalloc(MOUSE_W*MOUSE_H*2);
for (i=0; i<NUM_BUFFERS; i++)
- if (!ovl_tx[i])
- ovl_tx[i] = ta_txalloc(OVL_TXSTRIDE*OVL_H*2);
+ if (!ovl_tx[i])
+ ovl_tx[i] = ta_txalloc(OVL_TXSTRIDE*OVL_H*2);
_screen_buffer = 0;
_mouse_buffer = 0;
_overlay_buffer = 0;
@@ -265,16 +265,16 @@ void OSystem_Dreamcast::copyRectToScreen(const void *buf, int pitch, int x, int
int w, int h)
{
if (w<1 || h<1)
- return;
+ return;
if (_screenFormat != 0) {
- x<<=1; w<<=1;
+ x<<=1; w<<=1;
}
unsigned char *dst = screen + y*SCREEN_W*2 + x;
const byte *src = (const byte *)buf;
do {
- memcpy(dst, src, w);
- dst += SCREEN_W*2;
- src += pitch;
+ memcpy(dst, src, w);
+ dst += SCREEN_W*2;
+ src += pitch;
} while (--h);
_screen_dirty = true;
}
@@ -307,15 +307,15 @@ void OSystem_Dreamcast::setMouseCursor(const void *buf, uint w, uint h,
int i = 0;
if (format != NULL)
- for (i=NUM_FORMATS-1; i>0; --i)
- if (*format == screenFormats[i])
+ for (i=NUM_FORMATS-1; i>0; --i)
+ if (*format == screenFormats[i])
break;
_mouseFormat = i;
free(_ms_buf);
if (_mouseFormat != 0)
- w <<= 1;
+ w <<= 1;
_ms_buf = (byte *)malloc(w * h);
memcpy(_ms_buf, buf, w * h);
@@ -331,49 +331,49 @@ void OSystem_Dreamcast::updateScreenTextures(void)
{
if (_screen_dirty) {
- _screen_buffer++;
- _screen_buffer &= NUM_BUFFERS-1;
+ _screen_buffer++;
+ _screen_buffer &= NUM_BUFFERS-1;
- unsigned short *dst = (unsigned short *)screen_tx[_screen_buffer];
- unsigned char *src = screen;
+ unsigned short *dst = (unsigned short *)screen_tx[_screen_buffer];
+ unsigned char *src = screen;
- // while ((*((volatile unsigned int *)(void *)0xa05f810c) & 0x3ff) != 200);
- // *((volatile unsigned int *)(void *)0xa05f8040) = 0xff0000;
+ // while ((*((volatile unsigned int *)(void *)0xa05f810c) & 0x3ff) != 200);
+ // *((volatile unsigned int *)(void *)0xa05f8040) = 0xff0000;
- if (_screenFormat == 0)
- for ( int y = 0; y<_screen_h; y++ )
- {
+ if (_screenFormat == 0)
+ for ( int y = 0; y<_screen_h; y++ )
+ {
texture_memcpy64_pal( dst, src, _screen_w>>5, palette );
src += SCREEN_W*2;
dst += SCREEN_W;
- }
- else
- for ( int y = 0; y<_screen_h; y++ )
- {
+ }
+ else
+ for ( int y = 0; y<_screen_h; y++ )
+ {
texture_memcpy64( dst, src, _screen_w>>5 );
src += SCREEN_W*2;
dst += SCREEN_W;
- }
+ }
- _screen_dirty = false;
+ _screen_dirty = false;
}
if ( _overlay_visible && _overlay_dirty ) {
- _overlay_buffer++;
- _overlay_buffer &= NUM_BUFFERS-1;
+ _overlay_buffer++;
+ _overlay_buffer &= NUM_BUFFERS-1;
- unsigned short *dst = (unsigned short *)ovl_tx[_overlay_buffer];
- unsigned short *src = overlay;
+ unsigned short *dst = (unsigned short *)ovl_tx[_overlay_buffer];
+ unsigned short *src = overlay;
- for ( int y = 0; y<OVL_H; y++ )
- {
- texture_memcpy64( dst, src, OVL_W>>5 );
- src += OVL_W;
- dst += OVL_TXSTRIDE;
- }
+ for ( int y = 0; y<OVL_H; y++ )
+ {
+ texture_memcpy64( dst, src, OVL_W>>5 );
+ src += OVL_W;
+ dst += OVL_TXSTRIDE;
+ }
- _overlay_dirty = false;
+ _overlay_dirty = false;
}
}
@@ -385,15 +385,15 @@ void OSystem_Dreamcast::updateScreenPolygons(void)
// *((volatile unsigned int *)(void *)0xa05f8040) = 0x00ff00;
mypoly.cmd =
- TA_CMD_POLYGON|TA_CMD_POLYGON_TYPE_OPAQUE|TA_CMD_POLYGON_SUBLIST|
- TA_CMD_POLYGON_STRIPLENGTH_2|TA_CMD_POLYGON_PACKED_COLOUR|TA_CMD_POLYGON_TEXTURED;
+ TA_CMD_POLYGON|TA_CMD_POLYGON_TYPE_OPAQUE|TA_CMD_POLYGON_SUBLIST|
+ TA_CMD_POLYGON_STRIPLENGTH_2|TA_CMD_POLYGON_PACKED_COLOUR|TA_CMD_POLYGON_TEXTURED;
mypoly.mode1 = TA_POLYMODE1_Z_ALWAYS|TA_POLYMODE1_NO_Z_UPDATE;
mypoly.mode2 =
- TA_POLYMODE2_BLEND_SRC|TA_POLYMODE2_FOG_DISABLED|TA_POLYMODE2_TEXTURE_REPLACE|
- TA_POLYMODE2_U_SIZE_1024|TA_POLYMODE2_V_SIZE_1024;
+ TA_POLYMODE2_BLEND_SRC|TA_POLYMODE2_FOG_DISABLED|TA_POLYMODE2_TEXTURE_REPLACE|
+ TA_POLYMODE2_U_SIZE_1024|TA_POLYMODE2_V_SIZE_1024;
mypoly.texture = screenFormats[_screenFormat].textureFormat|
- TA_TEXTUREMODE_NON_TWIDDLED|TA_TEXTUREMODE_STRIDE|
- TA_TEXTUREMODE_ADDRESS(screen_tx[_screen_buffer]);
+ TA_TEXTUREMODE_NON_TWIDDLED|TA_TEXTUREMODE_STRIDE|
+ TA_TEXTUREMODE_ADDRESS(screen_tx[_screen_buffer]);
mypoly.red = mypoly.green = mypoly.blue = mypoly.alpha = 0;
@@ -430,70 +430,70 @@ void OSystem_Dreamcast::updateScreenPolygons(void)
ta_commit_end();
if (_overlay_visible) {
- if (_overlay_fade < 1.0)
- _overlay_fade += 0.125;
+ if (_overlay_fade < 1.0)
+ _overlay_fade += 0.125;
} else {
- if (_overlay_fade > 0)
- _overlay_fade -= 0.125;
+ if (_overlay_fade > 0)
+ _overlay_fade -= 0.125;
}
if (_overlay_fade > 0.0) {
- mypoly.cmd =
- TA_CMD_POLYGON|TA_CMD_POLYGON_TYPE_TRANSPARENT|TA_CMD_POLYGON_SUBLIST|
- TA_CMD_POLYGON_STRIPLENGTH_2|TA_CMD_POLYGON_PACKED_COLOUR|TA_CMD_POLYGON_TEXTURED;
- mypoly.mode1 = TA_POLYMODE1_Z_ALWAYS|TA_POLYMODE1_NO_Z_UPDATE;
- mypoly.mode2 =
- TA_POLYMODE2_BLEND_SRC/*_ALPHA*/|TA_POLYMODE2_BLEND_DST_INVALPHA|
- TA_POLYMODE2_ENABLE_ALPHA|
- TA_POLYMODE2_FOG_DISABLED|TA_POLYMODE2_TEXTURE_MODULATE_ALPHA|
- TA_POLYMODE2_U_SIZE_512|TA_POLYMODE2_V_SIZE_512;
- mypoly.texture = TA_TEXTUREMODE_ARGB4444|TA_TEXTUREMODE_NON_TWIDDLED|
- TA_TEXTUREMODE_ADDRESS(ovl_tx[_overlay_buffer]);
-
- mypoly.red = mypoly.green = mypoly.blue = mypoly.alpha = 0.0;
-
- ta_commit_list(&mypoly);
-
- myvertex.cmd = TA_CMD_VERTEX;
- myvertex.ocolour = 0;
- myvertex.colour = 0xffffff|(((int)(255*_overlay_fade))<<24);
-
- myvertex.z = 0.5;
- myvertex.u = 0.0;
- myvertex.v = 0.0;
-
- myvertex.x = _overlay_x*_xscale+LEFT_OFFSET;
- myvertex.y = _overlay_y*_yscale+TOP_OFFSET;
- ta_commit_list(&myvertex);
-
- myvertex.x += OVL_W*_xscale;
- myvertex.u = OVL_W*(1.0/512.0);
- ta_commit_list(&myvertex);
-
- myvertex.x = _overlay_x*_xscale;
- myvertex.y += OVL_H*_yscale;
- myvertex.u = 0.0;
- myvertex.v = OVL_H*(1.0/512.0);
- ta_commit_list(&myvertex);
-
- myvertex.x += OVL_W*_xscale;
- myvertex.u = OVL_W*(1.0/512.0);
- myvertex.cmd |= TA_CMD_VERTEX_EOS;
- ta_commit_list(&myvertex);
+ mypoly.cmd =
+ TA_CMD_POLYGON|TA_CMD_POLYGON_TYPE_TRANSPARENT|TA_CMD_POLYGON_SUBLIST|
+ TA_CMD_POLYGON_STRIPLENGTH_2|TA_CMD_POLYGON_PACKED_COLOUR|TA_CMD_POLYGON_TEXTURED;
+ mypoly.mode1 = TA_POLYMODE1_Z_ALWAYS|TA_POLYMODE1_NO_Z_UPDATE;
+ mypoly.mode2 =
+ TA_POLYMODE2_BLEND_SRC/*_ALPHA*/|TA_POLYMODE2_BLEND_DST_INVALPHA|
+ TA_POLYMODE2_ENABLE_ALPHA|
+ TA_POLYMODE2_FOG_DISABLED|TA_POLYMODE2_TEXTURE_MODULATE_ALPHA|
+ TA_POLYMODE2_U_SIZE_512|TA_POLYMODE2_V_SIZE_512;
+ mypoly.texture = TA_TEXTUREMODE_ARGB4444|TA_TEXTUREMODE_NON_TWIDDLED|
+ TA_TEXTUREMODE_ADDRESS(ovl_tx[_overlay_buffer]);
+
+ mypoly.red = mypoly.green = mypoly.blue = mypoly.alpha = 0.0;
+
+ ta_commit_list(&mypoly);
+
+ myvertex.cmd = TA_CMD_VERTEX;
+ myvertex.ocolour = 0;
+ myvertex.colour = 0xffffff|(((int)(255*_overlay_fade))<<24);
+
+ myvertex.z = 0.5;
+ myvertex.u = 0.0;
+ myvertex.v = 0.0;
+
+ myvertex.x = _overlay_x*_xscale+LEFT_OFFSET;
+ myvertex.y = _overlay_y*_yscale+TOP_OFFSET;
+ ta_commit_list(&myvertex);
+
+ myvertex.x += OVL_W*_xscale;
+ myvertex.u = OVL_W*(1.0/512.0);
+ ta_commit_list(&myvertex);
+
+ myvertex.x = _overlay_x*_xscale;
+ myvertex.y += OVL_H*_yscale;
+ myvertex.u = 0.0;
+ myvertex.v = OVL_H*(1.0/512.0);
+ ta_commit_list(&myvertex);
+
+ myvertex.x += OVL_W*_xscale;
+ myvertex.u = OVL_W*(1.0/512.0);
+ myvertex.cmd |= TA_CMD_VERTEX_EOS;
+ ta_commit_list(&myvertex);
}
if (_softkbd_on)
- if (_softkbd_motion < 120)
- _softkbd_motion += 10;
- else
- ;
+ if (_softkbd_motion < 120)
+ _softkbd_motion += 10;
+ else
+ ;
else
- if (_softkbd_motion > 0)
- _softkbd_motion -= 10;
+ if (_softkbd_motion > 0)
+ _softkbd_motion -= 10;
if (_softkbd_motion)
- _softkbd.draw(330.0*sin(0.013*_softkbd_motion) - 320.0, 200.0,
+ _softkbd.draw(330.0*sin(0.013*_softkbd_motion) - 320.0, 200.0,
120-_softkbd_motion);
// *((volatile unsigned int *)(void *)0xa05f8040) = 0xffff00;
@@ -516,15 +516,15 @@ void OSystem_Dreamcast::maybeRefreshScreen(void)
{
unsigned int t = Timer();
if((int)(t-_last_screen_refresh) > USEC_TO_TIMER(30000))
- updateScreenPolygons();
+ updateScreenPolygons();
}
void OSystem_Dreamcast::drawMouse(int xdraw, int ydraw, int w, int h,
unsigned char *buf, bool visible)
{
if (!visible || buf == NULL || !w || !h || w>MOUSE_W || h>MOUSE_H) {
- commit_dummy_transpoly();
- return;
+ commit_dummy_transpoly();
+ return;
}
struct polygon_list mypoly;
@@ -537,26 +537,26 @@ void OSystem_Dreamcast::drawMouse(int xdraw, int ydraw, int w, int h,
unsigned int texturemode = screenFormats[_mouseFormat].textureFormat;
if (_mouseFormat == 0) {
- unsigned short *pal = _enable_cursor_palette? cursor_palette : palette;
- for (int y=0; y<h; y++) {
- int x;
- for (x=0; x<w; x++)
+ unsigned short *pal = _enable_cursor_palette? cursor_palette : palette;
+ for (int y=0; y<h; y++) {
+ int x;
+ for (x=0; x<w; x++)
if (*buf == _ms_keycolor) {
*dst++ = 0;
buf++;
} else
*dst++ = pal[*buf++]|0x8000;
- dst += MOUSE_W-x;
- }
+ dst += MOUSE_W-x;
+ }
} else if(texturemode == TA_TEXTUREMODE_RGB565 &&
_ms_keycolor<=0xffff) {
- /* Special handling when doing colorkey on RGB565; we need
- to convert to ARGB1555 to get an alpha channel... */
- texturemode = TA_TEXTUREMODE_ARGB1555;
- unsigned short *bufs = (unsigned short *)buf;
- for (int y=0; y<h; y++) {
- int x;
- for (x=0; x<w; x++)
+ /* Special handling when doing colorkey on RGB565; we need
+ to convert to ARGB1555 to get an alpha channel... */
+ texturemode = TA_TEXTUREMODE_ARGB1555;
+ unsigned short *bufs = (unsigned short *)buf;
+ for (int y=0; y<h; y++) {
+ int x;
+ for (x=0; x<w; x++)
if (*bufs == _ms_keycolor) {
*dst++ = 0;
bufs++;
@@ -564,32 +564,32 @@ void OSystem_Dreamcast::drawMouse(int xdraw, int ydraw, int w, int h,
unsigned short p = *bufs++;
*dst++ = (p&0x1f)|((p&0xffc0)>>1)|0x8000;
}
- dst += MOUSE_W-x;
- }
+ dst += MOUSE_W-x;
+ }
} else {
- unsigned short *bufs = (unsigned short *)buf;
- for (int y=0; y<h; y++) {
- int x;
- for (x=0; x<w; x++)
+ unsigned short *bufs = (unsigned short *)buf;
+ for (int y=0; y<h; y++) {
+ int x;
+ for (x=0; x<w; x++)
if (*bufs == _ms_keycolor) {
*dst++ = 0;
bufs++;
} else
*dst++ = *bufs++;
- dst += MOUSE_W-x;
- }
+ dst += MOUSE_W-x;
+ }
}
mypoly.cmd =
- TA_CMD_POLYGON|TA_CMD_POLYGON_TYPE_TRANSPARENT|TA_CMD_POLYGON_SUBLIST|
- TA_CMD_POLYGON_STRIPLENGTH_2|TA_CMD_POLYGON_PACKED_COLOUR|TA_CMD_POLYGON_TEXTURED;
+ TA_CMD_POLYGON|TA_CMD_POLYGON_TYPE_TRANSPARENT|TA_CMD_POLYGON_SUBLIST|
+ TA_CMD_POLYGON_STRIPLENGTH_2|TA_CMD_POLYGON_PACKED_COLOUR|TA_CMD_POLYGON_TEXTURED;
mypoly.mode1 = TA_POLYMODE1_Z_ALWAYS|TA_POLYMODE1_NO_Z_UPDATE;
mypoly.mode2 =
- TA_POLYMODE2_BLEND_SRC_ALPHA|TA_POLYMODE2_BLEND_DST_INVALPHA|
- TA_POLYMODE2_FOG_DISABLED|TA_POLYMODE2_TEXTURE_REPLACE|
- TA_POLYMODE2_U_SIZE_128|TA_POLYMODE2_V_SIZE_128;
+ TA_POLYMODE2_BLEND_SRC_ALPHA|TA_POLYMODE2_BLEND_DST_INVALPHA|
+ TA_POLYMODE2_FOG_DISABLED|TA_POLYMODE2_TEXTURE_REPLACE|
+ TA_POLYMODE2_U_SIZE_128|TA_POLYMODE2_V_SIZE_128;
mypoly.texture = texturemode|TA_TEXTUREMODE_NON_TWIDDLED|
- TA_TEXTUREMODE_ADDRESS(mouse_tx[_mouse_buffer]);
+ TA_TEXTUREMODE_ADDRESS(mouse_tx[_mouse_buffer]);
mypoly.red = mypoly.green = mypoly.blue = mypoly.alpha = 0;
@@ -625,11 +625,11 @@ void OSystem_Dreamcast::drawMouse(int xdraw, int ydraw, int w, int h,
void OSystem_Dreamcast::mouseToSoftKbd(int x, int y, int &rx, int &ry) const
{
if (_softkbd_motion) {
- rx = (int)(x*_xscale - (330.0*sin(0.013*_softkbd_motion) + LEFT_OFFSET - 320.0));
- ry = (int)(y*_yscale + TOP_OFFSET - 200.0);
+ rx = (int)(x*_xscale - (330.0*sin(0.013*_softkbd_motion) + LEFT_OFFSET - 320.0));
+ ry = (int)(y*_yscale + TOP_OFFSET - 200.0);
} else {
- rx = -1;
- ry = -1;
+ rx = -1;
+ ry = -1;
}
}
@@ -648,7 +648,7 @@ void OSystem_Dreamcast::hideOverlay()
void OSystem_Dreamcast::clearOverlay()
{
if (!_overlay_visible)
- return;
+ return;
memset(overlay, 0, OVL_W*OVL_H*sizeof(unsigned short));
@@ -661,9 +661,9 @@ void OSystem_Dreamcast::grabOverlay(void *buf, int pitch)
unsigned short *src = overlay;
unsigned char *dst = (unsigned char *)buf;
do {
- memcpy(dst, src, OVL_W*sizeof(int16));
- src += OVL_W;
- dst += pitch;
+ memcpy(dst, src, OVL_W*sizeof(int16));
+ src += OVL_W;
+ dst += pitch;
} while (--h);
}
@@ -671,13 +671,13 @@ void OSystem_Dreamcast::copyRectToOverlay(const void *buf, int pitch,
int x, int y, int w, int h)
{
if (w<1 || h<1)
- return;
+ return;
unsigned short *dst = overlay + y*OVL_W + x;
const unsigned char *src = (const unsigned char *)buf;
do {
- memcpy(dst, src, w*sizeof(int16));
- dst += OVL_W;
- src += pitch;
+ memcpy(dst, src, w*sizeof(int16));
+ dst += OVL_W;
+ src += pitch;
} while (--h);
_overlay_dirty = true;
}
@@ -685,7 +685,7 @@ void OSystem_Dreamcast::copyRectToOverlay(const void *buf, int pitch,
Graphics::Surface *OSystem_Dreamcast::lockScreen()
{
if (!screen)
- return 0;
+ return 0;
_framebuffer.init(_screen_w, _screen_h, SCREEN_W*2, screen, screenFormats[_screenFormat]);
diff --git a/backends/platform/dc/icon.cpp b/backends/platform/dc/icon.cpp
index ba621883a9..7b4e9e3878 100644
--- a/backends/platform/dc/icon.cpp
+++ b/backends/platform/dc/icon.cpp
@@ -31,17 +31,17 @@ void Icon::create_vmicon(void *buffer)
unsigned char *pix = ((unsigned char *)buffer)+32;
for (int n = 0; n<16; n++) {
- int p = palette[n];
- pal[n] =
- ((p>>16)&0xf000)|
- ((p>>12)&0x0f00)|
- ((p>> 8)&0x00f0)|
- ((p>> 4)&0x000f);
+ int p = palette[n];
+ pal[n] =
+ ((p>>16)&0xf000)|
+ ((p>>12)&0x0f00)|
+ ((p>> 8)&0x00f0)|
+ ((p>> 4)&0x000f);
}
for (int line = 0; line < 32; line++) {
- memcpy(pix, &bitmap[32/2*(31-line)], 32/2);
- pix += 32/2;
+ memcpy(pix, &bitmap[32/2*(31-line)], 32/2);
+ pix += 32/2;
}
}
@@ -53,10 +53,10 @@ void Icon::create_texture()
unsigned short *linebase;
unsigned char *src = bitmap+sizeof(bitmap)-17;
for (int y=0; y<16; y++) {
- linebase = tex + (tt[y]<<1);
- for (int x=0; x<16; x++, --src)
- linebase[tt[x]] = src[16]|(src[0]<<8);
- src -= 16;
+ linebase = tex + (tt[y]<<1);
+ for (int x=0; x<16; x++, --src)
+ linebase[tt[x]] = src[16]|(src[0]<<8);
+ src -= 16;
}
texture = tex;
}
@@ -65,7 +65,7 @@ void Icon::setPalette(int pal)
{
unsigned int (*hwpal)[64][16] = (unsigned int (*)[64][16])0xa05f9000;
for (int n = 0; n<16; n++)
- (*hwpal)[pal][n] = palette[n];
+ (*hwpal)[pal][n] = palette[n];
}
void Icon::draw(float x1, float y1, float x2, float y2, int pal,
@@ -75,16 +75,16 @@ void Icon::draw(float x1, float y1, float x2, float y2, int pal,
struct packed_colour_vertex_list myvertex;
mypoly.cmd =
- TA_CMD_POLYGON|TA_CMD_POLYGON_TYPE_TRANSPARENT|TA_CMD_POLYGON_SUBLIST|
- TA_CMD_POLYGON_STRIPLENGTH_2|TA_CMD_POLYGON_PACKED_COLOUR|TA_CMD_POLYGON_TEXTURED;
+ TA_CMD_POLYGON|TA_CMD_POLYGON_TYPE_TRANSPARENT|TA_CMD_POLYGON_SUBLIST|
+ TA_CMD_POLYGON_STRIPLENGTH_2|TA_CMD_POLYGON_PACKED_COLOUR|TA_CMD_POLYGON_TEXTURED;
mypoly.mode1 = TA_POLYMODE1_Z_ALWAYS|TA_POLYMODE1_NO_Z_UPDATE;
mypoly.mode2 =
- TA_POLYMODE2_BLEND_SRC_ALPHA|TA_POLYMODE2_BLEND_DST_INVALPHA|
- TA_POLYMODE2_FOG_DISABLED|TA_POLYMODE2_ENABLE_ALPHA|
- TA_POLYMODE2_TEXTURE_MODULATE_ALPHA|TA_POLYMODE2_U_SIZE_32|
- TA_POLYMODE2_V_SIZE_32;
+ TA_POLYMODE2_BLEND_SRC_ALPHA|TA_POLYMODE2_BLEND_DST_INVALPHA|
+ TA_POLYMODE2_FOG_DISABLED|TA_POLYMODE2_ENABLE_ALPHA|
+ TA_POLYMODE2_TEXTURE_MODULATE_ALPHA|TA_POLYMODE2_U_SIZE_32|
+ TA_POLYMODE2_V_SIZE_32;
mypoly.texture = TA_TEXTUREMODE_CLUT4|TA_TEXTUREMODE_CLUTBANK4(pal)|
- TA_TEXTUREMODE_ADDRESS(texture);
+ TA_TEXTUREMODE_ADDRESS(texture);
mypoly.red = mypoly.green = mypoly.blue = mypoly.alpha = 0;
@@ -123,59 +123,59 @@ int Icon::find_unused_pixel(const unsigned char *mask)
memset(use, 0, sizeof(use));
unsigned char *p = bitmap;
for (int n=0; n<32*32/2/4; n++) {
- unsigned char mbits = ~*mask++;
- for (int i=0; i<4; i++) {
- unsigned char pix = *p++;
- if(mbits & 64)
+ unsigned char mbits = ~*mask++;
+ for (int i=0; i<4; i++) {
+ unsigned char pix = *p++;
+ if(mbits & 64)
use[pix&0xf]++;
- if(mbits & 128)
+ if(mbits & 128)
use[pix>>4]++;
- mbits <<= 2;
- }
+ mbits <<= 2;
+ }
}
for (int i=0; i<16; i++)
- if (!use[i])
- return i;
+ if (!use[i])
+ return i;
return -1;
}
bool Icon::load_image2(const void *data, int len)
{
struct {
- int size, w, h;
- short pla, bitcnt;
- int comp, sizeimg, xres, yres, used, imp;
+ int size, w, h;
+ short pla, bitcnt;
+ int comp, sizeimg, xres, yres, used, imp;
} hdr;
if (len < 40)
- return false;
+ return false;
memcpy(&hdr, data, 40);
if (hdr.size != 40 || /* hdr.sizeimg<=0 || */ hdr.w<0 || hdr.h<0 ||
- hdr.bitcnt<0 || hdr.used<0)
- return false;
+ hdr.bitcnt<0 || hdr.used<0)
+ return false;
if (!hdr.used)
- hdr.used = 1<<hdr.bitcnt;
+ hdr.used = 1<<hdr.bitcnt;
hdr.h >>= 1;
/* Fix incorrect sizeimg (The Dig) */
if (hdr.sizeimg < ((hdr.w*hdr.h*(1+hdr.bitcnt)+7)>>3))
- hdr.sizeimg = ((hdr.w*hdr.h*(1+hdr.bitcnt)+7)>>3);
+ hdr.sizeimg = ((hdr.w*hdr.h*(1+hdr.bitcnt)+7)>>3);
if (hdr.size + (hdr.used<<2) + hdr.sizeimg > len /* ||
- hdr.sizeimg < ((hdr.w*hdr.h*(1+hdr.bitcnt)+7)>>3) */)
- return false;
+ hdr.sizeimg < ((hdr.w*hdr.h*(1+hdr.bitcnt)+7)>>3) */)
+ return false;
if (hdr.w != 32 || hdr.h != 32 || hdr.bitcnt != 4 || hdr.used > 16)
- return false;
+ return false;
memcpy(palette, ((const char *)data)+hdr.size, hdr.used<<2);
memcpy(bitmap, ((const char *)data)+hdr.size+(hdr.used<<2), 32*32/2);
for (int i=0; i<16; i++)
- palette[i] |= 0xff000000;
+ palette[i] |= 0xff000000;
for (int i=hdr.used; i<16; i++)
- palette[i] = 0;
+ palette[i] = 0;
const unsigned char *mask =
- ((const unsigned char *)data)+hdr.size+(hdr.used<<2)+32*32/2;
+ ((const unsigned char *)data)+hdr.size+(hdr.used<<2)+32*32/2;
int unused = find_unused_pixel(mask);
if (unused >= 0) {
- unsigned char *pix = bitmap;
- for (int y=0; y<32; y++)
- for (int x=0; x<32/8; x++) {
+ unsigned char *pix = bitmap;
+ for (int y=0; y<32; y++)
+ for (int x=0; x<32/8; x++) {
unsigned char mbits = *mask++;
for (int z=0; z<4; z++) {
unsigned char pbits = *pix;
@@ -184,8 +184,8 @@ bool Icon::load_image2(const void *data, int len)
*pix++ = pbits;
mbits <<= 2;
}
- }
- palette[unused] = 0;
+ }
+ palette[unused] = 0;
}
return true;
}
@@ -193,17 +193,17 @@ bool Icon::load_image2(const void *data, int len)
bool Icon::load_image1(const void *data, int len, int offs)
{
struct {
- char w, h, colors, rsrv;
- short pla, bitcnt;
- int bytes, offs;
+ char w, h, colors, rsrv;
+ short pla, bitcnt;
+ int bytes, offs;
} hdr;
if (len < offs+16)
- return false;
+ return false;
memcpy(&hdr, ((const char *)data)+offs, 16);
if (hdr.bytes > 0 && hdr.offs >= 0 && hdr.offs+hdr.bytes <= len)
- return load_image2(((const char *)data)+hdr.offs, hdr.bytes);
+ return load_image2(((const char *)data)+hdr.offs, hdr.bytes);
else
- return false;
+ return false;
}
bool Icon::load(const void *data, int len, int offs)
@@ -213,13 +213,13 @@ bool Icon::load(const void *data, int len, int offs)
memset(palette, 0, sizeof(palette));
texture = NULL;
if (len < offs+6)
- return false;
+ return false;
memcpy(&hdr, ((const char *)data)+offs, 6);
if (hdr.type != 1 || hdr.cnt < 1 || offs+6+(hdr.cnt<<4) > len)
- return false;
+ return false;
for (int i=0; i<hdr.cnt; i++)
- if (load_image1(data, len, offs+6+(i<<4)))
- return true;
+ if (load_image1(data, len, offs+6+(i<<4)))
+ return true;
return false;
}
@@ -228,11 +228,11 @@ bool Icon::load(const char *filename)
char buf[2048];
int fd;
if ((fd = open(filename, O_RDONLY))>=0) {
- int sz;
- sz = read(fd, buf, sizeof(buf));
- close(fd);
- if (sz>0)
- return load(buf, sz);
+ int sz;
+ sz = read(fd, buf, sizeof(buf));
+ close(fd);
+ if (sz>0)
+ return load(buf, sz);
}
return false;
}
diff --git a/backends/platform/dc/input.cpp b/backends/platform/dc/input.cpp
index a69bb3b78f..850a4db84b 100644
--- a/backends/platform/dc/input.cpp
+++ b/backends/platform/dc/input.cpp
@@ -38,49 +38,49 @@ int handleInput(struct mapledev *pad, int &mouse_x, int &mouse_y,
static int8 mouse_wheel = 0, lastwheel = 0;
shiftFlags = 0;
for (int i=0; i<4; i++, pad++)
- if (pad->func & MAPLE_FUNC_CONTROLLER) {
- int buttons = pad->cond.controller.buttons;
+ if (pad->func & MAPLE_FUNC_CONTROLLER) {
+ int buttons = pad->cond.controller.buttons;
- if (!(buttons & 0x060e)) exit(0);
+ if (!(buttons & 0x060e)) exit(0);
- if (!(buttons & 4)) lmb++;
- if (!(buttons & 2)) rmb++;
+ if (!(buttons & 4)) lmb++;
+ if (!(buttons & 2)) rmb++;
- if (!(buttons & 8)) newkey = Common::KEYCODE_F5;
- else if (!(buttons & 512)) newkey = ' ';
- else if (!(buttons & 1024)) newkey = numpadmap[(buttons>>4)&15];
+ if (!(buttons & 8)) newkey = Common::KEYCODE_F5;
+ else if (!(buttons & 512)) newkey = ' ';
+ else if (!(buttons & 1024)) newkey = numpadmap[(buttons>>4)&15];
- if (!(buttons & 128)) { if (inter) newkey = 1001; else mouse_x++; }
- if (!(buttons & 64)) { if (inter) newkey = 1002; else mouse_x--; }
- if (!(buttons & 32)) { if (inter) newkey = 1003; else mouse_y++; }
- if (!(buttons & 16)) { if (inter) newkey = 1004; else mouse_y--; }
+ if (!(buttons & 128)) { if (inter) newkey = 1001; else mouse_x++; }
+ if (!(buttons & 64)) { if (inter) newkey = 1002; else mouse_x--; }
+ if (!(buttons & 32)) { if (inter) newkey = 1003; else mouse_y++; }
+ if (!(buttons & 16)) { if (inter) newkey = 1004; else mouse_y--; }
- mouse_x += ((int)pad->cond.controller.joyx-128)>>4;
- mouse_y += ((int)pad->cond.controller.joyy-128)>>4;
+ mouse_x += ((int)pad->cond.controller.joyx-128)>>4;
+ mouse_y += ((int)pad->cond.controller.joyy-128)>>4;
- if (pad->cond.controller.ltrigger > 200) newkey = 1005;
- else if (pad->cond.controller.rtrigger > 200) newkey = 1006;
+ if (pad->cond.controller.ltrigger > 200) newkey = 1005;
+ else if (pad->cond.controller.rtrigger > 200) newkey = 1006;
- } else if (pad->func & MAPLE_FUNC_MOUSE) {
- int buttons = pad->cond.mouse.buttons;
+ } else if (pad->func & MAPLE_FUNC_MOUSE) {
+ int buttons = pad->cond.mouse.buttons;
- if (!(buttons & 4)) lmb++;
- if (!(buttons & 2)) rmb++;
+ if (!(buttons & 4)) lmb++;
+ if (!(buttons & 2)) rmb++;
- if (!(buttons & 8)) newkey = Common::KEYCODE_F5;
+ if (!(buttons & 8)) newkey = Common::KEYCODE_F5;
- mouse_x += pad->cond.mouse.axis1;
- mouse_y += pad->cond.mouse.axis2;
- mouse_wheel += pad->cond.mouse.axis3;
+ mouse_x += pad->cond.mouse.axis1;
+ mouse_y += pad->cond.mouse.axis2;
+ mouse_wheel += pad->cond.mouse.axis3;
- if (inter)
+ if (inter)
inter->mouse(mouse_x, mouse_y);
- pad->cond.mouse.axis1 = 0;
- pad->cond.mouse.axis2 = 0;
- pad->cond.mouse.axis3 = 0;
- } else if (pad->func & MAPLE_FUNC_KEYBOARD) {
- for (int p=0; p<6; p++) {
+ pad->cond.mouse.axis1 = 0;
+ pad->cond.mouse.axis2 = 0;
+ pad->cond.mouse.axis3 = 0;
+ } else if (pad->func & MAPLE_FUNC_KEYBOARD) {
+ for (int p=0; p<6; p++) {
int shift = pad->cond.kbd.shift;
int key = pad->cond.kbd.key[p];
if (shift & 0x08) lmb++;
@@ -134,56 +134,56 @@ int handleInput(struct mapledev *pad, int &mouse_x, int &mouse_y,
case 0x89:
newkey = ((shift & 0x22)? '|' : '?'); break;
}
- }
- }
+ }
+ }
if (lmb && inter && !lastlmb) {
- newkey = 1000;
- lmb = 0;
+ newkey = 1000;
+ lmb = 0;
}
if (lmb && !lastlmb) {
- lastlmb = 1;
- return -Common::EVENT_LBUTTONDOWN;
+ lastlmb = 1;
+ return -Common::EVENT_LBUTTONDOWN;
} else if (lastlmb && !lmb) {
- lastlmb = 0;
- return -Common::EVENT_LBUTTONUP;
+ lastlmb = 0;
+ return -Common::EVENT_LBUTTONUP;
}
if (rmb && !lastrmb) {
- lastrmb = 1;
- return -Common::EVENT_RBUTTONDOWN;
+ lastrmb = 1;
+ return -Common::EVENT_RBUTTONDOWN;
} else if (lastrmb && !rmb) {
- lastrmb = 0;
- return -Common::EVENT_RBUTTONUP;
+ lastrmb = 0;
+ return -Common::EVENT_RBUTTONUP;
}
if (mouse_wheel != lastwheel) {
- if (((int8)(mouse_wheel - lastwheel)) > 0) {
- lastwheel++;
- return -Common::EVENT_WHEELDOWN;
- } else {
- --lastwheel;
- return -Common::EVENT_WHEELUP;
- }
+ if (((int8)(mouse_wheel - lastwheel)) > 0) {
+ lastwheel++;
+ return -Common::EVENT_WHEELDOWN;
+ } else {
+ --lastwheel;
+ return -Common::EVENT_WHEELUP;
+ }
}
if (newkey && inter && newkey != lastkey) {
- int transkey = inter->key(newkey, shiftFlags);
- if (transkey) {
- newkey = transkey;
- inter = NULL;
- }
+ int transkey = inter->key(newkey, shiftFlags);
+ if (transkey) {
+ newkey = transkey;
+ inter = NULL;
+ }
}
if (!newkey || (lastkey && newkey != lastkey)) {
- int upkey = lastkey;
- lastkey = 0;
- if (upkey)
- return upkey | (1<<30);
+ int upkey = lastkey;
+ lastkey = 0;
+ if (upkey)
+ return upkey | (1<<30);
} else if (!lastkey) {
- lastkey = newkey;
- if (newkey >= 1000 || !inter)
- return newkey;
+ lastkey = newkey;
+ if (newkey >= 1000 || !inter)
+ return newkey;
}
return 0;
@@ -194,13 +194,13 @@ bool OSystem_Dreamcast::pollEvent(Common::Event &event)
unsigned int t = Timer();
if (_timerManager != NULL)
- ((DefaultTimerManager *)_timerManager)->handler();
+ ((DefaultTimerManager *)_timerManager)->handler();
if (((int)(t-_devpoll))<0)
- return false;
+ return false;
_devpoll += USEC_TO_TIMER(17000);
if (((int)(t-_devpoll))>=0)
- _devpoll = t + USEC_TO_TIMER(17000);
+ _devpoll = t + USEC_TO_TIMER(17000);
maybeRefreshScreen();
@@ -217,36 +217,36 @@ bool OSystem_Dreamcast::pollEvent(Common::Event &event)
event.mouse.x = _ms_cur_x;
event.mouse.y = _ms_cur_y;
if (_overlay_visible) {
- event.mouse.x -= _overlay_x;
- event.mouse.y -= _overlay_y;
+ event.mouse.x -= _overlay_x;
+ event.mouse.y -= _overlay_y;
}
event.kbd.ascii = 0;
event.kbd.keycode = Common::KEYCODE_INVALID;
if (e<0) {
- event.type = (Common::EventType)-e;
- return true;
+ event.type = (Common::EventType)-e;
+ return true;
} else if (e>0) {
- bool processed = false, down = !(e&(1<<30));
- e &= ~(1<<30);
- if (e < 1000) {
- event.type = (down? Common::EVENT_KEYDOWN : Common::EVENT_KEYUP);
- event.kbd.keycode = (Common::KeyCode)e;
- event.kbd.ascii = (e>='a' && e<='z' && (event.kbd.flags & Common::KBD_SHIFT)?
+ bool processed = false, down = !(e&(1<<30));
+ e &= ~(1<<30);
+ if (e < 1000) {
+ event.type = (down? Common::EVENT_KEYDOWN : Common::EVENT_KEYUP);
+ event.kbd.keycode = (Common::KeyCode)e;
+ event.kbd.ascii = (e>='a' && e<='z' && (event.kbd.flags & Common::KBD_SHIFT)?
e &~ 0x20 : e);
- processed = true;
- } else if (down) {
- if (e == 1005)
+ processed = true;
+ } else if (down) {
+ if (e == 1005)
setFeatureState(kFeatureVirtualKeyboard,
!getFeatureState(kFeatureVirtualKeyboard));
- }
- return processed;
+ }
+ return processed;
} else if (_ms_cur_x != _ms_old_x || _ms_cur_y != _ms_old_y) {
- event.type = Common::EVENT_MOUSEMOVE;
- _ms_old_x = _ms_cur_x;
- _ms_old_y = _ms_cur_y;
- return true;
+ event.type = Common::EVENT_MOUSEMOVE;
+ _ms_old_x = _ms_cur_x;
+ _ms_old_y = _ms_cur_y;
+ return true;
} else {
- event.type = (Common::EventType)0;
- return false;
+ event.type = (Common::EventType)0;
+ return false;
}
}
diff --git a/backends/platform/dc/label.cpp b/backends/platform/dc/label.cpp
index 46bff0db11..ba60697b20 100644
--- a/backends/platform/dc/label.cpp
+++ b/backends/platform/dc/label.cpp
@@ -30,11 +30,11 @@ void *get_romfont_address() __asm__(".get_romfont_address");
__asm__("\
\n\
.get_romfont_address: \n\
- mov.l 1f,r0 \n\
- mov.l @r0,r0 \n\
- jmp @r0 \n\
- mov #0,r1 \n\
- .align 2 \n\
+ mov.l 1f,r0 \n\
+ mov.l @r0,r0 \n\
+ jmp @r0 \n\
+ mov #0,r1 \n\
+ .align 2 \n\
1: .long 0x8c0000b4 \n\
\n\
");
@@ -48,26 +48,26 @@ static void draw_char(unsigned short *dst, int mod, int c, void *font_base)
if (c<128) c -= 32; else c -= 64;
src = c*36 + (unsigned char *)font_base;
for (i=0; i<12; i++) {
- int n = (src[0]<<16)|(src[1]<<8)|src[2];
- for (j=0; j<12; j++, n<<=1)
- if (n & (1<<23)) {
+ int n = (src[0]<<16)|(src[1]<<8)|src[2];
+ for (j=0; j<12; j++, n<<=1)
+ if (n & (1<<23)) {
dst[j] = 0xffff;
dst[j+1] = 0xffff;
dst[j+2] = 0xa108;
dst[j+mod] = 0xa108;
dst[j+mod+1] = 0xa108;
- }
- dst += mod;
- for (j=0; j<12; j++, n<<=1)
- if (n & (1<<23)) {
+ }
+ dst += mod;
+ for (j=0; j<12; j++, n<<=1)
+ if (n & (1<<23)) {
dst[j] = 0xffff;
dst[j+1] = 0xffff;
dst[j+2] = 0xa108;
dst[j+mod] = 0xa108;
dst[j+mod+1] = 0xa108;
- }
- dst += mod;
- src += 3;
+ }
+ dst += mod;
+ src += 3;
}
}
@@ -81,10 +81,10 @@ void Label::create_texture(const char *text)
int tsz = u*32;
unsigned short *tex = (unsigned short *)ta_txalloc(tsz*2);
for (int i=0; i<tsz; i++)
- tex[i] = 0;
+ tex[i] = 0;
int p=l*14;
while (l>0)
- draw_char(tex+(p-=14), u, text[--l], font);
+ draw_char(tex+(p-=14), u, text[--l], font);
texture = tex;
}
@@ -94,15 +94,15 @@ void Label::draw(float x, float y, unsigned int argb, float scale)
struct packed_colour_vertex_list myvertex;
mypoly.cmd =
- TA_CMD_POLYGON|TA_CMD_POLYGON_TYPE_TRANSPARENT|TA_CMD_POLYGON_SUBLIST|
- TA_CMD_POLYGON_STRIPLENGTH_2|TA_CMD_POLYGON_PACKED_COLOUR|TA_CMD_POLYGON_TEXTURED;
+ TA_CMD_POLYGON|TA_CMD_POLYGON_TYPE_TRANSPARENT|TA_CMD_POLYGON_SUBLIST|
+ TA_CMD_POLYGON_STRIPLENGTH_2|TA_CMD_POLYGON_PACKED_COLOUR|TA_CMD_POLYGON_TEXTURED;
mypoly.mode1 = TA_POLYMODE1_Z_ALWAYS|TA_POLYMODE1_NO_Z_UPDATE;
mypoly.mode2 =
- TA_POLYMODE2_BLEND_SRC_ALPHA|TA_POLYMODE2_BLEND_DST_INVALPHA|
- TA_POLYMODE2_FOG_DISABLED|TA_POLYMODE2_ENABLE_ALPHA|
- TA_POLYMODE2_TEXTURE_MODULATE_ALPHA|TA_POLYMODE2_V_SIZE_32|tex_u;
+ TA_POLYMODE2_BLEND_SRC_ALPHA|TA_POLYMODE2_BLEND_DST_INVALPHA|
+ TA_POLYMODE2_FOG_DISABLED|TA_POLYMODE2_ENABLE_ALPHA|
+ TA_POLYMODE2_TEXTURE_MODULATE_ALPHA|TA_POLYMODE2_V_SIZE_32|tex_u;
mypoly.texture = TA_TEXTUREMODE_ARGB1555|TA_TEXTUREMODE_NON_TWIDDLED|
- TA_TEXTUREMODE_ADDRESS(texture);
+ TA_TEXTUREMODE_ADDRESS(texture);
mypoly.red = mypoly.green = mypoly.blue = mypoly.alpha = 0;
diff --git a/backends/platform/dc/plugins.cpp b/backends/platform/dc/plugins.cpp
index cf1558eaa8..68ebf39bd5 100644
--- a/backends/platform/dc/plugins.cpp
+++ b/backends/platform/dc/plugins.cpp
@@ -134,7 +134,7 @@ void OSystem_Dreamcast::addCustomDirectories(Common::FSList &dirs) const
{
FilePluginProvider::addCustomDirectories(dirs);
if (pluginCustomDirectory != NULL)
- dirs.push_back(Common::FSNode(pluginCustomDirectory));
+ dirs.push_back(Common::FSNode(pluginCustomDirectory));
}
PluginList OSystem_Dreamcast::getPlugins()
@@ -142,12 +142,12 @@ PluginList OSystem_Dreamcast::getPlugins()
pluginCustomDirectory = NULL;
PluginList list = FilePluginProvider::getPlugins();
if (list.empty()) {
- Common::String selection;
- if (selectPluginDir(selection, Common::FSNode("plugins"))) {
- pluginCustomDirectory = selection.c_str();
- list = FilePluginProvider::getPlugins();
- pluginCustomDirectory = NULL;
- }
+ Common::String selection;
+ if (selectPluginDir(selection, Common::FSNode("plugins"))) {
+ pluginCustomDirectory = selection.c_str();
+ list = FilePluginProvider::getPlugins();
+ pluginCustomDirectory = NULL;
+ }
}
return list;
}
diff --git a/backends/platform/dc/selector.cpp b/backends/platform/dc/selector.cpp
index f70ce67d51..c14f869418 100644
--- a/backends/platform/dc/selector.cpp
+++ b/backends/platform/dc/selector.cpp
@@ -49,12 +49,12 @@ void draw_solid_quad(float x1, float y1, float x2, float y2,
struct packed_colour_vertex_list myvertex;
mypoly.cmd =
- TA_CMD_POLYGON|TA_CMD_POLYGON_TYPE_OPAQUE|TA_CMD_POLYGON_SUBLIST|
- TA_CMD_POLYGON_STRIPLENGTH_2|TA_CMD_POLYGON_PACKED_COLOUR|
- TA_CMD_POLYGON_GOURAUD_SHADING;
+ TA_CMD_POLYGON|TA_CMD_POLYGON_TYPE_OPAQUE|TA_CMD_POLYGON_SUBLIST|
+ TA_CMD_POLYGON_STRIPLENGTH_2|TA_CMD_POLYGON_PACKED_COLOUR|
+ TA_CMD_POLYGON_GOURAUD_SHADING;
mypoly.mode1 = TA_POLYMODE1_Z_ALWAYS|TA_POLYMODE1_NO_Z_UPDATE;
mypoly.mode2 =
- TA_POLYMODE2_BLEND_SRC|TA_POLYMODE2_FOG_DISABLED;
+ TA_POLYMODE2_BLEND_SRC|TA_POLYMODE2_FOG_DISABLED;
mypoly.texture = 0;
mypoly.red = mypoly.green = mypoly.blue = mypoly.alpha = 0;
@@ -94,13 +94,13 @@ void draw_trans_quad(float x1, float y1, float x2, float y2,
struct packed_colour_vertex_list myvertex;
mypoly.cmd =
- TA_CMD_POLYGON|TA_CMD_POLYGON_TYPE_TRANSPARENT|TA_CMD_POLYGON_SUBLIST|
- TA_CMD_POLYGON_STRIPLENGTH_2|TA_CMD_POLYGON_PACKED_COLOUR|
- TA_CMD_POLYGON_GOURAUD_SHADING;
+ TA_CMD_POLYGON|TA_CMD_POLYGON_TYPE_TRANSPARENT|TA_CMD_POLYGON_SUBLIST|
+ TA_CMD_POLYGON_STRIPLENGTH_2|TA_CMD_POLYGON_PACKED_COLOUR|
+ TA_CMD_POLYGON_GOURAUD_SHADING;
mypoly.mode1 = TA_POLYMODE1_Z_ALWAYS|TA_POLYMODE1_NO_Z_UPDATE;
mypoly.mode2 =
- TA_POLYMODE2_BLEND_SRC_ALPHA|TA_POLYMODE2_BLEND_DST_INVALPHA|
- TA_POLYMODE2_FOG_DISABLED|TA_POLYMODE2_ENABLE_ALPHA;
+ TA_POLYMODE2_BLEND_SRC_ALPHA|TA_POLYMODE2_BLEND_DST_INVALPHA|
+ TA_POLYMODE2_FOG_DISABLED|TA_POLYMODE2_ENABLE_ALPHA;
mypoly.texture = 0;
mypoly.red = mypoly.green = mypoly.blue = mypoly.alpha = 0;
@@ -165,15 +165,15 @@ static bool loadIcon(Game &game, Dir *dirs, int num_dirs)
char icofn[520];
sprintf(icofn, "%s%s.ICO", game.dir, game.filename_base);
if (game.icon.load(icofn))
- return true;
+ return true;
for (int i=0; i<num_dirs; i++)
- if (!strcmp(dirs[i].name, game.dir) &&
- dirs[i].deficon[0]) {
- sprintf(icofn, "%s%s", game.dir, dirs[i].deficon);
- if (game.icon.load(icofn))
+ if (!strcmp(dirs[i].name, game.dir) &&
+ dirs[i].deficon[0]) {
+ sprintf(icofn, "%s%s", game.dir, dirs[i].deficon);
+ if (game.icon.load(icofn))
return true;
- break;
- }
+ break;
+ }
return false;
}
@@ -187,9 +187,9 @@ static bool sameOrSubdir(const char *dir1, const char *dir2)
{
int l1 = strlen(dir1), l2 = strlen(dir2);
if (l1<=l2)
- return !strcmp(dir1, dir2);
+ return !strcmp(dir1, dir2);
else
- return !memcmp(dir1, dir2, l2);
+ return !memcmp(dir1, dir2, l2);
}
static bool uniqueGame(const char *base, const char *dir,
@@ -197,16 +197,16 @@ static bool uniqueGame(const char *base, const char *dir,
Game *games, int cnt)
{
while (cnt--)
- if (/*Don't detect the same game in a subdir,
+ if (/*Don't detect the same game in a subdir,
this is a workaround for the detector bug in toon... */
sameOrSubdir(dir, games->dir) &&
/*!strcmp(dir, games->dir) &&*/
!scumm_stricmp(base, games->filename_base) &&
lang == games->language &&
plf == games->platform)
- return false;
- else
- games++;
+ return false;
+ else
+ games++;
return true;
}
@@ -216,23 +216,23 @@ static int findGames(Game *games, int max, bool use_ini)
int curr_game = 0, curr_dir = 0, num_dirs = 0;
if (use_ini) {
- ConfMan.loadDefaultConfigFile();
- const Common::ConfigManager::DomainMap &game_domains = ConfMan.getGameDomains();
- for(Common::ConfigManager::DomainMap::const_iterator i =
+ ConfMan.loadDefaultConfigFile();
+ const Common::ConfigManager::DomainMap &game_domains = ConfMan.getGameDomains();
+ for(Common::ConfigManager::DomainMap::const_iterator i =
game_domains.begin(); curr_game < max && i != game_domains.end(); i++) {
- Common::String path = (*i)._value["path"];
- if (path.size() && path.lastChar() != '/')
+ Common::String path = (*i)._value["path"];
+ if (path.size() && path.lastChar() != '/')
path += "/";
- int j;
- for (j=0; j<num_dirs; j++)
+ int j;
+ for (j=0; j<num_dirs; j++)
if (path.equals(dirs[j].node.getPath()))
break;
- if (j >= num_dirs) {
+ if (j >= num_dirs) {
if (num_dirs >= MAX_DIR)
continue;
dirs[j = num_dirs++].node = Common::FSNode(path);
- }
- if (curr_game < max) {
+ }
+ if (curr_game < max) {
strcpy(games[curr_game].filename_base, (*i)._key.c_str());
strncpy(games[curr_game].engine_id, (*i)._value["engineid"].c_str(), 256);
games[curr_game].engine_id[255] = '\0';
@@ -242,24 +242,24 @@ static int findGames(Game *games, int max, bool use_ini)
games[curr_game].platform = Common::kPlatformUnknown;
strcpy(games[curr_game].text, (*i)._value["description"].c_str());
curr_game++;
- }
- }
+ }
+ }
} else {
- dirs[num_dirs++].node = Common::FSNode("");
+ dirs[num_dirs++].node = Common::FSNode("");
}
while ((curr_game < max || use_ini) && curr_dir < num_dirs) {
- strncpy(dirs[curr_dir].name, dirs[curr_dir].node.getPath().c_str(), 251);
- dirs[curr_dir].name[250] = '\0';
- if (!dirs[curr_dir].name[0] ||
+ strncpy(dirs[curr_dir].name, dirs[curr_dir].node.getPath().c_str(), 251);
+ dirs[curr_dir].name[250] = '\0';
+ if (!dirs[curr_dir].name[0] ||
dirs[curr_dir].name[strlen(dirs[curr_dir].name)-1] != '/')
- strcat(dirs[curr_dir].name, "/");
- dirs[curr_dir].deficon[0] = '\0';
- Common::FSList files, fslist;
- dirs[curr_dir++].node.getChildren(fslist, Common::FSNode::kListAll);
- for (Common::FSList::const_iterator entry = fslist.begin(); entry != fslist.end();
+ strcat(dirs[curr_dir].name, "/");
+ dirs[curr_dir].deficon[0] = '\0';
+ Common::FSList files, fslist;
+ dirs[curr_dir++].node.getChildren(fslist, Common::FSNode::kListAll);
+ for (Common::FSList::const_iterator entry = fslist.begin(); entry != fslist.end();
++entry) {
- if (entry->isDirectory()) {
+ if (entry->isDirectory()) {
if (!use_ini && num_dirs < MAX_DIR) {
dirs[num_dirs].node = *entry;
num_dirs++;
@@ -267,18 +267,18 @@ static int findGames(Game *games, int max, bool use_ini)
/* Toonstruck detector needs directories to be present too */
if(!use_ini)
files.push_back(*entry);
- } else
+ } else
if (isIcon(*entry))
strcpy(dirs[curr_dir-1].deficon, entry->getDisplayName().c_str());
else if(!use_ini)
files.push_back(*entry);
- }
+ }
- if (!use_ini) {
- DetectionResults detectionResults = EngineMan.detectGames(files);
- DetectedGames candidates = detectionResults.listRecognizedGames();
+ if (!use_ini) {
+ DetectionResults detectionResults = EngineMan.detectGames(files);
+ DetectedGames candidates = detectionResults.listRecognizedGames();
- for (DetectedGames::const_iterator ge = candidates.begin();
+ for (DetectedGames::const_iterator ge = candidates.begin();
ge != candidates.end(); ++ge)
if (curr_game < max) {
strcpy(games[curr_game].engine_id, ge->engineId.c_str());
@@ -303,12 +303,12 @@ static int findGames(Game *games, int max, bool use_ini)
curr_game++;
}
}
- }
+ }
}
for (int i=0; i<curr_game; i++)
- if (!loadIcon(games[i], dirs, num_dirs))
- makeDefIcon(games[i].icon);
+ if (!loadIcon(games[i], dirs, num_dirs))
+ makeDefIcon(games[i].icon);
delete[] dirs;
return curr_game;
}
@@ -335,35 +335,35 @@ void waitForDisk()
lab.create_texture("Please insert game CD.");
//printf("waitForDisk, cdstate = %d\n", getCdState());
for (;;) {
- int s = getCdState();
- if (s >= 6)
- wasopen = 1;
- if (s > 0 && s < 6 && wasopen) {
- cdfs_reinit();
- chdir("/");
- chdir("/");
- ta_sync();
- ta_txrelease(mark);
- return;
- }
+ int s = getCdState();
+ if (s >= 6)
+ wasopen = 1;
+ if (s > 0 && s < 6 && wasopen) {
+ cdfs_reinit();
+ chdir("/");
+ chdir("/");
+ ta_sync();
+ ta_txrelease(mark);
+ return;
+ }
- ta_begin_frame();
+ ta_begin_frame();
- drawBackground();
+ drawBackground();
- ta_commit_end();
+ ta_commit_end();
- lab.draw(166.0, 200.0, 0xffff2020);
+ lab.draw(166.0, 200.0, 0xffff2020);
- ta_commit_frame();
+ ta_commit_frame();
- int mousex = 0, mousey = 0;
- byte shiftFlags;
+ int mousex = 0, mousey = 0;
+ byte shiftFlags;
- int mask = getimask();
- setimask(15);
- handleInput(locked_get_pads(), mousex, mousey, shiftFlags);
- setimask(mask);
+ int mask = getimask();
+ setimask(15);
+ handleInput(locked_get_pads(), mousex, mousey, shiftFlags);
+ setimask(mask);
}
}
@@ -383,47 +383,47 @@ int gameMenu(Game *games, int num_games)
float y;
if (!num_games)
- return -1;
+ return -1;
for (;;) {
- if (getCdState()>=6)
- return -1;
+ if (getCdState()>=6)
+ return -1;
- ta_begin_frame();
+ ta_begin_frame();
- drawBackground();
+ drawBackground();
- ta_commit_end();
+ ta_commit_end();
- y = 40.0;
- for (int i=top_game, cnt=0; cnt<10 && i<num_games; i++, cnt++) {
- int pal = 48+(i&15);
+ y = 40.0;
+ for (int i=top_game, cnt=0; cnt<10 && i<num_games; i++, cnt++) {
+ int pal = 48+(i&15);
- if (cnt == selector_pos)
+ if (cnt == selector_pos)
draw_trans_quad(100.0, y, 590.0, y+32.0,
0x7000ff00, 0x7000ff00, 0x7000ff00, 0x7000ff00);
- games[i].icon.setPalette(pal);
- drawGameLabel(games[i], pal, 50.0, y, (cnt == selector_pos?
+ games[i].icon.setPalette(pal);
+ drawGameLabel(games[i], pal, 50.0, y, (cnt == selector_pos?
0xffff00 : 0xffffff));
- y += 40.0;
- }
+ y += 40.0;
+ }
- ta_commit_frame();
+ ta_commit_frame();
- byte shiftFlags;
- int event;
+ byte shiftFlags;
+ int event;
- int mask = getimask();
- setimask(15);
- event = handleInput(locked_get_pads(), mousex, mousey, shiftFlags);
- setimask(mask);
+ int mask = getimask();
+ setimask(15);
+ event = handleInput(locked_get_pads(), mousex, mousey, shiftFlags);
+ setimask(mask);
- if (event==-Common::EVENT_LBUTTONDOWN || event==Common::KEYCODE_RETURN || event==Common::KEYCODE_F5) {
- int selected_game = top_game + selector_pos;
+ if (event==-Common::EVENT_LBUTTONDOWN || event==Common::KEYCODE_RETURN || event==Common::KEYCODE_F5) {
+ int selected_game = top_game + selector_pos;
- for (int fade=0; fade<=256; fade+=4) {
+ for (int fade=0; fade<=256; fade+=4) {
ta_begin_frame();
@@ -447,25 +447,25 @@ int gameMenu(Game *games, int num_games)
0xffff00, 0, scale);
ta_commit_frame();
- }
- return selected_game;
- }
+ }
+ return selected_game;
+ }
- if (mousey>=16) {
- if (selector_pos + top_game + 1 < num_games)
+ if (mousey>=16) {
+ if (selector_pos + top_game + 1 < num_games)
if (++selector_pos >= 10) {
--selector_pos;
++top_game;
}
- mousey -= 16;
- } else if (mousey<=-16) {
- if (selector_pos + top_game > 0)
+ mousey -= 16;
+ } else if (mousey<=-16) {
+ if (selector_pos + top_game > 0)
if (--selector_pos < 0) {
++selector_pos;
--top_game;
}
- mousey += 16;
- }
+ mousey += 16;
+ }
}
}
@@ -478,50 +478,50 @@ bool selectGame(char *&engineId, char *&ret, char *&dir_ret, Common::Language &l
void *mark = ta_txmark();
for (;;) {
- num_games = findGames(games, MAX_GAMES, true);
- if (!num_games)
- num_games = findGames(games, MAX_GAMES, false);
+ num_games = findGames(games, MAX_GAMES, true);
+ if (!num_games)
+ num_games = findGames(games, MAX_GAMES, false);
- for (int i=0; i<num_games; i++) {
- games[i].icon.create_texture();
- games[i].label.create_texture(games[i].text);
- }
+ for (int i=0; i<num_games; i++) {
+ games[i].icon.create_texture();
+ games[i].label.create_texture(games[i].text);
+ }
- selected = gameMenu(games, num_games);
+ selected = gameMenu(games, num_games);
- ta_sync();
- ta_txrelease(mark);
+ ta_sync();
+ ta_txrelease(mark);
- if (selected == -1)
- waitForDisk();
- else
- break;
+ if (selected == -1)
+ waitForDisk();
+ else
+ break;
}
if (selected >= num_games)
- selected = -1;
+ selected = -1;
if (selected >= 0)
- the_game = games[selected];
+ the_game = games[selected];
delete[] games;
if (selected>=0) {
#if 0
- chdir(the_game.dir);
+ chdir(the_game.dir);
#else
- chdir("/");
- dir_ret = the_game.dir;
+ chdir("/");
+ dir_ret = the_game.dir;
#endif
- engineId = the_game.engine_id;
- ret = the_game.filename_base;
- lang_ret = the_game.language;
- plf_ret = the_game.platform;
- icon = the_game.icon;
- return true;
+ engineId = the_game.engine_id;
+ ret = the_game.filename_base;
+ lang_ret = the_game.language;
+ plf_ret = the_game.platform;
+ icon = the_game.icon;
+ return true;
} else
- return false;
+ return false;
}
#ifdef DYNAMIC_MODULES
@@ -531,15 +531,15 @@ static int findPluginDirs(Game *plugin_dirs, int max, const Common::FSNode &base
int curr_dir = 0;
base.getChildren(fslist, Common::FSNode::kListDirectoriesOnly);
for (Common::FSList::const_iterator entry = fslist.begin(); entry != fslist.end();
- ++entry) {
- if (entry->isDirectory()) {
- if (curr_dir >= max)
+ ++entry) {
+ if (entry->isDirectory()) {
+ if (curr_dir >= max)
break;
- strncpy(plugin_dirs[curr_dir].dir, (*entry).getPath().c_str(), 256);
- strncpy(plugin_dirs[curr_dir].text, (*entry).getDisplayName().c_str(), 256);
- plugin_dirs[curr_dir].icon.load(NULL, 0, 0);
- curr_dir++;
- }
+ strncpy(plugin_dirs[curr_dir].dir, (*entry).getPath().c_str(), 256);
+ strncpy(plugin_dirs[curr_dir].text, (*entry).getDisplayName().c_str(), 256);
+ plugin_dirs[curr_dir].icon.load(NULL, 0, 0);
+ curr_dir++;
+ }
}
return curr_dir;
}
@@ -555,8 +555,8 @@ bool selectPluginDir(Common::String &selection, const Common::FSNode &base)
num_plugin_dirs = findPluginDirs(plugin_dirs, MAX_PLUGIN_DIRS, base);
for (int i=0; i<num_plugin_dirs; i++) {
- plugin_dirs[i].icon.create_texture();
- plugin_dirs[i].label.create_texture(plugin_dirs[i].text);
+ plugin_dirs[i].icon.create_texture();
+ plugin_dirs[i].label.create_texture(plugin_dirs[i].text);
}
selected = gameMenu(plugin_dirs, num_plugin_dirs);
@@ -565,10 +565,10 @@ bool selectPluginDir(Common::String &selection, const Common::FSNode &base)
ta_txrelease(mark);
if (selected >= num_plugin_dirs)
- selected = -1;
+ selected = -1;
if (selected >= 0)
- selection = plugin_dirs[selected].dir;
+ selection = plugin_dirs[selected].dir;
delete[] plugin_dirs;
diff --git a/backends/platform/dc/softkbd.cpp b/backends/platform/dc/softkbd.cpp
index 19f7b409a1..7aa1e889f7 100644
--- a/backends/platform/dc/softkbd.cpp
+++ b/backends/platform/dc/softkbd.cpp
@@ -48,16 +48,16 @@ static const char key_names[] =
static const short key_codes[] =
{
- Common::KEYCODE_ESCAPE, Common::KEYCODE_F1, Common::KEYCODE_F2, Common::KEYCODE_F3, Common::KEYCODE_F4, Common::KEYCODE_F5, Common::KEYCODE_F6, Common::KEYCODE_F7, Common::KEYCODE_F8, Common::KEYCODE_F9, Common::KEYCODE_F10,
- K('1','!'), K('2','"'), K('3','#'), K('4','$'), K('5','%'),
- K('6','&'), K('7','\''), K('8','('), K('9',')'), K('0','~'), K('-','='),
- K('q','Q'), K('w','W'), K('e','E'), K('r','R'), K('t','T'),
- K('y','Y'), K('u','U'), K('i','I'), K('o','O'), K('p','P'), K('@','`'),
- K('a','A'), K('s','S'), K('d','D'), K('f','F'), K('g','G'),
- K('h','H'), K('j','J'), K('k','K'), K('l','L'), K(';','+'), K(':','*'),
- K('z','Z'), K('x','X'), K('c','C'), K('v','V'), K('b','B'),
- K('n','N'), K('m','M'), K(',','<'), K('.','>'), K('/','?'), K('\\','_'),
- ~Common::KBD_SHIFT, ~Common::KBD_CTRL, ~Common::KBD_ALT, ' ', Common::KEYCODE_BACKSPACE, Common::KEYCODE_RETURN
+ Common::KEYCODE_ESCAPE, Common::KEYCODE_F1, Common::KEYCODE_F2, Common::KEYCODE_F3, Common::KEYCODE_F4, Common::KEYCODE_F5, Common::KEYCODE_F6, Common::KEYCODE_F7, Common::KEYCODE_F8, Common::KEYCODE_F9, Common::KEYCODE_F10,
+ K('1','!'), K('2','"'), K('3','#'), K('4','$'), K('5','%'),
+ K('6','&'), K('7','\''), K('8','('), K('9',')'), K('0','~'), K('-','='),
+ K('q','Q'), K('w','W'), K('e','E'), K('r','R'), K('t','T'),
+ K('y','Y'), K('u','U'), K('i','I'), K('o','O'), K('p','P'), K('@','`'),
+ K('a','A'), K('s','S'), K('d','D'), K('f','F'), K('g','G'),
+ K('h','H'), K('j','J'), K('k','K'), K('l','L'), K(';','+'), K(':','*'),
+ K('z','Z'), K('x','X'), K('c','C'), K('v','V'), K('b','B'),
+ K('n','N'), K('m','M'), K(',','<'), K('.','>'), K('/','?'), K('\\','_'),
+ ~Common::KBD_SHIFT, ~Common::KBD_CTRL, ~Common::KBD_ALT, ' ', Common::KEYCODE_BACKSPACE, Common::KEYCODE_RETURN
};
SoftKeyboard::SoftKeyboard(const OSystem_Dreamcast *_os)
@@ -67,12 +67,12 @@ SoftKeyboard::SoftKeyboard(const OSystem_Dreamcast *_os)
const char *np = key_names;
for (int i=0; i<SK_NUM_KEYS; i++) {
- labels[0][i].create_texture(np);
- np += strlen(np)+1;
- if (key_codes[i]>8192) {
- labels[1][i].create_texture(np);
- np += strlen(np)+1;
- }
+ labels[0][i].create_texture(np);
+ np += strlen(np)+1;
+ if (key_codes[i]>8192) {
+ labels[1][i].create_texture(np);
+ np += strlen(np)+1;
+ }
}
}
@@ -89,22 +89,22 @@ void SoftKeyboard::draw(float x, float y, int transp)
x0 = x += 4.0;
y += 4.0;
for (int i=0; i<SK_NUM_KEYS; i++) {
- float w = (i == 58? 164.0 : 24.0);
- unsigned int bg = (i == keySel? bg_alpha_mask|0xffff00 :
+ float w = (i == 58? 164.0 : 24.0);
+ unsigned int bg = (i == keySel? bg_alpha_mask|0xffff00 :
bg_alpha_mask|0xc0c0ff);
- draw_trans_quad(x, y, x+w, y+24.0, bg, bg, bg, bg);
- if (key_codes[i]<0 && (shiftState & ~key_codes[i]))
- labels[0][i].draw(x+2, y+5, txt_alpha_mask|0xffffff, 0.5);
- else if (key_codes[i]>8192 && (shiftState & Common::KBD_SHIFT))
- labels[1][i].draw(x+2, y+5, txt_alpha_mask|0x000000, 0.5);
- else
- labels[0][i].draw(x+2, y+5, txt_alpha_mask|0x000000, 0.5);
- x += w+4.0;
- if (++c == 11) {
- c = 0;
- x = x0;
- y += 28.0;
- }
+ draw_trans_quad(x, y, x+w, y+24.0, bg, bg, bg, bg);
+ if (key_codes[i]<0 && (shiftState & ~key_codes[i]))
+ labels[0][i].draw(x+2, y+5, txt_alpha_mask|0xffffff, 0.5);
+ else if (key_codes[i]>8192 && (shiftState & Common::KBD_SHIFT))
+ labels[1][i].draw(x+2, y+5, txt_alpha_mask|0x000000, 0.5);
+ else
+ labels[0][i].draw(x+2, y+5, txt_alpha_mask|0x000000, 0.5);
+ x += w+4.0;
+ if (++c == 11) {
+ c = 0;
+ x = x0;
+ y += 28.0;
+ }
}
}
@@ -112,47 +112,47 @@ int SoftKeyboard::key(int k, byte &shiftFlags)
{
switch(k) {
case 1001:
- if (++keySel == SK_NUM_KEYS)
- keySel = 0;
- break;
+ if (++keySel == SK_NUM_KEYS)
+ keySel = 0;
+ break;
case 1002:
- if (--keySel < 0)
- keySel = SK_NUM_KEYS - 1;
- break;
+ if (--keySel < 0)
+ keySel = SK_NUM_KEYS - 1;
+ break;
case 1003:
- if (keySel >= 55) {
- if (keySel > 58)
+ if (keySel >= 55) {
+ if (keySel > 58)
keySel += 5;
- keySel -= 55;
- } else if (keySel > 47) {
- if ((keySel += 6) < 59)
+ keySel -= 55;
+ } else if (keySel > 47) {
+ if ((keySel += 6) < 59)
keySel = 59;
- } else
- keySel += 11;
- break;
+ } else
+ keySel += 11;
+ break;
case 1004:
- if (keySel > 58)
- keySel -= 6;
- else if ((keySel -= 11) < 0)
- if ((keySel += 66) > 58)
+ if (keySel > 58)
+ keySel -= 6;
+ else if ((keySel -= 11) < 0)
+ if ((keySel += 66) > 58)
if ((keySel -= 5) < 59)
keySel = 59;
- break;
+ break;
case 1000:
case 13:
case 32:
case 319:
- if (key_codes[keySel]<0)
- shiftState ^= ~key_codes[keySel];
- else {
- shiftFlags = shiftState;
- if (key_codes[keySel] > 8192)
+ if (key_codes[keySel]<0)
+ shiftState ^= ~key_codes[keySel];
+ else {
+ shiftFlags = shiftState;
+ if (key_codes[keySel] > 8192)
return ((shiftState & Common::KBD_SHIFT)? (key_codes[keySel]>>8):
key_codes[keySel]) & 0xff;
- else
+ else
return key_codes[keySel];
- }
- break;
+ }
+ break;
}
return 0;
}
@@ -161,8 +161,8 @@ void SoftKeyboard::mouse(int x, int y)
{
os->mouseToSoftKbd(x, y, x, y);
if (x >= 0 && x < 11*28 && y >= 0 && y < 6*28 &&
- x%28 >= 4 && y%28 >= 4)
- if ((keySel = 11*(y/28)+(x/28)) > 58)
- if ((keySel -= 5) < 59)
+ x%28 >= 4 && y%28 >= 4)
+ if ((keySel = 11*(y/28)+(x/28)) > 58)
+ if ((keySel -= 5) < 59)
keySel = 58;
}
diff --git a/backends/platform/dc/time.cpp b/backends/platform/dc/time.cpp
index ada53bf755..2520e6596d 100644
--- a/backends/platform/dc/time.cpp
+++ b/backends/platform/dc/time.cpp
@@ -48,9 +48,9 @@ void OSystem_Dreamcast::delayMillis(uint msecs)
unsigned int t, start = Timer();
int time = (((unsigned int)msecs)*3125U)>>6;
while (((int)((t = Timer())-start))<time) {
- if (_timerManager != NULL)
- ((DefaultTimerManager *)_timerManager)->handler();
- checkSound();
+ if (_timerManager != NULL)
+ ((DefaultTimerManager *)_timerManager)->handler();
+ checkSound();
}
getMillis();
}
diff --git a/backends/platform/dc/vmsave.cpp b/backends/platform/dc/vmsave.cpp
index c10144d41c..06934fc62e 100644
--- a/backends/platform/dc/vmsave.cpp
+++ b/backends/platform/dc/vmsave.cpp
@@ -52,20 +52,20 @@ static void displaySaveResult(vmsaveResult res)
switch(res) {
case VMSAVE_OK:
- sprintf(buf, "Game saved on unit %c%d", 'A'+(lastvm/6), lastvm%6);
- break;
+ sprintf(buf, "Game saved on unit %c%d", 'A'+(lastvm/6), lastvm%6);
+ break;
case VMSAVE_NOVM:
- strcpy(buf, "No memory card present!");
- break;
+ strcpy(buf, "No memory card present!");
+ break;
case VMSAVE_NOSPACE:
- strcpy(buf, "Not enough space available!");
- break;
+ strcpy(buf, "Not enough space available!");
+ break;
case VMSAVE_WRITEERROR:
- strcpy(buf, "Write error!!!");
- break;
+ strcpy(buf, "Write error!!!");
+ break;
default:
- strcpy(buf, "Unknown error!!!");
- break;
+ strcpy(buf, "Unknown error!!!");
+ break;
}
GUI::MessageDialog dialog(buf);
@@ -85,14 +85,14 @@ static vmsaveResult trySave(const char *gamename, const char *data, int size,
unsigned char iconbuffer[512+32];
if (!vmsfs_check_unit(vm, 0, &info))
- return VMSAVE_NOVM;
+ return VMSAVE_NOVM;
if (!vmsfs_get_superblock(&info, &super))
- return VMSAVE_NOVM;
+ return VMSAVE_NOVM;
int free_cnt = vmsfs_count_free(&super);
if (vmsfs_open_file(&super, filename, &file))
- free_cnt += file.blks;
+ free_cnt += file.blks;
if (((128+512+size+511)>>9) > free_cnt)
- return VMSAVE_NOSPACE;
+ return VMSAVE_NOSPACE;
memset(&header, 0, sizeof(header));
strncpy(header.shortdesc, "ScummVM savegame", 16);
@@ -117,9 +117,9 @@ static vmsaveResult trySave(const char *gamename, const char *data, int size,
if (!vmsfs_create_file(&super, filename, &header,
iconbuffer+sizeof(header.palette), NULL,
data, size, &tstamp)) {
- fprintf(stderr, "%s\n", vmsfs_describe_error());
- vmsfs_beep(&info, 0);
- return VMSAVE_WRITEERROR;
+ fprintf(stderr, "%s\n", vmsfs_describe_error());
+ vmsfs_beep(&info, 0);
+ return VMSAVE_WRITEERROR;
}
vmsfs_beep(&info, 0);
@@ -133,16 +133,16 @@ static bool tryLoad(char *&buffer, int &size, const char *filename, int vm)
struct vms_file file;
if (!vmsfs_check_unit(vm, 0, &info))
- return false;
+ return false;
if (!vmsfs_get_superblock(&info, &super))
- return false;
+ return false;
if (!vmsfs_open_file(&super, filename, &file))
- return false;
+ return false;
buffer = new char[size = file.size];
if (vmsfs_read_file(&file, (unsigned char *)buffer, size))
- return true;
+ return true;
delete[] buffer;
buffer = NULL;
@@ -155,12 +155,12 @@ static bool tryDelete(const char *filename, int vm)
struct superblock super;
if (!vmsfs_check_unit(vm, 0, &info))
- return false;
+ return false;
if (!vmsfs_get_superblock(&info, &super))
- return false;
+ return false;
if (!vmsfs_delete_file(&super, filename))
- return false;
+ return false;
return true;
}
@@ -173,18 +173,18 @@ static void tryList(const Common::String &glob, int vm, Common::StringArray &lis
struct dir_entry de;
if (!vmsfs_check_unit(vm, 0, &info))
- return;
+ return;
if (!vmsfs_get_superblock(&info, &super))
- return;
+ return;
vmsfs_open_dir(&super, &iter);
while (vmsfs_next_dir_entry(&iter, &de))
- if (de.entry[0]) {
- char buf[16];
- strncpy(buf, (char *)de.entry+4, 12);
- buf[12] = 0;
- if (Common::matchString(buf, glob.c_str()))
+ if (de.entry[0]) {
+ char buf[16];
+ strncpy(buf, (char *)de.entry+4, 12);
+ buf[12] = 0;
+ if (Common::matchString(buf, glob.c_str()))
list.push_back(buf);
- }
+ }
}
vmsaveResult writeSaveGame(const char *gamename, const char *data, int size,
@@ -193,15 +193,15 @@ vmsaveResult writeSaveGame(const char *gamename, const char *data, int size,
vmsaveResult r, res = VMSAVE_NOVM;
if (lastvm >= 0 &&
- (res = trySave(gamename, data, size, filename, icon, lastvm)) == VMSAVE_OK)
- return res;
+ (res = trySave(gamename, data, size, filename, icon, lastvm)) == VMSAVE_OK)
+ return res;
for (int i=0; i<24; i++)
- if ((r = trySave(gamename, data, size, filename, icon, i)) == VMSAVE_OK) {
- lastvm = i;
- return r;
- } else if (r > res)
- res = r;
+ if ((r = trySave(gamename, data, size, filename, icon, i)) == VMSAVE_OK) {
+ lastvm = i;
+ return r;
+ } else if (r > res)
+ res = r;
return res;
}
@@ -209,14 +209,14 @@ vmsaveResult writeSaveGame(const char *gamename, const char *data, int size,
bool readSaveGame(char *&buffer, int &size, const char *filename)
{
if (lastvm >= 0 &&
- tryLoad(buffer, size, filename, lastvm))
- return true;
+ tryLoad(buffer, size, filename, lastvm))
+ return true;
for (int i=0; i<24; i++)
- if (tryLoad(buffer, size, filename, i)) {
- lastvm = i;
- return true;
- }
+ if (tryLoad(buffer, size, filename, i)) {
+ lastvm = i;
+ return true;
+ }
return false;
}
@@ -224,14 +224,14 @@ bool readSaveGame(char *&buffer, int &size, const char *filename)
bool deleteSaveGame(const char *filename)
{
if (lastvm >= 0 &&
- tryDelete(filename, lastvm))
- return true;
+ tryDelete(filename, lastvm))
+ return true;
for (int i=0; i<24; i++)
- if (tryDelete(filename, i)) {
- lastvm = i;
- return true;
- }
+ if (tryDelete(filename, i)) {
+ lastvm = i;
+ return true;
+ }
return false;
}
@@ -249,12 +249,12 @@ private:
public:
InVMSave()
- : _pos(0), buffer(NULL), _eos(false)
+ : _pos(0), buffer(NULL), _eos(false)
{ }
~InVMSave()
{
- delete[] buffer;
+ delete[] buffer;
}
bool eos() const override { return _eos; }
@@ -278,10 +278,10 @@ public:
virtual int32 pos() const { return _pos; }
OutVMSave(const char *_filename)
- : _pos(0), committed(-1), iofailed(false)
+ : _pos(0), committed(-1), iofailed(false)
{
- strncpy(filename, _filename, 16);
- buffer = new char[size = MAX_SAVE_SIZE];
+ strncpy(filename, _filename, 16);
+ buffer = new char[size = MAX_SAVE_SIZE];
}
~OutVMSave();
@@ -344,7 +344,7 @@ void OutVMSave::finalize()
extern Icon icon;
if (committed >= _pos)
- return;
+ return;
char *data = buffer;
int len = _pos;
@@ -352,7 +352,7 @@ void OutVMSave::finalize()
vmsaveResult r = writeSaveGame(gGameName, data, len, filename, icon);
committed = _pos;
if (r != VMSAVE_OK)
- iofailed = true;
+ iofailed = true;
displaySaveResult(r);
}
@@ -366,12 +366,12 @@ uint32 InVMSave::read(void *buf, uint32 cnt)
{
int nbyt = cnt;
if (_pos + nbyt > _size) {
- cnt = (_size - _pos);
- _eos = true;
- nbyt = cnt;
+ cnt = (_size - _pos);
+ _eos = true;
+ nbyt = cnt;
}
if (nbyt)
- memcpy(buf, buffer + _pos, nbyt);
+ memcpy(buf, buffer + _pos, nbyt);
_pos += nbyt;
return cnt;
}
@@ -380,7 +380,7 @@ bool InVMSave::skip(uint32 offset)
{
int nbyt = offset;
if (_pos + nbyt > _size)
- nbyt = (_size - _pos);
+ nbyt = (_size - _pos);
_pos += nbyt;
return true;
}
@@ -389,19 +389,19 @@ bool InVMSave::seek(int32 offs, int whence)
{
switch(whence) {
case SEEK_SET:
- _pos = offs;
- break;
+ _pos = offs;
+ break;
case SEEK_CUR:
- _pos += offs;
- break;
+ _pos += offs;
+ break;
case SEEK_END:
- _pos = _size + offs;
- break;
+ _pos = _size + offs;
+ break;
}
if (_pos < 0)
- _pos = 0;
+ _pos = 0;
else if (_pos > _size)
- _pos = _size;
+ _pos = _size;
_eos = false;
return true;
}
@@ -410,11 +410,11 @@ uint32 OutVMSave::write(const void *buf, uint32 cnt)
{
int nbyt = cnt;
if (_pos + nbyt > size) {
- cnt = (size - _pos);
- nbyt = cnt;
+ cnt = (size - _pos);
+ nbyt = cnt;
}
if (nbyt)
- memcpy(buffer + _pos, buf, nbyt);
+ memcpy(buffer + _pos, buf, nbyt);
_pos += nbyt;
return cnt;
}
@@ -425,7 +425,7 @@ Common::StringArray VMSaveManager::listSavefiles(const Common::String &pattern)
Common::StringArray list;
for (int i=0; i<24; i++)
- tryList(pattern, i, list);
+ tryList(pattern, i, list);
return list;
}
diff --git a/backends/platform/ds/background.cpp b/backends/platform/ds/background.cpp
index 155a21ac41..f4e5730f59 100644
--- a/backends/platform/ds/background.cpp
+++ b/backends/platform/ds/background.cpp
@@ -158,7 +158,7 @@ void Background::init(Background *surface, int layer, bool isSub, int mapBase, b
}
static void dmaBlit(uint16 *dst, const uint dstPitch, const uint16 *src, const uint srcPitch,
- const uint w, const uint h, const uint bytesPerPixel) {
+ const uint w, const uint h, const uint bytesPerPixel) {
if (dstPitch == srcPitch && ((w * bytesPerPixel) == dstPitch)) {
dmaCopy(src, dst, dstPitch * h);
return;
diff --git a/backends/platform/ds/osystem_ds.cpp b/backends/platform/ds/osystem_ds.cpp
index 4a958e4b32..ce96045db7 100644
--- a/backends/platform/ds/osystem_ds.cpp
+++ b/backends/platform/ds/osystem_ds.cpp
@@ -137,28 +137,28 @@ void OSystem_DS::logMessage(LogMessageType::Type type, const char *message) {
}
static const Common::HardwareInputTableEntry ndsJoystickButtons[] = {
- { "JOY_A", Common::JOYSTICK_BUTTON_A, _s("A") },
- { "JOY_B", Common::JOYSTICK_BUTTON_B, _s("B") },
- { "JOY_X", Common::JOYSTICK_BUTTON_X, _s("X") },
- { "JOY_Y", Common::JOYSTICK_BUTTON_Y, _s("Y") },
- { "JOY_BACK", Common::JOYSTICK_BUTTON_BACK, _s("Select") },
- { "JOY_START", Common::JOYSTICK_BUTTON_START, _s("Start") },
- { "JOY_LEFT_SHOULDER", Common::JOYSTICK_BUTTON_LEFT_SHOULDER, _s("L") },
- { "JOY_RIGHT_SHOULDER", Common::JOYSTICK_BUTTON_RIGHT_SHOULDER, _s("R") },
- { "JOY_UP", Common::JOYSTICK_BUTTON_DPAD_UP, _s("D-pad Up") },
- { "JOY_DOWN", Common::JOYSTICK_BUTTON_DPAD_DOWN, _s("D-pad Down") },
- { "JOY_LEFT", Common::JOYSTICK_BUTTON_DPAD_LEFT, _s("D-pad Left") },
- { "JOY_RIGHT", Common::JOYSTICK_BUTTON_DPAD_RIGHT, _s("D-pad Right") },
- { nullptr, 0, nullptr }
+ { "JOY_A", Common::JOYSTICK_BUTTON_A, _s("A") },
+ { "JOY_B", Common::JOYSTICK_BUTTON_B, _s("B") },
+ { "JOY_X", Common::JOYSTICK_BUTTON_X, _s("X") },
+ { "JOY_Y", Common::JOYSTICK_BUTTON_Y, _s("Y") },
+ { "JOY_BACK", Common::JOYSTICK_BUTTON_BACK, _s("Select") },
+ { "JOY_START", Common::JOYSTICK_BUTTON_START, _s("Start") },
+ { "JOY_LEFT_SHOULDER", Common::JOYSTICK_BUTTON_LEFT_SHOULDER, _s("L") },
+ { "JOY_RIGHT_SHOULDER", Common::JOYSTICK_BUTTON_RIGHT_SHOULDER, _s("R") },
+ { "JOY_UP", Common::JOYSTICK_BUTTON_DPAD_UP, _s("D-pad Up") },
+ { "JOY_DOWN", Common::JOYSTICK_BUTTON_DPAD_DOWN, _s("D-pad Down") },
+ { "JOY_LEFT", Common::JOYSTICK_BUTTON_DPAD_LEFT, _s("D-pad Left") },
+ { "JOY_RIGHT", Common::JOYSTICK_BUTTON_DPAD_RIGHT, _s("D-pad Right") },
+ { nullptr, 0, nullptr }
};
static const Common::AxisTableEntry ndsJoystickAxes[] = {
- { nullptr, 0, Common::kAxisTypeFull, nullptr }
+ { nullptr, 0, Common::kAxisTypeFull, nullptr }
};
const Common::HardwareInputTableEntry ndsMouseButtons[] = {
- { "MOUSE_LEFT", Common::MOUSE_BUTTON_LEFT, _s("Touch") },
- { nullptr, 0, nullptr }
+ { "MOUSE_LEFT", Common::MOUSE_BUTTON_LEFT, _s("Touch") },
+ { nullptr, 0, nullptr }
};
Common::HardwareInputSet *OSystem_DS::getHardwareInputSet() {
diff --git a/backends/platform/ios7/ios7_osys_main.h b/backends/platform/ios7/ios7_osys_main.h
index fc100ace18..73fec9d184 100644
--- a/backends/platform/ios7/ios7_osys_main.h
+++ b/backends/platform/ios7/ios7_osys_main.h
@@ -139,7 +139,7 @@ public:
virtual int16 getHeight() override;
virtual int16 getWidth() override;
- bool touchpadModeEnabled() const;
+ bool touchpadModeEnabled() const;
#ifdef USE_RGB_COLOR
virtual Graphics::PixelFormat getScreenFormat() const override { return _framebuffer.format; }
diff --git a/backends/platform/psp/mp3.cpp b/backends/platform/psp/mp3.cpp
index 9e55fc72f5..1bde7cce31 100644
--- a/backends/platform/psp/mp3.cpp
+++ b/backends/platform/psp/mp3.cpp
@@ -97,20 +97,20 @@ bool Mp3PspStream::initDecoder() {
// Based on PSP firmware version, we need to do different things to do Media Engine processing
uint32 firmware = sceKernelDevkitVersion();
PSP_DEBUG_PRINT("Firmware version 0x%x\n", firmware);
- if (firmware == 0x01050001){
+ if (firmware == 0x01050001){
if (!loadStartAudioModule("flash0:/kd/me_for_vsh.prx",
PSP_MEMORY_PARTITION_KERNEL)) {
PSP_ERROR("failed to load me_for_vsh.prx. ME cannot start.\n");
_decoderFail = true;
return false;
}
- if (!loadStartAudioModule("flash0:/kd/audiocodec.prx", PSP_MEMORY_PARTITION_KERNEL)) {
+ if (!loadStartAudioModule("flash0:/kd/audiocodec.prx", PSP_MEMORY_PARTITION_KERNEL)) {
PSP_ERROR("failed to load audiocodec.prx. ME cannot start.\n");
_decoderFail = true;
return false;
}
- } else {
- if (sceUtilityLoadAvModule(PSP_AV_MODULE_AVCODEC) < 0) {
+ } else {
+ if (sceUtilityLoadAvModule(PSP_AV_MODULE_AVCODEC) < 0) {
PSP_ERROR("failed to load AVCODEC module. ME cannot start.\n");
_decoderFail = true;
return false;
@@ -130,15 +130,15 @@ bool Mp3PspStream::stopDecoder() {
return true;
// Based on PSP firmware version, we need to do different things to do Media Engine processing
- if (sceKernelDevkitVersion() == 0x01050001){ // TODO: how do we unload?
+ if (sceKernelDevkitVersion() == 0x01050001){ // TODO: how do we unload?
/* if (!unloadAudioModule("flash0:/kd/me_for_vsh.prx", PSP_MEMORY_PARTITION_KERNEL) ||
!unloadAudioModule("flash0:/kd/audiocodec.prx", PSP_MEMORY_PARTITION_KERNEL) {
PSP_ERROR("failed to unload audio module\n");
return false;
}
*/
- }else{
- if (sceUtilityUnloadModule(PSP_MODULE_AV_AVCODEC) < 0) {
+ }else{
+ if (sceUtilityUnloadModule(PSP_MODULE_AV_AVCODEC) < 0) {
PSP_ERROR("failed to unload avcodec module\n");
return false;
}
@@ -152,26 +152,26 @@ bool Mp3PspStream::stopDecoder() {
bool Mp3PspStream::loadStartAudioModule(const char *modname, int partition){
DEBUG_ENTER_FUNC();
- SceKernelLMOption option;
- SceUID modid;
+ SceKernelLMOption option;
+ SceUID modid;
- memset(&option, 0, sizeof(option));
- option.size = sizeof(option);
- option.mpidtext = partition;
- option.mpiddata = partition;
- option.position = 0;
- option.access = 1;
+ memset(&option, 0, sizeof(option));
+ option.size = sizeof(option);
+ option.mpidtext = partition;
+ option.mpiddata = partition;
+ option.position = 0;
+ option.access = 1;
- modid = sceKernelLoadModule(modname, 0, &option);
- if (modid < 0) {
+ modid = sceKernelLoadModule(modname, 0, &option);
+ if (modid < 0) {
PSP_ERROR("Failed to load module %s. Got error 0x%x\n", modname, modid);
- return false;
+ return false;
}
- int ret = sceKernelStartModule(modid, 0, NULL, NULL, NULL);
+ int ret = sceKernelStartModule(modid, 0, NULL, NULL, NULL);
if (ret < 0) {
PSP_ERROR("Failed to start module %s. Got error 0x%x\n", modname, ret);
- return false;
+ return false;
}
return true;
}
diff --git a/backends/platform/psp/psppixelformat.cpp b/backends/platform/psp/psppixelformat.cpp
index 83f5935eee..72302b4d9f 100644
--- a/backends/platform/psp/psppixelformat.cpp
+++ b/backends/platform/psp/psppixelformat.cpp
@@ -67,9 +67,9 @@ void PSPPixelFormat::set(Type type, bool swap /* = false */) {
// Convert from ScummVM general PixelFormat to our pixel format
// For buffer and palette.
void PSPPixelFormat::convertFromScummvmPixelFormat(const Graphics::PixelFormat *pf,
- PSPPixelFormat::Type &bufferType,
- PSPPixelFormat::Type &paletteType,
- bool &swapRedBlue) {
+ PSPPixelFormat::Type &bufferType,
+ PSPPixelFormat::Type &paletteType,
+ bool &swapRedBlue) {
swapRedBlue = false; // no red-blue swap by default
PSPPixelFormat::Type *target = 0; // which one we'll be filling
diff --git a/backends/platform/psp/thread.cpp b/backends/platform/psp/thread.cpp
index 669a682c21..22d294e05a 100644
--- a/backends/platform/psp/thread.cpp
+++ b/backends/platform/psp/thread.cpp
@@ -193,38 +193,38 @@ bool PspMutex::unlock() {
// Release all threads waiting on the condition
void PspCondition::releaseAll() {
- _mutex.lock();
- if (_waitingThreads > _signaledThreads) { // we have signals to issue
- int numWaiting = _waitingThreads - _signaledThreads; // threads we haven't signaled
- _signaledThreads = _waitingThreads;
+ _mutex.lock();
+ if (_waitingThreads > _signaledThreads) { // we have signals to issue
+ int numWaiting = _waitingThreads - _signaledThreads; // threads we haven't signaled
+ _signaledThreads = _waitingThreads;
_waitSem.give(numWaiting);
- _mutex.unlock();
- for (int i=0; i<numWaiting; i++) // wait for threads to tell us they're awake
+ _mutex.unlock();
+ for (int i=0; i<numWaiting; i++) // wait for threads to tell us they're awake
_doneSem.take();
- } else {
- _mutex.unlock();
- }
+ } else {
+ _mutex.unlock();
+ }
}
// Mutex must be taken before entering wait
void PspCondition::wait(PspMutex &externalMutex) {
- _mutex.lock();
- _waitingThreads++;
- _mutex.unlock();
+ _mutex.lock();
+ _waitingThreads++;
+ _mutex.unlock();
- externalMutex.unlock(); // must unlock external mutex
+ externalMutex.unlock(); // must unlock external mutex
_waitSem.take(); // sleep on the wait semaphore
// let the signaling thread know we're done
_mutex.lock();
- if (_signaledThreads > 0 ) {
- _doneSem.give(); // let the thread know
- _signaledThreads--;
- }
- _waitingThreads--;
- _mutex.unlock();
-
- externalMutex.lock(); // must lock external mutex here for continuation
+ if (_signaledThreads > 0 ) {
+ _doneSem.give(); // let the thread know
+ _signaledThreads--;
+ }
+ _waitingThreads--;
+ _mutex.unlock();
+
+ externalMutex.lock(); // must lock external mutex here for continuation
}
diff --git a/backends/platform/psp/trace.h b/backends/platform/psp/trace.h
index 43ccaea52a..6115c39bd1 100644
--- a/backends/platform/psp/trace.h
+++ b/backends/platform/psp/trace.h
@@ -60,13 +60,13 @@ extern int psp_debug_indent;
//
class PSPStackDebugFuncs {
- Common::String _name;
+ Common::String _name;
public:
PSPStackDebugFuncs(const char *name) : _name(name) {
PSP_INFO_PRINT_INDENT("++ %s\n", _name.c_str());
psp_debug_indent++;
- }
+ }
~PSPStackDebugFuncs() {
psp_debug_indent--;
diff --git a/backends/platform/sdl/macosx/macosx.cpp b/backends/platform/sdl/macosx/macosx.cpp
index 331e56e54d..793473c5a6 100644
--- a/backends/platform/sdl/macosx/macosx.cpp
+++ b/backends/platform/sdl/macosx/macosx.cpp
@@ -150,9 +150,9 @@ bool OSystem_MacOSX::displayLogFile() {
if (_logFilePath.empty())
return false;
- CFURLRef url = CFURLCreateFromFileSystemRepresentation(kCFAllocatorDefault, (const UInt8 *)_logFilePath.c_str(), _logFilePath.size(), false);
- OSStatus err = LSOpenCFURLRef(url, NULL);
- CFRelease(url);
+ CFURLRef url = CFURLCreateFromFileSystemRepresentation(kCFAllocatorDefault, (const UInt8 *)_logFilePath.c_str(), _logFilePath.size(), false);
+ OSStatus err = LSOpenCFURLRef(url, NULL);
+ CFRelease(url);
return err != noErr;
}
diff --git a/backends/platform/sdl/ps3/ps3.cpp b/backends/platform/sdl/ps3/ps3.cpp
index 1243508aff..2dd4788f33 100644
--- a/backends/platform/sdl/ps3/ps3.cpp
+++ b/backends/platform/sdl/ps3/ps3.cpp
@@ -38,32 +38,32 @@
#include <sys/stat.h>
static const Common::HardwareInputTableEntry playstationJoystickButtons[] = {
- { "JOY_A", Common::JOYSTICK_BUTTON_A, _s("Cross") },
- { "JOY_B", Common::JOYSTICK_BUTTON_B, _s("Circle") },
- { "JOY_X", Common::JOYSTICK_BUTTON_X, _s("Square") },
- { "JOY_Y", Common::JOYSTICK_BUTTON_Y, _s("Triangle") },
- { "JOY_BACK", Common::JOYSTICK_BUTTON_BACK, _s("Select") },
- { "JOY_GUIDE", Common::JOYSTICK_BUTTON_GUIDE, _s("PS") },
- { "JOY_START", Common::JOYSTICK_BUTTON_START, _s("Start") },
- { "JOY_LEFT_STICK", Common::JOYSTICK_BUTTON_LEFT_STICK, _s("L3") },
- { "JOY_RIGHT_STICK", Common::JOYSTICK_BUTTON_RIGHT_STICK, _s("R3") },
- { "JOY_LEFT_SHOULDER", Common::JOYSTICK_BUTTON_LEFT_SHOULDER, _s("L1") },
- { "JOY_RIGHT_SHOULDER", Common::JOYSTICK_BUTTON_RIGHT_SHOULDER, _s("R1") },
- { "JOY_UP", Common::JOYSTICK_BUTTON_DPAD_UP, _s("D-pad Up") },
- { "JOY_DOWN", Common::JOYSTICK_BUTTON_DPAD_DOWN, _s("D-pad Down") },
- { "JOY_LEFT", Common::JOYSTICK_BUTTON_DPAD_LEFT, _s("D-pad Left") },
- { "JOY_RIGHT", Common::JOYSTICK_BUTTON_DPAD_RIGHT, _s("D-pad Right") },
- { nullptr, 0, nullptr }
+ { "JOY_A", Common::JOYSTICK_BUTTON_A, _s("Cross") },
+ { "JOY_B", Common::JOYSTICK_BUTTON_B, _s("Circle") },
+ { "JOY_X", Common::JOYSTICK_BUTTON_X, _s("Square") },
+ { "JOY_Y", Common::JOYSTICK_BUTTON_Y, _s("Triangle") },
+ { "JOY_BACK", Common::JOYSTICK_BUTTON_BACK, _s("Select") },
+ { "JOY_GUIDE", Common::JOYSTICK_BUTTON_GUIDE, _s("PS") },
+ { "JOY_START", Common::JOYSTICK_BUTTON_START, _s("Start") },
+ { "JOY_LEFT_STICK", Common::JOYSTICK_BUTTON_LEFT_STICK, _s("L3") },
+ { "JOY_RIGHT_STICK", Common::JOYSTICK_BUTTON_RIGHT_STICK, _s("R3") },
+ { "JOY_LEFT_SHOULDER", Common::JOYSTICK_BUTTON_LEFT_SHOULDER, _s("L1") },
+ { "JOY_RIGHT_SHOULDER", Common::JOYSTICK_BUTTON_RIGHT_SHOULDER, _s("R1") },
+ { "JOY_UP", Common::JOYSTICK_BUTTON_DPAD_UP, _s("D-pad Up") },
+ { "JOY_DOWN", Common::JOYSTICK_BUTTON_DPAD_DOWN, _s("D-pad Down") },
+ { "JOY_LEFT", Common::JOYSTICK_BUTTON_DPAD_LEFT, _s("D-pad Left") },
+ { "JOY_RIGHT", Common::JOYSTICK_BUTTON_DPAD_RIGHT, _s("D-pad Right") },
+ { nullptr, 0, nullptr }
};
static const Common::AxisTableEntry playstationJoystickAxes[] = {
- { "JOY_LEFT_TRIGGER", Common::JOYSTICK_AXIS_LEFT_TRIGGER, Common::kAxisTypeHalf, _s("L2") },
- { "JOY_RIGHT_TRIGGER", Common::JOYSTICK_AXIS_RIGHT_TRIGGER, Common::kAxisTypeHalf, _s("R2") },
- { "JOY_LEFT_STICK_X", Common::JOYSTICK_AXIS_LEFT_STICK_X, Common::kAxisTypeFull, _s("Left Stick X") },
- { "JOY_LEFT_STICK_Y", Common::JOYSTICK_AXIS_LEFT_STICK_Y, Common::kAxisTypeFull, _s("Left Stick Y") },
- { "JOY_RIGHT_STICK_X", Common::JOYSTICK_AXIS_RIGHT_STICK_X, Common::kAxisTypeFull, _s("Right Stick X") },
- { "JOY_RIGHT_STICK_Y", Common::JOYSTICK_AXIS_RIGHT_STICK_Y, Common::kAxisTypeFull, _s("Right Stick Y") },
- { nullptr, 0, Common::kAxisTypeFull, nullptr }
+ { "JOY_LEFT_TRIGGER", Common::JOYSTICK_AXIS_LEFT_TRIGGER, Common::kAxisTypeHalf, _s("L2") },
+ { "JOY_RIGHT_TRIGGER", Common::JOYSTICK_AXIS_RIGHT_TRIGGER, Common::kAxisTypeHalf, _s("R2") },
+ { "JOY_LEFT_STICK_X", Common::JOYSTICK_AXIS_LEFT_STICK_X, Common::kAxisTypeFull, _s("Left Stick X") },
+ { "JOY_LEFT_STICK_Y", Common::JOYSTICK_AXIS_LEFT_STICK_Y, Common::kAxisTypeFull, _s("Left Stick Y") },
+ { "JOY_RIGHT_STICK_X", Common::JOYSTICK_AXIS_RIGHT_STICK_X, Common::kAxisTypeFull, _s("Right Stick X") },
+ { "JOY_RIGHT_STICK_Y", Common::JOYSTICK_AXIS_RIGHT_STICK_Y, Common::kAxisTypeFull, _s("Right Stick Y") },
+ { nullptr, 0, Common::kAxisTypeFull, nullptr }
};
int access(const char *pathname, int mode) {
diff --git a/backends/platform/sdl/psp2/psp2.cpp b/backends/platform/sdl/psp2/psp2.cpp
index fc86480c1b..1d308d7de5 100644
--- a/backends/platform/sdl/psp2/psp2.cpp
+++ b/backends/platform/sdl/psp2/psp2.cpp
@@ -41,27 +41,27 @@
#endif
static const Common::HardwareInputTableEntry psp2JoystickButtons[] = {
- { "JOY_A", Common::JOYSTICK_BUTTON_A, _s("Cross") },
- { "JOY_B", Common::JOYSTICK_BUTTON_B, _s("Circle") },
- { "JOY_X", Common::JOYSTICK_BUTTON_X, _s("Square") },
- { "JOY_Y", Common::JOYSTICK_BUTTON_Y, _s("Triangle") },
- { "JOY_BACK", Common::JOYSTICK_BUTTON_BACK, _s("Select") },
- { "JOY_START", Common::JOYSTICK_BUTTON_START, _s("Start") },
- { "JOY_LEFT_SHOULDER", Common::JOYSTICK_BUTTON_LEFT_SHOULDER, _s("L") },
- { "JOY_RIGHT_SHOULDER", Common::JOYSTICK_BUTTON_RIGHT_SHOULDER, _s("R") },
- { "JOY_UP", Common::JOYSTICK_BUTTON_DPAD_UP, _s("D-pad Up") },
- { "JOY_DOWN", Common::JOYSTICK_BUTTON_DPAD_DOWN, _s("D-pad Down") },
- { "JOY_LEFT", Common::JOYSTICK_BUTTON_DPAD_LEFT, _s("D-pad Left") },
- { "JOY_RIGHT", Common::JOYSTICK_BUTTON_DPAD_RIGHT, _s("D-pad Right") },
- { nullptr, 0, nullptr }
+ { "JOY_A", Common::JOYSTICK_BUTTON_A, _s("Cross") },
+ { "JOY_B", Common::JOYSTICK_BUTTON_B, _s("Circle") },
+ { "JOY_X", Common::JOYSTICK_BUTTON_X, _s("Square") },
+ { "JOY_Y", Common::JOYSTICK_BUTTON_Y, _s("Triangle") },
+ { "JOY_BACK", Common::JOYSTICK_BUTTON_BACK, _s("Select") },
+ { "JOY_START", Common::JOYSTICK_BUTTON_START, _s("Start") },
+ { "JOY_LEFT_SHOULDER", Common::JOYSTICK_BUTTON_LEFT_SHOULDER, _s("L") },
+ { "JOY_RIGHT_SHOULDER", Common::JOYSTICK_BUTTON_RIGHT_SHOULDER, _s("R") },
+ { "JOY_UP", Common::JOYSTICK_BUTTON_DPAD_UP, _s("D-pad Up") },
+ { "JOY_DOWN", Common::JOYSTICK_BUTTON_DPAD_DOWN, _s("D-pad Down") },
+ { "JOY_LEFT", Common::JOYSTICK_BUTTON_DPAD_LEFT, _s("D-pad Left") },
+ { "JOY_RIGHT", Common::JOYSTICK_BUTTON_DPAD_RIGHT, _s("D-pad Right") },
+ { nullptr, 0, nullptr }
};
static const Common::AxisTableEntry psp2JoystickAxes[] = {
- { "JOY_LEFT_STICK_X", Common::JOYSTICK_AXIS_LEFT_STICK_X, Common::kAxisTypeFull, _s("Left Stick X") },
- { "JOY_LEFT_STICK_Y", Common::JOYSTICK_AXIS_LEFT_STICK_Y, Common::kAxisTypeFull, _s("Left Stick Y") },
- { "JOY_RIGHT_STICK_X", Common::JOYSTICK_AXIS_RIGHT_STICK_X, Common::kAxisTypeFull, _s("Right Stick X") },
- { "JOY_RIGHT_STICK_Y", Common::JOYSTICK_AXIS_RIGHT_STICK_Y, Common::kAxisTypeFull, _s("Right Stick Y") },
- { nullptr, 0, Common::kAxisTypeFull, nullptr }
+ { "JOY_LEFT_STICK_X", Common::JOYSTICK_AXIS_LEFT_STICK_X, Common::kAxisTypeFull, _s("Left Stick X") },
+ { "JOY_LEFT_STICK_Y", Common::JOYSTICK_AXIS_LEFT_STICK_Y, Common::kAxisTypeFull, _s("Left Stick Y") },
+ { "JOY_RIGHT_STICK_X", Common::JOYSTICK_AXIS_RIGHT_STICK_X, Common::kAxisTypeFull, _s("Right Stick X") },
+ { "JOY_RIGHT_STICK_Y", Common::JOYSTICK_AXIS_RIGHT_STICK_Y, Common::kAxisTypeFull, _s("Right Stick Y") },
+ { nullptr, 0, Common::kAxisTypeFull, nullptr }
};
int access(const char *pathname, int mode) {
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index 285cf09240..3710a42d2d 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -728,9 +728,9 @@ AudioCDManager *OSystem_SDL::createAudioCDManager() {
Common::SaveFileManager *OSystem_SDL::getSavefileManager() {
#ifdef ENABLE_EVENTRECORDER
- return g_eventRec.getSaveManager(_savefileManager);
+ return g_eventRec.getSaveManager(_savefileManager);
#else
- return _savefileManager;
+ return _savefileManager;
#endif
}
diff --git a/backends/platform/sdl/switch/switch.cpp b/backends/platform/sdl/switch/switch.cpp
index f4b3eb2885..36c6177355 100644
--- a/backends/platform/sdl/switch/switch.cpp
+++ b/backends/platform/sdl/switch/switch.cpp
@@ -35,32 +35,32 @@
#include "backends/keymapper/hardware-input.h"
static const Common::HardwareInputTableEntry switchJoystickButtons[] = {
- { "JOY_A", Common::JOYSTICK_BUTTON_A, _s("B") },
- { "JOY_B", Common::JOYSTICK_BUTTON_B, _s("A") },
- { "JOY_X", Common::JOYSTICK_BUTTON_X, _s("Y") },
- { "JOY_Y", Common::JOYSTICK_BUTTON_Y, _s("X") },
- { "JOY_BACK", Common::JOYSTICK_BUTTON_BACK, _s("Minus") },
- { "JOY_START", Common::JOYSTICK_BUTTON_START, _s("Plus") },
- { "JOY_GUIDE", Common::JOYSTICK_BUTTON_START, _s("Plus") },
- { "JOY_LEFT_STICK", Common::JOYSTICK_BUTTON_LEFT_STICK, _s("L3") },
- { "JOY_RIGHT_STICK", Common::JOYSTICK_BUTTON_RIGHT_STICK, _s("R3") },
- { "JOY_LEFT_SHOULDER", Common::JOYSTICK_BUTTON_LEFT_SHOULDER, _s("L") },
- { "JOY_RIGHT_SHOULDER", Common::JOYSTICK_BUTTON_RIGHT_SHOULDER, _s("R") },
- { "JOY_UP", Common::JOYSTICK_BUTTON_DPAD_UP, _s("D-pad Up") },
- { "JOY_DOWN", Common::JOYSTICK_BUTTON_DPAD_DOWN, _s("D-pad Down") },
- { "JOY_LEFT", Common::JOYSTICK_BUTTON_DPAD_LEFT, _s("D-pad Left") },
- { "JOY_RIGHT", Common::JOYSTICK_BUTTON_DPAD_RIGHT, _s("D-pad Right") },
- { nullptr, 0, nullptr }
+ { "JOY_A", Common::JOYSTICK_BUTTON_A, _s("B") },
+ { "JOY_B", Common::JOYSTICK_BUTTON_B, _s("A") },
+ { "JOY_X", Common::JOYSTICK_BUTTON_X, _s("Y") },
+ { "JOY_Y", Common::JOYSTICK_BUTTON_Y, _s("X") },
+ { "JOY_BACK", Common::JOYSTICK_BUTTON_BACK, _s("Minus") },
+ { "JOY_START", Common::JOYSTICK_BUTTON_START, _s("Plus") },
+ { "JOY_GUIDE", Common::JOYSTICK_BUTTON_START, _s("Plus") },
+ { "JOY_LEFT_STICK", Common::JOYSTICK_BUTTON_LEFT_STICK, _s("L3") },
+ { "JOY_RIGHT_STICK", Common::JOYSTICK_BUTTON_RIGHT_STICK, _s("R3") },
+ { "JOY_LEFT_SHOULDER", Common::JOYSTICK_BUTTON_LEFT_SHOULDER, _s("L") },
+ { "JOY_RIGHT_SHOULDER", Common::JOYSTICK_BUTTON_RIGHT_SHOULDER, _s("R") },
+ { "JOY_UP", Common::JOYSTICK_BUTTON_DPAD_UP, _s("D-pad Up") },
+ { "JOY_DOWN", Common::JOYSTICK_BUTTON_DPAD_DOWN, _s("D-pad Down") },
+ { "JOY_LEFT", Common::JOYSTICK_BUTTON_DPAD_LEFT, _s("D-pad Left") },
+ { "JOY_RIGHT", Common::JOYSTICK_BUTTON_DPAD_RIGHT, _s("D-pad Right") },
+ { nullptr, 0, nullptr }
};
static const Common::AxisTableEntry switchJoystickAxes[] = {
- { "JOY_LEFT_TRIGGER", Common::JOYSTICK_AXIS_LEFT_TRIGGER, Common::kAxisTypeHalf, _s("ZL") },
- { "JOY_RIGHT_TRIGGER", Common::JOYSTICK_AXIS_RIGHT_TRIGGER, Common::kAxisTypeHalf, _s("ZR") },
- { "JOY_LEFT_STICK_X", Common::JOYSTICK_AXIS_LEFT_STICK_X, Common::kAxisTypeFull, _s("Left Stick X") },
- { "JOY_LEFT_STICK_Y", Common::JOYSTICK_AXIS_LEFT_STICK_Y, Common::kAxisTypeFull, _s("Left Stick Y") },
- { "JOY_RIGHT_STICK_X", Common::JOYSTICK_AXIS_RIGHT_STICK_X, Common::kAxisTypeFull, _s("Right Stick X") },
- { "JOY_RIGHT_STICK_Y", Common::JOYSTICK_AXIS_RIGHT_STICK_Y, Common::kAxisTypeFull, _s("Right Stick Y") },
- { nullptr, 0, Common::kAxisTypeFull, nullptr }
+ { "JOY_LEFT_TRIGGER", Common::JOYSTICK_AXIS_LEFT_TRIGGER, Common::kAxisTypeHalf, _s("ZL") },
+ { "JOY_RIGHT_TRIGGER", Common::JOYSTICK_AXIS_RIGHT_TRIGGER, Common::kAxisTypeHalf, _s("ZR") },
+ { "JOY_LEFT_STICK_X", Common::JOYSTICK_AXIS_LEFT_STICK_X, Common::kAxisTypeFull, _s("Left Stick X") },
+ { "JOY_LEFT_STICK_Y", Common::JOYSTICK_AXIS_LEFT_STICK_Y, Common::kAxisTypeFull, _s("Left Stick Y") },
+ { "JOY_RIGHT_STICK_X", Common::JOYSTICK_AXIS_RIGHT_STICK_X, Common::kAxisTypeFull, _s("Right Stick X") },
+ { "JOY_RIGHT_STICK_Y", Common::JOYSTICK_AXIS_RIGHT_STICK_Y, Common::kAxisTypeFull, _s("Right Stick Y") },
+ { nullptr, 0, Common::kAxisTypeFull, nullptr }
};
void OSystem_Switch::init() {
diff --git a/backends/platform/symbian/src/SymbianActions.h b/backends/platform/symbian/src/SymbianActions.h
index cf060aed44..592f1ce6b0 100644
--- a/backends/platform/symbian/src/SymbianActions.h
+++ b/backends/platform/symbian/src/SymbianActions.h
@@ -37,15 +37,15 @@ namespace GUI {
#define ACTION_VERSION 7
enum actionType {
- ACTION_UP = 0,
- ACTION_DOWN,
- ACTION_LEFT,
- ACTION_RIGHT,
- ACTION_LEFTCLICK,
- ACTION_RIGHTCLICK,
- ACTION_SAVE,
- ACTION_SKIP,
- ACTION_ZONE,
+ ACTION_UP = 0,
+ ACTION_DOWN,
+ ACTION_LEFT,
+ ACTION_RIGHT,
+ ACTION_LEFTCLICK,
+ ACTION_RIGHTCLICK,
+ ACTION_SAVE,
+ ACTION_SKIP,
+ ACTION_ZONE,
ACTION_MULTI,
ACTION_SWAPCHAR,
ACTION_SKIP_TEXT,
diff --git a/backends/platform/symbian/src/portdefs.h b/backends/platform/symbian/src/portdefs.h
index 411ff3c907..eab8f12315 100644
--- a/backends/platform/symbian/src/portdefs.h
+++ b/backends/platform/symbian/src/portdefs.h
@@ -175,9 +175,9 @@ namespace std
#ifndef signbit
#define signbit(x) \
- ((sizeof (x) == sizeof (float)) ? __signbitf(x) \
- : (sizeof (x) == sizeof (double)) ? __signbit(x) \
- : __signbitl(x))
+ ((sizeof (x) == sizeof (float)) ? __signbitf(x) \
+ : (sizeof (x) == sizeof (double)) ? __signbit(x) \
+ : __signbitl(x))
#endif
// Functions from openlibm not declared in Symbian math.h
diff --git a/backends/platform/symbian/src/vsnprintf.h b/backends/platform/symbian/src/vsnprintf.h
index 1e25716cd8..d6e239c536 100644
--- a/backends/platform/symbian/src/vsnprintf.h
+++ b/backends/platform/symbian/src/vsnprintf.h
@@ -213,15 +213,15 @@
#define fast_memcpy(d,s,n) \
{ size_t nn = (size_t)(n); \
- if (nn >= breakeven_point) memcpy((d), (s), nn); \
- else if (nn > 0) { /* proc call overhead is worth only for large strings*/\
+ if (nn >= breakeven_point) memcpy((d), (s), nn); \
+ else if (nn > 0) { /* proc call overhead is worth only for large strings*/\
char *dd; const char *ss; \
for (ss=(s), dd=(d); nn>0; nn--) *dd++ = *ss++; } }
#define fast_memset(d,c,n) \
{ size_t nn = (size_t)(n); \
- if (nn >= breakeven_point) memset((d), (int)(c), nn); \
- else if (nn > 0) { /* proc call overhead is worth only for large strings*/\
+ if (nn >= breakeven_point) memset((d), (int)(c), nn); \
+ else if (nn > 0) { /* proc call overhead is worth only for large strings*/\
char *dd; const int cc=(int)(c); \
for (dd=(d); nn>0; nn--) *dd++ = cc; } }
diff --git a/backends/platform/wii/main.cpp b/backends/platform/wii/main.cpp
index 72d2514d90..f25f538888 100644
--- a/backends/platform/wii/main.cpp
+++ b/backends/platform/wii/main.cpp
@@ -54,8 +54,8 @@ bool reset_btn_pressed = false;
bool power_btn_pressed = false;
#if ((_V_MAJOR_ > 1) || \
- (_V_MAJOR_ == 1 && _V_MINOR_ > 8 ) || \
- (_V_MAJOR_ == 1 && _V_MINOR_ == 8 && _V_PATCH_ >= 18))
+ (_V_MAJOR_ == 1 && _V_MINOR_ > 8 ) || \
+ (_V_MAJOR_ == 1 && _V_MINOR_ == 8 && _V_PATCH_ >= 18))
void reset_cb(u32, void *) {
#else
void reset_cb(void) {
diff --git a/backends/taskbar/unity/unity-taskbar.h b/backends/taskbar/unity/unity-taskbar.h
index d818ed9ff1..b8d7a38745 100644
--- a/backends/taskbar/unity/unity-taskbar.h
+++ b/backends/taskbar/unity/unity-taskbar.h
@@ -43,7 +43,7 @@ public:
virtual void setCount(int count);
// Implementation of the EventSource interface
- virtual bool pollEvent(Common::Event &event);
+ virtual bool pollEvent(Common::Event &event);
private:
GMainLoop *_loop;
diff --git a/backends/updates/win32/win32-updates.cpp b/backends/updates/win32/win32-updates.cpp
index 7496431951..f53f5a274d 100644
--- a/backends/updates/win32/win32-updates.cpp
+++ b/backends/updates/win32/win32-updates.cpp
@@ -60,79 +60,79 @@ Win32UpdateManager::Win32UpdateManager(SdlWindow_Win32 *window) {
win_sparkle_set_appcast_url(appcastUrl);
win_sparkle_set_can_shutdown_callback(canShutdownCallback);
win_sparkle_set_shutdown_request_callback(shutdownRequestCallback);
- win_sparkle_init();
-
- if (!ConfMan.hasKey("updates_check")
- || ConfMan.getInt("updates_check") == Common::UpdateManager::kUpdateIntervalNotSupported) {
- setAutomaticallyChecksForUpdates(kUpdateStateDisabled);
- } else {
- setAutomaticallyChecksForUpdates(kUpdateStateEnabled);
- setUpdateCheckInterval(normalizeInterval(ConfMan.getInt("updates_check")));
- }
+ win_sparkle_init();
+
+ if (!ConfMan.hasKey("updates_check")
+ || ConfMan.getInt("updates_check") == Common::UpdateManager::kUpdateIntervalNotSupported) {
+ setAutomaticallyChecksForUpdates(kUpdateStateDisabled);
+ } else {
+ setAutomaticallyChecksForUpdates(kUpdateStateEnabled);
+ setUpdateCheckInterval(normalizeInterval(ConfMan.getInt("updates_check")));
+ }
}
Win32UpdateManager::~Win32UpdateManager() {
- win_sparkle_cleanup();
+ win_sparkle_cleanup();
}
void Win32UpdateManager::checkForUpdates() {
- win_sparkle_check_update_with_ui();
+ win_sparkle_check_update_with_ui();
}
void Win32UpdateManager::setAutomaticallyChecksForUpdates(UpdateManager::UpdateState state) {
- if (state == kUpdateStateNotSupported)
- return;
+ if (state == kUpdateStateNotSupported)
+ return;
- win_sparkle_set_automatic_check_for_updates(state == kUpdateStateEnabled ? 1 : 0);
+ win_sparkle_set_automatic_check_for_updates(state == kUpdateStateEnabled ? 1 : 0);
}
Common::UpdateManager::UpdateState Win32UpdateManager::getAutomaticallyChecksForUpdates() {
- if (win_sparkle_get_automatic_check_for_updates() == 1)
- return kUpdateStateEnabled;
- else
- return kUpdateStateDisabled;
+ if (win_sparkle_get_automatic_check_for_updates() == 1)
+ return kUpdateStateEnabled;
+ else
+ return kUpdateStateDisabled;
}
void Win32UpdateManager::setUpdateCheckInterval(int interval) {
- if (interval == kUpdateIntervalNotSupported)
- return;
+ if (interval == kUpdateIntervalNotSupported)
+ return;
- interval = normalizeInterval(interval);
+ interval = normalizeInterval(interval);
- win_sparkle_set_update_check_interval(interval);
+ win_sparkle_set_update_check_interval(interval);
}
int Win32UpdateManager::getUpdateCheckInterval() {
- // This is kind of a hack but necessary, as the value stored by Sparkle
- // might have been changed outside of ScummVM (in which case we return the
- // default interval of one day)
-
- int updateInterval = win_sparkle_get_update_check_interval();
- switch (updateInterval) {
- case kUpdateIntervalOneDay:
- case kUpdateIntervalOneWeek:
- case kUpdateIntervalOneMonth:
- return updateInterval;
-
- default:
- // Return the default value (one day)
- return kUpdateIntervalOneDay;
- }
+ // This is kind of a hack but necessary, as the value stored by Sparkle
+ // might have been changed outside of ScummVM (in which case we return the
+ // default interval of one day)
+
+ int updateInterval = win_sparkle_get_update_check_interval();
+ switch (updateInterval) {
+ case kUpdateIntervalOneDay:
+ case kUpdateIntervalOneWeek:
+ case kUpdateIntervalOneMonth:
+ return updateInterval;
+
+ default:
+ // Return the default value (one day)
+ return kUpdateIntervalOneDay;
+ }
}
bool Win32UpdateManager::getLastUpdateCheckTimeAndDate(TimeDate &t) {
- time_t updateTime = win_sparkle_get_last_check_time();
- tm *ut = localtime(&updateTime);
-
- t.tm_wday = ut->tm_wday;
- t.tm_year = ut->tm_year;
- t.tm_mon = ut->tm_mon;
- t.tm_mday = ut->tm_mday;
- t.tm_hour = ut->tm_hour;
- t.tm_min = ut->tm_min;
- t.tm_sec = ut->tm_sec;
-
- return true;
+ time_t updateTime = win_sparkle_get_last_check_time();
+ tm *ut = localtime(&updateTime);
+
+ t.tm_wday = ut->tm_wday;
+ t.tm_year = ut->tm_year;
+ t.tm_mon = ut->tm_mon;
+ t.tm_mday = ut->tm_mday;
+ t.tm_hour = ut->tm_hour;
+ t.tm_min = ut->tm_min;
+ t.tm_sec = ut->tm_sec;
+
+ return true;
}
// WinSparkle calls this to ask if we can shut down.
diff --git a/backends/vkeybd/virtual-keyboard-parser.h b/backends/vkeybd/virtual-keyboard-parser.h
index c8a2c4158e..4728c45759 100644
--- a/backends/vkeybd/virtual-keyboard-parser.h
+++ b/backends/vkeybd/virtual-keyboard-parser.h
@@ -32,9 +32,9 @@
/**
- ***************************************
- ** Virtual Keyboard Pack File Format **
- ***************************************
+ ***************************************
+ ** Virtual Keyboard Pack File Format **
+ ***************************************
The new virtual keyboard for ScummVM is implemented in the same way as a HTML
ImageMap. It uses a single bitmap of the entire keyboard layout and then a
@@ -45,42 +45,42 @@ keyboard. The HTML image map description is contained in a larger XML file that
can describe all the different modes of the keyboard, and also different
keyboard layouts for different screen resolutions.
- ********************************************
- ** Example keyboard pack description file **
- ********************************************
+ ********************************************
+ ** Example keyboard pack description file **
+ ********************************************
<keyboard modes="normal,caps" initial_mode="normal" v_align="bottom" h_align="center">
<mode name="normal" resolutions="640x400,320x200">
- <layout resolution="640x400" bitmap="normal_640x400.bmp" transparent_color="255,0,255">
- <map>
- <area shape="poly" coords="65,50,67,48,94,48,96,50,96,77,94,79,67,79,65,77" target="q" />
- <area shape="poly" coords="105,50,107,48,134,48,136,50,136,77,134,79,107,79,105,77" target="w" />
- <area shape="poly" coords="146,50,148,48,174,48,176,50,176,77,174,79,148,79,146,77" target="e" />
- ...
- <area shape="poly" coords="11,89,12,88,69,88,70,89,70,116,69,117,12,117,11,116" target="caps" />
- </map>
- </layout>
- <layout resolution="320x200" bitmap="normal_320x200.bmp" transparent_color="255,0,255">
- ...
- </layout>
- <event name="a" type="key" code="97" ascii="97" modifiers="" />
- <event name="b" type="key" code="98" ascii="98" modifiers="" />
- <event name="c" type="key" code="99" ascii="99" modifiers="" />
- ...
- <event name="caps" type="switch_mode" mode="caps" />
+ <layout resolution="640x400" bitmap="normal_640x400.bmp" transparent_color="255,0,255">
+ <map>
+ <area shape="poly" coords="65,50,67,48,94,48,96,50,96,77,94,79,67,79,65,77" target="q" />
+ <area shape="poly" coords="105,50,107,48,134,48,136,50,136,77,134,79,107,79,105,77" target="w" />
+ <area shape="poly" coords="146,50,148,48,174,48,176,50,176,77,174,79,148,79,146,77" target="e" />
+ ...
+ <area shape="poly" coords="11,89,12,88,69,88,70,89,70,116,69,117,12,117,11,116" target="caps" />
+ </map>
+ </layout>
+ <layout resolution="320x200" bitmap="normal_320x200.bmp" transparent_color="255,0,255">
+ ...
+ </layout>
+ <event name="a" type="key" code="97" ascii="97" modifiers="" />
+ <event name="b" type="key" code="98" ascii="98" modifiers="" />
+ <event name="c" type="key" code="99" ascii="99" modifiers="" />
+ ...
+ <event name="caps" type="switch_mode" mode="caps" />
</mode>
<mode name="caps" resolutions="640x400">
- <layout resolution="640x400" bitmap="caps_640x480.bmp" transparent_color="255,0,255">
- <map>
- <area shape="poly" coords="65,50,67,48,94,48,96,50,96,77,94,79,67,79,65,77" target="Q" />
- ...
- </map>
- </layout>
- <event name="A" type="key" code="97" ascii="65" modifiers="shift" />
- <event name="B" type="key" code="98" ascii="66" modifiers="shift" />
- <event name="C" type="key" code="99" ascii="67" modifiers="shift" />
- ...
+ <layout resolution="640x400" bitmap="caps_640x480.bmp" transparent_color="255,0,255">
+ <map>
+ <area shape="poly" coords="65,50,67,48,94,48,96,50,96,77,94,79,67,79,65,77" target="Q" />
+ ...
+ </map>
+ </layout>
+ <event name="A" type="key" code="97" ascii="65" modifiers="shift" />
+ <event name="B" type="key" code="98" ascii="66" modifiers="shift" />
+ <event name="C" type="key" code="99" ascii="67" modifiers="shift" />
+ ...
</mode>
</keyboard>
diff --git a/backends/vkeybd/virtual-keyboard.cpp b/backends/vkeybd/virtual-keyboard.cpp
index 164e404591..3d010e2b9d 100644
--- a/backends/vkeybd/virtual-keyboard.cpp
+++ b/backends/vkeybd/virtual-keyboard.cpp
@@ -227,16 +227,16 @@ void VirtualKeyboard::handleMouseUp(int16 x, int16 y) {
// If no GUI opened before the virtual keyboard, kKeymapTypeGui is not yet initialized
// Check and do it if needed
void VirtualKeyboard::initKeymap() {
- using namespace Common;
+ using namespace Common;
- Keymapper *mapper = _system->getEventManager()->getKeymapper();
+ Keymapper *mapper = _system->getEventManager()->getKeymapper();
- // Do not try to recreate same keymap over again
- if (mapper->getKeymap(kGuiKeymapName) != 0)
- return;
+ // Do not try to recreate same keymap over again
+ if (mapper->getKeymap(kGuiKeymapName) != 0)
+ return;
- Keymap *guiMap = g_gui.getKeymap();
- mapper->addGlobalKeymap(guiMap);
+ Keymap *guiMap = g_gui.getKeymap();
+ mapper->addGlobalKeymap(guiMap);
}
void VirtualKeyboard::show() {
diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index bc7df2550f..e1f8638b56 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -144,12 +144,12 @@ static const char HELP_STRING[] =
" --output-rate=RATE Select output sample rate in Hz (e.g. 22050)\n"
" --opl-driver=DRIVER Select AdLib (OPL) emulator (db, mame"
#ifndef DISABLE_NUKED_OPL
- ", nuked"
+ ", nuked"
#endif
#ifdef ENABLE_OPL2LPT
- ", opl2lpt"
+ ", opl2lpt"
#endif
- ")\n"
+ ")\n"
" --show-fps Set the turn on display FPS info in 3D games\n"
" --no-show-fps Set the turn off display FPS info in 3D games\n"
" --renderer=RENDERER Select 3D renderer (software, opengl, opengl_shaders)\n"
diff --git a/base/detection/detection.cpp b/base/detection/detection.cpp
index 6274e87113..132fa7d727 100644
--- a/base/detection/detection.cpp
+++ b/base/detection/detection.cpp
@@ -30,25 +30,25 @@
class DetectionDynamic : public Detection {
public:
- DetectionDynamic() {}
- ~DetectionDynamic() {}
+ DetectionDynamic() {}
+ ~DetectionDynamic() {}
- const char *getName() const override {
- return "detection";
- }
+ const char *getName() const override {
+ return "detection";
+ }
- PluginList getPlugins() const override {
- PluginList pl;
+ PluginList getPlugins() const override {
+ PluginList pl;
- #define LINK_PLUGIN(ID) \
+ #define LINK_PLUGIN(ID) \
extern PluginType g_##ID##_type; \
extern PluginObject *g_##ID##_getObject(); \
pl.push_back(new StaticPlugin(g_##ID##_getObject(), g_##ID##_type));
- #include "engines/detection_table.h"
+ #include "engines/detection_table.h"
- return pl;
- }
+ return pl;
+ }
};
REGISTER_PLUGIN_DYNAMIC(DETECTION_DYNAMIC, PLUGIN_TYPE_DETECTION, DetectionDynamic);
diff --git a/base/detection/detection.h b/base/detection/detection.h
index 181afd5a4b..f3b61f9a6c 100644
--- a/base/detection/detection.h
+++ b/base/detection/detection.h
@@ -24,9 +24,9 @@
class Detection : public PluginObject {
public:
- Detection() {}
- virtual ~Detection() {}
+ Detection() {}
+ virtual ~Detection() {}
- virtual const char *getName() const = 0;
- virtual PluginList getPlugins() const = 0;
+ virtual const char *getName() const = 0;
+ virtual PluginList getPlugins() const = 0;
};
diff --git a/common/algorithm.h b/common/algorithm.h
index 96a5c69056..d3cf7d5e1d 100644
--- a/common/algorithm.h
+++ b/common/algorithm.h
@@ -385,10 +385,10 @@ T nextHigher2(T v) {
template<class It, class Dat>
void replace(It begin, It end, const Dat &original, const Dat &replaced) {
for (; begin != end; ++begin) {
- if (*begin == original) {
- *begin = replaced;
- }
- }
+ if (*begin == original) {
+ *begin = replaced;
+ }
+ }
}
/** @} */
diff --git a/common/archive.cpp b/common/archive.cpp
index 4f70ac2796..4f87000291 100644
--- a/common/archive.cpp
+++ b/common/archive.cpp
@@ -81,9 +81,9 @@ SearchSet::ArchiveNodeList::const_iterator SearchSet::find(const String &name) c
}
/*
- Keep the nodes sorted according to descending priorities.
- In case two or node nodes have the same priority, insertion
- order prevails.
+ Keep the nodes sorted according to descending priorities.
+ In case two or node nodes have the same priority, insertion
+ order prevails.
*/
void SearchSet::insert(const Node &node) {
ArchiveNodeList::iterator it = _list.begin();
diff --git a/common/array.h b/common/array.h
index 934d883813..11082a7486 100644
--- a/common/array.h
+++ b/common/array.h
@@ -150,7 +150,7 @@ public:
insert_aux(end(), &element, &element + 1);
}
- /** Append an element to the end of the array. */
+ /** Append an element to the end of the array. */
void push_back(const Array<T> &array) {
if (_size + array.size() <= _capacity) {
uninitialized_copy(array.begin(), array.end(), end());
@@ -201,12 +201,12 @@ public:
return _storage[_size-1];
}
- /** Insert an element into the array at the given position. */
+ /** Insert an element into the array at the given position. */
void insert_at(size_type idx, const T &element) {
assert(idx <= _size);
insert_aux(_storage + idx, &element, &element + 1);
}
-
+
/** Insert copies of all the elements from the given array into this array at the given position. */
void insert_at(size_type idx, const Array<T> &array) {
assert(idx <= _size);
@@ -219,7 +219,7 @@ public:
void insert(iterator pos, const T &element) {
insert_aux(pos, &element, &element + 1);
}
-
+
/** Remove an element at the given position from the array and return the value of that element. */
T remove_at(size_type idx) {
assert(idx < _size);
@@ -239,13 +239,13 @@ public:
return _storage[idx];
}
- /** Return a const reference to the element at the given position in the array. */
+ /** Return a const reference to the element at the given position in the array. */
const T &operator[](size_type idx) const {
assert(idx < _size);
return _storage[idx];
}
- /** Assign the given @p array to this array. */
+ /** Assign the given @p array to this array. */
Array<T> &operator=(const Array<T> &array) {
if (this == &array)
return *this;
@@ -259,7 +259,7 @@ public:
}
#ifdef USE_CXX11
- /** Assign the given array to this array using the C++11 move semantic. */
+ /** Assign the given array to this array using the C++11 move semantic. */
Array &operator=(Array<T> &&old) {
if (this == &old)
return *this;
@@ -277,12 +277,12 @@ public:
}
#endif
- /** Return the size of the array. */
+ /** Return the size of the array. */
size_type size() const {
return _size;
}
- /** Clear the array of all its elements. */
+ /** Clear the array of all its elements. */
void clear() {
freeStorage(_storage, _size);
_storage = nullptr;
@@ -290,7 +290,7 @@ public:
_capacity = 0;
}
- /** Erase the element at @p pos position and return an iterator pointing to the next element in the array. */
+ /** Erase the element at @p pos position and return an iterator pointing to the next element in the array. */
iterator erase(iterator pos) {
copy(pos + 1, _storage + _size, pos);
_size--;
@@ -298,13 +298,13 @@ public:
_storage[_size].~T();
return pos;
}
-
- /** Check whether the array is empty. */
+
+ /** Check whether the array is empty. */
bool empty() const {
return (_size == 0);
}
- /** Check whether two arrays are identical. */
+ /** Check whether two arrays are identical. */
bool operator==(const Array<T> &other) const {
if (this == &other)
return true;
@@ -317,32 +317,32 @@ public:
return true;
}
- /** Check if two arrays are different. */
+ /** Check if two arrays are different. */
bool operator!=(const Array<T> &other) const {
return !(*this == other);
}
- /** Return an iterator pointing to the first element in the array. */
+ /** Return an iterator pointing to the first element in the array. */
iterator begin() {
return _storage;
}
- /** Return an iterator pointing past the last element in the array. */
+ /** Return an iterator pointing past the last element in the array. */
iterator end() {
return _storage + _size;
}
- /** Return a const iterator pointing to the first element in the array. */
+ /** Return a const iterator pointing to the first element in the array. */
const_iterator begin() const {
return _storage;
}
- /** Return a const iterator pointing past the last element in the array. */
+ /** Return a const iterator pointing past the last element in the array. */
const_iterator end() const {
return _storage + _size;
}
- /** Reserve enough memory in the array so that it can store at least the given number of elements.
+ /** Reserve enough memory in the array so that it can store at least the given number of elements.
* The current content of the array is not modified.
*/
void reserve(size_type newCapacity) {
@@ -359,7 +359,7 @@ public:
}
}
- /** Change the size of the array. */
+ /** Change the size of the array. */
void resize(size_type newSize) {
reserve(newSize);
for (size_type i = newSize; i < _size; ++i)
@@ -369,7 +369,7 @@ public:
_size = newSize;
}
- /** Assign to this array the elements between the given iterators from another array,
+ /** Assign to this array the elements between the given iterators from another array,
* from @p first included to @p last excluded.
*/
void assign(const_iterator first, const_iterator last) {
@@ -380,7 +380,7 @@ public:
}
protected:
- /** Round up capacity to the next power of 2.
+ /** Round up capacity to the next power of 2.
* A minimal capacity of 8 is used.
*/
static size_type roundUpCapacity(size_type capacity) {
@@ -390,7 +390,7 @@ protected:
return capa;
}
- /** Allocate a specific capacity for the array. */
+ /** Allocate a specific capacity for the array. */
void allocCapacity(size_type capacity) {
_capacity = capacity;
if (capacity) {
@@ -402,7 +402,7 @@ protected:
}
}
- /** Free the storage used by the array. */
+ /** Free the storage used by the array. */
void freeStorage(T *storage, const size_type elements) {
for (size_type i = 0; i < elements; ++i)
storage[i].~T();
diff --git a/common/base-str.cpp b/common/base-str.cpp
index 588410b9b4..0073c11053 100644
--- a/common/base-str.cpp
+++ b/common/base-str.cpp
@@ -69,7 +69,7 @@ static uint32 computeCapacity(uint32 len) {
TEMPLATE
BASESTRING::BaseString(const BASESTRING &str)
- : _size(str._size) {
+ : _size(str._size) {
if (str.isStorageIntern()) {
// String in internal storage: just copy it
memcpy(_storage, str._storage, _builtinCapacity * sizeof(value_type));
diff --git a/common/config-manager.h b/common/config-manager.h
index 3383e0f4b0..918c8cb077 100644
--- a/common/config-manager.h
+++ b/common/config-manager.h
@@ -70,7 +70,7 @@ public:
bool empty() const { return _entries.empty(); } /*!< Return true if the configuration is empty, i.e. has no [key, value] pairs, and false otherwise. */
bool contains(const String &key) const { return _entries.contains(key); } /*!< Check whether the domain contains a @p key. */
- /** Return the configuration value for the given key.
+ /** Return the configuration value for the given key.
* If no entry exists for the given key in the configuration, it is created.
*/
/** Return the configuration value for the given key.
@@ -84,11 +84,11 @@ public:
String &getOrCreateVal(const String &key) { return _entries.getOrCreateVal(key); }
String &getVal(const String &key) { return _entries.getVal(key); } /*!< Retrieve the value of a @p key. */
const String &getVal(const String &key) const { return _entries.getVal(key); } /*!< @overload */
- /**
- * Retrieve the value of @p key if it exists and leave the referenced variable unchanged if the key does not exist.
- * @return True if the key exists, false otherwise.
- * You can use this method if you frequently attempt to access keys that do not exist.
- */
+ /**
+ * Retrieve the value of @p key if it exists and leave the referenced variable unchanged if the key does not exist.
+ * @return True if the key exists, false otherwise.
+ * You can use this method if you frequently attempt to access keys that do not exist.
+ */
const String &getValOrDefault(const String &key) const { return _entries.getValOrDefault(key); }
bool tryGetVal(const String &key, String &out) const { return _entries.tryGetVal(key, out); }
@@ -133,7 +133,7 @@ public:
const Domain *getDomain(const String &domName) const; /*!< @overload */
- /**
+ /**
* @name Generic access methods
* @brief No domain specified, use the values from the
* various domains in the order of their priority.
@@ -143,7 +143,7 @@ public:
bool hasKey(const String &key) const; /*!< Check if a given @p key exists. */
const String &get(const String &key) const; /*!< Get the value of a @p key. */
void set(const String &key, const String &value); /*!< Assign a @p value to a @p key. */
- /** @} */
+ /** @} */
/**
* Update a configuration entry for the active domain and flush
@@ -152,7 +152,7 @@ public:
void setAndFlush(const String &key, const Common::String &value);
#if 1
- /**
+ /**
* @name Domain-specific access methods
* @brief Access one specific domain and modify it.
*
@@ -170,7 +170,7 @@ public:
/** @} */
#endif
- /**
+ /**
* @name Additional convenience accessors
* @{
*/
diff --git a/common/coroutines.cpp b/common/coroutines.cpp
index 0e7a1098cf..3cb1a37489 100644
--- a/common/coroutines.cpp
+++ b/common/coroutines.cpp
@@ -399,7 +399,7 @@ void CoroutineScheduler::waitForSingleObject(CORO_PARAM, int pid, uint32 duratio
}
void CoroutineScheduler::waitForMultipleObjects(CORO_PARAM, int nCount, uint32 *pidList, bool bWaitAll,
- uint32 duration, bool *expired) {
+ uint32 duration, bool *expired) {
if (!pCurrent)
error("Called CoroutineScheduler::waitForMultipleObjects from the main process");
diff --git a/common/coroutines.h b/common/coroutines.h
index 275ccfa471..a0b2388004 100644
--- a/common/coroutines.h
+++ b/common/coroutines.h
@@ -363,7 +363,7 @@ private:
Common::List<EVENT *> _events;
#ifdef DEBUG
- /** Diagnostic process counters. */
+ /** Diagnostic process counters. */
int numProcs;
int maxProcs;
diff --git a/common/error.h b/common/error.h
index 810eb724e7..85116c4c9a 100644
--- a/common/error.h
+++ b/common/error.h
@@ -65,7 +65,7 @@ enum ErrorCode {
/** Failed to find a MetaEnginePlugin. This should never happen, because all MetaEngines must always
* be built into the executable, regardless if the engine plugins are present or not.
- */
+ */
kMetaEnginePluginNotFound,
kEnginePluginNotFound, ///< Failed to find an Engine plugin to handle target.
diff --git a/common/events.h b/common/events.h
index 8a41945d60..fb98674cc0 100644
--- a/common/events.h
+++ b/common/events.h
@@ -75,8 +75,8 @@ enum EventType {
/**
* The backend requests the AGI engine's predictive dialog to be shown.
- *
- * @todo Fingolfin suggests that it would be of better value to expand
+ *
+ * @todo Fingolfin suggests that it would be of better value to expand
* on this notion by generalizing its use. For example the backend could
* use events to ask for the save game dialog or to pause the engine.
* An associated enumerated type can accomplish this.
@@ -219,7 +219,7 @@ struct Event {
* screen area as defined by the most recent call to initSize().
*/
Point mouse;
-
+
/** Refers to an event generated by @ref ArtificialEventSource. */
CustomEventType customType;
@@ -287,7 +287,7 @@ class ArtificialEventSource : public EventSource {
protected:
Queue<Event> _artificialEventQueue;
public:
- /** Put the specified event into the queue. */
+ /** Put the specified event into the queue. */
void addEvent(const Event &ev) {
_artificialEventQueue.push(ev);
}
@@ -518,7 +518,7 @@ public:
// TODO: Consider removing OSystem::getScreenChangeID and
// replacing it by a generic getScreenChangeID method here
- /** Return the @ref Keymapper object. */
+ /** Return the @ref Keymapper object. */
virtual Keymapper *getKeymapper() = 0;
/** Return the global @ref Keymap object. */
virtual Keymap *getGlobalKeymap() = 0;
diff --git a/common/fs.cpp b/common/fs.cpp
index aac774714c..c3b2290bfa 100644
--- a/common/fs.cpp
+++ b/common/fs.cpp
@@ -174,22 +174,22 @@ FSDirectory::FSDirectory(const FSNode &node, int depth, bool flat, bool ignoreCl
}
FSDirectory::FSDirectory(const String &prefix, const FSNode &node, int depth, bool flat,
- bool ignoreClashes, bool includeDirectories)
+ bool ignoreClashes, bool includeDirectories)
: _node(node), _cached(false), _depth(depth), _flat(flat), _ignoreClashes(ignoreClashes),
- _includeDirectories(includeDirectories) {
+ _includeDirectories(includeDirectories) {
setPrefix(prefix);
}
FSDirectory::FSDirectory(const String &name, int depth, bool flat, bool ignoreClashes, bool includeDirectories)
: _node(name), _cached(false), _depth(depth), _flat(flat), _ignoreClashes(ignoreClashes),
- _includeDirectories(includeDirectories) {
+ _includeDirectories(includeDirectories) {
}
FSDirectory::FSDirectory(const String &prefix, const String &name, int depth, bool flat,
- bool ignoreClashes, bool includeDirectories)
+ bool ignoreClashes, bool includeDirectories)
: _node(name), _cached(false), _depth(depth), _flat(flat), _ignoreClashes(ignoreClashes),
- _includeDirectories(includeDirectories) {
+ _includeDirectories(includeDirectories) {
setPrefix(prefix);
}
@@ -264,7 +264,7 @@ FSDirectory *FSDirectory::getSubDirectory(const String &name, int depth, bool fl
}
FSDirectory *FSDirectory::getSubDirectory(const String &prefix, const String &name, int depth,
- bool flat, bool ignoreClashes) {
+ bool flat, bool ignoreClashes) {
if (name.empty() || !_node.isDirectory())
return nullptr;
diff --git a/common/hashmap.h b/common/hashmap.h
index 6a63cd0345..e565558df3 100644
--- a/common/hashmap.h
+++ b/common/hashmap.h
@@ -300,7 +300,7 @@ public:
}
// TODO: insert() method?
- /** Return true if hashmap is empty. */
+ /** Return true if hashmap is empty. */
bool empty() const {
return (_size == 0);
}
diff --git a/common/list.h b/common/list.h
index fd1347fa82..e2ce6f5f51 100644
--- a/common/list.h
+++ b/common/list.h
@@ -33,7 +33,7 @@ namespace Common {
*
* @brief API for managing doubly linked lists.
*
- *
+ *
* @{
*/
@@ -176,7 +176,7 @@ public:
return static_cast<Node *>(_anchor._prev)->_data;
}
- /** Assign a given @p list to this list. */
+ /** Assign a given @p list to this list. */
List<t_T> &operator=(const List<t_T> &list) {
if (this != &list) {
iterator i;
@@ -197,7 +197,7 @@ public:
return *this;
}
- /** Return the size of the list. */
+ /** Return the size of the list. */
size_type size() const {
size_type n = 0;
for (const NodeBase *cur = _anchor._next; cur != &_anchor; cur = cur->_next)
@@ -205,7 +205,7 @@ public:
return n;
}
- /** Remove all elements from the list. */
+ /** Remove all elements from the list. */
void clear() {
NodeBase *pos = _anchor._next;
while (pos != &_anchor) {
@@ -218,12 +218,12 @@ public:
_anchor._next = &_anchor;
}
- /** Check whether the list is empty. */
+ /** Check whether the list is empty. */
bool empty() const {
return (&_anchor == _anchor._next);
}
- /** Return an iterator to the start of the list.
+ /** Return an iterator to the start of the list.
* This can be used, for example, to iterate from the first element
* of the list to the last element of the list.
*/
@@ -231,7 +231,7 @@ public:
return iterator(_anchor._next);
}
- /** Return a reverse iterator to the start of the list.
+ /** Return a reverse iterator to the start of the list.
* This can be used, for example, to iterate from the last element
* of the list to the first element of the list.
*/
@@ -239,12 +239,12 @@ public:
return iterator(_anchor._prev);
}
- /** Return an iterator to the end of the list. */
+ /** Return an iterator to the end of the list. */
iterator end() {
return iterator(&_anchor);
}
- /** Return a const iterator to the start of the list.
+ /** Return a const iterator to the start of the list.
* This can be used, for example, to iterate from the first element
* of the list to the last element of the list.
*/
@@ -252,7 +252,7 @@ public:
return const_iterator(_anchor._next);
}
- /** Return a const reverse iterator to the start of the list.
+ /** Return a const reverse iterator to the start of the list.
* This can be used, for example, to iterate from the last element
* of the list to the first element of the list.
*/
@@ -260,13 +260,13 @@ public:
return const_iterator(_anchor._prev);
}
- /** Return a const iterator to the end of the list. */
+ /** Return a const iterator to the end of the list. */
const_iterator end() const {
return const_iterator(const_cast<NodeBase *>(&_anchor));
}
protected:
- /**
+ /**
* Erase an element at @p pos.
*/
NodeBase erase(NodeBase *pos) {
diff --git a/common/math.h b/common/math.h
index 5c8b82372a..a391d85580 100644
--- a/common/math.h
+++ b/common/math.h
@@ -111,7 +111,7 @@ inline int intLog2(uint32 v) {
// Input and Output type can be different
template<class InputT, class OutputT>
inline OutputT trunc(InputT x) {
- return (x > 0) ? floor(x) : ceil(x);
+ return (x > 0) ? floor(x) : ceil(x);
}
// Round a number towards zero
diff --git a/common/rect.h b/common/rect.h
index 8585accbb1..020a9cbe90 100644
--- a/common/rect.h
+++ b/common/rect.h
@@ -50,53 +50,53 @@ struct Point {
Point() : x(0), y(0) {}
/**
- * Create a point with position defined by @p x1 and @p y1.
- */
+ * Create a point with position defined by @p x1 and @p y1.
+ */
Point(int16 x1, int16 y1) : x(x1), y(y1) {}
/**
- * Determine whether the position of two points is the same.
- */
+ * Determine whether the position of two points is the same.
+ */
bool operator==(const Point &p) const { return x == p.x && y == p.y; }
/**
- * Determine whether the position of two points is not the same.
- */
+ * Determine whether the position of two points is not the same.
+ */
bool operator!=(const Point &p) const { return x != p.x || y != p.y; }
/**
- * Create a point by adding the @p delta value to a point.
- */
+ * Create a point by adding the @p delta value to a point.
+ */
Point operator+(const Point &delta) const { return Point(x + delta.x, y + delta.y); }
/**
- * Create a point by subtracting the @p delta value from a point.
- */
+ * Create a point by subtracting the @p delta value from a point.
+ */
Point operator-(const Point &delta) const { return Point(x - delta.x, y - delta.y); }
/**
- * Create a point by dividing a point by the (int) @p divisor value.
- */
+ * Create a point by dividing a point by the (int) @p divisor value.
+ */
Point operator/(int divisor) const { return Point(x / divisor, y / divisor); }
/**
- * Create a point by multiplying a point by the (int) @p multiplier value.
- */
+ * Create a point by multiplying a point by the (int) @p multiplier value.
+ */
Point operator*(int multiplier) const { return Point(x * multiplier, y * multiplier); }
/**
- * Create a point by dividing a point by the (double) @p divisor value.
- */
+ * Create a point by dividing a point by the (double) @p divisor value.
+ */
Point operator/(double divisor) const { return Point(x / divisor, y / divisor); }
/**
- * Create a point by multiplying a point by the (double) @p multiplier value.
- */
+ * Create a point by multiplying a point by the (double) @p multiplier value.
+ */
Point operator*(double multiplier) const { return Point(x * multiplier, y * multiplier); }
- /**
- * Change a point's position by adding @p delta to its x and y coordinates.
- */
+ /**
+ * Change a point's position by adding @p delta to its x and y coordinates.
+ */
void operator+=(const Point &delta) {
x += delta.x;
y += delta.y;
}
- /**
- * Change a point's position by subtracting @p delta from its x and y arguments.
- */
+ /**
+ * Change a point's position by subtracting @p delta from its x and y arguments.
+ */
void operator-=(const Point &delta) {
x -= delta.x;
y -= delta.y;
@@ -148,29 +148,29 @@ struct Rect {
Rect() : top(0), left(0), bottom(0), right(0) {}
/**
- * Create a rectangle with the top-left corner at position (0, 0) and the given width @p w and height @p h.
- */
+ * Create a rectangle with the top-left corner at position (0, 0) and the given width @p w and height @p h.
+ */
Rect(int16 w, int16 h) : top(0), left(0), bottom(h), right(w) {}
/**
- * Create a rectangle with the top-left corner at the given position (x1, y1)
+ * Create a rectangle with the top-left corner at the given position (x1, y1)
* and the bottom-right corner at the position (x2, y2).
*
* The @p x2 value must be greater or equal @p x1 and @p y2 must be greater or equal @p y1.
- */
+ */
Rect(int16 x1, int16 y1, int16 x2, int16 y2) : top(y1), left(x1), bottom(y2), right(x2) {
assert(isValidRect());
}
/**
- * Check if two rectangles are identical.
+ * Check if two rectangles are identical.
*
* @return True if the rectangles are identical, false otherwise.
- */
+ */
bool operator==(const Rect &rhs) const { return equals(rhs); }
- /**
- * Check if two rectangles are different.
+ /**
+ * Check if two rectangles are different.
*
* @return True if the rectangles are different, false otherwise.
- */
+ */
bool operator!=(const Rect &rhs) const { return !equals(rhs); }
int16 width() const { return right - left; } /*!< Return the width of a rectangle. */
@@ -316,14 +316,14 @@ struct Rect {
return (left >= right || top >= bottom);
}
- /**
+ /**
* Check if this is a valid rectangle.
*/
bool isValidRect() const {
return (left <= right && top <= bottom);
}
- /**
+ /**
* Move this rectangle to the position defined by @p x, @p y.
*/
void moveTo(int16 x, int16 y) {
@@ -341,14 +341,14 @@ struct Rect {
top += dy; bottom += dy;
}
- /**
+ /**
* Move this rectangle to the position of the point @p p.
*/
void moveTo(const Point &p) {
moveTo(p.x, p.y);
}
- /**
+ /**
* Print debug messages related to this class.
*/
void debugPrint(int debuglevel = 0, const char *caption = "Rect:") const {
diff --git a/common/safe-bool.h b/common/safe-bool.h
index 978040ece4..f51cd8c236 100644
--- a/common/safe-bool.h
+++ b/common/safe-bool.h
@@ -40,14 +40,14 @@ namespace Common {
};
}
- /**
- * @defgroup common_safe_bool Safe Boolean
- * @ingroup common
- *
- * @brief Template for a SafeBool function.
- *
- * @{
- */
+ /**
+ * @defgroup common_safe_bool Safe Boolean
+ * @ingroup common
+ *
+ * @brief Template for a SafeBool function.
+ *
+ * @{
+ */
/**
* Prevents `operator bool` from implicitly converting to other types.
diff --git a/common/savefile.h b/common/savefile.h
index 03893ce1de..c674306c7d 100644
--- a/common/savefile.h
+++ b/common/savefile.h
@@ -60,14 +60,14 @@ public:
OutSaveFile(WriteStream *w); /*!< Create an OutSaveFile that uses the given WriteStream to write the data. */
virtual ~OutSaveFile();
- /**
+ /**
* Return true if an I/O failure occurred.
* This flag is never cleared automatically. In order to clear it,
* you must call clearErr() explicitly.
*/
virtual bool err() const;
- /**
+ /**
* Reset the I/O error status as returned by err().
*/
virtual void clearErr();
@@ -93,11 +93,11 @@ public:
virtual bool flush();
/**
- * Write data into the stream.
+ * Write data into the stream.
*
* @param dataPtr Pointer to the data to be written.
* @param dataSize Number of bytes to be written.
- */
+ */
virtual uint32 write(const void *dataPtr, uint32 dataSize);
/**
diff --git a/common/str-enc.cpp b/common/str-enc.cpp
index 9ffb200d56..f78ee39c99 100644
--- a/common/str-enc.cpp
+++ b/common/str-enc.cpp
@@ -777,7 +777,7 @@ getReverseConversionTable(CodePage page) {
}
void U32String::decodeOneByte(const char *src, uint32 len, CodePage page) {
- const uint16 *conversionTable = getConversionTable(page);
+ const uint16 *conversionTable = getConversionTable(page);
if (conversionTable == nullptr) {
conversionTable = kASCIIConversionTable;
diff --git a/common/system.h b/common/system.h
index e1d16c07e8..894db3f4f5 100644
--- a/common/system.h
+++ b/common/system.h
@@ -635,7 +635,7 @@ public:
virtual const GraphicsMode *getSupportedGraphicsModes() const {
static const GraphicsMode noGraphicsModes[] = {{"NONE", "Normal", 0}, {nullptr, nullptr, 0 }};
return noGraphicsModes;
- }
+ }
/**
* Return the ID of the 'default' graphics mode. What exactly this means
@@ -1517,7 +1517,7 @@ public:
* @param icon The icon to display on the screen.
*/
virtual void displayActivityIconOnOSD(const Graphics::Surface *icon) = 0;
- /** @} */
+ /** @} */
/**
* @addtogroup common_system_module
@@ -1584,7 +1584,7 @@ public:
* @return The FSNode factory for the current architecture.
*/
virtual FilesystemFactory *getFilesystemFactory();
- /** @} */
+ /** @} */
/**
* @addtogroup common_system_misc
diff --git a/common/translation.h b/common/translation.h
index 5662454434..c66f15d814 100644
--- a/common/translation.h
+++ b/common/translation.h
@@ -78,7 +78,7 @@ typedef Array<TLanguage> TLangArray;
struct PoMessageEntry {
int msgid; /*!< ID of the message. */
String msgctxt; /*!< Context of the message. It can be empty.
- Can be used to solve ambiguities. */
+ Can be used to solve ambiguities. */
U32String msgstr; /*!< Message string. */
};
diff --git a/common/unzip.cpp b/common/unzip.cpp
index 2e7a3f8b81..152b5bb812 100644
--- a/common/unzip.cpp
+++ b/common/unzip.cpp
@@ -96,9 +96,9 @@ typedef long z_off_t;
typedef unsigned char Byte;
typedef Byte Bytef;
typedef struct {
- Bytef *next_in, *next_out;
- uInt avail_in, avail_out;
- uLong total_out;
+ Bytef *next_in, *next_out;
+ uInt avail_in, avail_out;
+ uLong total_out;
} z_stream;
#endif // !USE_ZLIB
@@ -149,23 +149,23 @@ typedef struct {
/* unz_file_info contain information about a file in the zipfile */
typedef struct {
- uLong version; /* version made by 2 bytes */
- uLong version_needed; /* version needed to extract 2 bytes */
- uLong flag; /* general purpose bit flag 2 bytes */
- uLong compression_method; /* compression method 2 bytes */
- uLong dosDate; /* last mod file date in Dos fmt 4 bytes */
- uLong crc; /* crc-32 4 bytes */
- uLong compressed_size; /* compressed size 4 bytes */
- uLong uncompressed_size; /* uncompressed size 4 bytes */
- uLong size_filename; /* filename length 2 bytes */
- uLong size_file_extra; /* extra field length 2 bytes */
- uLong size_file_comment; /* file comment length 2 bytes */
-
- uLong disk_num_start; /* disk number start 2 bytes */
- uLong internal_fa; /* internal file attributes 2 bytes */
- uLong external_fa; /* external file attributes 4 bytes */
-
- tm_unz tmu_date;
+ uLong version; /* version made by 2 bytes */
+ uLong version_needed; /* version needed to extract 2 bytes */
+ uLong flag; /* general purpose bit flag 2 bytes */
+ uLong compression_method; /* compression method 2 bytes */
+ uLong dosDate; /* last mod file date in Dos fmt 4 bytes */
+ uLong crc; /* crc-32 4 bytes */
+ uLong compressed_size; /* compressed size 4 bytes */
+ uLong uncompressed_size; /* uncompressed size 4 bytes */
+ uLong size_filename; /* filename length 2 bytes */
+ uLong size_file_extra; /* extra field length 2 bytes */
+ uLong size_file_comment; /* file comment length 2 bytes */
+
+ uLong disk_num_start; /* disk number start 2 bytes */
+ uLong internal_fa; /* internal file attributes 2 bytes */
+ uLong external_fa; /* external file attributes 4 bytes */
+
+ tm_unz tmu_date;
} unz_file_info;
int unzStringFileNameCompare(const char* fileName1,
@@ -183,11 +183,11 @@ int unzStringFileNameCompare(const char* fileName1,
/*
Open a Zip file. path contain the full pathname (by example,
- on a Windows NT computer "c:\\zlib\\zlib111.zip" or on an Unix computer
+ on a Windows NT computer "c:\\zlib\\zlib111.zip" or on an Unix computer
"zlib/zlib111.zip".
If the zipfile cannot be opened (file don't exist or in not valid), the
return value is NULL.
- Else, the return value is a unzFile Handle, usable with other function
+ Else, the return value is a unzFile Handle, usable with other function
of this unzip package.
*/
@@ -195,7 +195,7 @@ int unzClose(unzFile file);
/*
Close a ZipFile opened with unzipOpen.
If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
- these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
+ these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
return UNZ_OK if there is no problem. */
int unzGetGlobalInfo(unzFile file,
@@ -289,7 +289,7 @@ int unzReadCurrentFile(unzFile file, voidp buf, unsigned len);
return the number of byte copied if somes bytes are copied
return 0 if the end of file was reached
return <0 with error code if there is an error
- (UNZ_ERRNO for IO error, or zLib error for uncompress error)
+ (UNZ_ERRNO for IO error, or zLib error for uncompress error)
*/
z_off_t unztell(unzFile file);
@@ -306,7 +306,7 @@ int unzGetLocalExtrafield(unzFile file, voidp buf, unsigned len);
/*
Read extra field from the current file (opened by unzOpenCurrentFile)
This is the local-header version of the extra field (sometimes, there is
- more info in the local-header version than in the central-header)
+ more info in the local-header version than in the central-header)
if buf==NULL, it return the size of the local extra field
@@ -317,7 +317,7 @@ int unzGetLocalExtrafield(unzFile file, voidp buf, unsigned len);
*/
#if !defined(unix) && !defined(CASESENSITIVITYDEFAULT_YES) && \
- !defined(CASESENSITIVITYDEFAULT_NO)
+ !defined(CASESENSITIVITYDEFAULT_NO)
#define CASESENSITIVITYDEFAULT_NO
#endif
@@ -341,12 +341,12 @@ const char unz_copyright[] =
/* unz_file_info_interntal contain internal info about a file in zipfile*/
typedef struct {
- uLong offset_curfile;/* relative offset of local header 4 bytes */
+ uLong offset_curfile;/* relative offset of local header 4 bytes */
} unz_file_info_internal;
/* file_in_zip_read_info_s contain internal information about a file in zipfile,
- when reading and decompress it */
+ when reading and decompress it */
typedef struct {
char *read_buffer; /* internal buffer for compressed data */
z_stream stream; /* zLib stream structure for inflate */
@@ -401,22 +401,22 @@ typedef struct {
} unz_s;
/* ===========================================================================
- Read a byte from a gz_stream; update next_in and avail_in. Return EOF
+ Read a byte from a gz_stream; update next_in and avail_in. Return EOF
for end of file.
IN assertion: the stream s has been successfully opened for reading.
*/
/*static int unzlocal_getByte(Common::SeekableReadStream &fin, int *pi) {
- unsigned char c = fin.readByte();
- *pi = (int)c;
- return UNZ_OK;
- } else {
- if (fin.err())
- return UNZ_ERRNO;
- else
- return UNZ_EOF;
- }
+ unsigned char c = fin.readByte();
+ *pi = (int)c;
+ return UNZ_OK;
+ } else {
+ if (fin.err())
+ return UNZ_ERRNO;
+ else
+ return UNZ_EOF;
+ }
}*/
@@ -444,9 +444,9 @@ static int unzlocal_getLong(Common::SeekableReadStream *fin, uLong *pX) {
Compare two filename (fileName1,fileName2).
If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
- or strcasecmp)
+ or strcasecmp)
If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
- (like 1 on Unix, 2 on Windows)
+ (like 1 on Unix, 2 on Windows)
*/
int unzStringFileNameCompare(const char* fileName1, const char* fileName2, int iCaseSensitivity) {
@@ -463,7 +463,7 @@ int unzStringFileNameCompare(const char* fileName1, const char* fileName2, int i
/*
Locate the Central directory of a zipfile (at the end, just before
- the global comment)
+ the global comment)
*/
static uLong unzlocal_SearchCentralDir(Common::SeekableReadStream &fin) {
unsigned char* buf;
@@ -494,7 +494,7 @@ static uLong unzlocal_SearchCentralDir(Common::SeekableReadStream &fin) {
uReadPos = uSizeFile-uBackRead;
uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
- (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);
+ (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);
fin.seek(uReadPos, SEEK_SET);
if (fin.err())
break;
@@ -502,7 +502,7 @@ static uLong unzlocal_SearchCentralDir(Common::SeekableReadStream &fin) {
if (fin.read(buf,(uInt)uReadSize)!=uReadSize)
break;
- for (i=(int)uReadSize-3; (i--)>0;)
+ for (i=(int)uReadSize-3; (i--)>0;)
if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
{
@@ -519,11 +519,11 @@ static uLong unzlocal_SearchCentralDir(Common::SeekableReadStream &fin) {
/*
Open a Zip file. path contain the full pathname (by example,
- on a Windows NT computer "c:\\test\\zlib109.zip" or on an Unix computer
+ on a Windows NT computer "c:\\test\\zlib109.zip" or on an Unix computer
"zlib/zlib109.zip".
If the zipfile cannot be opened (file don't exist or in not valid), the
return value is NULL.
- Else, the return value is a unzFile Handle, usable with other function
+ Else, the return value is a unzFile Handle, usable with other function
of this unzip package.
*/
unzFile unzOpen(Common::SeekableReadStream *stream) {
@@ -633,7 +633,7 @@ unzFile unzOpen(Common::SeekableReadStream *stream) {
/*
Close a ZipFile opened with unzipOpen.
If there is files inside the .Zip opened with unzipOpenCurrentFile (see later),
- these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
+ these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
return UNZ_OK if there is no problem. */
int unzClose(unzFile file) {
unz_s *s;
@@ -683,22 +683,22 @@ static void unzlocal_DosDateToTmuDate(uLong ulDosDate, tm_unz* ptm) {
Get Info about the current file in the zipfile, with internal only info
*/
static int unzlocal_GetCurrentFileInfoInternal(unzFile file,
- unz_file_info *pfile_info,
- unz_file_info_internal
- *pfile_info_internal,
- char *szFileName,
+ unz_file_info *pfile_info,
+ unz_file_info_internal
+ *pfile_info_internal,
+ char *szFileName,
uLong fileNameBufferSize,
- void *extraField,
+ void *extraField,
uLong extraFieldBufferSize,
- char *szComment,
+ char *szComment,
uLong commentBufferSize);
static int unzlocal_GetCurrentFileInfoInternal(unzFile file,
- unz_file_info *pfile_info,
- unz_file_info_internal *pfile_info_internal,
- char *szFileName, uLong fileNameBufferSize,
- void *extraField, uLong extraFieldBufferSize,
- char *szComment, uLong commentBufferSize)
+ unz_file_info *pfile_info,
+ unz_file_info_internal *pfile_info_internal,
+ char *szFileName, uLong fileNameBufferSize,
+ void *extraField, uLong extraFieldBufferSize,
+ char *szComment, uLong commentBufferSize)
{
unz_s* s;
unz_file_info file_info;
@@ -848,10 +848,10 @@ static int unzlocal_GetCurrentFileInfoInternal(unzFile file,
return UNZ_OK if there is no problem.
*/
int unzGetCurrentFileInfo(unzFile file,
- unz_file_info *pfile_info,
- char *szFileName, uLong fileNameBufferSize,
- void *extraField, uLong extraFieldBufferSize,
- char *szComment, uLong commentBufferSize)
+ unz_file_info *pfile_info,
+ char *szFileName, uLong fileNameBufferSize,
+ void *extraField, uLong extraFieldBufferSize,
+ char *szComment, uLong commentBufferSize)
{
return unzlocal_GetCurrentFileInfoInternal(file,pfile_info,nullptr,
szFileName,fileNameBufferSize,
@@ -947,9 +947,9 @@ int unzLocateFile(unzFile file, const char *szFileName, int iCaseSensitivity) {
/*
Read the local header of the current zipfile
Check the coherency of the local header and info in the end of central
- directory about this file
+ directory about this file
store in *piSizeVar the size of extra info in local header
- (filename and size of extra field data)
+ (filename and size of extra field data)
*/
static int unzlocal_CheckCurrentFileCoherencyHeader(unz_s* s, uInt* piSizeVar,
uLong *poffset_local_extrafield,
@@ -1133,7 +1133,7 @@ int unzOpenCurrentFile (unzFile file) {
return the number of byte copied if somes bytes are copied
return 0 if the end of file was reached
return <0 with error code if there is an error
- (UNZ_ERRNO for IO error, or zLib error for uncompress error)
+ (UNZ_ERRNO for IO error, or zLib error for uncompress error)
*/
int unzReadCurrentFile(unzFile file, voidp buf, unsigned len) {
int err=UNZ_OK;
@@ -1295,7 +1295,7 @@ int unzeof(unzFile file) {
/*
Read extra field from the current file (opened by unzOpenCurrentFile)
This is the local-header version of the extra field (sometimes, there is
- more info in the local-header version than in the central-header)
+ more info in the local-header version than in the central-header)
if buf==NULL, it return the size of the local extra field that can be read
diff --git a/common/ustr.h b/common/ustr.h
index 84f9067124..b5b7024856 100644
--- a/common/ustr.h
+++ b/common/ustr.h
@@ -186,9 +186,9 @@ public:
private:
void decodeInternal(const char *str, uint32 len, CodePage page);
void decodeOneByte(const char *str, uint32 len, CodePage page);
- void decodeWindows932(const char *src, uint32 len);
+ void decodeWindows932(const char *src, uint32 len);
void decodeWindows949(const char *src, uint32 len);
- void decodeWindows950(const char *src, uint32 len);
+ void decodeWindows950(const char *src, uint32 len);
void decodeUTF8(const char *str, uint32 len);
friend class String;
diff --git a/common/util.h b/common/util.h
index cc78100e87..0f634464c0 100644
--- a/common/util.h
+++ b/common/util.h
@@ -40,7 +40,7 @@
* Note that 'alignment' must be a power of two!
*/
#define IS_ALIGNED(value, alignment) \
- ((((size_t)value) & ((alignment) - 1)) == 0)
+ ((((size_t)value) & ((alignment) - 1)) == 0)
#ifdef ABS
#undef ABS
diff --git a/common/zlib.cpp b/common/zlib.cpp
index 94fc7bb87b..1f6e7f66c0 100644
--- a/common/zlib.cpp
+++ b/common/zlib.cpp
@@ -32,13 +32,13 @@
#if defined(USE_ZLIB)
#ifdef __SYMBIAN32__
- #include <zlib\zlib.h>
+ #include <zlib\zlib.h>
#elif defined(__MORPHOS__)
#define _NO_PPCINLINE
#include <zlib.h>
#undef _NO_PPCINLINE
#else
- #include <zlib.h>
+ #include <zlib.h>
#endif
#if ZLIB_VERNUM < 0x1204
diff --git a/devtools/create_cryomni3d/create_cryomni3d_dat.cpp b/devtools/create_cryomni3d/create_cryomni3d_dat.cpp
index 55b99712fd..9296e93806 100644
--- a/devtools/create_cryomni3d/create_cryomni3d_dat.cpp
+++ b/devtools/create_cryomni3d/create_cryomni3d_dat.cpp
@@ -43,11 +43,11 @@ struct Parts {
};
#define DEFINE_GAME_PLATFORM_LANG_FUNCS(game, platform, lang) \
- size_t write ## game ## _ ## platform ## _ ## lang ## _Header(FILE *f, \
- uint32 offset, uint32 size); \
- size_t write ## game ## _ ## platform ## _ ## lang ## _Data(FILE *f);
+ size_t write ## game ## _ ## platform ## _ ## lang ## _Header(FILE *f, \
+ uint32 offset, uint32 size); \
+ size_t write ## game ## _ ## platform ## _ ## lang ## _Data(FILE *f);
#define GAME_PLATFORM_LANG_PART(game, platform, lang) { write ## game ## _ ## platform ## _ ## lang ## _Header, \
- write ## game ## _ ## platform ## _ ## lang ## _Data, 0, 0 }
+ write ## game ## _ ## platform ## _ ## lang ## _Data, 0, 0 }
DEFINE_GAME_PLATFORM_LANG_FUNCS(Versailles, ALL, FR)
DEFINE_GAME_PLATFORM_LANG_FUNCS(Versailles, ALL, BR)
@@ -86,7 +86,7 @@ size_t writeFileHeader(FILE *f, uint16 games) {
}
size_t writeGameHeader(FILE *f, uint32 gameId, uint16 version, uint16 lang, uint32 platforms,
- uint32 offset, uint32 size) {
+ uint32 offset, uint32 size) {
size_t headerSize = 0;
headerSize += writeUint32BE(f, gameId); // BE to keep the tag readable
headerSize += writeUint16LE(f, version);
diff --git a/devtools/create_cryomni3d/create_cryomni3d_dat.h b/devtools/create_cryomni3d/create_cryomni3d_dat.h
index 47f77fb7d8..9f9a4e74b6 100644
--- a/devtools/create_cryomni3d/create_cryomni3d_dat.h
+++ b/devtools/create_cryomni3d/create_cryomni3d_dat.h
@@ -29,7 +29,7 @@
size_t writeFileHeader(FILE *f, uint16 games = 0xdead);
size_t writeGameHeader(FILE *f, uint32 gameId, uint16 version, uint16 lang, uint32 platforms,
- uint32 offset = 0xdeadfeed, uint32 size = 0xdeadfeed);
+ uint32 offset = 0xdeadfeed, uint32 size = 0xdeadfeed);
#define PLATFORM_WIN 0x1
#define PLATFORM_DOS 0x2
diff --git a/devtools/create_cryomni3d/versailles.cpp b/devtools/create_cryomni3d/versailles.cpp
index f476b8a2d1..e6a9b18d3c 100644
--- a/devtools/create_cryomni3d/versailles.cpp
+++ b/devtools/create_cryomni3d/versailles.cpp
@@ -59,67 +59,67 @@ size_t writeVersaillesSubtitles16(FILE *fp, Subtitle const *subtitles, uint16 el
// In Versailles platform doesn't seem to change anything
#define DEFINE_FUNCS(lang) \
- size_t writeVersailles_ALL_ ## lang ## _Header(FILE *f, uint32 offset, uint32 size) { \
- return writeGameHeader(f, VERSAILLES_GAMEID, VERSAILLES_VERSION, LANG_ ## lang, PLATFORM_ALL, \
- offset, size); \
- } \
- \
- size_t writeVersailles_ALL_ ## lang ## _Data(FILE *f) { \
- size_t size = 0; \
- \
- assert(VERSAILLES_LOCALIZED_FILENAMES_COUNT == ARRAYSIZE(versailles ## lang ## localizedFilenames)); \
- size += writeString16Array16(f, versailles ## lang ## localizedFilenames, \
- VERSAILLES_LOCALIZED_FILENAMES_COUNT); \
- \
- size += writeString16(f, versailles ## lang ## EpilMsg); \
- size += writeString16(f, versailles ## lang ## EpilPwd); \
- \
- size += writeString16(f, versailles ## lang ## BombPwd); \
- \
- assert(VERSAILLES_MESSAGES_COUNT == ARRAYSIZE(versailles ## lang ## messages)); \
- size += writeString16Array16(f, versailles ## lang ## messages, ARRAYSIZE(versailles ## lang ## messages)); \
- \
- assert(VERSAILLES_PAINTINGS_COUNT == ARRAYSIZE(versailles ## lang ## paintings)); \
- size += writeString16Array16(f, versailles ## lang ## paintings, ARRAYSIZE(versailles ## lang ## paintings)); \
- \
- size += writePadding(f); \
- return size; \
- }
+ size_t writeVersailles_ALL_ ## lang ## _Header(FILE *f, uint32 offset, uint32 size) { \
+ return writeGameHeader(f, VERSAILLES_GAMEID, VERSAILLES_VERSION, LANG_ ## lang, PLATFORM_ALL, \
+ offset, size); \
+ } \
+ \
+ size_t writeVersailles_ALL_ ## lang ## _Data(FILE *f) { \
+ size_t size = 0; \
+ \
+ assert(VERSAILLES_LOCALIZED_FILENAMES_COUNT == ARRAYSIZE(versailles ## lang ## localizedFilenames)); \
+ size += writeString16Array16(f, versailles ## lang ## localizedFilenames, \
+ VERSAILLES_LOCALIZED_FILENAMES_COUNT); \
+ \
+ size += writeString16(f, versailles ## lang ## EpilMsg); \
+ size += writeString16(f, versailles ## lang ## EpilPwd); \
+ \
+ size += writeString16(f, versailles ## lang ## BombPwd); \
+ \
+ assert(VERSAILLES_MESSAGES_COUNT == ARRAYSIZE(versailles ## lang ## messages)); \
+ size += writeString16Array16(f, versailles ## lang ## messages, ARRAYSIZE(versailles ## lang ## messages)); \
+ \
+ assert(VERSAILLES_PAINTINGS_COUNT == ARRAYSIZE(versailles ## lang ## paintings)); \
+ size += writeString16Array16(f, versailles ## lang ## paintings, ARRAYSIZE(versailles ## lang ## paintings)); \
+ \
+ size += writePadding(f); \
+ return size; \
+ }
#define DEFINE_FUNCS_CJK(lang) \
- size_t writeVersailles_ALL_ ## lang ## _Header(FILE *f, uint32 offset, uint32 size) { \
- return writeGameHeader(f, VERSAILLES_GAMEID, VERSAILLES_VERSION, LANG_ ## lang, PLATFORM_ALL, \
- offset, size); \
- } \
- \
- size_t writeVersailles_ALL_ ## lang ## _Data(FILE *f) { \
- size_t size = 0; \
- \
- assert(VERSAILLES_LOCALIZED_FILENAMES_COUNT == ARRAYSIZE(versailles ## lang ## localizedFilenames)); \
- size += writeString16Array16(f, versailles ## lang ## localizedFilenames, \
- VERSAILLES_LOCALIZED_FILENAMES_COUNT); \
- \
- size += writeString16(f, versailles ## lang ## EpilMsg); \
- size += writeString16(f, versailles ## lang ## EpilPwd); \
- \
- if ((LANG_ ## lang == LANG_JA)) { \
- assert(VERSAILLES_JA_BOMB_ALPHABET_SIZE + 1 == sizeof(versaillesJABombAlphabet)); \
- size += writeString16(f, versaillesJABombAlphabet); \
- } \
- size += writeString16(f, versailles ## lang ## BombPwd); \
- \
- assert(VERSAILLES_MESSAGES_COUNT_CJK == ARRAYSIZE(versailles ## lang ## messages)); \
- size += writeString16Array16(f, versailles ## lang ## messages, ARRAYSIZE(versailles ## lang ## messages)); \
- \
- assert(VERSAILLES_PAINTINGS_COUNT == ARRAYSIZE(versailles ## lang ## paintings)); \
- size += writeString16Array16(f, versailles ## lang ## paintings, ARRAYSIZE(versailles ## lang ## paintings)); \
- \
- /* No need to assert as we don't expect a fixed count in engine */ \
- size += writeVersaillesSubtitles16(f, versailles ## lang ## subtitles, ARRAYSIZE(versailles ## lang ## subtitles)); \
- \
- size += writePadding(f); \
- return size; \
- }
+ size_t writeVersailles_ALL_ ## lang ## _Header(FILE *f, uint32 offset, uint32 size) { \
+ return writeGameHeader(f, VERSAILLES_GAMEID, VERSAILLES_VERSION, LANG_ ## lang, PLATFORM_ALL, \
+ offset, size); \
+ } \
+ \
+ size_t writeVersailles_ALL_ ## lang ## _Data(FILE *f) { \
+ size_t size = 0; \
+ \
+ assert(VERSAILLES_LOCALIZED_FILENAMES_COUNT == ARRAYSIZE(versailles ## lang ## localizedFilenames)); \
+ size += writeString16Array16(f, versailles ## lang ## localizedFilenames, \
+ VERSAILLES_LOCALIZED_FILENAMES_COUNT); \
+ \
+ size += writeString16(f, versailles ## lang ## EpilMsg); \
+ size += writeString16(f, versailles ## lang ## EpilPwd); \
+ \
+ if ((LANG_ ## lang == LANG_JA)) { \
+ assert(VERSAILLES_JA_BOMB_ALPHABET_SIZE + 1 == sizeof(versaillesJABombAlphabet)); \
+ size += writeString16(f, versaillesJABombAlphabet); \
+ } \
+ size += writeString16(f, versailles ## lang ## BombPwd); \
+ \
+ assert(VERSAILLES_MESSAGES_COUNT_CJK == ARRAYSIZE(versailles ## lang ## messages)); \
+ size += writeString16Array16(f, versailles ## lang ## messages, ARRAYSIZE(versailles ## lang ## messages)); \
+ \
+ assert(VERSAILLES_PAINTINGS_COUNT == ARRAYSIZE(versailles ## lang ## paintings)); \
+ size += writeString16Array16(f, versailles ## lang ## paintings, ARRAYSIZE(versailles ## lang ## paintings)); \
+ \
+ /* No need to assert as we don't expect a fixed count in engine */ \
+ size += writeVersaillesSubtitles16(f, versailles ## lang ## subtitles, ARRAYSIZE(versailles ## lang ## subtitles)); \
+ \
+ size += writePadding(f); \
+ return size; \
+ }
DEFINE_FUNCS(FR)
DEFINE_FUNCS(BR)
diff --git a/devtools/create_cryomni3d/versailles.h b/devtools/create_cryomni3d/versailles.h
index 46bee5a7c5..8f3cda6a5d 100644
--- a/devtools/create_cryomni3d/versailles.h
+++ b/devtools/create_cryomni3d/versailles.h
@@ -126,123 +126,123 @@ static char const versaillesZTEpilPwd[] = "FOXANDCRANE";
static char const versaillesFRBombPwd[] = "JEMENVAISMAISLETATDEMEURERATOUJOURS";
static char const versaillesBRBombPwd[] = "O PODER DE UM REI NAO O TORNA IMORTAL";
static char const versaillesDEBombPwd[] =
- "MONARCHEN IST ES NICHT GEGEBEN VOLLKOMMENHEIT ZU ERREICHEN";
+ "MONARCHEN IST ES NICHT GEGEBEN VOLLKOMMENHEIT ZU ERREICHEN";
static char const versaillesENBombPwd[] = "IT IS NOT IN THE POWER OF KINGS TO ATTAIN PERFECTION";
static char const versaillesESBombPwd[] = "NO ES PODER DE REYES EL ALCANZAR LA PERFECCION";
static char const versaillesITBombPwd[] = "AI SOVRANI NON E DATO RAGGIUNGERE LA PERFEZIONE";
static char const versaillesJABombPwd[] = "\203V\203A\203K\203\212\203m\203_\203\223\203J\203C"
- "\203j\203C\203^\203c\203^\203m\203K\203R\203N\203I\203E\203^\203`\203j\203`\203J\203\211\203K"
- "\203A\203\213\203R\203g\203j\203i\203\211\203i\203C\203m\203_";
+ "\203j\203C\203^\203c\203^\203m\203K\203R\203N\203I\203E\203^\203`\203j\203`\203J\203\211\203K"
+ "\203A\203\213\203R\203g\203j\203i\203\211\203i\203C\203m\203_";
static char const versaillesKOBombPwd[] = "IT IS NOT IN THE POWER OF KINGS TO ATTAIN PERFECTION";
static char const versaillesZTBombPwd[] = "IT IS NOT IN THE POWER OF KINGS TO ATTAIN PERFECTION";
#define VERSAILLES_JA_BOMB_ALPHABET_SIZE 2490
static char const versaillesJABombAlphabet[] =
- "\202\323\202\255\202\353\202\244\202\306\221\274\202\314\222\271\202\275\202\277\210\253\202\242"
- "\202\323\202\255\202\353\202\244\202\252\222\213\212\324\201A\222\271\202\275\202\277\202\360"
- "\212l\202\350\202\311\217o\202\251\202\257\222\271\202\275\202\277\202\315\217W\202\334"
- "\202\301\202\304\211\236\220\355\217X\202\255\202\267\202\254\202\270\224\374\202\265\202\267"
- "\202\254\202\270\223\313\202\301\202\302\202\253\201A\220\330\202\350\227\364\202\253\201A"
- "\215\217\202\361\202\305\202\277\202\254\202\351\227Y\214{\202\306\203_\203C\203A"
- "\203\202\203\223\203h\227Y\214{\202\252\201A\345v\222\216\202\360\222T\202\265"
- "\202\304\222n\226\312\202\360\214@\202\301\202\304\202\242\202\351\202\306\203_\203C"
- "\203A\203\202\203\223\203h\202\360\214@\202\350\223\226\202\304\202\275\227Y\214{"
- "\202\252\214\276\202\244\202\311\202\315\201A\202\261\202\361\202\310\220\316\202\261\202\353"
- "\202\252\211\275\202\314\226\360\202\311\202\275\202\302\201H\224a\202\314\202\331\202\244"
- "\202\252\202\334\202\276\202\334\202\265\202\310\202\314\202\311\224L\202\306\203l\203Y"
- "\203~\224L\202\252\216\200\202\361\202\276\202\323\202\350\202\360\202\265\202\304\203l"
- "\203Y\203~\202\360\202\275\202\255\202\263\202\361\225\337\202\334\202\246\202\275\202\340"
- "\202\301\202\306\225\337\202\334\202\246\202\346\202\244\202\306\201A\217\254\224\236\225\262"
- "\202\311\202\334\202\335\202\352\202\304\211B\202\352\202\304\202\242\202\351\202\306\224N"
- "\212\361\202\350\203l\203Y\203~\202\252\225@\202\360\202\255\202\361\202\255\202\361"
- "\224L\202\346\202\350\217\254\224\236\225\262\202\314\202\331\202\244\202\252\202\250\202\242"
- "\202\265\202\273\202\244\202\276\227\263\202\306\202\342\202\267\202\350\227\263\202\252\202\342"
- "\202\267\202\350\202\360\202\251\202\266\202\301\202\304\202\242\202\351\202\306\202\342\202\267"
- "\202\350\202\252\220\324\226\332\202\314\227\263\202\311\220q\202\313\202\275\202\310\202\272"
- "\214\343\220\346\202\340\215l\202\246\202\270\201A\341\222\341\233\202\360\213N\202\261"
- "\202\265\202\304\226l\202\360\202\251\202\266\202\351\202\314\201H\214\253\202\242\202\240"
- "\202\310\202\275\202\314\216\225\202\252\202\310\202\255\202\310\202\301\202\304\202\265\202\334"
- "\202\244\202\346\202\253\202\302\202\313\202\306\222\337\202\253\202\302\202\313\202\252\222\337"
- "\202\360\220H\216\226\202\311\217\265\202\242\202\304\225\275\202\327\202\301\202\275\202\242"
- "\216M\202\311\223\374\202\352\202\304\217o\202\265\202\275\216\251\225\252\202\315\202\346"
- "\202\276\202\352\202\360\202\275\202\347\202\265\202\310\202\252\202\347\216M\202\360\202\330"
- "\202\353\202\330\202\353\232{\202\314\222\267\202\242\222\337\202\315\202\275\202\276\202\267"
- "\202\267\202\351\202\276\202\257\201B\222\337\202\306\202\253\202\302\202\313\202\261\202\361"
- "\202\307\202\315\222\337\202\252\202\253\202\302\202\313\202\360\217\265\202\242\202\304\215\327"
- "\222\267\202\242\202\302\202\332\202\311\223\374\202\352\202\304\217o\202\265\202\275\222\337"
- "\202\315\202\250\225\240\210\352\224t\220H\202\327\202\275\202\350\210\371\202\361\202\276"
- "\202\350\202\251\202\255\202\265\202\304\225\234\217Q\202\315\220\213\202\260\202\347\202\352"
- "\202\275\201B\216\223\214{\202\306\203q\203\210\203R\202\275\202\277\202\306\202\361"
- "\202\321\202\252\227\326\202\360\202\251\202\242\202\304\224\362\202\361\202\305\202\242\202\351"
- "\202\314\202\360\214\251\202\302\202\257\202\275\216\223\214{\202\240\202\355\202\304\202\304"
- "\203q\203\210\203R\202\275\202\277\202\360\214{\217\254\211\256\202\326\202\265\202\251"
- "\202\265\216\251\225\252\202\252\220H\202\327\202\347\202\352\202\304\202\240\202\355\202\352"
- "\202\310\203q\203\210\203R\202\275\202\277\202\315\212O\202\326\202\340\217o\202\347"
- "\202\352\202\270\201A\225\302\202\266\202\261\202\337\202\347\202\352\202\275\202\334\202\334"
- "\230V\202\242\202\304\202\242\202\255\201B\230T\202\306\222\337\230T\202\252\215\234"
- "\202\360\202\314\202\335\202\261\202\361\202\305\201A\202\314\202\307\202\311\216h\202\263"
- "\202\301\202\304\222\311\202\255\202\304\202\275\202\334\202\347\202\310\202\242\202\273\202\261"
- "\202\305\222\337\202\311\201A\202\250\212\350\202\242\202\276\202\251\202\347\202\261\202\314"
- "\215\234\202\360\202\306\202\301\202\304\202\277\202\345\202\244\202\276\202\242\201A\202\273"
- "\202\314\202\251\202\355\202\350\215\234\202\360\202\306\202\301\202\304\202\340\202\347\202\301"
- "\202\304\202\340\214N\202\314\202\261\202\306\202\360\220H\202\327\202\275\202\350\202\265"
- "\202\310\202\242\202\251\202\347\230T\202\315\201A\202\273\202\244\214\276\202\242\202\310"
- "\202\252\202\347\202\340\202\323\202\255\202\352\202\301\226\312\221\351\202\306\217\254\222\271"
- "\202\275\202\277\221\351\202\252\217\254\222\271\202\275\202\277\202\360\220H\216\226\202\311"
- "\217\265\202\242\202\275\222a\220\266\223\372\202\314\202\250\217j\202\242\202\360\202\267"
- "\202\351\202\251\202\347\221\201\202\255\227\210\202\304\211\272\202\263\202\242\217\254\222\271"
- "\202\275\202\277\202\252\217W\202\334\202\301\202\304\217j\202\242\202\314\220\310\202\311"
- "\202\302\202\255\202\306\221\351\202\315\202\267\202\256\202\263\202\334\217P\202\242\202\251"
- "\202\251\202\350\201A\202\262\202\277\202\273\202\244\202\311\202\240\202\350\202\302\202\242"
- "\202\275\202\251\202\246\202\351\202\306\203W\203\205\203s\203^\201[\211\244\227l"
- "\202\276\202\346\201A\202\306\203W\203\205\203s\203^\201[\202\252\202\255\202\352"
- "\202\275\212\333\221\276\202\315\221\345\202\265\202\275\225\250\202\266\202\341\202\310\202\251"
- "\202\301\202\275\202\306\202\251\202\246\202\351\202\275\202\277\202\315\203K\201[\203K"
- "\201[\225\266\213\345\202\316\202\251\202\350\202\273\202\261\202\305\203W\203\205\203s"
- "\203^\201[\202\315\203R\203E\203m\203g\203\212\202\360\202\302\202\251\202\355"
- "\202\265\202\304\202\251\202\246\202\351\202\275\202\277\202\360\202\335\202\361\202\310\220H"
- "\202\327\202\263\202\271\202\275\230h\202\306\202\244\202\263\202\254\202\306\202\251\202\324"
- "\202\306\222\216\230h\202\252\202\244\202\263\202\254\202\360\202\302\202\251\202\334\202\246"
- "\202\275\202\244\202\263\202\254\202\314\227F\222B\202\314\202\251\202\324\202\306\222\216"
- "\202\252\201A\202\307\202\244\202\251\202\244\202\263\202\254\202\360\217\225\202\257\202\304"
- "\202\342\202\301\202\304\211\272\202\263\202\242\202\265\202\251\202\265\230h\202\315\202\244"
- "\202\263\202\254\202\360\220H\202\327\202\304\202\265\202\334\202\242\202\251\202\324\202\306"
- "\222\216\202\315\230h\202\360\215\246\202\361\202\305\201A\230h\202\314\216Y\202\361"
- "\202\276\227\221\202\360\221S\225\224\225\262\201X\202\311\215\323\202\242\202\304\202\265"
- "\202\334\202\301\202\275\203l\203Y\203~\202\306\224L\202\306\217\254\202\263\202\310"
- "\227Y\214{\216q\203l\203Y\203~\202\252\202\250\225\352\202\263\202\361\202\311"
- "\201A\202\332\202\255\202\315\227Y\214{\202\315\202\253\202\347\202\242\202\276\202\257"
- "\202\307\224L\202\315\221\345\215D\202\253\202\267\202\351\202\306\202\250\225\352\202\263"
- "\202\361\202\315\201A\211\275\202\360\214\276\202\244\202\314\202\250\202\277\202\321\202\277"
- "\202\341\202\361\201A\224L\202\315\216\204\202\275\202\277\202\360\220H\202\327\202\304"
- "\202\240\202\361\202\310\202\311\221\276\202\301\202\304\202\251\202\301\202\261\202\346\202\255"
- "\202\310\202\301\202\275\202\314\202\346\202\305\202\340\227Y\214{\202\252\202\342\202\271"
- "\202\304\212i\215D\202\252\210\253\202\242\202\314\202\315\201A\216\204\202\275\202\277"
- "\203l\203Y\203~\202\360\202\302\202\251\202\334\202\246\202\347\202\352\202\310\202\242"
- "\202\251\202\347\202\310\202\314\202\346\224\222\222\271\202\306\203R\203E\203m\203g"
- "\203\212\224\222\222\271\202\252\220\205\225\323\202\305\224\374\202\265\202\242\220\272\202\305"
- "\211\314\202\301\202\304\202\242\202\351\202\306\202\307\202\244\202\265\202\304\211\314\202\301"
- "\202\304\202\242\202\351\202\314\201H\202\306\222m\202\350\202\275\202\252\202\350\211\256"
- "\202\314\203R\203E\203m\203g\203\212\202\276\202\301\202\304\216\204\202\315\202\340"
- "\202\244\202\267\202\256\216\200\202\312\202\361\202\276\202\301\202\304\214\374\202\261\202\244"
- "\202\251\202\347\202\242\202\242\222m\202\347\202\271\202\252\223\315\202\242\202\275\202\361"
- "\202\305\202\267\202\340\202\314\202\250\202\250\202\251\202\335\202\306\222\244\221\234\214\216"
- "\202\314\214\365\202\305\201A\222\244\221\234\202\252\223\256\202\242\202\275\202\346\202\244"
- "\202\311\214\251\202\246\202\275\202\314\202\305\201A\202\250\202\250\202\251\202\335\202\315"
- "\225\337\202\334\202\246\202\346\202\244\202\306\220g\215\\\202\246\202\275\202\305\202\340"
- "\216c\224O\202\310\202\252\202\347\222\244\221\234\202\311\202\315\220\316\202\314\221\314"
- "\202\360\223\256\202\251\202\267\202\275\202\337\202\314\220S\202\340\202\310\202\242\202\265"
- "\212\264\217\356\202\340\202\310\202\242\201A\215l\202\246\202\340\217\356\224M\202\340"
- "\201A\210\244\202\340\202\310\202\242\202\240\202\320\202\351\202\306\203X\203p\203j"
- "\203G\203\213\214\242\203X\203p\203j\203G\203\213\214\242\202\252\226\260\202\301"
- "\202\304\202\242\202\351\203A\203q\203\213\202\311\202\251\202\335\202\302\202\261\202\244"
- "\202\306\202\267\202\351\202\306\203A\203q\203\213\202\315\202\267\202\316\202\342\202\255"
- "\223\246\202\260\202\304\203K\201[\203K\201[\226\302\202\253\202\310\202\252\202\347"
- "\214\242\202\360\202\261\202\244\224l\202\301\202\275\216\251\225\252\202\314\216\350\202\311"
- "\223\315\202\251\202\310\202\242\202\340\202\314\202\360\222\307\202\242\202\251\202\257\202\351"
- "\202\310\202\361\202\304\201A\214N\202\315\211\275\202\304\202\244\202\312\202\332\202\352"
- "\202\342\202\305\202\250\202\353\202\251\216\322\202\310\202\361\202\276";
+ "\202\323\202\255\202\353\202\244\202\306\221\274\202\314\222\271\202\275\202\277\210\253\202\242"
+ "\202\323\202\255\202\353\202\244\202\252\222\213\212\324\201A\222\271\202\275\202\277\202\360"
+ "\212l\202\350\202\311\217o\202\251\202\257\222\271\202\275\202\277\202\315\217W\202\334"
+ "\202\301\202\304\211\236\220\355\217X\202\255\202\267\202\254\202\270\224\374\202\265\202\267"
+ "\202\254\202\270\223\313\202\301\202\302\202\253\201A\220\330\202\350\227\364\202\253\201A"
+ "\215\217\202\361\202\305\202\277\202\254\202\351\227Y\214{\202\306\203_\203C\203A"
+ "\203\202\203\223\203h\227Y\214{\202\252\201A\345v\222\216\202\360\222T\202\265"
+ "\202\304\222n\226\312\202\360\214@\202\301\202\304\202\242\202\351\202\306\203_\203C"
+ "\203A\203\202\203\223\203h\202\360\214@\202\350\223\226\202\304\202\275\227Y\214{"
+ "\202\252\214\276\202\244\202\311\202\315\201A\202\261\202\361\202\310\220\316\202\261\202\353"
+ "\202\252\211\275\202\314\226\360\202\311\202\275\202\302\201H\224a\202\314\202\331\202\244"
+ "\202\252\202\334\202\276\202\334\202\265\202\310\202\314\202\311\224L\202\306\203l\203Y"
+ "\203~\224L\202\252\216\200\202\361\202\276\202\323\202\350\202\360\202\265\202\304\203l"
+ "\203Y\203~\202\360\202\275\202\255\202\263\202\361\225\337\202\334\202\246\202\275\202\340"
+ "\202\301\202\306\225\337\202\334\202\246\202\346\202\244\202\306\201A\217\254\224\236\225\262"
+ "\202\311\202\334\202\335\202\352\202\304\211B\202\352\202\304\202\242\202\351\202\306\224N"
+ "\212\361\202\350\203l\203Y\203~\202\252\225@\202\360\202\255\202\361\202\255\202\361"
+ "\224L\202\346\202\350\217\254\224\236\225\262\202\314\202\331\202\244\202\252\202\250\202\242"
+ "\202\265\202\273\202\244\202\276\227\263\202\306\202\342\202\267\202\350\227\263\202\252\202\342"
+ "\202\267\202\350\202\360\202\251\202\266\202\301\202\304\202\242\202\351\202\306\202\342\202\267"
+ "\202\350\202\252\220\324\226\332\202\314\227\263\202\311\220q\202\313\202\275\202\310\202\272"
+ "\214\343\220\346\202\340\215l\202\246\202\270\201A\341\222\341\233\202\360\213N\202\261"
+ "\202\265\202\304\226l\202\360\202\251\202\266\202\351\202\314\201H\214\253\202\242\202\240"
+ "\202\310\202\275\202\314\216\225\202\252\202\310\202\255\202\310\202\301\202\304\202\265\202\334"
+ "\202\244\202\346\202\253\202\302\202\313\202\306\222\337\202\253\202\302\202\313\202\252\222\337"
+ "\202\360\220H\216\226\202\311\217\265\202\242\202\304\225\275\202\327\202\301\202\275\202\242"
+ "\216M\202\311\223\374\202\352\202\304\217o\202\265\202\275\216\251\225\252\202\315\202\346"
+ "\202\276\202\352\202\360\202\275\202\347\202\265\202\310\202\252\202\347\216M\202\360\202\330"
+ "\202\353\202\330\202\353\232{\202\314\222\267\202\242\222\337\202\315\202\275\202\276\202\267"
+ "\202\267\202\351\202\276\202\257\201B\222\337\202\306\202\253\202\302\202\313\202\261\202\361"
+ "\202\307\202\315\222\337\202\252\202\253\202\302\202\313\202\360\217\265\202\242\202\304\215\327"
+ "\222\267\202\242\202\302\202\332\202\311\223\374\202\352\202\304\217o\202\265\202\275\222\337"
+ "\202\315\202\250\225\240\210\352\224t\220H\202\327\202\275\202\350\210\371\202\361\202\276"
+ "\202\350\202\251\202\255\202\265\202\304\225\234\217Q\202\315\220\213\202\260\202\347\202\352"
+ "\202\275\201B\216\223\214{\202\306\203q\203\210\203R\202\275\202\277\202\306\202\361"
+ "\202\321\202\252\227\326\202\360\202\251\202\242\202\304\224\362\202\361\202\305\202\242\202\351"
+ "\202\314\202\360\214\251\202\302\202\257\202\275\216\223\214{\202\240\202\355\202\304\202\304"
+ "\203q\203\210\203R\202\275\202\277\202\360\214{\217\254\211\256\202\326\202\265\202\251"
+ "\202\265\216\251\225\252\202\252\220H\202\327\202\347\202\352\202\304\202\240\202\355\202\352"
+ "\202\310\203q\203\210\203R\202\275\202\277\202\315\212O\202\326\202\340\217o\202\347"
+ "\202\352\202\270\201A\225\302\202\266\202\261\202\337\202\347\202\352\202\275\202\334\202\334"
+ "\230V\202\242\202\304\202\242\202\255\201B\230T\202\306\222\337\230T\202\252\215\234"
+ "\202\360\202\314\202\335\202\261\202\361\202\305\201A\202\314\202\307\202\311\216h\202\263"
+ "\202\301\202\304\222\311\202\255\202\304\202\275\202\334\202\347\202\310\202\242\202\273\202\261"
+ "\202\305\222\337\202\311\201A\202\250\212\350\202\242\202\276\202\251\202\347\202\261\202\314"
+ "\215\234\202\360\202\306\202\301\202\304\202\277\202\345\202\244\202\276\202\242\201A\202\273"
+ "\202\314\202\251\202\355\202\350\215\234\202\360\202\306\202\301\202\304\202\340\202\347\202\301"
+ "\202\304\202\340\214N\202\314\202\261\202\306\202\360\220H\202\327\202\275\202\350\202\265"
+ "\202\310\202\242\202\251\202\347\230T\202\315\201A\202\273\202\244\214\276\202\242\202\310"
+ "\202\252\202\347\202\340\202\323\202\255\202\352\202\301\226\312\221\351\202\306\217\254\222\271"
+ "\202\275\202\277\221\351\202\252\217\254\222\271\202\275\202\277\202\360\220H\216\226\202\311"
+ "\217\265\202\242\202\275\222a\220\266\223\372\202\314\202\250\217j\202\242\202\360\202\267"
+ "\202\351\202\251\202\347\221\201\202\255\227\210\202\304\211\272\202\263\202\242\217\254\222\271"
+ "\202\275\202\277\202\252\217W\202\334\202\301\202\304\217j\202\242\202\314\220\310\202\311"
+ "\202\302\202\255\202\306\221\351\202\315\202\267\202\256\202\263\202\334\217P\202\242\202\251"
+ "\202\251\202\350\201A\202\262\202\277\202\273\202\244\202\311\202\240\202\350\202\302\202\242"
+ "\202\275\202\251\202\246\202\351\202\306\203W\203\205\203s\203^\201[\211\244\227l"
+ "\202\276\202\346\201A\202\306\203W\203\205\203s\203^\201[\202\252\202\255\202\352"
+ "\202\275\212\333\221\276\202\315\221\345\202\265\202\275\225\250\202\266\202\341\202\310\202\251"
+ "\202\301\202\275\202\306\202\251\202\246\202\351\202\275\202\277\202\315\203K\201[\203K"
+ "\201[\225\266\213\345\202\316\202\251\202\350\202\273\202\261\202\305\203W\203\205\203s"
+ "\203^\201[\202\315\203R\203E\203m\203g\203\212\202\360\202\302\202\251\202\355"
+ "\202\265\202\304\202\251\202\246\202\351\202\275\202\277\202\360\202\335\202\361\202\310\220H"
+ "\202\327\202\263\202\271\202\275\230h\202\306\202\244\202\263\202\254\202\306\202\251\202\324"
+ "\202\306\222\216\230h\202\252\202\244\202\263\202\254\202\360\202\302\202\251\202\334\202\246"
+ "\202\275\202\244\202\263\202\254\202\314\227F\222B\202\314\202\251\202\324\202\306\222\216"
+ "\202\252\201A\202\307\202\244\202\251\202\244\202\263\202\254\202\360\217\225\202\257\202\304"
+ "\202\342\202\301\202\304\211\272\202\263\202\242\202\265\202\251\202\265\230h\202\315\202\244"
+ "\202\263\202\254\202\360\220H\202\327\202\304\202\265\202\334\202\242\202\251\202\324\202\306"
+ "\222\216\202\315\230h\202\360\215\246\202\361\202\305\201A\230h\202\314\216Y\202\361"
+ "\202\276\227\221\202\360\221S\225\224\225\262\201X\202\311\215\323\202\242\202\304\202\265"
+ "\202\334\202\301\202\275\203l\203Y\203~\202\306\224L\202\306\217\254\202\263\202\310"
+ "\227Y\214{\216q\203l\203Y\203~\202\252\202\250\225\352\202\263\202\361\202\311"
+ "\201A\202\332\202\255\202\315\227Y\214{\202\315\202\253\202\347\202\242\202\276\202\257"
+ "\202\307\224L\202\315\221\345\215D\202\253\202\267\202\351\202\306\202\250\225\352\202\263"
+ "\202\361\202\315\201A\211\275\202\360\214\276\202\244\202\314\202\250\202\277\202\321\202\277"
+ "\202\341\202\361\201A\224L\202\315\216\204\202\275\202\277\202\360\220H\202\327\202\304"
+ "\202\240\202\361\202\310\202\311\221\276\202\301\202\304\202\251\202\301\202\261\202\346\202\255"
+ "\202\310\202\301\202\275\202\314\202\346\202\305\202\340\227Y\214{\202\252\202\342\202\271"
+ "\202\304\212i\215D\202\252\210\253\202\242\202\314\202\315\201A\216\204\202\275\202\277"
+ "\203l\203Y\203~\202\360\202\302\202\251\202\334\202\246\202\347\202\352\202\310\202\242"
+ "\202\251\202\347\202\310\202\314\202\346\224\222\222\271\202\306\203R\203E\203m\203g"
+ "\203\212\224\222\222\271\202\252\220\205\225\323\202\305\224\374\202\265\202\242\220\272\202\305"
+ "\211\314\202\301\202\304\202\242\202\351\202\306\202\307\202\244\202\265\202\304\211\314\202\301"
+ "\202\304\202\242\202\351\202\314\201H\202\306\222m\202\350\202\275\202\252\202\350\211\256"
+ "\202\314\203R\203E\203m\203g\203\212\202\276\202\301\202\304\216\204\202\315\202\340"
+ "\202\244\202\267\202\256\216\200\202\312\202\361\202\276\202\301\202\304\214\374\202\261\202\244"
+ "\202\251\202\347\202\242\202\242\222m\202\347\202\271\202\252\223\315\202\242\202\275\202\361"
+ "\202\305\202\267\202\340\202\314\202\250\202\250\202\251\202\335\202\306\222\244\221\234\214\216"
+ "\202\314\214\365\202\305\201A\222\244\221\234\202\252\223\256\202\242\202\275\202\346\202\244"
+ "\202\311\214\251\202\246\202\275\202\314\202\305\201A\202\250\202\250\202\251\202\335\202\315"
+ "\225\337\202\334\202\246\202\346\202\244\202\306\220g\215\\\202\246\202\275\202\305\202\340"
+ "\216c\224O\202\310\202\252\202\347\222\244\221\234\202\311\202\315\220\316\202\314\221\314"
+ "\202\360\223\256\202\251\202\267\202\275\202\337\202\314\220S\202\340\202\310\202\242\202\265"
+ "\212\264\217\356\202\340\202\310\202\242\201A\215l\202\246\202\340\217\356\224M\202\340"
+ "\201A\210\244\202\340\202\310\202\242\202\240\202\320\202\351\202\306\203X\203p\203j"
+ "\203G\203\213\214\242\203X\203p\203j\203G\203\213\214\242\202\252\226\260\202\301"
+ "\202\304\202\242\202\351\203A\203q\203\213\202\311\202\251\202\335\202\302\202\261\202\244"
+ "\202\306\202\267\202\351\202\306\203A\203q\203\213\202\315\202\267\202\316\202\342\202\255"
+ "\223\246\202\260\202\304\203K\201[\203K\201[\226\302\202\253\202\310\202\252\202\347"
+ "\214\242\202\360\202\261\202\244\224l\202\301\202\275\216\251\225\252\202\314\216\350\202\311"
+ "\223\315\202\251\202\310\202\242\202\340\202\314\202\360\222\307\202\242\202\251\202\257\202\351"
+ "\202\310\202\361\202\304\201A\214N\202\315\211\275\202\304\202\244\202\312\202\332\202\352"
+ "\202\342\202\305\202\250\202\353\202\251\216\322\202\310\202\361\202\276";
#define VERSAILLES_MESSAGES_COUNT 146
#define VERSAILLES_MESSAGES_COUNT_CJK 151
diff --git a/devtools/create_project/cmake.cpp b/devtools/create_project/cmake.cpp
index dfec5d3614..b91232d0ef 100644
--- a/devtools/create_project/cmake.cpp
+++ b/devtools/create_project/cmake.cpp
@@ -234,7 +234,7 @@ void CMakeProvider::writeSubEngines(const BuildSetup &setup, std::ofstream &work
}
void CMakeProvider::createProjectFile(const std::string &name, const std::string &, const BuildSetup &setup, const std::string &moduleDir,
- const StringList &includeList, const StringList &excludeList) {
+ const StringList &includeList, const StringList &excludeList) {
const std::string projectFile = setup.outputDir + "/CMakeLists.txt";
std::ofstream project(projectFile.c_str(), std::ofstream::out | std::ofstream::app);
@@ -320,7 +320,7 @@ void CMakeProvider::writeDefines(const BuildSetup &setup, std::ofstream &output)
}
void CMakeProvider::writeFileListToProject(const FileNode &dir, std::ofstream &projectFile, const int indentation,
- const std::string &objPrefix, const std::string &filePrefix) {
+ const std::string &objPrefix, const std::string &filePrefix) {
std::string lastName;
for (FileNode::NodeList::const_iterator i = dir.children.begin(); i != dir.children.end(); ++i) {
diff --git a/devtools/create_project/codeblocks.cpp b/devtools/create_project/codeblocks.cpp
index 06f16f5da8..a0d7d20156 100644
--- a/devtools/create_project/codeblocks.cpp
+++ b/devtools/create_project/codeblocks.cpp
@@ -96,7 +96,7 @@ StringList getFeatureLibraries(const BuildSetup &setup) {
}
void CodeBlocksProvider::createProjectFile(const std::string &name, const std::string &, const BuildSetup &setup, const std::string &moduleDir,
- const StringList &includeList, const StringList &excludeList) {
+ const StringList &includeList, const StringList &excludeList) {
const std::string projectFile = setup.outputDir + '/' + name + getProjectExtension();
std::ofstream project(projectFile.c_str());
@@ -242,7 +242,7 @@ void CodeBlocksProvider::writeDefines(const StringList &defines, std::ofstream &
}
void CodeBlocksProvider::writeFileListToProject(const FileNode &dir, std::ofstream &projectFile, const int indentation,
- const std::string &objPrefix, const std::string &filePrefix) {
+ const std::string &objPrefix, const std::string &filePrefix) {
for (FileNode::NodeList::const_iterator i = dir.children.begin(); i != dir.children.end(); ++i) {
const FileNode *node = *i;
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index b30be619c1..da7cbb1ac4 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -1512,7 +1512,7 @@ FileNode *scanFiles(const std::string &dir, const StringList &includeList, const
// Project Provider methods
//////////////////////////////////////////////////////////////////////////
ProjectProvider::ProjectProvider(StringList &global_warnings, std::map<std::string, StringList> &project_warnings, const int version)
- : _version(version), _globalWarnings(global_warnings), _projectWarnings(project_warnings) {
+ : _version(version), _globalWarnings(global_warnings), _projectWarnings(project_warnings) {
}
void ProjectProvider::createProject(BuildSetup &setup) {
@@ -1765,8 +1765,8 @@ std::string ProjectProvider::getLastPathComponent(const std::string &path) {
}
void ProjectProvider::addFilesToProject(const std::string &dir, std::ofstream &projectFile,
- const StringList &includeList, const StringList &excludeList,
- const std::string &filePrefix) {
+ const StringList &includeList, const StringList &excludeList,
+ const std::string &filePrefix) {
FileNode *files = scanFiles(dir, includeList, excludeList);
writeFileListToProject(*files, projectFile, 0, std::string(), filePrefix + '/');
diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp
index f71c2370a8..4abccdf12e 100644
--- a/devtools/create_project/msbuild.cpp
+++ b/devtools/create_project/msbuild.cpp
@@ -33,7 +33,7 @@ namespace CreateProjectTool {
//////////////////////////////////////////////////////////////////////////
MSBuildProvider::MSBuildProvider(StringList &global_warnings, std::map<std::string, StringList> &project_warnings, const int version, const MSVCVersion &msvc)
- : MSVCProvider(global_warnings, project_warnings, version, msvc) {
+ : MSVCProvider(global_warnings, project_warnings, version, msvc) {
_archs.push_back(ARCH_X86);
_archs.push_back(ARCH_AMD64);
@@ -74,7 +74,7 @@ inline void outputProperties(std::ostream &project, const std::string &config, c
} // End of anonymous namespace
void MSBuildProvider::createProjectFile(const std::string &name, const std::string &uuid, const BuildSetup &setup, const std::string &moduleDir,
- const StringList &includeList, const StringList &excludeList) {
+ const StringList &includeList, const StringList &excludeList) {
const std::string projectFile = setup.outputDir + '/' + name + getProjectExtension();
std::ofstream project(projectFile.c_str());
if (!project || !project.is_open()) {
@@ -493,7 +493,7 @@ void MSBuildProvider::outputNasmCommand(std::ostream &projectFile, const std::st
}
void MSBuildProvider::writeFileListToProject(const FileNode &dir, std::ofstream &projectFile, const int,
- const std::string &objPrefix, const std::string &filePrefix) {
+ const std::string &objPrefix, const std::string &filePrefix) {
// Reset lists
_filters.clear();
_compileFiles.clear();
diff --git a/devtools/create_project/msvc.cpp b/devtools/create_project/msvc.cpp
index 410185a76f..9ed3984ad6 100644
--- a/devtools/create_project/msvc.cpp
+++ b/devtools/create_project/msvc.cpp
@@ -33,7 +33,7 @@ namespace CreateProjectTool {
// MSVC Provider (Base class)
//////////////////////////////////////////////////////////////////////////
MSVCProvider::MSVCProvider(StringList &global_warnings, std::map<std::string, StringList> &project_warnings, const int version, const MSVCVersion &msvc)
- : ProjectProvider(global_warnings, project_warnings, version), _msvcVersion(msvc) {
+ : ProjectProvider(global_warnings, project_warnings, version), _msvcVersion(msvc) {
_enableLanguageExtensions = tokenize(ENABLE_LANGUAGE_EXTENSIONS, ',');
_disableEditAndContinue = tokenize(DISABLE_EDIT_AND_CONTINUE, ',');
diff --git a/devtools/create_project/visualstudio.cpp b/devtools/create_project/visualstudio.cpp
index fa67b025ab..f8196d65e4 100644
--- a/devtools/create_project/visualstudio.cpp
+++ b/devtools/create_project/visualstudio.cpp
@@ -33,7 +33,7 @@ namespace CreateProjectTool {
//////////////////////////////////////////////////////////////////////////
VisualStudioProvider::VisualStudioProvider(StringList &global_warnings, std::map<std::string, StringList> &project_warnings, const int version, const MSVCVersion &msvc)
- : MSVCProvider(global_warnings, project_warnings, version, msvc) {
+ : MSVCProvider(global_warnings, project_warnings, version, msvc) {
_archs.push_back(ARCH_X86);
_archs.push_back(ARCH_AMD64);
@@ -48,7 +48,7 @@ const char *VisualStudioProvider::getPropertiesExtension() {
}
void VisualStudioProvider::createProjectFile(const std::string &name, const std::string &uuid, const BuildSetup &setup, const std::string &moduleDir,
- const StringList &includeList, const StringList &excludeList) {
+ const StringList &includeList, const StringList &excludeList) {
const std::string projectFile = setup.outputDir + '/' + name + getProjectExtension();
std::ofstream project(projectFile.c_str());
if (!project || !project.is_open()) {
@@ -314,7 +314,7 @@ void VisualStudioProvider::createBuildProp(const BuildSetup &setup, bool isRelea
}
void VisualStudioProvider::writeFileListToProject(const FileNode &dir, std::ofstream &projectFile, const int indentation,
- const std::string &objPrefix, const std::string &filePrefix) {
+ const std::string &objPrefix, const std::string &filePrefix) {
const std::string indentString = getIndent(indentation + 2);
if (indentation)
@@ -354,7 +354,7 @@ void VisualStudioProvider::writeFileListToProject(const FileNode &dir, std::ofst
}
void VisualStudioProvider::writeFileToProject(std::ofstream &projectFile, const std::string &filePath, MSVC_Architecture arch,
- const std::string &indentString, const std::string &toolLine) {
+ const std::string &indentString, const std::string &toolLine) {
projectFile << indentString << "<File RelativePath=\"" << filePath << "\">\n"
<< indentString << "\t<FileConfiguration Name=\"Debug|" << getMSVCConfigName(arch) << "\">\n"
<< toolLine
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index 7ef429f31d..e455499150 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -318,7 +318,7 @@ void XcodeProvider::createOtherBuildFiles(const BuildSetup &setup) {
// Store information about a project here, for use at the end
void XcodeProvider::createProjectFile(const std::string &, const std::string &, const BuildSetup &setup, const std::string &moduleDir,
- const StringList &includeList, const StringList &excludeList) {
+ const StringList &includeList, const StringList &excludeList) {
std::string modulePath;
if (!moduleDir.compare(0, setup.srcDir.size(), setup.srcDir)) {
modulePath = moduleDir.substr(setup.srcDir.size());
@@ -377,7 +377,7 @@ void XcodeProvider::outputMainProjectFile(const BuildSetup &setup) {
// Files
//////////////////////////////////////////////////////////////////////////
void XcodeProvider::writeFileListToProject(const FileNode &dir, std::ofstream &projectFile, const int indentation,
- const std::string &objPrefix, const std::string &filePrefix) {
+ const std::string &objPrefix, const std::string &filePrefix) {
// Ensure that top-level groups are generated for i.e. engines/
Group *group = touchGroupsForPath(filePrefix);
diff --git a/devtools/create_titanic/zlib.cpp b/devtools/create_titanic/zlib.cpp
index 8c0ffabfd4..f24b2bb9b7 100644
--- a/devtools/create_titanic/zlib.cpp
+++ b/devtools/create_titanic/zlib.cpp
@@ -31,9 +31,9 @@
#if defined(USE_ZLIB)
#ifdef __SYMBIAN32__
- #include <zlib\zlib.h>
+ #include <zlib\zlib.h>
#else
- #include <zlib.h>
+ #include <zlib.h>
#endif
#if ZLIB_VERNUM < 0x1204
diff --git a/devtools/sci/scidisasm.cpp b/devtools/sci/scidisasm.cpp
index 6c7049e639..24c6283c41 100644
--- a/devtools/sci/scidisasm.cpp
+++ b/devtools/sci/scidisasm.cpp
@@ -405,7 +405,7 @@ get_class_name(disasm_state_t *d, int class_no) {
static void
script_dump_object(disasm_state_t *d, script_state_t *s,
- unsigned char *data, int seeker, int objsize, int pass_no) {
+ unsigned char *data, int seeker, int objsize, int pass_no) {
int selectors, overloads, selectorsize;
int species = getInt16(data + 8 + seeker);
int superclass = getInt16(data + 10 + seeker);
@@ -479,7 +479,7 @@ script_dump_object(disasm_state_t *d, script_state_t *s,
static void
script_dump_class(disasm_state_t *d, script_state_t *s,
- unsigned char *data, int seeker, int objsize, int pass_no) {
+ unsigned char *data, int seeker, int objsize, int pass_no) {
word selectors, overloads, selectorsize;
int species = getInt16(data + 8 + seeker);
int superclass = getInt16(data + 10 + seeker);
@@ -606,7 +606,7 @@ script_dump_said_string(disasm_state_t *d, unsigned char *data, int seeker) {
static void
script_dump_said(disasm_state_t *d, script_state_t *s,
- unsigned char *data, int seeker, int objsize, int pass_no) {
+ unsigned char *data, int seeker, int objsize, int pass_no) {
int _seeker = seeker + objsize - 4;
if (pass_no == 1) {
@@ -625,7 +625,7 @@ script_dump_said(disasm_state_t *d, script_state_t *s,
static void
script_dump_synonyms(disasm_state_t *d, script_state_t *s,
- unsigned char *data, int seeker, int objsize, int pass_no) {
+ unsigned char *data, int seeker, int objsize, int pass_no) {
int _seeker = seeker + objsize - 4;
sciprintf("Synonyms:\n");
@@ -642,7 +642,7 @@ script_dump_synonyms(disasm_state_t *d, script_state_t *s,
static void
script_dump_strings(disasm_state_t *d, script_state_t *s,
- unsigned char *data, int seeker, int objsize, int pass_no) {
+ unsigned char *data, int seeker, int objsize, int pass_no) {
int endptr = seeker + objsize - 4;
if (pass_no == 1) {
@@ -659,7 +659,7 @@ script_dump_strings(disasm_state_t *d, script_state_t *s,
static void
script_dump_exports(disasm_state_t *d, script_state_t *s,
- unsigned char *data, int seeker, int objsize, int pass_no) {
+ unsigned char *data, int seeker, int objsize, int pass_no) {
byte *pexport = (byte *)(data + seeker);
word export_count = getUInt16(pexport);
int i;
@@ -684,7 +684,7 @@ script_dump_exports(disasm_state_t *d, script_state_t *s,
static void
script_disassemble_code(disasm_state_t *d, script_state_t *s,
- unsigned char *data, int seeker, int objsize, int pass_no) {
+ unsigned char *data, int seeker, int objsize, int pass_no) {
int endptr = seeker + objsize - 4;
int i = 0;
int cur_class = -1;
@@ -882,7 +882,7 @@ script_disassemble_code(disasm_state_t *d, script_state_t *s,
void
disassemble_script_pass(disasm_state_t *d, script_state_t *s,
- resource_t *script, int pass_no) {
+ resource_t *script, int pass_no) {
int _seeker = 0;
word id = getInt16(script->data);
diff --git a/devtools/skycpt/cptcompiler.cpp b/devtools/skycpt/cptcompiler.cpp
index eb2c287a1d..9a444d697b 100644
--- a/devtools/skycpt/cptcompiler.cpp
+++ b/devtools/skycpt/cptcompiler.cpp
@@ -75,7 +75,7 @@ void processMainLists(FILE *inf, CptObj *destArr, uint16 *idList) {
uint16 destId = (uint16)strtoul(line + 2, &stopCh, 16);
assert(stopCh == (line + 6));
assert((stopCh[0] == ':') && (stopCh[1] == ':'));
- resBuf[resPos] = destId;
+ resBuf[resPos] = destId;
resPos++;
} else
break;
@@ -169,7 +169,7 @@ void processTurntabs(FILE *inf, CptObj *destArr) {
uint16 destId = (uint16)strtoul(line + 2, &stopCh, 16);
assert(stopCh == (line + 6));
assert((stopCh[0] == '-') && (stopCh[1] == '>'));
- resBuf[resPos] = destId;
+ resBuf[resPos] = destId;
resPos++;
} else
break;
@@ -211,7 +211,7 @@ void processBins(FILE *inf, CptObj *destArr, const char *typeName, const char *o
uint16 destId = (uint16)strtoul(line + 2, &stopCh, 16);
assert(stopCh == (line + 6));
assert(*stopCh == '\0');
- resBuf[resPos] = destId;
+ resBuf[resPos] = destId;
resPos++;
} else
break;
@@ -425,7 +425,7 @@ void doCompile(FILE *inf, FILE *debOutf, FILE *resOutf, TextFile *cptDef, FILE *
assert(id);
diff[diffDest++] = id;
diff[diffDest++] = 0;
- pos++;
+ pos++;
uint16 len = (uint16)strtoul(pos, &pos, 10);
diff[diffDest++] = len;
assert(len);
diff --git a/engines/access/metaengine.cpp b/engines/access/metaengine.cpp
index 3bfe4bdb17..12e514c00e 100644
--- a/engines/access/metaengine.cpp
+++ b/engines/access/metaengine.cpp
@@ -74,7 +74,7 @@ public:
return "access";
}
- bool hasFeature(MetaEngineFeature f) const override;
+ bool hasFeature(MetaEngineFeature f) const override;
Common::Error createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
diff --git a/engines/adl/metaengine.cpp b/engines/adl/metaengine.cpp
index 72409a86a1..e6f56b279a 100644
--- a/engines/adl/metaengine.cpp
+++ b/engines/adl/metaengine.cpp
@@ -69,11 +69,11 @@ Common::Platform getPlatform(const AdlGameDescription &adlDesc) {
class AdlMetaEngine : public AdvancedMetaEngine {
public:
- const char *getName() const override {
+ const char *getName() const override {
return "adl";
}
- bool hasFeature(MetaEngineFeature f) const override;
+ bool hasFeature(MetaEngineFeature f) const override;
SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
int getMaximumSaveSlot() const override { return 'O' - 'A'; }
SaveStateList listSaves(const char *target) const override;
diff --git a/engines/agi/loader_v3.cpp b/engines/agi/loader_v3.cpp
index abfe65010e..7eddb82fea 100644
--- a/engines/agi/loader_v3.cpp
+++ b/engines/agi/loader_v3.cpp
@@ -67,7 +67,7 @@ int AgiLoader_v3::detectGame() {
}
int AgiLoader_v3::loadDir(struct AgiDir *agid, Common::File *fp,
- uint32 offs, uint32 len) {
+ uint32 offs, uint32 len) {
int ec = errOK;
uint8 *mem;
unsigned int i;
diff --git a/engines/agi/saveload.cpp b/engines/agi/saveload.cpp
index cca2c8b0e6..b1ecf190e4 100644
--- a/engines/agi/saveload.cpp
+++ b/engines/agi/saveload.cpp
@@ -1018,7 +1018,7 @@ bool AgiEngine::saveGameDialog() {
void AgiEngine::recordImageStackCall(uint8 type, int16 p1, int16 p2, int16 p3,
- int16 p4, int16 p5, int16 p6, int16 p7) {
+ int16 p4, int16 p5, int16 p6, int16 p7) {
ImageStackElement pnew;
pnew.type = type;
@@ -1035,7 +1035,7 @@ void AgiEngine::recordImageStackCall(uint8 type, int16 p1, int16 p2, int16 p3,
}
void AgiEngine::replayImageStackCall(uint8 type, int16 p1, int16 p2, int16 p3,
- int16 p4, int16 p5, int16 p6, int16 p7) {
+ int16 p4, int16 p5, int16 p6, int16 p7) {
switch (type) {
case ADD_PIC:
debugC(8, kDebugLevelMain, "--- decoding picture %d ---", p1);
diff --git a/engines/agi/sound_2gs.cpp b/engines/agi/sound_2gs.cpp
index 0f6738ef97..63d50ed52c 100644
--- a/engines/agi/sound_2gs.cpp
+++ b/engines/agi/sound_2gs.cpp
@@ -667,7 +667,7 @@ static const IIgsMidiProgramMapping progToInstMappingV1 = {
};
/** Newer Apple IIGS AGI MIDI program change to instrument number mapping.
- FIXME: Some instrument choices sound wrong. */
+ FIXME: Some instrument choices sound wrong. */
static const IIgsMidiProgramMapping progToInstMappingV2 = {
{
21, 22, 24, 25, 23, 26, 6, 6, 6, 6,
diff --git a/engines/agi/wagparser.cpp b/engines/agi/wagparser.cpp
index 03a93aefa0..59837c9e9e 100644
--- a/engines/agi/wagparser.cpp
+++ b/engines/agi/wagparser.cpp
@@ -243,7 +243,7 @@ bool WagFileParser::endOfProperties(const Common::SeekableReadStream &stream) co
void WagProperty::setPropCode(WagPropertyCode propCode) {
- _propCode = propCode;
+ _propCode = propCode;
}
void WagProperty::setPropDataSize(Common::String str) {
diff --git a/engines/agi/wagparser.h b/engines/agi/wagparser.h
index 36b3880f94..8fa547ea5c 100644
--- a/engines/agi/wagparser.h
+++ b/engines/agi/wagparser.h
@@ -180,17 +180,17 @@ public:
*/
const char *getData() const { return _propData; }
- /**
- * Set property's code
- * @param propCode the code value to set
- */
- void setPropCode(WagPropertyCode propCode);
-
- /**
- * Set property's data and property's size
- * @param str the string that according to it these are set
- */
- void setPropDataSize(Common::String str);
+ /**
+ * Set property's code
+ * @param propCode the code value to set
+ */
+ void setPropCode(WagPropertyCode propCode);
+
+ /**
+ * Set property's data and property's size
+ * @param str the string that according to it these are set
+ */
+ void setPropDataSize(Common::String str);
// Member variables
protected:
diff --git a/engines/agos/drivers/simon1/adlib.cpp b/engines/agos/drivers/simon1/adlib.cpp
index 7f1370e8bd..c73f7048b3 100644
--- a/engines/agos/drivers/simon1/adlib.cpp
+++ b/engines/agos/drivers/simon1/adlib.cpp
@@ -36,13 +36,13 @@ enum {
};
MidiDriver_Simon1_AdLib::Voice::Voice()
- : channel(kChannelUnused), note(0), instrTotalLevel(0), instrScalingLevel(0), frequency(0) {
+ : channel(kChannelUnused), note(0), instrTotalLevel(0), instrScalingLevel(0), frequency(0) {
}
MidiDriver_Simon1_AdLib::MidiDriver_Simon1_AdLib(const byte *instrumentData)
- : _isOpen(false), _opl(nullptr), _timerProc(nullptr), _timerParam(nullptr),
- _melodyVoices(0), _amvdrBits(0), _rhythmEnabled(false), _voices(), _midiPrograms(),
- _instruments(instrumentData) {
+ : _isOpen(false), _opl(nullptr), _timerProc(nullptr), _timerParam(nullptr),
+ _melodyVoices(0), _amvdrBits(0), _rhythmEnabled(false), _voices(), _midiPrograms(),
+ _instruments(instrumentData) {
}
MidiDriver_Simon1_AdLib::~MidiDriver_Simon1_AdLib() {
diff --git a/engines/agos/metaengine.cpp b/engines/agos/metaengine.cpp
index 2d2fd3098a..c33a6b994b 100644
--- a/engines/agos/metaengine.cpp
+++ b/engines/agos/metaengine.cpp
@@ -36,11 +36,11 @@
class AgosMetaEngine : public AdvancedMetaEngine {
public:
- const char *getName() const override {
+ const char *getName() const override {
return "agos";
}
- bool hasFeature(MetaEngineFeature f) const override;
+ bool hasFeature(MetaEngineFeature f) const override;
Common::Error createInstance(OSystem *syst, Engine **engine) const override {
Engines::upgradeTargetIfNecessary(obsoleteGameIDsTable);
diff --git a/engines/ags/engine/ac/dialog.cpp b/engines/ags/engine/ac/dialog.cpp
index 7dc2367c1e..c4cd66b896 100644
--- a/engines/ags/engine/ac/dialog.cpp
+++ b/engines/ags/engine/ac/dialog.cpp
@@ -305,8 +305,8 @@ int run_dialog_script(DialogTopic *dtpp, int dialogID, int offse, int optionInde
}
int write_dialog_options(Bitmap *ds, bool ds_has_alpha, int dlgxp, int curyp, int numdisp, int mouseison, int areawid,
- int bullet_wid, int usingfont, DialogTopic *dtop, char *disporder, short *dispyp,
- int linespacing, int utextcol, int padding) {
+ int bullet_wid, int usingfont, DialogTopic *dtop, char *disporder, short *dispyp,
+ int linespacing, int utextcol, int padding) {
int ww;
color_t text_color;
diff --git a/engines/ags/engine/ac/draw.cpp b/engines/ags/engine/ac/draw.cpp
index ab14d93364..057479f81c 100644
--- a/engines/ags/engine/ac/draw.cpp
+++ b/engines/ags/engine/ac/draw.cpp
@@ -661,7 +661,7 @@ void putpixel_compensate(Bitmap *ds, int xx, int yy, int col) {
void draw_sprite_support_alpha(Bitmap *ds, bool ds_has_alpha, int xpos, int ypos, Bitmap *image, bool src_has_alpha,
- BlendMode blend_mode, int alpha) {
+ BlendMode blend_mode, int alpha) {
if (alpha <= 0)
return;
@@ -678,7 +678,7 @@ void draw_sprite_support_alpha(Bitmap *ds, bool ds_has_alpha, int xpos, int ypos
}
void draw_sprite_slot_support_alpha(Bitmap *ds, bool ds_has_alpha, int xpos, int ypos, int src_slot,
- BlendMode blend_mode, int alpha) {
+ BlendMode blend_mode, int alpha) {
draw_sprite_support_alpha(ds, ds_has_alpha, xpos, ypos, _GP(spriteset)[src_slot], (_GP(game).SpriteInfos[src_slot].Flags & SPF_ALPHACHANNEL) != 0,
blend_mode, alpha);
}
@@ -988,9 +988,9 @@ Bitmap *recycle_bitmap(Bitmap *bimp, int coldep, int wid, int hit, bool make_tra
// tint_amnt will be set to 0 if there is no tint enabled
// if this is the case, then light_lev holds the light level (0=none)
void get_local_tint(int xpp, int ypp, int nolight,
- int *tint_amnt, int *tint_r, int *tint_g,
- int *tint_b, int *tint_lit,
- int *light_lev) {
+ int *tint_amnt, int *tint_r, int *tint_g,
+ int *tint_b, int *tint_lit,
+ int *light_lev) {
int tint_level = 0, light_level = 0;
int tint_amount = 0;
@@ -1072,9 +1072,9 @@ void get_local_tint(int xpp, int ypp, int nolight,
// Applies the specified RGB Tint or Light Level to the _G(actsps)
// sprite indexed with actspsindex
void apply_tint_or_light(int actspsindex, int light_level,
- int tint_amount, int tint_red, int tint_green,
- int tint_blue, int tint_light, int coldept,
- Bitmap *blitFrom) {
+ int tint_amount, int tint_red, int tint_green,
+ int tint_blue, int tint_light, int coldept,
+ Bitmap *blitFrom) {
// In a 256-colour game, we cannot do tinting or lightening
// (but we can do darkening, if light_level < 0)
@@ -1140,8 +1140,8 @@ void apply_tint_or_light(int actspsindex, int light_level,
// Returns 1 if something was drawn to _G(actsps); returns 0 if no
// scaling or stretching was required, in which case nothing was done
int scale_and_flip_sprite(int useindx, int coldept, int zoom_level,
- int sppic, int newwidth, int newheight,
- int isMirrored) {
+ int sppic, int newwidth, int newheight,
+ int isMirrored) {
int actsps_used = 1;
diff --git a/engines/ags/engine/game/savegame_components.cpp b/engines/ags/engine/game/savegame_components.cpp
index f87b032243..374cfa7445 100644
--- a/engines/ags/engine/game/savegame_components.cpp
+++ b/engines/ags/engine/game/savegame_components.cpp
@@ -139,7 +139,7 @@ inline bool AssertGameContent(HSaveError &err, int new_val, int original_val, co
}
inline bool AssertGameObjectContent(HSaveError &err, int new_val, int original_val, const char *content_name,
- const char *obj_type, int obj_id) {
+ const char *obj_type, int obj_id) {
if (new_val != original_val) {
err = new SavegameError(kSvgErr_GameContentAssertion,
String::FromFormat("Mismatching number of %s, %s #%d (game: %d, save: %d).",
@@ -150,7 +150,7 @@ inline bool AssertGameObjectContent(HSaveError &err, int new_val, int original_v
}
inline bool AssertGameObjectContent2(HSaveError &err, int new_val, int original_val, const char *content_name,
- const char *obj1_type, int obj1_id, const char *obj2_type, int obj2_id) {
+ const char *obj1_type, int obj1_id, const char *obj2_type, int obj2_id) {
if (new_val != original_val) {
err = new SavegameError(kSvgErr_GameContentAssertion,
String::FromFormat("Mismatching number of %s, %s #%d, %s #%d (game: %d, save: %d).",
diff --git a/engines/ags/engine/script/cc_instance.cpp b/engines/ags/engine/script/cc_instance.cpp
index 56ccd58646..62be478e6a 100644
--- a/engines/ags/engine/script/cc_instance.cpp
+++ b/engines/ags/engine/script/cc_instance.cpp
@@ -1635,82 +1635,82 @@ bool ccInstance::CreateRuntimeCodeFixups(PScript scri) {
/*
bool ccInstance::ReadOperation(ScriptOperation &op, int32_t at_pc)
{
- op.Instruction.Code = code[at_pc];
- op.Instruction.InstanceId = (op.Instruction.Code >> INSTANCE_ID_SHIFT) & INSTANCE_ID_MASK;
- op.Instruction.Code &= INSTANCE_ID_REMOVEMASK; // now this is pure instruction code
-
- int want_args = sccmd_info[op.Instruction.Code].ArgCount;
- if (at_pc + want_args >= codesize)
- {
- cc_error("unexpected end of code data at %d", at_pc + want_args);
- return false;
- }
- op.ArgCount = want_args;
-
- at_pc++;
- for (int i = 0; i < op.ArgCount; ++i, ++at_pc)
- {
- char fixup = code_fixups[at_pc];
- if (fixup > 0)
- {
- // could be relative pointer or import address
- if (!FixupArgument(code[at_pc], fixup, op.Args[i]))
- {
- return false;
- }
- }
- else
- {
- // should be a numeric literal (int32 or float)
- op.Args[i].SetInt32( (int32_t)code[at_pc] );
- }
- }
-
- return true;
+ op.Instruction.Code = code[at_pc];
+ op.Instruction.InstanceId = (op.Instruction.Code >> INSTANCE_ID_SHIFT) & INSTANCE_ID_MASK;
+ op.Instruction.Code &= INSTANCE_ID_REMOVEMASK; // now this is pure instruction code
+
+ int want_args = sccmd_info[op.Instruction.Code].ArgCount;
+ if (at_pc + want_args >= codesize)
+ {
+ cc_error("unexpected end of code data at %d", at_pc + want_args);
+ return false;
+ }
+ op.ArgCount = want_args;
+
+ at_pc++;
+ for (int i = 0; i < op.ArgCount; ++i, ++at_pc)
+ {
+ char fixup = code_fixups[at_pc];
+ if (fixup > 0)
+ {
+ // could be relative pointer or import address
+ if (!FixupArgument(code[at_pc], fixup, op.Args[i]))
+ {
+ return false;
+ }
+ }
+ else
+ {
+ // should be a numeric literal (int32 or float)
+ op.Args[i].SetInt32( (int32_t)code[at_pc] );
+ }
+ }
+
+ return true;
}
*/
/*
bool ccInstance::FixupArgument(intptr_t code_value, char fixup_type, RuntimeScriptValue &argument)
{
- switch (fixup_type)
- {
- case FIXUP_GLOBALDATA:
- {
- ScriptVariable *gl_var = (ScriptVariable*)code_value;
- argument.SetGlobalVar(&gl_var->RValue);
- }
- break;
- case FIXUP_FUNCTION:
- // originally commented -- CHECKME: could this be used in very old versions of AGS?
- // code[fixup] += (long)&code[0];
- // This is a program counter value, presumably will be used as SCMD_CALL argument
- argument.SetInt32((int32_t)code_value);
- break;
- case FIXUP_STRING:
- argument.SetStringLiteral(&strings[0] + code_value);
- break;
- case FIXUP_IMPORT:
- {
- const ScriptImport *import = _GP(simp).getByIndex((int32_t)code_value);
- if (import)
- {
- argument = import->Value;
- }
- else
- {
- cc_error("cannot resolve import, key = %ld", code_value);
- return false;
- }
- }
- break;
- case FIXUP_STACK:
- argument = GetStackPtrOffsetFw((int32_t)code_value);
- break;
- default:
- cc_error("internal fixup type error: %d", fixup_type);
- return false;;
- }
- return true;
+ switch (fixup_type)
+ {
+ case FIXUP_GLOBALDATA:
+ {
+ ScriptVariable *gl_var = (ScriptVariable*)code_value;
+ argument.SetGlobalVar(&gl_var->RValue);
+ }
+ break;
+ case FIXUP_FUNCTION:
+ // originally commented -- CHECKME: could this be used in very old versions of AGS?
+ // code[fixup] += (long)&code[0];
+ // This is a program counter value, presumably will be used as SCMD_CALL argument
+ argument.SetInt32((int32_t)code_value);
+ break;
+ case FIXUP_STRING:
+ argument.SetStringLiteral(&strings[0] + code_value);
+ break;
+ case FIXUP_IMPORT:
+ {
+ const ScriptImport *import = _GP(simp).getByIndex((int32_t)code_value);
+ if (import)
+ {
+ argument = import->Value;
+ }
+ else
+ {
+ cc_error("cannot resolve import, key = %ld", code_value);
+ return false;
+ }
+ }
+ break;
+ case FIXUP_STACK:
+ argument = GetStackPtrOffsetFw((int32_t)code_value);
+ break;
+ default:
+ cc_error("internal fixup type error: %d", fixup_type);
+ return false;;
+ }
+ return true;
}
*/
//-----------------------------------------------------------------------------
diff --git a/engines/ags/lib/aastr-0.1.1/aautil.cpp b/engines/ags/lib/aastr-0.1.1/aautil.cpp
index 75cf50a36d..edd5dabd26 100644
--- a/engines/ags/lib/aastr-0.1.1/aautil.cpp
+++ b/engines/ags/lib/aastr-0.1.1/aautil.cpp
@@ -1553,7 +1553,7 @@ void _aa_masked_put_rgb16(byte *addr, int _x) {
#ifdef ALLEGRO_COLOR24
void _aa_masked_put_rgb24 (byte *addr, int _x) {
if (!_aa.transparent)
- bmp_write24 (addr + 3 * _x, makecol24 (_aa.r, _aa.g, _aa.b));
+ bmp_write24 (addr + 3 * _x, makecol24 (_aa.r, _aa.g, _aa.b));
}
#endif
diff --git a/engines/ags/lib/aastr-0.1.1/aautil.h b/engines/ags/lib/aastr-0.1.1/aautil.h
index 7dce41fe14..8c74adfddb 100644
--- a/engines/ags/lib/aastr-0.1.1/aautil.h
+++ b/engines/ags/lib/aastr-0.1.1/aautil.h
@@ -70,15 +70,15 @@ namespace AGS3 {
int yw = (_yw); \
\
if ((xw == 0) || ((yw < xw) && (yw > -xw))) { \
- (inc) = 0; \
+ (inc) = 0; \
} \
else { \
- (inc) = yw / xw; \
- yw %= xw; \
+ (inc) = yw / xw; \
+ yw %= xw; \
} \
if (yw < 0) { \
- (inc) -= 1; \
- yw += xw; \
+ (inc) -= 1; \
+ yw += xw; \
} \
(i2) = ((dd) = ((i1) = 2 * yw) - xw) - xw; \
}
@@ -87,9 +87,9 @@ namespace AGS3 {
#define aa_ADVANCE(y,inc,dd,i1,i2) \
{ \
if ((dd) >= 0) \
- (y) += (inc) + 1, (dd) += (i2); \
+ (y) += (inc) + 1, (dd) += (i2); \
else \
- (y) += (inc), (dd) += (i1); \
+ (y) += (inc), (dd) += (i1); \
}
diff --git a/engines/ags/lib/allegro/base.h b/engines/ags/lib/allegro/base.h
index e85f4f7bfe..9fa3bab87e 100644
--- a/engines/ags/lib/allegro/base.h
+++ b/engines/ags/lib/allegro/base.h
@@ -39,8 +39,8 @@ namespace AGS3 {
/* Returns the median of x, y, z */
#define MID(x,y,z) ((x) > (y) ? ((y) > (z) ? (y) : ((x) > (z) ? \
- (z) : (x))) : ((y) > (z) ? ((z) > (x) ? (z) : \
- (x)): (y)))
+ (z) : (x))) : ((y) > (z) ? ((z) > (x) ? (z) : \
+ (x)): (y)))
#define AL_ID MKTAG
diff --git a/engines/ags/lib/allegro/color.cpp b/engines/ags/lib/allegro/color.cpp
index c674f8ac2b..9c09588239 100644
--- a/engines/ags/lib/allegro/color.cpp
+++ b/engines/ags/lib/allegro/color.cpp
@@ -663,11 +663,11 @@ void create_rgb_table(RGB_MAP *table, AL_CONST PALETTE pal, void (*callback)(int
/* checking of position */
#define dopos(rp, gp, bp, ts) \
- if ((rp > -1 || r > 0) && (rp < 1 || r < 61) && \
+ if ((rp > -1 || r > 0) && (rp < 1 || r < 61) && \
(gp > -1 || g > 0) && (gp < 1 || g < 61) && \
(bp > -1 || b > 0) && (bp < 1 || b < 61)) { \
i = first + rp * 32 * 32 + gp * 32 + bp; \
- if (!data[i]) { \
+ if (!data[i]) { \
data[i] = val; \
add1(i); \
} \
@@ -680,7 +680,7 @@ void create_rgb_table(RGB_MAP *table, AL_CONST PALETTE pal, void (*callback)(int
add1(i); \
} \
} \
- }
+ }
int i, curr, r, g, b, val, dist2;
unsigned int r2, g2, b2;
diff --git a/engines/ags/lib/allegro/gfx.h b/engines/ags/lib/allegro/gfx.h
index 14b8e18351..d2907f8e6d 100644
--- a/engines/ags/lib/allegro/gfx.h
+++ b/engines/ags/lib/allegro/gfx.h
@@ -117,62 +117,62 @@ namespace AGS3 {
#define COLORCONV_KEEP_TRANS 0x4000000
#define COLORCONV_DITHER (COLORCONV_DITHER_PAL | \
- COLORCONV_DITHER_HI)
+ COLORCONV_DITHER_HI)
#define COLORCONV_EXPAND_256 (COLORCONV_8_TO_15 | \
- COLORCONV_8_TO_16 | \
- COLORCONV_8_TO_24 | \
- COLORCONV_8_TO_32)
+ COLORCONV_8_TO_16 | \
+ COLORCONV_8_TO_24 | \
+ COLORCONV_8_TO_32)
#define COLORCONV_REDUCE_TO_256 (COLORCONV_15_TO_8 | \
- COLORCONV_16_TO_8 | \
- COLORCONV_24_TO_8 | \
- COLORCONV_32_TO_8 | \
- COLORCONV_32A_TO_8)
+ COLORCONV_16_TO_8 | \
+ COLORCONV_24_TO_8 | \
+ COLORCONV_32_TO_8 | \
+ COLORCONV_32A_TO_8)
#define COLORCONV_EXPAND_15_TO_16 COLORCONV_15_TO_16
#define COLORCONV_REDUCE_16_TO_15 COLORCONV_16_TO_15
#define COLORCONV_EXPAND_HI_TO_TRUE (COLORCONV_15_TO_24 | \
- COLORCONV_15_TO_32 | \
- COLORCONV_16_TO_24 | \
- COLORCONV_16_TO_32)
+ COLORCONV_15_TO_32 | \
+ COLORCONV_16_TO_24 | \
+ COLORCONV_16_TO_32)
#define COLORCONV_REDUCE_TRUE_TO_HI (COLORCONV_24_TO_15 | \
- COLORCONV_24_TO_16 | \
- COLORCONV_32_TO_15 | \
- COLORCONV_32_TO_16)
+ COLORCONV_24_TO_16 | \
+ COLORCONV_32_TO_15 | \
+ COLORCONV_32_TO_16)
#define COLORCONV_24_EQUALS_32 (COLORCONV_24_TO_32 | \
- COLORCONV_32_TO_24)
+ COLORCONV_32_TO_24)
#define COLORCONV_TOTAL (COLORCONV_EXPAND_256 | \
- COLORCONV_REDUCE_TO_256 | \
- COLORCONV_EXPAND_15_TO_16 | \
- COLORCONV_REDUCE_16_TO_15 | \
- COLORCONV_EXPAND_HI_TO_TRUE | \
- COLORCONV_REDUCE_TRUE_TO_HI | \
- COLORCONV_24_EQUALS_32 | \
- COLORCONV_32A_TO_15 | \
- COLORCONV_32A_TO_16 | \
- COLORCONV_32A_TO_24)
+ COLORCONV_REDUCE_TO_256 | \
+ COLORCONV_EXPAND_15_TO_16 | \
+ COLORCONV_REDUCE_16_TO_15 | \
+ COLORCONV_EXPAND_HI_TO_TRUE | \
+ COLORCONV_REDUCE_TRUE_TO_HI | \
+ COLORCONV_24_EQUALS_32 | \
+ COLORCONV_32A_TO_15 | \
+ COLORCONV_32A_TO_16 | \
+ COLORCONV_32A_TO_24)
#define COLORCONV_PARTIAL (COLORCONV_EXPAND_15_TO_16 | \
- COLORCONV_REDUCE_16_TO_15 | \
- COLORCONV_24_EQUALS_32)
+ COLORCONV_REDUCE_16_TO_15 | \
+ COLORCONV_24_EQUALS_32)
#define COLORCONV_MOST (COLORCONV_EXPAND_15_TO_16 | \
- COLORCONV_REDUCE_16_TO_15 | \
- COLORCONV_EXPAND_HI_TO_TRUE | \
- COLORCONV_REDUCE_TRUE_TO_HI | \
- COLORCONV_24_EQUALS_32)
+ COLORCONV_REDUCE_16_TO_15 | \
+ COLORCONV_EXPAND_HI_TO_TRUE | \
+ COLORCONV_REDUCE_TRUE_TO_HI | \
+ COLORCONV_24_EQUALS_32)
#define COLORCONV_KEEP_ALPHA (COLORCONV_TOTAL \
- & ~(COLORCONV_32A_TO_8 | \
- COLORCONV_32A_TO_15 | \
- COLORCONV_32A_TO_16 | \
- COLORCONV_32A_TO_24))
+ & ~(COLORCONV_32A_TO_8 | \
+ COLORCONV_32A_TO_15 | \
+ COLORCONV_32A_TO_16 | \
+ COLORCONV_32A_TO_24))
AL_FUNC(void, set_color_conversion, (int mode));
AL_FUNC(int, get_color_conversion, ());
diff --git a/engines/ags/lib/std/map.h b/engines/ags/lib/std/map.h
index 65272ff704..185dcbfecd 100644
--- a/engines/ags/lib/std/map.h
+++ b/engines/ags/lib/std/map.h
@@ -193,7 +193,7 @@ public:
};
template<class Key, class Val, class HashFunc = Common::Hash<Key>,
- class EqualFunc = Common::EqualTo<Key> >
+ class EqualFunc = Common::EqualTo<Key> >
class unordered_map : public Common::HashMap<Key, Val, HashFunc, EqualFunc> {
public:
pair<Key, Val> insert(pair<Key, Val> elem) {
diff --git a/engines/ags/plugins/ags_galaxy_steam/ags_wadjeteye_steam.h b/engines/ags/plugins/ags_galaxy_steam/ags_wadjeteye_steam.h
index 6c004cf965..5285de4525 100644
--- a/engines/ags/plugins/ags_galaxy_steam/ags_wadjeteye_steam.h
+++ b/engines/ags/plugins/ags_galaxy_steam/ags_wadjeteye_steam.h
@@ -34,7 +34,7 @@ private:
static void AGS_EngineStartup(IAGSEngine *engine);
static void AddAchievement(ScriptMethodParams ¶ms);
static void AddStat(ScriptMethodParams ¶ms);
-
+
public:
AGSWadjetEyeSteam();
};
diff --git a/engines/ags/plugins/ags_pal_render/ags_pal_render.cpp b/engines/ags/plugins/ags_pal_render/ags_pal_render.cpp
index 034c410db7..9245a7f881 100644
--- a/engines/ags/plugins/ags_pal_render/ags_pal_render.cpp
+++ b/engines/ags/plugins/ags_pal_render/ags_pal_render.cpp
@@ -182,9 +182,9 @@ void Make_Sin_Lut() {
/*
void PreMultiply_Alphas () //Ha ha, this isn't the kind of premultiplcation you're thinking of.
{
- for (int y=0;y<64;y++)
- for (int x=0;x<64;x++)
- alphamultiply [y*64+x] = y*x;
+ for (int y=0;y<64;y++)
+ for (int x=0;x<64;x++)
+ alphamultiply [y*64+x] = y*x;
}
*/
@@ -593,60 +593,60 @@ void DoFire(ScriptMethodParams ¶ms) {
/*
unsigned char MixColorAlpha (unsigned char fg,unsigned char bg,unsigned char alpha)
{
- //unsigned char rfg = cycle_remap [fg]; //Automatic remapping of palette slots.
- //unsigned char rbg = cycle_remap [bg]; //Saves on typing elsewhere.
- //BITMAP *clutspr = engine->GetSpriteGraphic (clutslot);
- //if (!clutspr) engine->AbortGame ("MixColorAlpha: Can't load CLUT sprite into memory.");
- //uint8 *clutarray = engine->GetRawBitmapSurface (clutspr);
- AGSColor *palette = engine->GetPalette ();
- int i=0;
- int out_r = (palette[fg].r>>1) * alpha + (palette[bg].r>>1) * (255 - alpha);
- int out_g = palette[fg].g * alpha + palette[bg].g * (255 - alpha);
- int out_b = (palette[fg].b>>1) * alpha + (palette[bg].b>>1) * (255 - alpha);
- //unsigned char ralpha = alpha>>2;
- //unsigned char invralpha = 64-ralpha;
- //if (ralpha > alpha) engine->AbortGame ("wtf");
- //int out_r = alphamultiply[(palette[fg].r>>1)][ralpha] + alphamultiply[(palette[bg].r>>1)][(invralpha)];
- //int out_g = alphamultiply[(palette[fg].g)][ralpha] + alphamultiply[(palette[bg].g)][(invralpha)];
- //int out_b = alphamultiply[(palette[fg].b>>1)][ralpha] + alphamultiply[(palette[bg].b>>1)][(invralpha)];
- out_r = (out_r + 1 + (out_r >> 8)) >> 8;
- out_g = (out_g + 1 + (out_g >> 8)) >> 8;
- out_b = (out_b + 1 + (out_b >> 8)) >> 8;
- i = ((out_r << 11) | (out_g << 5) | out_b);
- unsigned char (*clutp) = clut;
- //unsigned char result = cycle_remap [clut[i>>8][i%256]]; //Once again, to make sure that the palette slot used is the right one.
- unsigned char result = cycle_remap [*(clutp+i)]; //Once again, to make sure that the palette slot used is the right one.
- //engine->ReleaseBitmapSurface (clutspr);
- return result;
+ //unsigned char rfg = cycle_remap [fg]; //Automatic remapping of palette slots.
+ //unsigned char rbg = cycle_remap [bg]; //Saves on typing elsewhere.
+ //BITMAP *clutspr = engine->GetSpriteGraphic (clutslot);
+ //if (!clutspr) engine->AbortGame ("MixColorAlpha: Can't load CLUT sprite into memory.");
+ //uint8 *clutarray = engine->GetRawBitmapSurface (clutspr);
+ AGSColor *palette = engine->GetPalette ();
+ int i=0;
+ int out_r = (palette[fg].r>>1) * alpha + (palette[bg].r>>1) * (255 - alpha);
+ int out_g = palette[fg].g * alpha + palette[bg].g * (255 - alpha);
+ int out_b = (palette[fg].b>>1) * alpha + (palette[bg].b>>1) * (255 - alpha);
+ //unsigned char ralpha = alpha>>2;
+ //unsigned char invralpha = 64-ralpha;
+ //if (ralpha > alpha) engine->AbortGame ("wtf");
+ //int out_r = alphamultiply[(palette[fg].r>>1)][ralpha] + alphamultiply[(palette[bg].r>>1)][(invralpha)];
+ //int out_g = alphamultiply[(palette[fg].g)][ralpha] + alphamultiply[(palette[bg].g)][(invralpha)];
+ //int out_b = alphamultiply[(palette[fg].b>>1)][ralpha] + alphamultiply[(palette[bg].b>>1)][(invralpha)];
+ out_r = (out_r + 1 + (out_r >> 8)) >> 8;
+ out_g = (out_g + 1 + (out_g >> 8)) >> 8;
+ out_b = (out_b + 1 + (out_b >> 8)) >> 8;
+ i = ((out_r << 11) | (out_g << 5) | out_b);
+ unsigned char (*clutp) = clut;
+ //unsigned char result = cycle_remap [clut[i>>8][i%256]]; //Once again, to make sure that the palette slot used is the right one.
+ unsigned char result = cycle_remap [*(clutp+i)]; //Once again, to make sure that the palette slot used is the right one.
+ //engine->ReleaseBitmapSurface (clutspr);
+ return result;
}
unsigned char MixColorAdditive (unsigned char fg,unsigned char bg,unsigned char alpha)
{
- //unsigned char rfg = cycle_remap [fg]; //Automatic remapping of palette slots.
- //unsigned char rbg = cycle_remap [bg]; //Saves on typing elsewhere.
- //BITMAP *clutspr = engine->GetSpriteGraphic (clutslot);
- //if (!clutspr) engine->AbortGame ("MixColorAlpha: Can't load CLUT sprite into memory.");
- //uint8 *clutarray = engine->GetRawBitmapSurface (clutspr);
- AGSColor *palette = engine->GetPalette ();
- int i=0;
- int add_r,add_b,add_g = 0;
- char ralpha = alpha>>2;
- //if (ralpha > alpha) engine->AbortGame ("wtf");
- //add_r = (((palette[fg].r>>1) * (alpha))>>8);
- //add_b = (((palette[fg].b>>1) * (alpha))>>8);
- //add_g = (((palette[fg].g) * (alpha))>>8);
- add_r = ((alphamultiply[(palette[fg].r>>1)*64+ralpha])>>6);
- add_b = ((alphamultiply[(palette[fg].b>>1)*64+ralpha])>>6);
- add_g = ((alphamultiply[(palette[fg].g )*64+ralpha])>>6);
- int out_r = min(31,(palette[bg].r>>1) + add_r);
- int out_g = min(63, palette[bg].g + add_g);
- int out_b = min(31,(palette[bg].b>>1) + add_b);
- i = ((out_r << 11) | (out_g << 5) | out_b);
- unsigned char (*clutp) = clut;
- unsigned char result = cycle_remap [*(clutp+i)]; //Once again, to make sure that the palette slot used is the right one.
- //unsigned char result = cycle_remap [clut[i>>8][i%256]]; //Once again, to make sure that the palette slot used is the right one.
- //engine->ReleaseBitmapSurface (clutspr);
- return result;
+ //unsigned char rfg = cycle_remap [fg]; //Automatic remapping of palette slots.
+ //unsigned char rbg = cycle_remap [bg]; //Saves on typing elsewhere.
+ //BITMAP *clutspr = engine->GetSpriteGraphic (clutslot);
+ //if (!clutspr) engine->AbortGame ("MixColorAlpha: Can't load CLUT sprite into memory.");
+ //uint8 *clutarray = engine->GetRawBitmapSurface (clutspr);
+ AGSColor *palette = engine->GetPalette ();
+ int i=0;
+ int add_r,add_b,add_g = 0;
+ char ralpha = alpha>>2;
+ //if (ralpha > alpha) engine->AbortGame ("wtf");
+ //add_r = (((palette[fg].r>>1) * (alpha))>>8);
+ //add_b = (((palette[fg].b>>1) * (alpha))>>8);
+ //add_g = (((palette[fg].g) * (alpha))>>8);
+ add_r = ((alphamultiply[(palette[fg].r>>1)*64+ralpha])>>6);
+ add_b = ((alphamultiply[(palette[fg].b>>1)*64+ralpha])>>6);
+ add_g = ((alphamultiply[(palette[fg].g )*64+ralpha])>>6);
+ int out_r = min(31,(palette[bg].r>>1) + add_r);
+ int out_g = min(63, palette[bg].g + add_g);
+ int out_b = min(31,(palette[bg].b>>1) + add_b);
+ i = ((out_r << 11) | (out_g << 5) | out_b);
+ unsigned char (*clutp) = clut;
+ unsigned char result = cycle_remap [*(clutp+i)]; //Once again, to make sure that the palette slot used is the right one.
+ //unsigned char result = cycle_remap [clut[i>>8][i%256]]; //Once again, to make sure that the palette slot used is the right one.
+ //engine->ReleaseBitmapSurface (clutspr);
+ return result;
}
*/
void GetColor565(ScriptMethodParams ¶ms) {
diff --git a/engines/ags/plugins/ags_pal_render/raycast.cpp b/engines/ags/plugins/ags_pal_render/raycast.cpp
index 6820f7af3d..aa7438a1a5 100644
--- a/engines/ags/plugins/ags_pal_render/raycast.cpp
+++ b/engines/ags/plugins/ags_pal_render/raycast.cpp
@@ -1520,14 +1520,14 @@ void MoveBackward(ScriptMethodParams &) {
/*
void MoveBackward ()
{
- double newposx;
- if (dirX > 0) newposx = -0.2 + posX - dirX * moveSpeed;
- else newposx = 0.2 + posX - dirX * moveSpeed;
- double newposy;
- if (dirY > 0) newposy = -0.2 + posY - dirY * moveSpeed;
- else newposy = 0.2 + posY - dirY * moveSpeed;
- if(worldMap[int(newposx)][int(posY)] == false || worldMap[int(newposx)][int(posY)] > 8) posX -= dirX * moveSpeed;
- if(worldMap[int(posX)][int(newposy)] == false || worldMap[int(posX)][int(newposy)] > 8) posY -= dirY * moveSpeed;
+ double newposx;
+ if (dirX > 0) newposx = -0.2 + posX - dirX * moveSpeed;
+ else newposx = 0.2 + posX - dirX * moveSpeed;
+ double newposy;
+ if (dirY > 0) newposy = -0.2 + posY - dirY * moveSpeed;
+ else newposy = 0.2 + posY - dirY * moveSpeed;
+ if(worldMap[int(newposx)][int(posY)] == false || worldMap[int(newposx)][int(posY)] > 8) posX -= dirX * moveSpeed;
+ if(worldMap[int(posX)][int(newposy)] == false || worldMap[int(posX)][int(newposy)] > 8) posY -= dirY * moveSpeed;
}
*/
diff --git a/engines/ags/shared/util/misc.cpp b/engines/ags/shared/util/misc.cpp
index a261420bd1..3304301b3c 100644
--- a/engines/ags/shared/util/misc.cpp
+++ b/engines/ags/shared/util/misc.cpp
@@ -28,14 +28,14 @@
modification, are permitted provided that the following conditions
are met:
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- * Neither the name of Shawn R. Walker nor names of contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * Neither the name of Shawn R. Walker nor names of contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
diff --git a/engines/ags/shared/util/misc.h b/engines/ags/shared/util/misc.h
index c84500c929..a9ff6acb57 100644
--- a/engines/ags/shared/util/misc.h
+++ b/engines/ags/shared/util/misc.h
@@ -28,14 +28,14 @@
modification, are permitted provided that the following conditions
are met:
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- * Neither the name of Shawn R. Walker nor names of contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * Neither the name of Shawn R. Walker nor names of contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
diff --git a/engines/avalanche/parser.cpp b/engines/avalanche/parser.cpp
index 26c3cbd75a..09282919c0 100644
--- a/engines/avalanche/parser.cpp
+++ b/engines/avalanche/parser.cpp
@@ -528,7 +528,7 @@ void Parser::cursorOff() {
* Asks the parsekey proc in Dropdown if it knows it.
*/
void Parser::tryDropdown() {
- // TODO: Implement at the same time with Dropdown's keyboard handling.
+ // TODO: Implement at the same time with Dropdown's keyboard handling.
warning("STUB: Parser::tryDropdown()");
}
diff --git a/engines/bbvs/metaengine.cpp b/engines/bbvs/metaengine.cpp
index 2d8e0eae06..ead8186c7a 100644
--- a/engines/bbvs/metaengine.cpp
+++ b/engines/bbvs/metaengine.cpp
@@ -43,7 +43,7 @@ public:
return "bbvs";
}
- bool hasFeature(MetaEngineFeature f) const override;
+ bool hasFeature(MetaEngineFeature f) const override;
Common::Error createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
int getMaximumSaveSlot() const override;
diff --git a/engines/bladerunner/debugger.cpp b/engines/bladerunner/debugger.cpp
index e1103b7368..c0ac863dc2 100644
--- a/engines/bladerunner/debugger.cpp
+++ b/engines/bladerunner/debugger.cpp
@@ -603,27 +603,27 @@ bool isAllZeroes(Common::String valStr) {
// which is played at the NightClub Row (NR01), is "kSfxMUSBLEED" (looping).
// TODO maybe support those too?
const char* kMusicTracksArr[] = {"Animoid Row (G)", // kMusicArabLoop
- "Battle Theme", // kMusicBatl226M
- "Blade Runner Blues", // kMusicBRBlues
- "Etsuko Theme", // kMusicKyoto
- "One More Time, Love (G)", // kMusicOneTime
- "Gothic Club 2", // kMusicGothic3
- "Arcane Dragon Fly (G)", // kMusicArkdFly1
- "Arcane Dance (G)", // kMusicArkDnce1
- "Taffy's Club 2", // kMusicTaffy2
- "Enigma Drift", // kMusicTaffy3
- "Late Call", // kMusicTaffy4
- "Nexus (aka Beating 1)", // kMusicBeating1
- "Awakenings (aka Crystal Dies 1)", // kMusicCrysDie1
- "Gothic Club", // kMusicGothic1
- "Transition", // kMusicGothic2
- "The Eyes Follow", // kMusicStrip1
- "Dektora's Dance (G)", // kMusicDkoDnce1
- "End Credits", // kMusicCredits
- "Ending (aka Moraji)", // kMusicMoraji
- "Remorse (aka Clovis Dies 1)", // kMusicClovDie1
- "Solitude (aka Clovis Dies)", // kMusicClovDies
- "Love Theme"}; // kMusicLoveSong
+ "Battle Theme", // kMusicBatl226M
+ "Blade Runner Blues", // kMusicBRBlues
+ "Etsuko Theme", // kMusicKyoto
+ "One More Time, Love (G)", // kMusicOneTime
+ "Gothic Club 2", // kMusicGothic3
+ "Arcane Dragon Fly (G)", // kMusicArkdFly1
+ "Arcane Dance (G)", // kMusicArkDnce1
+ "Taffy's Club 2", // kMusicTaffy2
+ "Enigma Drift", // kMusicTaffy3
+ "Late Call", // kMusicTaffy4
+ "Nexus (aka Beating 1)", // kMusicBeating1
+ "Awakenings (aka Crystal Dies 1)", // kMusicCrysDie1
+ "Gothic Club", // kMusicGothic1
+ "Transition", // kMusicGothic2
+ "The Eyes Follow", // kMusicStrip1
+ "Dektora's Dance (G)", // kMusicDkoDnce1
+ "End Credits", // kMusicCredits
+ "Ending (aka Moraji)", // kMusicMoraji
+ "Remorse (aka Clovis Dies 1)", // kMusicClovDie1
+ "Solitude (aka Clovis Dies)", // kMusicClovDies
+ "Love Theme"}; // kMusicLoveSong
bool Debugger::cmdMusic(int argc, const char** argv) {
if (argc != 2) {
diff --git a/engines/bladerunner/metaengine.cpp b/engines/bladerunner/metaengine.cpp
index b467b5b71c..fb65516f9a 100644
--- a/engines/bladerunner/metaengine.cpp
+++ b/engines/bladerunner/metaengine.cpp
@@ -33,7 +33,7 @@
class BladeRunnerMetaEngine : public AdvancedMetaEngine {
public:
- const char *getName() const override;
+ const char *getName() const override;
Common::Error createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
bool hasFeature(MetaEngineFeature f) const override;
diff --git a/engines/bladerunner/obstacles.cpp b/engines/bladerunner/obstacles.cpp
index e154209843..9882b1e115 100644
--- a/engines/bladerunner/obstacles.cpp
+++ b/engines/bladerunner/obstacles.cpp
@@ -460,7 +460,7 @@ bool Obstacles::findNextWaypoint(const Vector3 &from, const Vector3 &to, Vector3
#endif
bool Obstacles::findIntersectionNearest(int polygonIndex, Vector2 from, Vector2 to,
- int *outVertexIndex, float *outDistance, Vector2 *out) const
+ int *outVertexIndex, float *outDistance, Vector2 *out) const
{
float minDistance = 0.0f;
Vector2 minIntersection;
@@ -492,7 +492,7 @@ bool Obstacles::findIntersectionNearest(int polygonIndex, Vector2 from, Vector2
}
bool Obstacles::findIntersectionFarthest(int polygonIndex, Vector2 from, Vector2 to,
- int *outVertexIndex, float *outDistance, Vector2 *out) const
+ int *outVertexIndex, float *outDistance, Vector2 *out) const
{
float maxDistance = 0.0f;
Vector2 maxIntersection;
diff --git a/engines/bladerunner/script/scene/ma07.cpp b/engines/bladerunner/script/scene/ma07.cpp
index ec69b3d3d5..c42c1c6f32 100644
--- a/engines/bladerunner/script/scene/ma07.cpp
+++ b/engines/bladerunner/script/scene/ma07.cpp
@@ -143,7 +143,7 @@ void SceneScriptMA07::PlayerWalkedIn() {
Actor_Set_Goal_Number(kActorRachael, kGoalRachaelIsOutWalksToPoliceHQAct3);
} else if (_vm->_cutContent && Actor_Query_Goal_Number(kActorRachael) == kGoalRachaelIsOutsideMcCoysBuildingAct4) {
Actor_Set_Goal_Number(kActorRachael, kGoalRachaelIsOutWalksToPoliceHQAct4);
- }
+ }
if (Game_Flag_Query(kFlagMA06toMA07)) {
Game_Flag_Reset(kFlagMA06toMA07);
diff --git a/engines/bladerunner/ui/kia_section_base.cpp b/engines/bladerunner/ui/kia_section_base.cpp
index 95f025e336..4580efb84b 100644
--- a/engines/bladerunner/ui/kia_section_base.cpp
+++ b/engines/bladerunner/ui/kia_section_base.cpp
@@ -25,8 +25,8 @@
namespace BladeRunner {
KIASectionBase::KIASectionBase(BladeRunnerEngine *vm) {
- _vm = vm;
- _scheduledSwitch = false;
+ _vm = vm;
+ _scheduledSwitch = false;
}
KIASectionBase::~KIASectionBase() {
diff --git a/engines/bladerunner/ui/kia_section_crimes.cpp b/engines/bladerunner/ui/kia_section_crimes.cpp
index a1d365f338..34f88e788f 100644
--- a/engines/bladerunner/ui/kia_section_crimes.cpp
+++ b/engines/bladerunner/ui/kia_section_crimes.cpp
@@ -88,14 +88,14 @@ KIASectionCrimes::~KIASectionCrimes() {
void KIASectionCrimes::reset() {
_acquiredClueCount = 0;
- _crimesFoundCount = 0;
- _suspectsFoundCount = 0;
- _mouseX = 0;
- _mouseY = 0;
- _suspectSelected = -1;
- _crimeSelected = -1;
- _suspectPhotoShapeId = -1;
- _suspectPhotoNotUsed = -1;
+ _crimesFoundCount = 0;
+ _suspectsFoundCount = 0;
+ _mouseX = 0;
+ _mouseY = 0;
+ _suspectSelected = -1;
+ _crimeSelected = -1;
+ _suspectPhotoShapeId = -1;
+ _suspectPhotoNotUsed = -1;
}
void KIASectionCrimes::open() {
diff --git a/engines/bladerunner/ui/ui_image_picker.cpp b/engines/bladerunner/ui/ui_image_picker.cpp
index d6c01301f1..27aa5202e5 100644
--- a/engines/bladerunner/ui/ui_image_picker.cpp
+++ b/engines/bladerunner/ui/ui_image_picker.cpp
@@ -199,10 +199,10 @@ bool UIImagePicker::resetActiveImage(int i) {
}
void UIImagePicker::activate(UIImagePickerCallback *mouseInCallback,
- UIImagePickerCallback *mouseOutCallback,
- UIImagePickerCallback *mouseDownCallback,
- UIImagePickerCallback *mouseUpCallback,
- void *callbackData) {
+ UIImagePickerCallback *mouseOutCallback,
+ UIImagePickerCallback *mouseDownCallback,
+ UIImagePickerCallback *mouseUpCallback,
+ void *callbackData) {
_isButtonDown = false;
_mouseInCallback = mouseInCallback;
_mouseOutCallback = mouseOutCallback;
diff --git a/engines/bladerunner/ui/vk.cpp b/engines/bladerunner/ui/vk.cpp
index ee926926ce..2afbd7b9e8 100644
--- a/engines/bladerunner/ui/vk.cpp
+++ b/engines/bladerunner/ui/vk.cpp
@@ -958,8 +958,8 @@ void VK::setAdjustmentFromMouse() {
* It will search through all questions to find a related question Id and its intensity
*/
void VK::findRelatedQuestionBySentenceId(int inSentenceId, int &outRelatedQuestionId, int &outRelatedIntensity) {
- outRelatedQuestionId = -1;
- outRelatedIntensity = -1;
+ outRelatedQuestionId = -1;
+ outRelatedIntensity = -1;
for (int intensity = 0; intensity < 3; ++intensity) {
for (int i = 0; i < (int)_questions[intensity].size(); ++i) {
diff --git a/engines/cge/metaengine.cpp b/engines/cge/metaengine.cpp
index c3c63051a6..ede99e9129 100644
--- a/engines/cge/metaengine.cpp
+++ b/engines/cge/metaengine.cpp
@@ -37,7 +37,7 @@ public:
return "cge";
}
- bool hasFeature(MetaEngineFeature f) const override;
+ bool hasFeature(MetaEngineFeature f) const override;
Common::Error createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
diff --git a/engines/cge2/snail.cpp b/engines/cge2/snail.cpp
index ccb6f1e7de..ce05d763e6 100644
--- a/engines/cge2/snail.cpp
+++ b/engines/cge2/snail.cpp
@@ -45,8 +45,8 @@ const char *CommandHandler::_commandText[] = {
CommandHandler::CommandHandler(CGE2Engine *vm, bool turbo)
: _turbo(turbo), _textDelay(false), _timerExpiry(0), _talkEnable(true),
- _head(0), _tail(0), _commandList((Command *)malloc(sizeof(Command)* 256)),
- _vm(vm) {
+ _head(0), _tail(0), _commandList((Command *)malloc(sizeof(Command)* 256)),
+ _vm(vm) {
}
CommandHandler::~CommandHandler() {
diff --git a/engines/cge2/vga13h.cpp b/engines/cge2/vga13h.cpp
index 524e547f35..d4ef418d1b 100644
--- a/engines/cge2/vga13h.cpp
+++ b/engines/cge2/vga13h.cpp
@@ -127,17 +127,17 @@ Seq Sprite::_stdSeq8[] =
SprExt::SprExt(CGE2Engine *vm)
: _p0(vm, 0, 0), _p1(vm, 0, 0),
- _b0(nullptr), _b1(nullptr), _shpList(nullptr),
- _location(0), _seq(nullptr), _name(nullptr) {
+ _b0(nullptr), _b1(nullptr), _shpList(nullptr),
+ _location(0), _seq(nullptr), _name(nullptr) {
for (int i = 0; i < kActions; i++)
_actions[i] = nullptr;
}
Sprite::Sprite(CGE2Engine *vm)
: _siz(_vm, 0, 0), _seqPtr(kNoSeq), _seqCnt(0), _shpCnt(0),
- _next(nullptr), _prev(nullptr), _time(0),
- _ext(nullptr), _ref(-1), _scene(0), _vm(vm),
- _pos2D(_vm, kScrWidth >> 1, 0), _pos3D(kScrWidth >> 1, 0, 0) {
+ _next(nullptr), _prev(nullptr), _time(0),
+ _ext(nullptr), _ref(-1), _scene(0), _vm(vm),
+ _pos2D(_vm, kScrWidth >> 1, 0), _pos3D(kScrWidth >> 1, 0, 0) {
memset(_actionCtrl, 0, sizeof(_actionCtrl));
memset(_file, 0, sizeof(_file));
memset(&_flags, 0, sizeof(_flags));
@@ -146,9 +146,9 @@ Sprite::Sprite(CGE2Engine *vm)
Sprite::Sprite(CGE2Engine *vm, BitmapPtr shpP, int cnt)
: _siz(_vm, 0, 0), _seqPtr(kNoSeq), _seqCnt(0), _shpCnt(0),
- _next(nullptr), _prev(nullptr), _time(0),
- _ext(nullptr), _ref(-1), _scene(0), _vm(vm),
- _pos2D(_vm, kScrWidth >> 1, 0), _pos3D(kScrWidth >> 1, 0, 0) {
+ _next(nullptr), _prev(nullptr), _time(0),
+ _ext(nullptr), _ref(-1), _scene(0), _vm(vm),
+ _pos2D(_vm, kScrWidth >> 1, 0), _pos3D(kScrWidth >> 1, 0, 0) {
memset(_actionCtrl, 0, sizeof(_actionCtrl));
memset(_file, 0, sizeof(_file));
memset(&_flags, 0, sizeof(_flags));
diff --git a/engines/chewy/metaengine.cpp b/engines/chewy/metaengine.cpp
index 1a55a79983..df9479b9b2 100644
--- a/engines/chewy/metaengine.cpp
+++ b/engines/chewy/metaengine.cpp
@@ -47,7 +47,7 @@ public:
return "chewy";
}
- bool hasFeature(MetaEngineFeature f) const override;
+ bool hasFeature(MetaEngineFeature f) const override;
Common::Error createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
SaveStateList listSaves(const char *target) const override;
diff --git a/engines/cine/anim.cpp b/engines/cine/anim.cpp
index d5b9a44c50..35f41ff37b 100644
--- a/engines/cine/anim.cpp
+++ b/engines/cine/anim.cpp
@@ -304,7 +304,7 @@ byte AnimData::getColor(int x, int y) {
* @param transparent Transparent color (for ANIM_MASKSPRITE)
*/
void AnimData::load(byte *d, int type, uint16 w, uint16 h, int16 file,
- int16 frame, const char *n, byte transparent) {
+ int16 frame, const char *n, byte transparent) {
assert(d);
if (_data) {
diff --git a/engines/cine/saveload.h b/engines/cine/saveload.h
index 821a5105e4..95aee2d75b 100644
--- a/engines/cine/saveload.h
+++ b/engines/cine/saveload.h
@@ -88,7 +88,7 @@ Version 0: Color count was not saved, was assumed to be 256. BGIncrust.bgIdx doe
Version 1: Saving of real color count was added but still 256 colors were always saved.
Version 2: BGIncrust.bgIdx was added.
Version 3: Saving real values for current music name, music playing status, current background index,
- scroll background index and background scrolling was added.
+ scroll background index and background scrolling was added.
*/
static const uint32 LAST_TEMP_OS_SAVE_VER = 3;
diff --git a/engines/cine/script_fw.cpp b/engines/cine/script_fw.cpp
index 50c77a1376..d020bef00b 100644
--- a/engines/cine/script_fw.cpp
+++ b/engines/cine/script_fw.cpp
@@ -591,7 +591,7 @@ RawObjectScript::RawObjectScript(uint16 s, uint16 p1, uint16 p2, uint16 p3)
* @param p3 Third object script parameter
*/
RawObjectScript::RawObjectScript(const FWScriptInfo &info, const byte *data,
- uint16 s, uint16 p1, uint16 p2, uint16 p3)
+ uint16 s, uint16 p1, uint16 p2, uint16 p3)
: RawScript(info, data, s), _runCount(0), _param1(p1), _param2(p2), _param3(p3) {
}
diff --git a/engines/cine/various.cpp b/engines/cine/various.cpp
index 5f41b2628e..85a0d6f47f 100644
--- a/engines/cine/various.cpp
+++ b/engines/cine/various.cpp
@@ -1603,7 +1603,7 @@ void modifySeqListElement(uint16 objIdx, int16 var4Test, int16 param1, int16 par
}
void computeMove1(SeqListElement &element, int16 x, int16 y, int16 param1,
- int16 param2, int16 x2, int16 y2) {
+ int16 param2, int16 x2, int16 y2) {
element.var16 = 0;
element.var14 = 0;
diff --git a/engines/composer/metaengine.cpp b/engines/composer/metaengine.cpp
index 7fdeaf8a09..a605133f2d 100644
--- a/engines/composer/metaengine.cpp
+++ b/engines/composer/metaengine.cpp
@@ -67,7 +67,7 @@ bool ComposerEngine::loadDetectedConfigFile(Common::INIFile &configFile) const {
class ComposerMetaEngine : public AdvancedMetaEngine {
public:
- const char *getName() const override {
+ const char *getName() const override {
return "composer";
}
diff --git a/engines/cruise/cruise_main.cpp b/engines/cruise/cruise_main.cpp
index 4955c4bd97..0857712e0a 100644
--- a/engines/cruise/cruise_main.cpp
+++ b/engines/cruise/cruise_main.cpp
@@ -263,7 +263,7 @@ ovlData3Struct *scriptFunc1Sub2(int32 scriptNumber, int32 param) {
}
void scriptFunc2(int scriptNumber, scriptInstanceStruct * scriptHandle,
- int param, int param2) {
+ int param, int param2) {
if (scriptHandle->nextScriptPtr) {
if (scriptNumber == scriptHandle->nextScriptPtr->overlayNumber
|| scriptNumber != -1) {
diff --git a/engines/cruise/decompiler.cpp b/engines/cruise/decompiler.cpp
index 7691a1bba7..677f81e7db 100644
--- a/engines/cruise/decompiler.cpp
+++ b/engines/cruise/decompiler.cpp
@@ -297,7 +297,7 @@ void addDecomp(char *string, ...) {
}
void resolveVarName(char *ovlIdxString, int varType, char *varIdxString,
- char *outputName) {
+ char *outputName) {
int varIdx = atoi(varIdxString);
strcpy(outputName, "");
diff --git a/engines/cruise/font.cpp b/engines/cruise/font.cpp
index fe3b93d1a7..c04796da0f 100644
--- a/engines/cruise/font.cpp
+++ b/engines/cruise/font.cpp
@@ -53,7 +53,7 @@ int32 getLineHeight(int16 charCount, const FontEntry *fontPtr) {
* This function determines how many lines the text will have
*/
int32 getTextLineCount(int32 rightBorder_X, int16 wordSpacingWidth,
- const FontEntry *fontData, const char *textString) {
+ const FontEntry *fontData, const char *textString) {
const char *localString = textString;
const char *tempPtr = textString;
uint8 ch;
@@ -188,7 +188,7 @@ void flipGen(void *var, int32 length) {
}
void renderWord(const uint8 *fontPtr_Data, uint8 *outBufferPtr, int xOffset, int yOffset,
- int32 height, int32 param4, int32 stringRenderBufferSize, int32 width, int32 charWidth) {
+ int32 height, int32 param4, int32 stringRenderBufferSize, int32 width, int32 charWidth) {
const uint8 *fontPtr_Data2 = fontPtr_Data + height * 2;
outBufferPtr += yOffset * width + xOffset;
@@ -214,7 +214,7 @@ void renderWord(const uint8 *fontPtr_Data, uint8 *outBufferPtr, int xOffset, int
// returns character count and pixel size (via pointer) per line of the string (old: prepareWordRender(int32 param, int32 var1, int16* out2, uint8* ptr3, uint8* string))
int32 prepareWordRender(int32 inRightBorder_X, int16 wordSpacingWidth,
- int16 *strPixelLength, const FontEntry *fontData, const char *textString) {
+ int16 *strPixelLength, const FontEntry *fontData, const char *textString) {
const char *localString = textString;
int32 counter = 0;
diff --git a/engines/cruise/font.h b/engines/cruise/font.h
index 12745c5b59..e530d6e4bb 100644
--- a/engines/cruise/font.h
+++ b/engines/cruise/font.h
@@ -60,11 +60,11 @@ int32 getLineHeight(int16 charCount, const FontEntry *fontPtr, const uint8 *font
int32 getTextLineCount(int32 rightBorder_X, int32 wordSpacingWidth, const FontEntry *fontData,
const char *textString);
void renderWord(uint8 *fontPtr_Data, uint8 *outBufferPtr,
- int32 drawPosPixel_X, int32 heightOff, int32 height, int32 param4,
- int32 stringRenderBufferSize, int32 width, int32 charWidth);
+ int32 drawPosPixel_X, int32 heightOff, int32 height, int32 param4,
+ int32 stringRenderBufferSize, int32 width, int32 charWidth);
gfxEntryStruct *renderText(int inRightBorder_X, const char *string);
void drawString(int32 x, int32 y, const char *string, uint8 * buffer, uint8 fontColor,
- int32 inRightBorder_X);
+ int32 inRightBorder_X);
void freeGfx(gfxEntryStruct *pGfx);
} // End of namespace Cruise
diff --git a/engines/cruise/menu.h b/engines/cruise/menu.h
index c6f607506e..8aba10d677 100644
--- a/engines/cruise/menu.h
+++ b/engines/cruise/menu.h
@@ -38,7 +38,7 @@ extern menuStruct *menuTable[8];
menuStruct *createMenu(int X, int Y, const char *menuName);
void addSelectableMenuEntry(int var0, int var1, menuStruct * pMenu, int var2,
- int color, const char *menuText);
+ int color, const char *menuText);
void updateMenuMouse(int mouseX, int mouseY, menuStruct * pMenu);
int processMenu(menuStruct * pMenu);
void freeMenu(menuStruct * pMenu);
diff --git a/engines/cruise/metaengine.cpp b/engines/cruise/metaengine.cpp
index 06864f414e..4578ebf859 100644
--- a/engines/cruise/metaengine.cpp
+++ b/engines/cruise/metaengine.cpp
@@ -50,7 +50,7 @@ public:
return "cruise";
}
- bool hasFeature(MetaEngineFeature f) const override;
+ bool hasFeature(MetaEngineFeature f) const override;
int getMaximumSaveSlot() const override { return 99; }
SaveStateList listSaves(const char *target) const override;
diff --git a/engines/cruise/perso.cpp b/engines/cruise/perso.cpp
index ff33eca14b..7360ed1fae 100644
--- a/engines/cruise/perso.cpp
+++ b/engines/cruise/perso.cpp
@@ -169,9 +169,9 @@ int cor_droite(int x1, int y1, int x2, int y2, point* outputTable) {
}
void processActorWalk(MovementEntry &resx_y, int16 *inc_droite, int16 *inc_droite0,
- int16 *inc_chemin, point* cor_joueur,
- int16 solution0[NUM_NODES + 3][2], int16 *inc_jo1, int16 *inc_jo2,
- int16 *dir_perso, int16 *inc_jo0, int16 num) {
+ int16 *inc_chemin, point* cor_joueur,
+ int16 solution0[NUM_NODES + 3][2], int16 *inc_jo1, int16 *inc_jo2,
+ int16 *dir_perso, int16 *inc_jo0, int16 num) {
int u = 0;
inc_jo = *inc_jo0;
diff --git a/engines/cryo/cryolib.cpp b/engines/cryo/cryolib.cpp
index 2018a517b1..32a60b4d19 100644
--- a/engines/cryo/cryolib.cpp
+++ b/engines/cryo/cryolib.cpp
@@ -196,7 +196,7 @@ void CLBlitter_OneBlackFlash() {
}
void CLBlitter_CopyView2ViewSimpleSize(byte *src, int16 srcw, int16 srcp, int16 srch,
- byte *dst, int16 dstw, int16 dstp, int16 dsth) {
+ byte *dst, int16 dstw, int16 dstp, int16 dsth) {
for (int16 y = 0; y < srch; y++) {
for (int16 x = 0; x < srcw; x++)
*dst++ = *src++;
diff --git a/engines/cryo/cryolib.h b/engines/cryo/cryolib.h
index d88ed6fae6..63ae29003f 100644
--- a/engines/cryo/cryolib.h
+++ b/engines/cryo/cryolib.h
@@ -86,7 +86,7 @@ void CLBlitter_CopyViewRect(View *view1, View *view2, Common::Rect *rect1, Commo
void CLBlitter_Send2ScreenNextCopy(color_t *palette, uint16 first, uint16 count);
void CLBlitter_OneBlackFlash();
void CLBlitter_CopyView2ViewSimpleSize(byte *src, int16 srcw, int16 srcp, int16 srch,
- byte *dst, int16 dstw, int16 dstp, int16 dsth);
+ byte *dst, int16 dstw, int16 dstp, int16 dsth);
void CLBlitter_CopyView2ScreenCUSTOM(View *view);
void CLBlitter_CopyView2Screen(View *view);
void CLBlitter_UpdateScreen();
diff --git a/engines/cryo/defs.h b/engines/cryo/defs.h
index 3f371489c0..f7faa8cb1c 100644
--- a/engines/cryo/defs.h
+++ b/engines/cryo/defs.h
@@ -45,7 +45,7 @@ Glossary
object - inventory item
icon - clickable rectangle with some action tied to it
dialog - a set of of dialog lines for character. further divided by categories and each entry may have associated
- condition to be validated
+ condition to be validated
global - game-wide storage area. must be preserved when saving/loading
phase - current story progress. Incremented by 1 for minor events, by 0x10 for major advancements
*/
diff --git a/engines/cryo/metaengine.cpp b/engines/cryo/metaengine.cpp
index db6afe4612..7baaaaf210 100644
--- a/engines/cryo/metaengine.cpp
+++ b/engines/cryo/metaengine.cpp
@@ -41,7 +41,7 @@ public:
return "cryo";
}
- bool hasFeature(MetaEngineFeature f) const override;
+ bool hasFeature(MetaEngineFeature f) const override;
Common::Error createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
};
diff --git a/engines/cryomni3d/cryomni3d.cpp b/engines/cryomni3d/cryomni3d.cpp
index 7438934246..484063d915 100644
--- a/engines/cryomni3d/cryomni3d.cpp
+++ b/engines/cryomni3d/cryomni3d.cpp
@@ -41,7 +41,7 @@
namespace CryOmni3D {
CryOmni3DEngine::CryOmni3DEngine(OSystem *syst,
- const CryOmni3DGameDescription *gamedesc) : Engine(syst), _gameDescription(gamedesc),
+ const CryOmni3DGameDescription *gamedesc) : Engine(syst), _gameDescription(gamedesc),
_canLoadSave(false), _fontManager(), _sprites(), _dragStatus(kDragStatus_NoDrag), _lastMouseButton(0),
_autoRepeatNextEvent(uint(-1)), _hnmHasClip(false) {
if (!_mixer->isReady()) {
@@ -100,7 +100,7 @@ DATSeekableStream *CryOmni3DEngine::getStaticData(uint32 gameId, uint16 version)
}
Common::String CryOmni3DEngine::prepareFileName(const Common::String &baseName,
- const char *const *extensions) const {
+ const char *const *extensions) const {
Common::String fname(baseName);
int lastDotPos = fname.size() - 1;
@@ -134,7 +134,7 @@ Common::String CryOmni3DEngine::prepareFileName(const Common::String &baseName,
}
void CryOmni3DEngine::playHNM(const Common::String &filename, Audio::Mixer::SoundType soundType,
- HNMCallback beforeDraw, HNMCallback afterDraw) {
+ HNMCallback beforeDraw, HNMCallback afterDraw) {
const char *const extensions[] = { "hns", "hnm", nullptr };
Common::String fname(prepareFileName(filename, extensions));
diff --git a/engines/cryomni3d/datstream.cpp b/engines/cryomni3d/datstream.cpp
index 4ce4650454..0a00f5bbb9 100644
--- a/engines/cryomni3d/datstream.cpp
+++ b/engines/cryomni3d/datstream.cpp
@@ -26,7 +26,7 @@
namespace CryOmni3D {
DATSeekableStream *DATSeekableStream::getGame(Common::SeekableReadStream *stream,
- uint32 gameId, uint16 version, Common::Language lang, Common::Platform platform) {
+ uint32 gameId, uint16 version, Common::Language lang, Common::Platform platform) {
if (stream == nullptr) {
return nullptr;
}
diff --git a/engines/cryomni3d/detection_tables.h b/engines/cryomni3d/detection_tables.h
index 330d37ae8f..f8afa50f1e 100644
--- a/engines/cryomni3d/detection_tables.h
+++ b/engines/cryomni3d/detection_tables.h
@@ -28,11 +28,11 @@ namespace CryOmni3D {
// We use files common to all installations except the documentation links and the binary
// We only check the file presence to simplify and use program to discriminate the version
#define VERSAILLES_ENTRY(f, x, s, lien_doc_ext) { \
- { "11D_LEB1.HNM", 0, nullptr, -1}, \
- { "COFBOUM.HNM", 0, nullptr, -1}, \
- { "lien_doc." lien_doc_ext, 0, nullptr, -1}, \
- { f, 0, x, s}, \
- AD_LISTEND}
+ { "11D_LEB1.HNM", 0, nullptr, -1}, \
+ { "COFBOUM.HNM", 0, nullptr, -1}, \
+ { "lien_doc." lien_doc_ext, 0, nullptr, -1}, \
+ { f, 0, x, s}, \
+ AD_LISTEND}
#define VERSAILLES_ENTRY_DEF(f, x, s) VERSAILLES_ENTRY(f, x, s, "txt")
diff --git a/engines/cryomni3d/dialogs_manager.cpp b/engines/cryomni3d/dialogs_manager.cpp
index 680f27f928..94ca3a0aac 100644
--- a/engines/cryomni3d/dialogs_manager.cpp
+++ b/engines/cryomni3d/dialogs_manager.cpp
@@ -349,7 +349,7 @@ bool DialogsManager::play(const Common::String &sequence, bool &slowStop) {
}
Common::Array<DialogsManager::Goto> DialogsManager::executeAfterPlayAndBuildGotoList(
- const char *actions) {
+ const char *actions) {
Common::Array<DialogsManager::Goto> gotos;
for (; actions && *actions != ':'; actions = nextLine(actions)) {
@@ -486,7 +486,7 @@ void DialogsManager::executeShow(const char *showLine) {
}
const char *DialogsManager::executePlayerQuestion(const char *text, bool dryRun,
- const char **realLabel) {
+ const char **realLabel) {
// Go after the text
const char *actions = nextLine(text);
@@ -551,7 +551,7 @@ const char *DialogsManager::parseIf(const char *ifLine) {
}
void DialogsManager::registerSubtitlesSettings(const Common::String &videoName,
- const SubtitlesSettings &settings) {
+ const SubtitlesSettings &settings) {
_subtitlesSettings[videoName] = settings;
}
diff --git a/engines/cryomni3d/fixed_image.cpp b/engines/cryomni3d/fixed_image.cpp
index cdae1a737b..647ca17af0 100644
--- a/engines/cryomni3d/fixed_image.cpp
+++ b/engines/cryomni3d/fixed_image.cpp
@@ -30,9 +30,9 @@
namespace CryOmni3D {
ZonFixedImage::ZonFixedImage(CryOmni3DEngine &engine,
- Inventory &inventory,
- const Sprites &sprites,
- const FixedImageConfiguration *configuration) :
+ Inventory &inventory,
+ const Sprites &sprites,
+ const FixedImageConfiguration *configuration) :
_engine(engine), _inventory(inventory), _sprites(sprites),
_configuration(configuration),
_callback(nullptr), _imageDecoder(nullptr), _imageSurface(nullptr),
diff --git a/engines/cryomni3d/font_manager.cpp b/engines/cryomni3d/font_manager.cpp
index 704198c617..6c40cc5294 100644
--- a/engines/cryomni3d/font_manager.cpp
+++ b/engines/cryomni3d/font_manager.cpp
@@ -55,7 +55,7 @@ FontManager::~FontManager() {
}
void FontManager::loadFonts(const Common::Array<Common::String> &fontFiles,
- Common::CodePage codepage) {
+ Common::CodePage codepage) {
assert(codepage != Common::kCodePageInvalid);
_codepage = codepage;
setupWrapParameters();
@@ -210,7 +210,7 @@ void FontManager::setSpaceWidth(uint additionalSpace) {
}
uint FontManager::displayStr_(uint x, uint y,
- const Common::U32String &text) const {
+ const Common::U32String &text) const {
uint offset = 0;
for (Common::U32String::const_iterator it = text.begin(); it != text.end(); it++) {
_currentFont->drawChar(_currentSurface, *it, x + offset, y, _foreColor);
@@ -233,7 +233,7 @@ uint FontManager::getStrWidth(const Common::U32String &text) const {
}
bool FontManager::displayBlockText(const Common::U32String &text,
- Common::U32String::const_iterator begin) {
+ Common::U32String::const_iterator begin) {
bool notEnoughSpace = false;
Common::U32String::const_iterator ptr = begin;
Common::Array<Common::U32String> words;
@@ -351,8 +351,8 @@ uint FontManager::getLinesCount(const Common::U32String &text, uint width) {
}
void FontManager::calculateWordWrap(const Common::U32String &text,
- Common::U32String::const_iterator *position, uint *finalPos, bool *hasCr,
- Common::Array<Common::U32String> &words) const {
+ Common::U32String::const_iterator *position, uint *finalPos, bool *hasCr,
+ Common::Array<Common::U32String> &words) const {
*hasCr = false;
uint offset = 0;
bool wordWrap = false;
diff --git a/engines/cryomni3d/image/codecs/hlz.cpp b/engines/cryomni3d/image/codecs/hlz.cpp
index adbea2d6ef..754c0cc0ca 100644
--- a/engines/cryomni3d/image/codecs/hlz.cpp
+++ b/engines/cryomni3d/image/codecs/hlz.cpp
@@ -57,7 +57,7 @@ Graphics::PixelFormat HLZDecoder::getPixelFormat() const {
}
static inline uint getReg(Common::SeekableReadStream &stream, uint32 *size, uint32 *reg,
- int *regBits) {
+ int *regBits) {
if (*regBits == 0) {
if (*size < 4) {
error("Can't feed register: not enough data");
diff --git a/engines/cryomni3d/metaengine.cpp b/engines/cryomni3d/metaengine.cpp
index ad89db1ecb..5a31f79667 100644
--- a/engines/cryomni3d/metaengine.cpp
+++ b/engines/cryomni3d/metaengine.cpp
@@ -69,7 +69,7 @@ bool CryOmni3DEngine::hasFeature(EngineFeature f) const {
class CryOmni3DMetaEngine : public AdvancedMetaEngine {
public:
- const char *getName() const override {
+ const char *getName() const override {
return "cryomni3d";
}
diff --git a/engines/cryomni3d/mouse_boxes.cpp b/engines/cryomni3d/mouse_boxes.cpp
index 85c4cd79f1..b77d87761b 100644
--- a/engines/cryomni3d/mouse_boxes.cpp
+++ b/engines/cryomni3d/mouse_boxes.cpp
@@ -42,7 +42,7 @@ void MouseBoxes::reset() {
}
void MouseBoxes::setupBox(int box_id, int left, int top, int right, int bottom,
- const Common::String *text) {
+ const Common::String *text) {
MouseBox &box = _boxes[box_id];
box.left = left;
box.top = top;
diff --git a/engines/cryomni3d/sprites.cpp b/engines/cryomni3d/sprites.cpp
index c6ee7721dc..0ec6288f47 100644
--- a/engines/cryomni3d/sprites.cpp
+++ b/engines/cryomni3d/sprites.cpp
@@ -31,11 +31,11 @@
namespace CryOmni3D {
#define MAP_ID(id) \
- do { \
- if (_map) { \
- id = (*_map)[id]; \
- } \
- } while(false)
+ do { \
+ if (_map) { \
+ id = (*_map)[id]; \
+ } \
+ } while(false)
Sprites::Sprites() : _map(nullptr) {
_surface = new Graphics::Surface();
diff --git a/engines/cryomni3d/versailles/data.cpp b/engines/cryomni3d/versailles/data.cpp
index d04420bc01..d5d0dcd769 100644
--- a/engines/cryomni3d/versailles/data.cpp
+++ b/engines/cryomni3d/versailles/data.cpp
@@ -72,7 +72,7 @@ const FakeTransitionActionPlace CryOmni3DEngine_Versailles::kFakeTransitions[] =
};
static void readSubtitles(Common::HashMap<Common::String, Common::Array<SubtitleEntry> > &subtitles,
- DATSeekableStream *data) {
+ DATSeekableStream *data) {
uint16 vidsCount = data->readUint16LE();
for (uint16 i = 0; i < vidsCount; i++) {
Common::String vidName = data->readString16();
diff --git a/engines/cryomni3d/versailles/dialogs_manager.cpp b/engines/cryomni3d/versailles/dialogs_manager.cpp
index bb3630ed50..f8ede020a1 100644
--- a/engines/cryomni3d/versailles/dialogs_manager.cpp
+++ b/engines/cryomni3d/versailles/dialogs_manager.cpp
@@ -33,7 +33,7 @@ namespace CryOmni3D {
namespace Versailles {
Versailles_DialogsManager::Versailles_DialogsManager(CryOmni3DEngine_Versailles *engine,
- bool padAudioFileName) :
+ bool padAudioFileName) :
_engine(engine), _padAudioFileName(padAudioFileName) {
}
@@ -93,7 +93,7 @@ void Versailles_DialogsManager::executeShow(const Common::String &show) {
}
void Versailles_DialogsManager::playDialog(const Common::String &video, const Common::String &sound,
- const Common::String &text, const SubtitlesSettings &settings) {
+ const Common::String &text, const SubtitlesSettings &settings) {
// Don't look for HNS file here
Common::String videoFName(_engine->prepareFileName(video, "hnm"));
Common::String soundFName(sound);
@@ -250,7 +250,7 @@ void Versailles_DialogsManager::displayMessage(const Common::String &text) {
}
uint Versailles_DialogsManager::askPlayerQuestions(const Common::String &video,
- const Common::StringArray &questions) {
+ const Common::StringArray &questions) {
if (_lastImage.empty()) {
loadFrame(video);
}
diff --git a/engines/cryomni3d/versailles/documentation.cpp b/engines/cryomni3d/versailles/documentation.cpp
index 54bfe43aac..6bc1721daf 100644
--- a/engines/cryomni3d/versailles/documentation.cpp
+++ b/engines/cryomni3d/versailles/documentation.cpp
@@ -82,8 +82,8 @@ const Versailles_Documentation::TimelineEntry Versailles_Documentation::kTimelin
};
void Versailles_Documentation::init(const Sprites *sprites, FontManager *fontManager,
- const Common::StringArray *messages, CryOmni3DEngine *engine,
- const Common::String &allDocsFileName, const Common::String &linksDocsFileName) {
+ const Common::StringArray *messages, CryOmni3DEngine *engine,
+ const Common::String &allDocsFileName, const Common::String &linksDocsFileName) {
_sprites = sprites;
_fontManager = fontManager;
_messages = messages;
@@ -669,7 +669,7 @@ void Versailles_Documentation::docAreaPrepareNavigation() {
}
void Versailles_Documentation::docAreaPrepareRecord(Graphics::ManagedSurface &surface,
- MouseBoxes &boxes) {
+ MouseBoxes &boxes) {
boxes.reset();
setupRecordBoxes(true, boxes);
@@ -698,7 +698,7 @@ void Versailles_Documentation::docAreaPrepareRecord(Graphics::ManagedSurface &su
}
uint Versailles_Documentation::docAreaHandleRecord(Graphics::ManagedSurface &surface,
- MouseBoxes &boxes, Common::String &nextRecord) {
+ MouseBoxes &boxes, Common::String &nextRecord) {
// Hovering is only handled for timeline entries
_engine->setCursor(181);
_engine->showMouse(true);
@@ -1318,7 +1318,7 @@ Common::String Versailles_Documentation::docAreaHandleCastleMap() {
}
void Versailles_Documentation::inGamePrepareRecord(Graphics::ManagedSurface &surface,
- MouseBoxes &boxes) {
+ MouseBoxes &boxes) {
_categoryStartRecord = "";
_categoryEndRecord = "";
_categoryTitle = "";
@@ -1350,7 +1350,7 @@ void Versailles_Documentation::inGamePrepareRecord(Graphics::ManagedSurface &sur
}
uint Versailles_Documentation::inGameHandleRecord(Graphics::ManagedSurface &surface,
- MouseBoxes &boxes, Common::String &nextRecord) {
+ MouseBoxes &boxes, Common::String &nextRecord) {
_engine->setCursor(181);
_engine->showMouse(true);
@@ -1401,8 +1401,8 @@ uint Versailles_Documentation::inGameHandleRecord(Graphics::ManagedSurface &surf
}
void Versailles_Documentation::drawRecordData(Graphics::ManagedSurface &surface,
- const Common::String &text, const Common::String &title,
- const Common::String &subtitle, const Common::String &caption) {
+ const Common::String &text, const Common::String &title,
+ const Common::String &subtitle, const Common::String &caption) {
unsigned char foreColor = 247;
Common::String background;
Common::Rect blockTitle;
@@ -1621,7 +1621,7 @@ void Versailles_Documentation::setupRecordBoxes(bool inDocArea, MouseBoxes &boxe
}
void Versailles_Documentation::drawRecordBoxes(Graphics::ManagedSurface &surface, bool inDocArea,
- MouseBoxes &boxes) {
+ MouseBoxes &boxes) {
if (_visitTrace.size()) {
surface.transBlitFrom(_sprites->getSurface(105), boxes.getBoxOrigin(0), _sprites->getKeyColor(105));
}
@@ -1662,9 +1662,9 @@ void Versailles_Documentation::drawRecordBoxes(Graphics::ManagedSurface &surface
}
uint Versailles_Documentation::handlePopupMenu(const Graphics::ManagedSurface
- &originalSurface,
- const Common::Point &anchor, bool rightAligned, uint itemHeight,
- const Common::StringArray &items) {
+ &originalSurface,
+ const Common::Point &anchor, bool rightAligned, uint itemHeight,
+ const Common::StringArray &items) {
uint maxTextWidth = 0;
@@ -1952,7 +1952,7 @@ const char *Versailles_Documentation::getRecordSubtitle(char *start, char *end)
}
void Versailles_Documentation::getRecordHyperlinks(char *start, char *end,
- Common::StringArray &hyperlinks) {
+ Common::StringArray &hyperlinks) {
const char *const hyperlinksPatterns[] = { "SAVOIR-PLUS 1=", "SAVOIR-PLUS 2=", "SAVOIR-PLUS 3=" };
hyperlinks.clear();
@@ -1992,8 +1992,8 @@ Common::String Versailles_Documentation::getRecordTitle(const Common::String &re
}
Common::String Versailles_Documentation::getRecordData(const Common::String &record,
- Common::String &title, Common::String &subtitle, Common::String &caption,
- Common::StringArray &hyperlinks) {
+ Common::String &title, Common::String &subtitle, Common::String &caption,
+ Common::StringArray &hyperlinks) {
Common::HashMap<Common::String, RecordInfo>::iterator it = _records.find(record);
if (it == _records.end()) {
warning("Can't find %s record data", record.c_str());
@@ -2041,7 +2041,7 @@ Common::String Versailles_Documentation::getRecordData(const Common::String &rec
}
void Versailles_Documentation::convertHyperlinks(const Common::StringArray &hyperlinks,
- Common::Array<LinkInfo> &links) {
+ Common::Array<LinkInfo> &links) {
for (Common::StringArray::const_iterator it = hyperlinks.begin(); it != hyperlinks.end(); it++) {
LinkInfo link;
link.record = *it;
@@ -2069,7 +2069,7 @@ void Versailles_Documentation::loadLinksFile() {
}
void Versailles_Documentation::getLinks(const Common::String &record,
- Common::Array<LinkInfo> &links) {
+ Common::Array<LinkInfo> &links) {
loadLinksFile();
links.clear();
diff --git a/engines/cryomni3d/versailles/engine.cpp b/engines/cryomni3d/versailles/engine.cpp
index 06496e1bab..d644b89ab8 100644
--- a/engines/cryomni3d/versailles/engine.cpp
+++ b/engines/cryomni3d/versailles/engine.cpp
@@ -49,7 +49,7 @@ const FixedImageConfiguration CryOmni3DEngine_Versailles::kFixedImageConfigurati
};
CryOmni3DEngine_Versailles::CryOmni3DEngine_Versailles(OSystem *syst,
- const CryOmni3DGameDescription *gamedesc) : CryOmni3DEngine(syst, gamedesc),
+ const CryOmni3DGameDescription *gamedesc) : CryOmni3DEngine(syst, gamedesc),
_mainPalette(nullptr), _cursorPalette(nullptr), _transparentPaletteMap(nullptr),
_transparentSrcStart(uint(-1)), _transparentSrcStop(uint(-1)), _transparentDstStart(uint(-1)),
_transparentDstStop(uint(-1)), _transparentNewStart(uint(-1)), _transparentNewStop(uint(-1)),
@@ -257,7 +257,7 @@ bool CryOmni3DEngine_Versailles::shouldAbort() {
}
Common::String CryOmni3DEngine_Versailles::prepareFileName(const Common::String &baseName,
- const char *const *extensions) const {
+ const char *const *extensions) const {
Common::String baseName_(baseName);
if (getPlatform() != Common::kPlatformMacintosh) {
// Replace dashes by underscores for PC versions
@@ -440,7 +440,7 @@ void CryOmni3DEngine_Versailles::loadCursorsPalette() {
}
void CryOmni3DEngine_Versailles::setupPalette(const byte *palette, uint start, uint num,
- bool commit) {
+ bool commit) {
memcpy(_mainPalette + 3 * start, palette, 3 * num);
copySubPalette(_mainPalette, _cursorPalette, 240, 8);
@@ -536,7 +536,7 @@ void CryOmni3DEngine_Versailles::calculateTransparentMapping() {
}
void CryOmni3DEngine_Versailles::makeTranslucent(Graphics::Surface &dst,
- const Graphics::Surface &src) const {
+ const Graphics::Surface &src) const {
assert(dst.w == src.w && dst.h == src.h);
const byte *srcP = (const byte *) src.getPixels();
@@ -1120,7 +1120,7 @@ void CryOmni3DEngine_Versailles::fakeTransition(uint dstPlaceId) {
}
uint CryOmni3DEngine_Versailles::determineTransitionAnimation(uint srcPlaceId,
- uint dstPlaceId, const Transition **transition_) {
+ uint dstPlaceId, const Transition **transition_) {
const Place *srcPlace = _wam.findPlaceById(srcPlaceId);
const Place *dstPlace = _wam.findPlaceById(dstPlaceId);
const Transition *transition = srcPlace->findTransition(dstPlaceId);
@@ -1270,7 +1270,7 @@ int CryOmni3DEngine_Versailles::handleWarp() {
}
bool CryOmni3DEngine_Versailles::handleWarpMouse(uint *actionId,
- uint movingCursor) {
+ uint movingCursor) {
fixActionId(actionId);
if (getCurrentMouseButton() == 2 ||
@@ -1485,7 +1485,7 @@ void CryOmni3DEngine_Versailles::animateCursor(const Object *obj) {
}
void CryOmni3DEngine_Versailles::collectObject(Object *obj, const ZonFixedImage *fimg,
- bool showObject) {
+ bool showObject) {
_inventory.add(obj);
Object::ViewCallback cb = obj->viewCallback();
if (showObject && cb) {
@@ -1501,7 +1501,7 @@ void CryOmni3DEngine_Versailles::collectObject(Object *obj, const ZonFixedImage
}
void CryOmni3DEngine_Versailles::displayObject(const Common::String &imgName,
- DisplayObjectHook hook) {
+ DisplayObjectHook hook) {
Image::ImageDecoder *imageDecoder = loadHLZ(imgName);
if (!imageDecoder) {
error("Can't display object");
@@ -1624,7 +1624,7 @@ uint CryOmni3DEngine_Versailles::getFakeTransition(uint actionId) const {
}
void CryOmni3DEngine_Versailles::playInGameVideo(const Common::String &filename,
- bool restoreCursorPalette) {
+ bool restoreCursorPalette) {
if (!_isPlaying) {
return;
}
@@ -1723,7 +1723,7 @@ void CryOmni3DEngine_Versailles::drawVideoSubtitles(uint frameNum) {
}
void CryOmni3DEngine_Versailles::loadBMPs(const char *pattern, Graphics::Surface *bmps,
- uint count) {
+ uint count) {
Image::BitmapDecoder bmpDecoder;
Common::File file;
diff --git a/engines/cryomni3d/versailles/logic.cpp b/engines/cryomni3d/versailles/logic.cpp
index 3e583ea11f..be9ed0c733 100644
--- a/engines/cryomni3d/versailles/logic.cpp
+++ b/engines/cryomni3d/versailles/logic.cpp
@@ -67,9 +67,9 @@ void CryOmni3DEngine_Versailles::setupObjects() {
_objects.reserve(51);
#define SET_OBJECT(cursorId, nameId) _objects.push_back(Object(_sprites, cursorId, nameId))
#define SET_OBJECT_AND_CB(cursorId, nameId, cb) do { \
- _objects.push_back(Object(_sprites, cursorId, nameId)); \
- _objects.back().setViewCallback(new Common::Functor0Mem<void, CryOmni3DEngine_Versailles>(this, &CryOmni3DEngine_Versailles::cb)); \
- } while (false)
+ _objects.push_back(Object(_sprites, cursorId, nameId)); \
+ _objects.back().setViewCallback(new Common::Functor0Mem<void, CryOmni3DEngine_Versailles>(this, &CryOmni3DEngine_Versailles::cb)); \
+ } while (false)
#define SET_OBJECT_GENERIC_CB(cursorId, nameId, imageId) SET_OBJECT_AND_CB(cursorId, nameId, genericDisplayObject<imageId>)
#define SET_OBJECT_CB(cursorId, nameId) SET_OBJECT_AND_CB(cursorId, nameId, obj_ ## nameId)
SET_OBJECT(161, 93); // 0
@@ -478,12 +478,12 @@ void CryOmni3DEngine_Versailles::genericDumbImage(ZonFixedImage *fimg) {
// Generic handler for interrogation mark action: display the painting title
#define HANDLE_QUESTION(ID) \
- do { \
- if (fimg->_zoneQuestion) { \
- displayMessageBox(kFixedimageMsgBoxParameters, fimg->surface(), _paintingsTitles[ID], Common::Point(600, 400), \
- Common::Functor0Mem<void, ZonFixedImage>(fimg, &ZonFixedImage::manage)); \
- } \
- } while (false)
+ do { \
+ if (fimg->_zoneQuestion) { \
+ displayMessageBox(kFixedimageMsgBoxParameters, fimg->surface(), _paintingsTitles[ID], Common::Point(600, 400), \
+ Common::Functor0Mem<void, ZonFixedImage>(fimg, &ZonFixedImage::manage)); \
+ } \
+ } while (false)
// Generic handler for paintings fixed images
template<uint ID>
@@ -1286,7 +1286,7 @@ const uint16 CryOmni3DEngine_Versailles::kSafeDigitsX[] = { 267, 318, 370, 421 }
const uint16 CryOmni3DEngine_Versailles::kSafeDigitsY[] = { 148, 230, 311 };
void CryOmni3DEngine_Versailles::drawSafeDigits(Graphics::ManagedSurface &surface,
- const Graphics::Surface(&bmpDigits)[10], const unsigned char (&safeDigits)[kSafeDigitsCount]) {
+ const Graphics::Surface(&bmpDigits)[10], const unsigned char (&safeDigits)[kSafeDigitsCount]) {
for (uint i = 0; i < ARRAYSIZE(safeDigits); i++) {
const Graphics::Surface &digit = bmpDigits[safeDigits[i]];
Common::Point dst(kSafeDigitsX[i % 4], kSafeDigitsY[i / 4]);
@@ -2444,7 +2444,7 @@ bool CryOmni3DEngine_Versailles::handleEpigraph(ZonFixedImage *fimg) {
}
void CryOmni3DEngine_Versailles::drawEpigraphLetters(Graphics::ManagedSurface &surface,
- const Graphics::Surface(&bmpLetters)[28], const Common::String &letters) {
+ const Graphics::Surface(&bmpLetters)[28], const Common::String &letters) {
for (uint i = 0; i < letters.size() && i < kEpigraphMaxLetters; i++) {
uint letterId = 0;
if (letters[i] >= 'A' && letters[i] <= 'Z') {
@@ -3206,9 +3206,9 @@ const uint16 CryOmni3DEngine_Versailles::kBombLettersPos[2][kBombPasswordMaxLeng
};
void CryOmni3DEngine_Versailles::drawBombLetters(Graphics::ManagedSurface &surface,
- const Graphics::Surface(&bmpLetters)[28], const uint bombPasswordLength,
- const uint32(&bombPossibilites)[kBombPasswordMaxLength][5],
- const byte(&bombCurrentLetters)[kBombPasswordMaxLength]) {
+ const Graphics::Surface(&bmpLetters)[28], const uint bombPasswordLength,
+ const uint32(&bombPossibilites)[kBombPasswordMaxLength][5],
+ const byte(&bombCurrentLetters)[kBombPasswordMaxLength]) {
uint table = bombPasswordLength <= kBombPasswordSmallLength ? 0 : 1;
if (getLanguage() == Common::JA_JPN) {
_fontManager.setCurrentFont(1);
@@ -3369,13 +3369,13 @@ FILTER_EVENT(1, 3) {
// Event 19 is not in this room: must be a leftover
/*
FILTER_EVENT(1, 7) {
- if (*event == 19) {
- // Too dark
- displayMessageBoxWarp(7);
- return false;
- }
+ if (*event == 19) {
+ // Too dark
+ displayMessageBoxWarp(7);
+ return false;
+ }
- return true;
+ return true;
}
*/
diff --git a/engines/cryomni3d/versailles/menus.cpp b/engines/cryomni3d/versailles/menus.cpp
index 6a4e7ca084..1158c822e1 100644
--- a/engines/cryomni3d/versailles/menus.cpp
+++ b/engines/cryomni3d/versailles/menus.cpp
@@ -529,7 +529,7 @@ uint CryOmni3DEngine_Versailles::displayOptions() {
}
uint CryOmni3DEngine_Versailles::displayYesNoBox(Graphics::ManagedSurface &surface,
- const Common::Rect &position, uint msg_id) {
+ const Common::Rect &position, uint msg_id) {
uint confirmWidth = _fontManager.getStrWidth(_messages[53]);
uint cancelWidth = _fontManager.getStrWidth(_messages[54]);
uint oldFont = _fontManager.getCurrentFont();
@@ -604,7 +604,7 @@ uint CryOmni3DEngine_Versailles::displayYesNoBox(Graphics::ManagedSurface &surfa
}
uint CryOmni3DEngine_Versailles::displayFilePicker(const Graphics::Surface *bgFrame,
- bool saveMode, Common::String &saveName) {
+ bool saveMode, Common::String &saveName) {
bool autoName = (_messages.size() >= 148);
Graphics::ManagedSurface surface(bgFrame->w, bgFrame->h, bgFrame->format);
@@ -891,8 +891,8 @@ const MsgBoxParameters CryOmni3DEngine_Versailles::kFixedimageMsgBoxParameters =
};
void CryOmni3DEngine_Versailles::displayMessageBox(const MsgBoxParameters ¶ms,
- const Graphics::Surface *surface, const Common::String &msg, const Common::Point &position,
- const Common::Functor0<void> &callback) {
+ const Graphics::Surface *surface, const Common::String &msg, const Common::Point &position,
+ const Common::Functor0<void> &callback) {
Graphics::ManagedSurface dstSurface;
dstSurface.create(surface->w, surface->h, surface->format);
dstSurface.blitFrom(*surface);
diff --git a/engines/cryomni3d/versailles/music.cpp b/engines/cryomni3d/versailles/music.cpp
index 22d1dd8a59..d97a533827 100644
--- a/engines/cryomni3d/versailles/music.cpp
+++ b/engines/cryomni3d/versailles/music.cpp
@@ -140,7 +140,7 @@ bool CryOmni3DEngine_Versailles::musicWouldChange(uint level, uint placeId) cons
}
uint CryOmni3DEngine_Versailles::getMusicId(uint level,
- uint placeId) const {
+ uint placeId) const {
// No need of place state
switch (level) {
case 1:
diff --git a/engines/cryomni3d/versailles/saveload.cpp b/engines/cryomni3d/versailles/saveload.cpp
index e28db7bc87..4a0fd4209f 100644
--- a/engines/cryomni3d/versailles/saveload.cpp
+++ b/engines/cryomni3d/versailles/saveload.cpp
@@ -54,7 +54,7 @@ bool CryOmni3DEngine_Versailles::canVisit() const {
}
void CryOmni3DEngine_Versailles::getSavesList(bool visit, Common::StringArray &saveNames,
- int &nextSaveNum) {
+ int &nextSaveNum) {
nextSaveNum = 1;
bool supportsAutoName = (_messages.size() >= 148);
@@ -145,7 +145,7 @@ void CryOmni3DEngine_Versailles::getSavesList(bool visit, Common::StringArray &s
}
void CryOmni3DEngine_Versailles::saveGame(bool visit, uint saveNum,
- const Common::String &saveName) {
+ const Common::String &saveName) {
if (visit && saveNum == 1) {
error("Can't erase bootstrap visit");
}
diff --git a/engines/cryomni3d/versailles/toolbar.cpp b/engines/cryomni3d/versailles/toolbar.cpp
index e4b1ce9bfd..c9633f3571 100644
--- a/engines/cryomni3d/versailles/toolbar.cpp
+++ b/engines/cryomni3d/versailles/toolbar.cpp
@@ -30,8 +30,8 @@ namespace CryOmni3D {
namespace Versailles {
void Toolbar::init(const Sprites *sprites, FontManager *fontManager,
- const Common::Array<Common::String> *messages, Inventory *inventory,
- CryOmni3DEngine *engine) {
+ const Common::Array<Common::String> *messages, Inventory *inventory,
+ CryOmni3DEngine *engine) {
_sprites = sprites;
_fontManager = fontManager;
_messages = messages;
@@ -82,7 +82,7 @@ void Toolbar::inventoryChanged(uint newPosition) {
}
void Toolbar::addZone(uint16 cursorMainId, uint16 cursorSecondaryId, Common::Point position,
- ZoneCallback callback) {
+ ZoneCallback callback) {
const Graphics::Cursor &cursorMain = _sprites->getCursor(cursorMainId);
Common::Rect rct(cursorMain.getWidth(), cursorMain.getHeight());
rct.moveTo(position);
diff --git a/engines/cryomni3d/video/hnm_decoder.cpp b/engines/cryomni3d/video/hnm_decoder.cpp
index 43a75f9da2..5214cfd8e2 100644
--- a/engines/cryomni3d/video/hnm_decoder.cpp
+++ b/engines/cryomni3d/video/hnm_decoder.cpp
@@ -153,7 +153,7 @@ void HNMDecoder::readNextPacket() {
}
HNMDecoder::HNM4VideoTrack::HNM4VideoTrack(uint32 width, uint32 height, uint32 frameSize,
- uint32 frameCount, uint32 regularFrameDelay, const byte *initialPalette) :
+ uint32 frameCount, uint32 regularFrameDelay, const byte *initialPalette) :
_frameCount(frameCount), _regularFrameDelay(regularFrameDelay), _nextFrameStartTime(0) {
restart();
@@ -350,7 +350,7 @@ void HNMDecoder::HNM4VideoTrack::decodeIntraframe(Common::SeekableReadStream *st
}
HNMDecoder::DPCMAudioTrack::DPCMAudioTrack(uint16 channels, uint16 bits, uint sampleRate,
- Audio::Mixer::SoundType soundType) : AudioTrack(soundType), _audioStream(nullptr),
+ Audio::Mixer::SoundType soundType) : AudioTrack(soundType), _audioStream(nullptr),
_gotLUT(false), _lastSample(0) {
if (bits != 16) {
error("Unsupported audio bits");
@@ -366,7 +366,7 @@ HNMDecoder::DPCMAudioTrack::~DPCMAudioTrack() {
}
Audio::Timestamp HNMDecoder::DPCMAudioTrack::decodeSound(Common::SeekableReadStream *stream,
- uint32 size) {
+ uint32 size) {
if (!_gotLUT) {
if (size < 256 * sizeof(*_lut)) {
error("Invalid first sound chunk");
diff --git a/engines/director/lingo/lingo-code.cpp b/engines/director/lingo/lingo-code.cpp
index 58181d4565..2bf058ca31 100644
--- a/engines/director/lingo/lingo-code.cpp
+++ b/engines/director/lingo/lingo-code.cpp
@@ -985,7 +985,7 @@ void LC::c_charOf() {
Datum src = g_lingo->pop(false);
Datum index = g_lingo->pop();
- if ((index.type != INT && index.type != FLOAT)
+ if ((index.type != INT && index.type != FLOAT)
|| (src.type != STRING && src.type != VAR && src.type != FIELDREF && src.type != CHUNKREF && src.type != CASTREF)) {
g_lingo->lingoError("LC::c_charOf(): Called with wrong data types: %s and %s", index.type2str(), src.type2str());
g_lingo->push(Datum(""));
diff --git a/engines/director/util.h b/engines/director/util.h
index 009291e33d..3918b3fb65 100644
--- a/engines/director/util.h
+++ b/engines/director/util.h
@@ -58,22 +58,22 @@ bool processQuitEvent(bool click = false); // events.cpp
class RandomState {
public:
- uint32 _seed;
- uint32 _mask;
- uint32 _len;
+ uint32 _seed;
+ uint32 _mask;
+ uint32 _len;
- RandomState() {
- _seed = _mask = _len = 0;
- }
+ RandomState() {
+ _seed = _mask = _len = 0;
+ }
- void setSeed(int seed);
- uint32 getSeed() { return _seed; }
- int32 getRandom(int32 range);
+ void setSeed(int seed);
+ uint32 getSeed() { return _seed; }
+ int32 getRandom(int32 range);
private:
- void init(int len);
- int32 genNextRandom();
- int32 perlin(int32 val);
+ void init(int len);
+ int32 genNextRandom();
+ int32 perlin(int32 val);
};
uint32 readVarInt(Common::SeekableReadStream &stream);
diff --git a/engines/dm/gfx.cpp b/engines/dm/gfx.cpp
index cdf92a884b..813633c80c 100644
--- a/engines/dm/gfx.cpp
+++ b/engines/dm/gfx.cpp
@@ -558,7 +558,7 @@ void DisplayMan::initConstants() {
for(int c = 0; c < 6; ++c)
_wallOrnamentCoordSets[a][b][c] = wallOrnamentCoordSets[a][b][c];
- for(int a = 0; a < 4; ++a)
+ for(int a = 0; a < 4; ++a)
for(int b = 0; b < 3; ++b)
for(int c = 0; c < 6; ++c)
_doorOrnCoordSets[a][b][c] = doorOrnCoordSets[a][b][c];
@@ -703,8 +703,8 @@ void DisplayMan::initializeGraphicData() {
_bitmapViewport = new byte[224 * 136]();
if (!_derivedBitmapByteCount) {
- _derivedBitmapByteCount = new uint16[k730_DerivedBitmapMaximumCount];
- }
+ _derivedBitmapByteCount = new uint16[k730_DerivedBitmapMaximumCount];
+ }
if (!_derivedBitmaps) {
_derivedBitmaps = new byte *[k730_DerivedBitmapMaximumCount];
for (uint16 i = 0; i < k730_DerivedBitmapMaximumCount; ++i)
diff --git a/engines/draci/metaengine.cpp b/engines/draci/metaengine.cpp
index fa40d4f817..f982e831a8 100644
--- a/engines/draci/metaengine.cpp
+++ b/engines/draci/metaengine.cpp
@@ -34,7 +34,7 @@ public:
return "draci";
}
- bool hasFeature(MetaEngineFeature f) const override;
+ bool hasFeature(MetaEngineFeature f) const override;
int getMaximumSaveSlot() const override { return 99; }
SaveStateList listSaves(const char *target) const override;
void removeSaveState(const char *target, int slot) const override;
diff --git a/engines/draci/sprite.cpp b/engines/draci/sprite.cpp
index 8b5e5a918a..32e34db032 100644
--- a/engines/draci/sprite.cpp
+++ b/engines/draci/sprite.cpp
@@ -55,7 +55,7 @@ static void transformToRows(byte *img, uint16 width, uint16 height) {
* Constructor for loading sprites from a raw data buffer, one byte per pixel.
*/
Sprite::Sprite(uint16 width, uint16 height, byte *raw_data, int x, int y, bool columnwise)
- : _ownsData(true), _data(raw_data), _mirror(false) {
+ : _ownsData(true), _data(raw_data), _mirror(false) {
_width = width;
_height = height;
@@ -78,7 +78,7 @@ Sprite::Sprite(uint16 width, uint16 height, byte *raw_data, int x, int y, bool c
* pixel.
*/
Sprite::Sprite(const byte *sprite_data, uint16 length, int x, int y, bool columnwise)
- : _ownsData(false), _data(NULL), _mirror(false) {
+ : _ownsData(false), _data(NULL), _mirror(false) {
Common::MemoryReadStream reader(sprite_data, length);
_width = reader.readSint16LE();
@@ -250,7 +250,7 @@ Common::Rect Sprite::getRect(const Displacement &displacement) const {
}
Text::Text(const Common::String &str, const Font *font, byte fontColor,
- int x, int y, uint spacing) {
+ int x, int y, uint spacing) {
_x = x;
_y = y;
_delay = 0;
diff --git a/engines/drascula/metaengine.cpp b/engines/drascula/metaengine.cpp
index 4ae15bb914..a1cd28b40d 100644
--- a/engines/drascula/metaengine.cpp
+++ b/engines/drascula/metaengine.cpp
@@ -60,14 +60,14 @@ SaveStateDescriptor loadMetaData(Common::ReadStream *s, int slot, bool setPlayTi
class DrasculaMetaEngine : public AdvancedMetaEngine {
public:
- const char *getName() const override {
+ const char *getName() const override {
return "drascula";
}
Common::Error createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const override;
bool hasFeature(MetaEngineFeature f) const override;
- SaveStateList listSaves(const char *target) const override;
+ SaveStateList listSaves(const char *target) const override;
int getMaximumSaveSlot() const override;
void removeSaveState(const char *target, int slot) const override;
SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
diff --git a/engines/engine.cpp b/engines/engine.cpp
index b926d475e3..2405600838 100644
--- a/engines/engine.cpp
+++ b/engines/engine.cpp
@@ -472,7 +472,7 @@ void Engine::checkCD() {
#endif
#ifdef USE_FLAC
if (Common::File::exists("track1.fla") ||
- Common::File::exists("track1.flac") ||
+ Common::File::exists("track1.flac") ||
Common::File::exists("track01.fla") ||
Common::File::exists("track01.flac"))
return;
diff --git a/engines/engine.h b/engines/engine.h
index 3d5963233a..6ee760ca3e 100644
--- a/engines/engine.h
+++ b/engines/engine.h
@@ -97,16 +97,16 @@ class PauseToken {
public:
PauseToken();
/**
- * Construct a pause token.
- */
+ * Construct a pause token.
+ */
PauseToken(const PauseToken &);
#if __cplusplus >= 201103L
PauseToken(PauseToken &&);
#endif
~PauseToken();
/**
- * Assign the pause token.
- */
+ * Assign the pause token.
+ */
void operator=(const PauseToken &);
#if __cplusplus >= 201103L
void operator=(PauseToken &&);
diff --git a/engines/glk/adrift/os_glk.cpp b/engines/glk/adrift/os_glk.cpp
index b4b9e4c5e2..1f94db46d6 100644
--- a/engines/glk/adrift/os_glk.cpp
+++ b/engines/glk/adrift/os_glk.cpp
@@ -83,12 +83,12 @@ sc_game gsc_game = nullptr;
/* Special out-of-band os_confirm() options used locally with os_glk. */
static const sc_int GSC_CONF_SUBTLE_HINT = INTEGER_MAX,
- GSC_CONF_UNSUBTLE_HINT = INTEGER_MAX - 1,
- GSC_CONF_CONTINUE_HINTS = INTEGER_MAX - 2;
+ GSC_CONF_UNSUBTLE_HINT = INTEGER_MAX - 1,
+ GSC_CONF_CONTINUE_HINTS = INTEGER_MAX - 2;
/* Forward declaration of event wait functions, and a short delay. */
static void gsc_event_wait_2(glui32 wait_type_1,
- glui32 wait_type_2, event_t *event);
+ glui32 wait_type_2, event_t *event);
static void gsc_event_wait(glui32 wait_type, event_t *event);
static void gsc_short_delay();
@@ -467,7 +467,7 @@ static void glk_put_char_uni(glui32 ch) {
}
static void glk_request_line_event_uni(winid_t win,
- glui32 *buf, glui32 maxlen, glui32 initlen) {
+ glui32 *buf, glui32 maxlen, glui32 initlen) {
winid_t unused1;
glui32 *unused2;
glui32 unused3, unused4;
@@ -486,7 +486,7 @@ static void glk_request_line_event_uni(winid_t win,
* we also make an explicit range check against guaranteed to print chars.
*/
static const glui32 GSC_MIN_PRINTABLE = ' ',
- GSC_MAX_PRINTABLE = '~';
+ GSC_MAX_PRINTABLE = '~';
/* List of pointers to supported and available locales, nullptr terminated. */
@@ -1002,7 +1002,7 @@ static void gsc_status_redraw() {
* been silenced as a result of already using a Glk command.
*/
static int gsc_help_requested = FALSE,
- gsc_help_hints_silenced = FALSE;
+ gsc_help_hints_silenced = FALSE;
/* Font descriptor type, encapsulating size and monospaced boolean. */
struct gsc_font_size_t {
@@ -1015,14 +1015,14 @@ enum { GSC_MAX_STYLE_NESTING = 32 };
static gsc_font_size_t gsc_font_stack[GSC_MAX_STYLE_NESTING];
static glui32 gsc_font_index = 0;
static glui32 gsc_attribute_bold = 0,
- gsc_attribute_italic = 0,
- gsc_attribute_underline = 0,
- gsc_attribute_secondary_color = 0;
+ gsc_attribute_italic = 0,
+ gsc_attribute_underline = 0,
+ gsc_attribute_secondary_color = 0;
/* Notional default font size, and limit font sizes. */
static const sc_int GSC_DEFAULT_FONT_SIZE = 12,
- GSC_MEDIUM_FONT_SIZE = 14,
- GSC_LARGE_FONT_SIZE = 16;
+ GSC_MEDIUM_FONT_SIZE = 14,
+ GSC_LARGE_FONT_SIZE = 16;
/* Milliseconds per second and timeouts count for delay tags. */
static const glui32 GSC_MILLISECONDS_PER_SECOND = 1000;
@@ -1033,7 +1033,7 @@ static const sc_int GSC_HINT_REFUSAL_LIMIT = 5;
/* The keypresses used to cancel any <wait x.x> early. */
static const glui32 GSC_CANCEL_WAIT_1 = ' ',
- GSC_CANCEL_WAIT_2 = keycode_Return;
+ GSC_CANCEL_WAIT_2 = keycode_Return;
/*
@@ -3019,7 +3019,7 @@ static void gsc_main() {
* we only get a call to main once.
*/
static int gsc_startup_called = FALSE,
- gsc_main_called = FALSE;
+ gsc_main_called = FALSE;
/*
* adrift_main()
diff --git a/engines/glk/adrift/scare.h b/engines/glk/adrift/scare.h
index f3bdc5a5ec..104a72fc87 100644
--- a/engines/glk/adrift/scare.h
+++ b/engines/glk/adrift/scare.h
@@ -77,10 +77,10 @@ typedef void *sc_game;
extern void os_print_string(const sc_char *string);
extern void os_print_tag(sc_int tag, const sc_char *argument);
extern void os_play_sound(const sc_char *filepath,
- sc_int offset, sc_int length, sc_bool is_looping);
+ sc_int offset, sc_int length, sc_bool is_looping);
extern void os_stop_sound();
extern void os_show_graphic(const sc_char *filepath,
- sc_int offset, sc_int length);
+ sc_int offset, sc_int length);
extern sc_bool os_read_line(sc_char *buffer, sc_int length);
extern sc_bool os_confirm(sc_int type);
extern void *os_open_file(sc_bool is_save);
@@ -110,8 +110,8 @@ extern void sc_set_trace_flags(sc_uint trace_flags);
extern sc_game sc_game_from_filename(const sc_char *filename);
extern sc_game sc_game_from_stream(Common::SeekableReadStream *stream);
extern sc_game sc_game_from_callback(sc_int(*callback)
- (void *, sc_byte *, sc_int),
- void *opaque);
+ (void *, sc_byte *, sc_int),
+ void *opaque);
extern void sc_interpret_game(CONTEXT, sc_game game);
extern void sc_restart_game(CONTEXT, sc_game game);
extern sc_bool sc_save_game(sc_game game);
@@ -121,16 +121,16 @@ extern void sc_quit_game(sc_game game);
extern sc_bool sc_save_game_to_filename(sc_game game, const sc_char *filename);
extern void sc_save_game_to_stream(sc_game game, Common::SeekableReadStream *stream);
extern void sc_save_game_to_callback(sc_game game,
- void (*callback)
- (void *, const sc_byte *, sc_int),
- void *opaque);
+ void (*callback)
+ (void *, const sc_byte *, sc_int),
+ void *opaque);
extern sc_bool sc_load_game_from_filename(sc_game game,
- const sc_char *filename);
+ const sc_char *filename);
extern sc_bool sc_load_game_from_stream(sc_game game, Common::SeekableReadStream *stream);
extern sc_bool sc_load_game_from_callback(sc_game game,
- sc_int(*callback)
- (void *, sc_byte *, sc_int),
- void *opaque);
+ sc_int(*callback)
+ (void *, sc_byte *, sc_int),
+ void *opaque);
extern void sc_free_game(sc_game game);
extern sc_bool sc_is_game_running(sc_game game);
extern const sc_char *sc_get_game_name(sc_game game);
@@ -158,16 +158,16 @@ typedef void *sc_game_hint;
extern sc_game_hint sc_get_first_game_hint(sc_game game);
extern sc_game_hint sc_get_next_game_hint(sc_game game, sc_game_hint hint);
extern const sc_char *sc_get_game_hint_question(sc_game game,
- sc_game_hint hint);
+ sc_game_hint hint);
extern const sc_char *sc_get_game_subtle_hint(sc_game game,
- sc_game_hint hint);
+ sc_game_hint hint);
extern const sc_char *sc_get_game_unsubtle_hint(sc_game game,
- sc_game_hint hint);
+ sc_game_hint hint);
extern void sc_set_game_debugger_enabled(sc_game game, sc_bool flag);
extern sc_bool sc_get_game_debugger_enabled(sc_game game);
extern sc_bool sc_run_game_debugger_command(sc_game game,
- const sc_char *debug_command);
+ const sc_char *debug_command);
extern void sc_set_portable_random(sc_bool flag);
extern void sc_reseed_random_sequence(sc_uint new_seed);
diff --git a/engines/glk/adrift/scgamest.cpp b/engines/glk/adrift/scgamest.cpp
index 9ecc8806cf..bc8d24ea1e 100644
--- a/engines/glk/adrift/scgamest.cpp
+++ b/engines/glk/adrift/scgamest.cpp
@@ -449,7 +449,7 @@ sc_int gs_npc_walkstep_count(sc_gameref_t gs, sc_int npc) {
}
void gs_set_npc_walkstep(sc_gameref_t gs,
- sc_int npc, sc_int walk, sc_int walkstep) {
+ sc_int npc, sc_int walk, sc_int walkstep) {
assert(gs_is_game_valid(gs) && gs_in_range(npc, gs->npc_count)
&& gs_in_range(walk, gs->npcs[npc].walkstep_count));
gs->npcs[npc].walksteps[walk] = walkstep;
diff --git a/engines/glk/adrift/scinterf.cpp b/engines/glk/adrift/scinterf.cpp
index d6d63365dc..9ad3e09db1 100644
--- a/engines/glk/adrift/scinterf.cpp
+++ b/engines/glk/adrift/scinterf.cpp
@@ -265,7 +265,7 @@ void if_update_sound(const sc_char *filename, sc_int sound_offset, sc_int sound_
}
void if_update_graphic(const sc_char *filename,
- sc_int graphic_offset, sc_int graphic_length) {
+ sc_int graphic_offset, sc_int graphic_length) {
os_show_graphic(filename, graphic_offset, graphic_length);
}
diff --git a/engines/glk/adrift/sclibrar.cpp b/engines/glk/adrift/sclibrar.cpp
index e3c13eae3a..3e18b122d8 100644
--- a/engines/glk/adrift/sclibrar.cpp
+++ b/engines/glk/adrift/sclibrar.cpp
@@ -7245,7 +7245,7 @@ static sc_bool lib_put_on_filter(sc_gameref_t game, sc_int object, sc_int unused
static sc_bool
lib_put_on_not_supporter_filter(sc_gameref_t game,
- sc_int object, sc_int supporter) {
+ sc_int object, sc_int supporter) {
return lib_put_on_filter(game, object, -1) && object != supporter;
}
@@ -9339,7 +9339,7 @@ sc_bool lib_cmd_wash_other(sc_gameref_t game) {
* uninteresting responses.
*/
static sc_bool lib_dont_think_common(sc_gameref_t game,
- const sc_char *verb, sc_bool is_object) {
+ const sc_char *verb, sc_bool is_object) {
const sc_filterref_t filter = gs_get_filter(game);
sc_int object;
sc_bool is_ambiguous;
diff --git a/engines/glk/adrift/scprintf.cpp b/engines/glk/adrift/scprintf.cpp
index 73c14d2e4a..fcbbc58767 100644
--- a/engines/glk/adrift/scprintf.cpp
+++ b/engines/glk/adrift/scprintf.cpp
@@ -46,8 +46,8 @@ static const sc_char LESSTHAN = '<';
static const sc_char GREATERTHAN = '>';
static const sc_char PERCENT = '%';
static const sc_char *const ENTITY_LESSTHAN = "<",
- *const ENTITY_GREATERTHAN = ">",
- *const ENTITY_PERCENT = "+percent+";
+ *const ENTITY_GREATERTHAN = ">",
+ *const ENTITY_PERCENT = "+percent+";
enum {
ENTITY_LENGTH = 4,
PERCENT_LENGTH = 9
diff --git a/engines/glk/adrift/scprotos.h b/engines/glk/adrift/scprotos.h
index 0a742b921f..bf9cc78c87 100644
--- a/engines/glk/adrift/scprotos.h
+++ b/engines/glk/adrift/scprotos.h
@@ -91,7 +91,7 @@ extern sc_bool sc_strempty(const sc_char *string);
extern sc_char *sc_trim_string(sc_char *string);
extern sc_char *sc_normalize_string(sc_char *string);
extern sc_bool sc_compare_word(const sc_char *string,
- const sc_char *Word, sc_int length);
+ const sc_char *Word, sc_int length);
extern sc_uint sc_hash(const sc_char *string);
/* TAF file reader/decompressor enumerations, opaque typedef and functions. */
@@ -108,7 +108,7 @@ typedef struct sc_taf_s *sc_tafref_t;
extern void taf_destroy(sc_tafref_t taf);
extern sc_tafref_t taf_create(sc_read_callbackref_t callback, void *opaque);
extern sc_tafref_t taf_create_tas(sc_read_callbackref_t callback,
- void *opaque);
+ void *opaque);
extern void taf_first_line(sc_tafref_t taf);
extern const sc_char *taf_next_line(sc_tafref_t taf);
extern sc_bool taf_more_lines(sc_tafref_t taf);
@@ -132,24 +132,24 @@ typedef struct sc_prop_set_s *sc_prop_setref_t;
extern sc_prop_setref_t prop_create(const sc_tafref_t taf);
extern void prop_destroy(sc_prop_setref_t bundle);
extern void prop_put(sc_prop_setref_t bundle,
- const sc_char *format, sc_vartype_t vt_value,
- const sc_vartype_t vt_key[]);
+ const sc_char *format, sc_vartype_t vt_value,
+ const sc_vartype_t vt_key[]);
extern sc_bool prop_get(sc_prop_setref_t bundle,
- const sc_char *format, sc_vartype_t *vt_value,
- const sc_vartype_t vt_key[]);
+ const sc_char *format, sc_vartype_t *vt_value,
+ const sc_vartype_t vt_key[]);
extern void prop_solidify(sc_prop_setref_t bundle);
extern sc_int prop_get_integer(sc_prop_setref_t bundle,
- const sc_char *format,
- const sc_vartype_t vt_key[]);
+ const sc_char *format,
+ const sc_vartype_t vt_key[]);
extern sc_bool prop_get_boolean(sc_prop_setref_t bundle,
- const sc_char *format,
- const sc_vartype_t vt_key[]);
+ const sc_char *format,
+ const sc_vartype_t vt_key[]);
extern const sc_char *prop_get_string(sc_prop_setref_t bundle,
- const sc_char *format,
- const sc_vartype_t vt_key[]);
+ const sc_char *format,
+ const sc_vartype_t vt_key[]);
extern sc_int prop_get_child_count(sc_prop_setref_t bundle,
- const sc_char *format,
- const sc_vartype_t vt_key[]);
+ const sc_char *format,
+ const sc_vartype_t vt_key[]);
extern void prop_adopt(sc_prop_setref_t bundle, void *addr);
extern void prop_debug_trace(sc_bool flag);
extern void prop_debug_dump(sc_prop_setref_t bundle);
@@ -184,17 +184,17 @@ enum {
typedef struct sc_var_set_s *sc_var_setref_t;
extern void var_put(sc_var_setref_t vars,
- const sc_char *name, sc_int _type, sc_vartype_t vt_value);
+ const sc_char *name, sc_int _type, sc_vartype_t vt_value);
extern sc_bool var_get(sc_var_setref_t vars,
- const sc_char *name, sc_int *_type,
- sc_vartype_t *vt_rvalue);
+ const sc_char *name, sc_int *_type,
+ sc_vartype_t *vt_rvalue);
extern void var_put_integer(sc_var_setref_t vars,
- const sc_char *name, sc_int value);
+ const sc_char *name, sc_int value);
extern sc_int var_get_integer(sc_var_setref_t vars, const sc_char *name);
extern void var_put_string(sc_var_setref_t vars,
- const sc_char *name, const sc_char *string);
+ const sc_char *name, const sc_char *string);
extern const sc_char *var_get_string(sc_var_setref_t vars,
- const sc_char *name);
+ const sc_char *name);
extern sc_var_setref_t var_create(sc_prop_setref_t bundle);
extern void var_destroy(sc_var_setref_t vars);
extern void var_register_game(sc_var_setref_t vars, sc_gameref_t game);
@@ -213,22 +213,22 @@ extern void var_debug_dump(sc_var_setref_t vars);
/* Expression evaluation functions. */
extern sc_bool expr_eval_numeric_expression(const sc_char *expression,
- sc_var_setref_t vars,
- sc_int *rvalue);
+ sc_var_setref_t vars,
+ sc_int *rvalue);
extern sc_bool expr_eval_string_expression(const sc_char *expression,
- sc_var_setref_t vars,
- sc_char **rvalue);
+ sc_var_setref_t vars,
+ sc_char **rvalue);
/* Print filtering opaque typedef and functions. */
typedef struct sc_filter_s *sc_filterref_t;
extern sc_filterref_t pf_create(void);
extern void pf_destroy(sc_filterref_t filter);
extern void pf_buffer_string(sc_filterref_t filter,
- const sc_char *string);
+ const sc_char *string);
extern void pf_buffer_character(sc_filterref_t filter,
- sc_char character);
+ sc_char character);
extern void pf_prepend_string(sc_filterref_t filter,
- const sc_char *string);
+ const sc_char *string);
extern void pf_new_sentence(sc_filterref_t filter);
extern void pf_mute(sc_filterref_t filter);
extern void pf_clear_mute(sc_filterref_t filter);
@@ -236,19 +236,19 @@ extern void pf_buffer_tag(sc_filterref_t filter, sc_int tag);
extern void pf_strip_tags(sc_char *string);
extern void pf_strip_tags_for_hints(sc_char *string);
extern sc_char *pf_filter(const sc_char *string,
- sc_var_setref_t vars, sc_prop_setref_t bundle);
+ sc_var_setref_t vars, sc_prop_setref_t bundle);
extern sc_char *pf_filter_for_info(const sc_char *string,
- sc_var_setref_t vars);
+ sc_var_setref_t vars);
extern void pf_flush(sc_filterref_t filter,
- sc_var_setref_t vars, sc_prop_setref_t bundle);
+ sc_var_setref_t vars, sc_prop_setref_t bundle);
extern void pf_checkpoint(sc_filterref_t filter,
- sc_var_setref_t vars, sc_prop_setref_t bundle);
+ sc_var_setref_t vars, sc_prop_setref_t bundle);
extern const sc_char *pf_get_buffer(sc_filterref_t filter);
extern sc_char *pf_transfer_buffer(sc_filterref_t filter);
extern void pf_empty(sc_filterref_t filter);
extern sc_char *pf_escape(const sc_char *string);
extern sc_char *pf_filter_input(const sc_char *string,
- sc_prop_setref_t bundle);
+ sc_prop_setref_t bundle);
extern void pf_debug_trace(sc_bool flag);
/* Game memo opaque typedef and functions. */
@@ -260,22 +260,22 @@ extern sc_bool memo_load_game(sc_memo_setref_t memento, sc_gameref_t game);
extern sc_bool memo_is_load_available(sc_memo_setref_t memento);
extern void memo_clear_games(sc_memo_setref_t memento);
extern void memo_save_command(sc_memo_setref_t memento,
- const sc_char *command, sc_int timestamp,
- sc_int turns);
+ const sc_char *command, sc_int timestamp,
+ sc_int turns);
extern void memo_unsave_command(sc_memo_setref_t memento);
extern sc_int memo_get_command_count(sc_memo_setref_t memento);
extern void memo_first_command(sc_memo_setref_t memento);
extern void memo_next_command(sc_memo_setref_t memento,
- const sc_char **command, sc_int *sequence,
- sc_int *timestamp, sc_int *turns);
+ const sc_char **command, sc_int *sequence,
+ sc_int *timestamp, sc_int *turns);
extern sc_bool memo_more_commands(sc_memo_setref_t memento);
extern const sc_char *memo_find_command(sc_memo_setref_t memento,
- sc_int sequence);
+ sc_int sequence);
extern void memo_clear_commands(sc_memo_setref_t memento);
/* Game state functions. */
extern sc_gameref_t gs_create(sc_var_setref_t vars, sc_prop_setref_t bundle,
- sc_filterref_t filter);
+ sc_filterref_t filter);
extern sc_bool gs_is_game_valid(sc_gameref_t game);
extern void gs_copy(sc_gameref_t to, sc_gameref_t from);
extern void gs_destroy(sc_gameref_t game);
@@ -309,13 +309,13 @@ extern sc_bool gs_task_done(sc_gameref_t gs, sc_int task);
extern sc_bool gs_task_scored(sc_gameref_t gs, sc_int task);
extern sc_int gs_object_count(sc_gameref_t gs);
extern void gs_set_object_openness(sc_gameref_t gs,
- sc_int object, sc_int openness);
+ sc_int object, sc_int openness);
extern void gs_set_object_state(sc_gameref_t gs, sc_int object, sc_int state);
extern void gs_set_object_seen(sc_gameref_t gs, sc_int object, sc_bool seen);
extern void gs_set_object_unmoved(sc_gameref_t gs,
- sc_int object, sc_bool unmoved);
+ sc_int object, sc_bool unmoved);
extern void gs_set_object_static_unmoved(sc_gameref_t gs,
- sc_int _object, sc_bool unmoved);
+ sc_int _object, sc_bool unmoved);
extern sc_int gs_object_openness(sc_gameref_t gs, sc_int object);
extern sc_int gs_object_state(sc_gameref_t gs, sc_int _object);
extern sc_bool gs_object_seen(sc_gameref_t gs, sc_int _object);
@@ -342,10 +342,10 @@ extern void gs_set_npc_seen(sc_gameref_t gs, sc_int npc, sc_bool seen);
extern sc_bool gs_npc_seen(sc_gameref_t gs, sc_int npc);
extern sc_int gs_npc_walkstep_count(sc_gameref_t gs, sc_int npc);
extern void gs_set_npc_walkstep(sc_gameref_t gs, sc_int npc,
- sc_int walk, sc_int walkstep);
+ sc_int walk, sc_int walkstep);
extern sc_int gs_npc_walkstep(sc_gameref_t gs, sc_int npc, sc_int walk);
extern void gs_decrement_npc_walkstep(sc_gameref_t gs,
- sc_int npc, sc_int walkstep);
+ sc_int npc, sc_int walkstep);
extern void gs_clear_npc_references(sc_gameref_t gs);
extern void gs_clear_object_references(sc_gameref_t gs);
extern void gs_set_multiple_references(sc_gameref_t gs);
@@ -353,7 +353,7 @@ extern void gs_clear_multiple_references(sc_gameref_t gs);
/* Pattern matching functions. */
extern sc_bool uip_match(const sc_char *pattern,
- const sc_char *string, sc_gameref_t game);
+ const sc_char *string, sc_gameref_t game);
extern sc_char *uip_replace_pronouns(sc_gameref_t game, const sc_char *string);
extern void uip_assign_pronouns(sc_gameref_t game, const sc_char *string);
extern void uip_debug_trace(sc_bool flag);
@@ -615,10 +615,10 @@ extern sc_bool res_has_sound(sc_gameref_t game);
extern sc_bool res_has_graphics(sc_gameref_t game);
extern void res_clear_resource(sc_resourceref_t resource);
extern sc_bool res_compare_resource(sc_resourceref_t from,
- sc_resourceref_t with);
+ sc_resourceref_t with);
extern void res_handle_resource(sc_gameref_t game,
- const sc_char *partial_format,
- const sc_vartype_t vt_partial[]);
+ const sc_char *partial_format,
+ const sc_vartype_t vt_partial[]);
extern void res_sync_resources(sc_gameref_t game);
extern void res_cancel_resources(sc_gameref_t game);
@@ -638,26 +638,26 @@ extern sc_bool run_is_running(sc_gameref_t game);
extern sc_bool run_has_completed(sc_gameref_t game);
extern sc_bool run_is_undo_available(sc_gameref_t game);
extern void run_get_attributes(sc_gameref_t game,
- const sc_char **game_name,
- const sc_char **game_author,
- const sc_char **game_compile_date,
- sc_int *turns, sc_int *score,
- sc_int *max_score,
- const sc_char **current_room_name,
- const sc_char **status_line,
- const sc_char **preferred_font,
- sc_bool *bold_room_names, sc_bool *verbose,
- sc_bool *notify_score_change);
+ const sc_char **game_name,
+ const sc_char **game_author,
+ const sc_char **game_compile_date,
+ sc_int *turns, sc_int *score,
+ sc_int *max_score,
+ const sc_char **current_room_name,
+ const sc_char **status_line,
+ const sc_char **preferred_font,
+ sc_bool *bold_room_names, sc_bool *verbose,
+ sc_bool *notify_score_change);
extern void run_set_attributes(sc_gameref_t game,
- sc_bool bold_room_names, sc_bool verbose,
- sc_bool notify_score_change);
+ sc_bool bold_room_names, sc_bool verbose,
+ sc_bool notify_score_change);
extern sc_hintref_t run_hint_iterate(sc_gameref_t game, sc_hintref_t hint);
extern const sc_char *run_get_hint_question(sc_gameref_t game,
- sc_hintref_t hint);
+ sc_hintref_t hint);
extern const sc_char *run_get_subtle_hint(sc_gameref_t game,
- sc_hintref_t hint);
+ sc_hintref_t hint);
extern const sc_char *run_get_unsubtle_hint(sc_gameref_t game,
- sc_hintref_t hint);
+ sc_hintref_t hint);
/* Event functions. */
extern sc_bool evt_can_see_event(sc_gameref_t game, sc_int event);
@@ -670,17 +670,17 @@ extern const sc_char *task_get_hint_question(sc_gameref_t game, sc_int task);
extern const sc_char *task_get_hint_subtle(sc_gameref_t game, sc_int task);
extern const sc_char *task_get_hint_unsubtle(sc_gameref_t game, sc_int task);
extern sc_bool task_can_run_task_directional(sc_gameref_t game,
- sc_int task, sc_bool forwards);
+ sc_int task, sc_bool forwards);
extern sc_bool task_can_run_task(sc_gameref_t game, sc_int task);
extern sc_bool task_run_task(sc_gameref_t game, sc_int task, sc_bool forwards);
extern void task_debug_trace(sc_bool flag);
/* Task restriction functions. */
extern sc_bool restr_pass_task_object_state(sc_gameref_t game,
- sc_int var1, sc_int var2);
+ sc_int var1, sc_int var2);
extern sc_bool restr_eval_task_restrictions(sc_gameref_t game,
- sc_int task, sc_bool *pass,
- const sc_char **fail_message);
+ sc_int task, sc_bool *pass,
+ const sc_char **fail_message);
extern void restr_debug_trace(sc_bool flag);
/* NPC gender enumeration and functions. */
@@ -712,10 +712,10 @@ extern sc_bool obj_is_surface(sc_gameref_t game, sc_int object);
extern sc_int obj_container_object(sc_gameref_t game, sc_int n);
extern sc_int obj_surface_object(sc_gameref_t game, sc_int n);
extern sc_bool obj_indirectly_in_room(sc_gameref_t game,
- sc_int _object, sc_int Room);
+ sc_int _object, sc_int Room);
extern sc_bool obj_indirectly_held_by_player(sc_gameref_t game, sc_int object);
extern sc_bool obj_directly_in_room(sc_gameref_t game,
- sc_int _object, sc_int Room);
+ sc_int _object, sc_int Room);
extern sc_int obj_stateful_object(sc_gameref_t game, sc_int n);
extern sc_int obj_dynamic_object(sc_gameref_t game, sc_int n);
extern sc_int obj_wearable_object(sc_gameref_t game, sc_int n);
@@ -751,7 +751,7 @@ extern void loc_debug_dump(void);
/* Debugger interface. */
typedef struct sc_debugger_s *sc_debuggerref_t;
extern sc_bool debug_run_command(sc_gameref_t game,
- const sc_char *debug_command);
+ const sc_char *debug_command);
extern sc_bool debug_cmd_debugger(sc_gameref_t game);
extern void debug_set_enabled(sc_gameref_t game, sc_bool enable);
extern sc_bool debug_get_enabled(sc_gameref_t game);
diff --git a/engines/glk/adrift/scresour.cpp b/engines/glk/adrift/scresour.cpp
index c09a5c82ab..4406f432ad 100644
--- a/engines/glk/adrift/scresour.cpp
+++ b/engines/glk/adrift/scresour.cpp
@@ -70,7 +70,7 @@ sc_bool res_has_graphics(sc_gameref_t game) {
* Convenience functions to set, clear, and compare resource fields.
*/
static void res_set_resource(sc_resourceref_t resource, const sc_char *name,
- sc_int offset, sc_int length) {
+ sc_int offset, sc_int length) {
resource->name = name;
resource->offset = offset;
resource->length = length;
diff --git a/engines/glk/adrift/sctaffil.cpp b/engines/glk/adrift/sctaffil.cpp
index eea22445e9..2365c1a093 100644
--- a/engines/glk/adrift/sctaffil.cpp
+++ b/engines/glk/adrift/sctaffil.cpp
@@ -83,9 +83,9 @@ typedef sc_taf_s sc_taf_t;
/* Microsoft Visual Basic PRNG magic numbers, initial and current state. */
static const sc_int PRNG_CST1 = 0x43fd43fd,
- PRNG_CST2 = 0x00c39ec3,
- PRNG_CST3 = 0x00ffffff,
- PRNG_INITIAL_STATE = 0x00a09e86;
+ PRNG_CST2 = 0x00c39ec3,
+ PRNG_CST3 = 0x00ffffff,
+ PRNG_INITIAL_STATE = 0x00a09e86;
static sc_int taf_random_state = 0x00a09e86;
/*
diff --git a/engines/glk/adrift/sxprotos.h b/engines/glk/adrift/sxprotos.h
index 5ea3951775..8256203ebb 100644
--- a/engines/glk/adrift/sxprotos.h
+++ b/engines/glk/adrift/sxprotos.h
@@ -68,13 +68,13 @@ extern void *sx_malloc(size_t size);
extern void *sx_realloc(void *pointer, size_t size);
extern void sx_free(void *pointer);
extern Common::SeekableReadStream *sx_fopen(const sc_char *name,
- const sc_char *extension, const sc_char *mode);
+ const sc_char *extension, const sc_char *mode);
extern sc_char *sx_trim_string(sc_char *string);
extern sc_char *sx_normalize_string(sc_char *string);
/* Test controller function. */
extern sc_int test_run_game_tests(const sx_test_descriptor_t tests[],
- sc_int count, sc_bool is_verbose);
+ sc_int count, sc_bool is_verbose);
/* Globbing function. */
extern sc_bool glob_match(const sc_char *pattern, const sc_char *string);
@@ -86,9 +86,9 @@ extern sc_bool glob_match(const sc_char *pattern, const sc_char *string);
/* Serialization helper for script running and checking. */
extern void *file_open_file_callback(sc_bool is_save);
extern sc_int file_read_file_callback(void *opaque,
- sc_byte *buffer, sc_int length);
+ sc_byte *buffer, sc_int length);
extern void file_write_file_callback(void *opaque,
- const sc_byte *buffer, sc_int length);
+ const sc_byte *buffer, sc_int length);
extern void file_close_file_callback(void *opaque);
extern void file_cleanup(void);
diff --git a/engines/glk/adrift/sxstubs.cpp b/engines/glk/adrift/sxstubs.cpp
index 32d1fddd4e..c1432e71c4 100644
--- a/engines/glk/adrift/sxstubs.cpp
+++ b/engines/glk/adrift/sxstubs.cpp
@@ -61,11 +61,11 @@ static sc_int stub_show_tags = 0;
*/
void
stub_attach_handlers(sc_bool(*read_line)(sc_char *, sc_int),
- void (*print_string)(const sc_char *),
- void *(*open_file)(sc_bool),
- sc_int(*read_file)(void *, sc_byte *, sc_int),
- void (*write_file)(void *, const sc_byte *, sc_int),
- void (*close_file)(void *)) {
+ void (*print_string)(const sc_char *),
+ void *(*open_file)(sc_bool),
+ sc_int(*read_file)(void *, sc_byte *, sc_int),
+ void (*write_file)(void *, const sc_byte *, sc_int),
+ void (*close_file)(void *)) {
stub_read_line = read_line;
stub_print_string = print_string;
stub_open_file = open_file;
@@ -183,7 +183,7 @@ os_print_string_debug(const sc_char *string) {
void
os_play_sound(const sc_char *filepath,
- sc_int offset, sc_int length, sc_bool is_looping) {
+ sc_int offset, sc_int length, sc_bool is_looping) {
if (stub_trace)
sx_trace("os_play_sound (\"%s\", %ld, %ld, %s)\n",
stub_notnull(filepath), offset, length,
diff --git a/engines/glk/agt/agil.cpp b/engines/glk/agt/agil.cpp
index 23bc2fb652..981a017e09 100644
--- a/engines/glk/agt/agil.cpp
+++ b/engines/glk/agt/agil.cpp
@@ -38,7 +38,7 @@ descr_ptr *err_ptr; /* [NUM_ERR];*/
descr_ptr *msg_ptr; /* [MAX_MSG];*/
descr_ptr *help_ptr, *room_ptr, *special_ptr; /*[ROOM] */
descr_ptr *noun_ptr, *text_ptr, *turn_ptr, /* [NOUN] */
- *push_ptr, *pull_ptr, *play_ptr;
+ *push_ptr, *pull_ptr, *play_ptr;
descr_ptr *talk_ptr, *ask_ptr, *creat_ptr; /* [CREAT] */
descr_ptr *quest_ptr, *ans_ptr; /* [MAX_QUEST] */
@@ -54,12 +54,12 @@ long dp; /* Dictionary pointer: number of words in dict */
#define DICT_INIT 12*1024 /* Starting size of dictstr */
#define DICT_GRAN 1024 /* Granularity of dictstr size requests
- must be at least 4. */
+ must be at least 4. */
char *dictstr; /* Pointer to memory block containing dict words */
long dictstrptr, dictstrsize;
/* dictstrptr points to the first unused byte in dictstr.
dictstrsize points to the end of the space currently allocated for
- dictstr.
+ dictstr.
*/
char *static_str; /*Static string space */
@@ -297,7 +297,7 @@ static void build_verbmenu(void) {
void agil_option(int optnum, char *optstr[], rbool setflag, rbool lastpass) {
if (opt("ibm_char")) fix_ascii_flag = !setflag;
else if (!lastpass) return; /* On the first pass through the game specific
- file, we ignore all but the above options */
+ file, we ignore all but the above options */
else if (opt("tone")) PURE_TONE = setflag;
else if (opt("input_bold")) PURE_INPUT = setflag;
else if (opt("force_load")) FORCE_VERSION = setflag;
@@ -329,7 +329,7 @@ static rbool check_dot(char *prevtext, int prevcnt, char *lookahead)
int i, endword, restcnt;
if (!PURE_DOT) return 1; /* No words with periods in them, so it must
- be punctuation. */
+ be punctuation. */
/* We just start scanning the dictionary to see if any of them
are possible matches, looking ahead as neccessary. */
@@ -355,7 +355,7 @@ static rbool check_dot(char *prevtext, int prevcnt, char *lookahead)
the fact that the trailing text could itself contain ambiguous '.'s */
restcnt -= prevcnt + 1; /* Number of characters in dict entry after '.' */
if (restcnt > endword) continue; /* Dictionary entry is longer than
- following text */
+ following text */
/* Check to see if the dictionary entry can be found in the lookahead
buffer */
@@ -520,7 +520,7 @@ static void parse_loop(void)
if (doing_restore) break;
if (ip >= 0 && ip < MAXINPUT && input[ip] != -1)
writeln(""); /* Insert blank lines between commands when dealing
- with THEN lists */
+ with THEN lists */
}
}
@@ -630,7 +630,7 @@ static int init(void) {
pictable = (integer *)rmalloc(sizeof(int) * maxpict);
for (i = 0; i < maxpict; i++) pictable[i] = i;
init_state_sys(); /* Initialize the system for saving and restoring
- game states */
+ game states */
tmp1 = (uchar *)rmalloc(MEM_MARGIN); /* Preserve some work space */
tmp2 = getstate(NULL); /* Make sure we have space to save */
@@ -693,7 +693,7 @@ static void fix_dummy(void) {
for (i = 0; i < dp && !PURE_DOT; i++)
if (strchr(dict[i], '.') != NULL && /* i.e. dict[i] contains period */
i != ext_code[wp]) /* The period itself _is_ a dictionary word:
- avoid this false match */
+ avoid this false match */
PURE_DOT = 1;
}
}
@@ -714,7 +714,7 @@ static void fix_prompt(void) {
void close_game(void); /* Called by setup_game, and so needs
- to be defined here. */
+ to be defined here. */
static fc_type setup_game(fc_type fc)
/* game_name is the common filename of the AGT game files */
@@ -766,7 +766,7 @@ static fc_type setup_game(fc_type fc)
#endif
if (have_opt)
menu_mode = opt_data[5]; /* See agtread.c for discussion of OPT file
- format */
+ format */
text_file = 1;
read_config(openfile(fc, fCFG, NULL, 0), 1); /*Game specific config file*/
text_file = 0;
@@ -780,7 +780,7 @@ static fc_type setup_game(fc_type fc)
More information about the Scummvm-git-logs
mailing list