diff options
36 files changed, 117 insertions, 71 deletions
diff --git a/audio/midiparser_smf.cpp b/audio/midiparser_smf.cpp index a614e5bd63..d1d86b918f 100644 --- a/audio/midiparser_smf.cpp +++ b/audio/midiparser_smf.cpp @@ -204,7 +204,7 @@ bool MidiParser_SMF::loadMusic(byte *data, uint32 size) { int tracksRead = 0; while (tracksRead < _numTracks) { if (memcmp(pos, "MTrk", 4) && !isGMF) { - warning("Position: %p ('%c')", pos, *pos); + warning("Position: %p ('%c')", (void *)pos, *pos); warning("Hit invalid block '%c%c%c%c' while scanning for track locations", pos[0], pos[1], pos[2], pos[3]); return false; } diff --git a/audio/softsynth/opl/mame.cpp b/audio/softsynth/opl/mame.cpp index 696169be09..eb08582da0 100644 --- a/audio/softsynth/opl/mame.cpp +++ b/audio/softsynth/opl/mame.cpp @@ -97,8 +97,8 @@ void OPL::generateSamples(int16 *buffer, int length) { /* final output shift , limit minimum and maximum */ #define OPL_OUTSB (TL_BITS+3-16) /* OPL output final shift 16bit */ -#define OPL_MAXOUT (0x7fff<<OPL_OUTSB) -#define OPL_MINOUT (-0x8000<<OPL_OUTSB) +#define OPL_MAXOUT (0x7fff<<OPL_OUTSB) +#define OPL_MINOUT (-(0x8000<<OPL_OUTSB)) /* -------------------- quality selection --------------------- */ diff --git a/backends/platform/ios7/iOS7AppDelegate.h b/backends/platform/ios7/iOS7AppDelegate.h deleted file mode 100644 index 7f903a692d..0000000000 --- a/backends/platform/ios7/iOS7AppDelegate.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// Created by Vincent Bénony on 07/12/2015. -// - -#import <UIKit/UIKit.h> - -@class iPhoneView; - - -@interface iOS7AppDelegate : NSObject<UIApplicationDelegate> - -+ (iOS7AppDelegate *)iOS7AppDelegate; -+ (iPhoneView *)iPhoneView; - -@end diff --git a/backends/platform/ios7/ios7_app_delegate.h b/backends/platform/ios7/ios7_app_delegate.h new file mode 100644 index 0000000000..08696c7b61 --- /dev/null +++ b/backends/platform/ios7/ios7_app_delegate.h @@ -0,0 +1,38 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#ifndef BACKENDS_PLATFORM_IOS7_IOS7_APP_DELEGATE_H +#define BACKENDS_PLATFORM_IOS7_IOS7_APP_DELEGATE_H + +#include <UIKit/UIKit.h> + +@class iPhoneView; + + +@interface iOS7AppDelegate : NSObject<UIApplicationDelegate> + ++ (iOS7AppDelegate *)iOS7AppDelegate; ++ (iPhoneView *)iPhoneView; + +@end + +#endif diff --git a/backends/platform/ios7/iOS7AppDelegate.mm b/backends/platform/ios7/ios7_app_delegate.mm index e9908ec146..88d0a8925e 100644 --- a/backends/platform/ios7/iOS7AppDelegate.mm +++ b/backends/platform/ios7/ios7_app_delegate.mm @@ -1,11 +1,29 @@ -// -// Created by Vincent Bénony on 07/12/2015. -// +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ #define FORBIDDEN_SYMBOL_ALLOW_ALL -#import "iOS7AppDelegate.h" -#import "iOS7ScummVMViewController.h" -#import "ios7_video.h" +#include "backends/platform/ios7/ios7_app_delegate.h" +#include "backends/platform/ios7/ios7_scummvm_view_controller.h" +#include "backends/platform/ios7/ios7_video.h" @implementation iOS7AppDelegate { UIWindow *_window; diff --git a/backends/platform/ios7/ios7_common.h b/backends/platform/ios7/ios7_common.h index a32a59a541..12740d4ae9 100644 --- a/backends/platform/ios7/ios7_common.h +++ b/backends/platform/ios7/ios7_common.h @@ -20,8 +20,8 @@ * */ -#ifndef BACKENDS_PLATFORM_IPHONE_IPHONE_COMMON_H -#define BACKENDS_PLATFORM_IPHONE_IPHONE_COMMON_H +#ifndef BACKENDS_PLATFORM_IOS7_IOS7_COMMON_H +#define BACKENDS_PLATFORM_IOS7_IOS7_COMMON_H #include "graphics/surface.h" diff --git a/backends/platform/ios7/ios7_keyboard.h b/backends/platform/ios7/ios7_keyboard.h index ddd8f436e5..1f917cc8c5 100644 --- a/backends/platform/ios7/ios7_keyboard.h +++ b/backends/platform/ios7/ios7_keyboard.h @@ -20,8 +20,8 @@ * */ -#ifndef BACKENDS_PLATFORM_IPHONE_IPHONE_KEYBOARD_H -#define BACKENDS_PLATFORM_IPHONE_IPHONE_KEYBOARD_H +#ifndef BACKENDS_PLATFORM_IOS7_IOS7_KEYBOARD_H +#define BACKENDS_PLATFORM_IOS7_IOS7_KEYBOARD_H #include <UIKit/UIKit.h> #include <UIKit/UITextView.h> diff --git a/backends/platform/ios7/ios7_keyboard.mm b/backends/platform/ios7/ios7_keyboard.mm index 7923a1cda9..9476b96ad4 100644 --- a/backends/platform/ios7/ios7_keyboard.mm +++ b/backends/platform/ios7/ios7_keyboard.mm @@ -20,7 +20,7 @@ * */ -#include "ios7_keyboard.h" +#include "backends/platform/ios7/ios7_keyboard.h" @interface UITextInputTraits - (void)setAutocorrectionType:(int)type; diff --git a/backends/platform/ios7/ios7_main.mm b/backends/platform/ios7/ios7_main.mm index 96f41f4c02..c36cc08aaa 100644 --- a/backends/platform/ios7/ios7_main.mm +++ b/backends/platform/ios7/ios7_main.mm @@ -26,7 +26,7 @@ #include <UIKit/UIKit.h> #include <Foundation/NSThread.h> -#include "ios7_video.h" +#include "backends/platform/ios7/ios7_video.h" int iOS7_argc; diff --git a/backends/platform/ios7/ios7_osys_events.cpp b/backends/platform/ios7/ios7_osys_events.cpp index 7e805f34b7..3621c084db 100644 --- a/backends/platform/ios7/ios7_osys_events.cpp +++ b/backends/platform/ios7/ios7_osys_events.cpp @@ -26,7 +26,7 @@ #include "gui/message.h" #include "common/translation.h" -#include "ios7_osys_main.h" +#include "backends/platform/ios7/ios7_osys_main.h" static const int kQueuedInputEventDelay = 50; diff --git a/backends/platform/ios7/ios7_osys_main.cpp b/backends/platform/ios7/ios7_osys_main.cpp index f169dbb1b2..c1280a2969 100644 --- a/backends/platform/ios7/ios7_osys_main.cpp +++ b/backends/platform/ios7/ios7_osys_main.cpp @@ -48,7 +48,7 @@ #include "graphics/scaler.h" #include "graphics/scaler/aspect.h" -#include "ios7_osys_main.h" +#include "backends/platform/ios7/ios7_osys_main.h" const OSystem::GraphicsMode OSystem_iOS7::s_supportedGraphicsModes[] = { diff --git a/backends/platform/ios7/ios7_osys_main.h b/backends/platform/ios7/ios7_osys_main.h index eadb49e5ac..cc2f1ccc06 100644 --- a/backends/platform/ios7/ios7_osys_main.h +++ b/backends/platform/ios7/ios7_osys_main.h @@ -20,11 +20,11 @@ * */ -#ifndef BACKENDS_PLATFORM_IPHONE_OSYS_MAIN_H -#define BACKENDS_PLATFORM_IPHONE_OSYS_MAIN_H +#ifndef BACKENDS_PLATFORM_IOS7_IOS7_OSYS_MAIN_H +#define BACKENDS_PLATFORM_IOS7_IOS7_OSYS_MAIN_H #include "graphics/surface.h" -#include "ios7_common.h" +#include "backends/platform/ios7/ios7_common.h" #include "backends/base-backend.h" #include "common/events.h" #include "audio/mixer_intern.h" diff --git a/backends/platform/ios7/ios7_osys_sound.cpp b/backends/platform/ios7/ios7_osys_sound.cpp index 0dc81a9385..07e9458711 100644 --- a/backends/platform/ios7/ios7_osys_sound.cpp +++ b/backends/platform/ios7/ios7_osys_sound.cpp @@ -23,7 +23,7 @@ // Disable symbol overrides so that we can use system headers. #define FORBIDDEN_SYMBOL_ALLOW_ALL -#include "ios7_osys_main.h" +#include "backends/platform/ios7/ios7_osys_main.h" void OSystem_iOS7::AQBufferCallback(void *in, AudioQueueRef inQ, AudioQueueBufferRef outQB) { //printf("AQBufferCallback()\n"); diff --git a/backends/platform/ios7/ios7_osys_video.mm b/backends/platform/ios7/ios7_osys_video.mm index 0d183ce834..6784cf46f5 100644 --- a/backends/platform/ios7/ios7_osys_video.mm +++ b/backends/platform/ios7/ios7_osys_video.mm @@ -23,11 +23,11 @@ // Disable symbol overrides so that we can use system headers. #define FORBIDDEN_SYMBOL_ALLOW_ALL -#include "ios7_osys_main.h" -#include "ios7_video.h" +#include "backends/platform/ios7/ios7_osys_main.h" +#include "backends/platform/ios7/ios7_video.h" #include "graphics/conversion.h" -#import "iOS7AppDelegate.h" +#include "backends/platform/ios7/ios7_app_delegate.h" @interface iOS7AlertHandler : NSObject<UIAlertViewDelegate> @end diff --git a/backends/platform/ios7/iOS7ScummVMViewController.h b/backends/platform/ios7/ios7_scummvm_view_controller.h index 0322bc6f7f..39168aaee7 100644 --- a/backends/platform/ios7/iOS7ScummVMViewController.h +++ b/backends/platform/ios7/ios7_scummvm_view_controller.h @@ -20,9 +20,14 @@ * */ -#import <UIKit/UIKit.h> +#ifndef BACKENDS_PLATFORM_IOS7_IOS7_SCUMMVM_VIEW_CONTROLLER_H +#define BACKENDS_PLATFORM_IOS7_IOS7_SCUMMVM_VIEW_CONTROLLER_H + +#include <UIKit/UIKit.h> @interface iOS7ScummVMViewController : UIViewController @end + +#endif diff --git a/backends/platform/ios7/iOS7ScummVMViewController.mm b/backends/platform/ios7/ios7_scummvm_view_controller.mm index f92fd0115c..e78fc91f93 100644 --- a/backends/platform/ios7/iOS7ScummVMViewController.mm +++ b/backends/platform/ios7/ios7_scummvm_view_controller.mm @@ -20,7 +20,7 @@ * */ -#import "iOS7ScummVMViewController.h" +#include "backends/platform/ios7/ios7_scummvm_view_controller.h" @implementation iOS7ScummVMViewController diff --git a/backends/platform/ios7/ios7_video.h b/backends/platform/ios7/ios7_video.h index ab261a977b..9c5d92a970 100644 --- a/backends/platform/ios7/ios7_video.h +++ b/backends/platform/ios7/ios7_video.h @@ -20,8 +20,8 @@ * */ -#ifndef BACKENDS_PLATFORM_IPHONE_IPHONE_VIDEO_H -#define BACKENDS_PLATFORM_IPHONE_IPHONE_VIDEO_H +#ifndef BACKENDS_PLATFORM_IOS7_IOS7_VIDEO_H +#define BACKENDS_PLATFORM_IOS7_IOS7_VIDEO_H #include <UIKit/UIKit.h> #include <Foundation/Foundation.h> @@ -31,11 +31,11 @@ #include <OpenGLES/ES2/gl.h> #include <OpenGLES/ES2/glext.h> -#include "ios7_keyboard.h" -#include "ios7_common.h" +#include "backends/platform/ios7/ios7_keyboard.h" +#include "backends/platform/ios7/ios7_common.h" #include "common/list.h" -#import "graphics/scaler.h" +#include "graphics/scaler.h" typedef struct { GLfloat x, y; diff --git a/backends/platform/ios7/ios7_video.mm b/backends/platform/ios7/ios7_video.mm index 2cfc3e05f7..5c0434d43e 100644 --- a/backends/platform/ios7/ios7_video.mm +++ b/backends/platform/ios7/ios7_video.mm @@ -23,11 +23,11 @@ // Disable symbol overrides so that we can use system headers. #define FORBIDDEN_SYMBOL_ALLOW_ALL -#include "ios7_video.h" +#include "backends/platform/ios7/ios7_video.h" #include "graphics/colormasks.h" #include "common/system.h" -#import "iOS7AppDelegate.h" +#include "backends/platform/ios7/ios7_app_delegate.h" static int g_needsScreenUpdate = 0; diff --git a/backends/platform/ios7/module.mk b/backends/platform/ios7/module.mk index 5ee4c7a601..ad4f7fda5b 100644 --- a/backends/platform/ios7/module.mk +++ b/backends/platform/ios7/module.mk @@ -8,8 +8,8 @@ MODULE_OBJS := \ ios7_main.o \ ios7_video.o \ ios7_keyboard.o \ - iOS7ScummVMViewController.o \ - iOS7AppDelegate.o + ios7_scummvm_view_controller.o \ + ios7_app_delegate.o # We don't use rules.mk but rather manually update OBJS and MODULE_DIRS. MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) diff --git a/backends/platform/iphone/iphone_keyboard.mm b/backends/platform/iphone/iphone_keyboard.mm index 39d68aff81..85ba3520f2 100644 --- a/backends/platform/iphone/iphone_keyboard.mm +++ b/backends/platform/iphone/iphone_keyboard.mm @@ -20,7 +20,7 @@ * */ -#include "iphone_keyboard.h" +#include "backends/platform/iphone/iphone_keyboard.h" @interface UITextInputTraits - (void)setAutocorrectionType:(int)type; diff --git a/backends/platform/iphone/iphone_main.mm b/backends/platform/iphone/iphone_main.mm index 3707f10a29..fc29615814 100644 --- a/backends/platform/iphone/iphone_main.mm +++ b/backends/platform/iphone/iphone_main.mm @@ -26,7 +26,7 @@ #include <UIKit/UIKit.h> #include <Foundation/NSThread.h> -#include "iphone_video.h" +#include "backends/platform/iphone/iphone_video.h" void iphone_main(int argc, char *argv[]); diff --git a/backends/platform/iphone/iphone_video.h b/backends/platform/iphone/iphone_video.h index 7dbf3c57ab..26c32183ce 100644 --- a/backends/platform/iphone/iphone_video.h +++ b/backends/platform/iphone/iphone_video.h @@ -31,8 +31,8 @@ #include <OpenGLES/ES1/gl.h> #include <OpenGLES/ES1/glext.h> -#include "iphone_keyboard.h" -#include "iphone_common.h" +#include "backends/platform/iphone/iphone_keyboard.h" +#include "backends/platform/iphone/iphone_common.h" #include "common/list.h" diff --git a/backends/platform/iphone/iphone_video.mm b/backends/platform/iphone/iphone_video.mm index 5048b57328..9e521de179 100644 --- a/backends/platform/iphone/iphone_video.mm +++ b/backends/platform/iphone/iphone_video.mm @@ -23,7 +23,7 @@ // Disable symbol overrides so that we can use system headers. #define FORBIDDEN_SYMBOL_ALLOW_ALL -#include "iphone_video.h" +#include "backends/platform/iphone/iphone_video.h" #include "graphics/colormasks.h" diff --git a/backends/platform/iphone/osys_events.cpp b/backends/platform/iphone/osys_events.cpp index 95ca25a2d2..617f6b8843 100644 --- a/backends/platform/iphone/osys_events.cpp +++ b/backends/platform/iphone/osys_events.cpp @@ -26,7 +26,7 @@ #include "gui/message.h" #include "common/translation.h" -#include "osys_main.h" +#include "backends/platform/iphone/osys_main.h" static const int kQueuedInputEventDelay = 50; diff --git a/backends/platform/iphone/osys_main.cpp b/backends/platform/iphone/osys_main.cpp index 3f5e7692c7..36b3482d7e 100644 --- a/backends/platform/iphone/osys_main.cpp +++ b/backends/platform/iphone/osys_main.cpp @@ -41,7 +41,7 @@ #include "audio/mixer.h" #include "audio/mixer_intern.h" -#include "osys_main.h" +#include "backends/platform/iphone/osys_main.h" const OSystem::GraphicsMode OSystem_IPHONE::s_supportedGraphicsModes[] = { diff --git a/backends/platform/iphone/osys_main.h b/backends/platform/iphone/osys_main.h index 0159eee1be..390566322c 100644 --- a/backends/platform/iphone/osys_main.h +++ b/backends/platform/iphone/osys_main.h @@ -24,7 +24,7 @@ #define BACKENDS_PLATFORM_IPHONE_OSYS_MAIN_H #include "graphics/surface.h" -#include "iphone_common.h" +#include "backends/platform/iphone/iphone_common.h" #include "backends/base-backend.h" #include "common/events.h" #include "audio/mixer_intern.h" diff --git a/backends/platform/iphone/osys_sound.cpp b/backends/platform/iphone/osys_sound.cpp index bfee06c6f2..34c1cbff34 100644 --- a/backends/platform/iphone/osys_sound.cpp +++ b/backends/platform/iphone/osys_sound.cpp @@ -23,7 +23,7 @@ // Disable symbol overrides so that we can use system headers. #define FORBIDDEN_SYMBOL_ALLOW_ALL -#include "osys_main.h" +#include "backends/platform/iphone/osys_main.h" void OSystem_IPHONE::AQBufferCallback(void *in, AudioQueueRef inQ, AudioQueueBufferRef outQB) { //printf("AQBufferCallback()\n"); diff --git a/backends/platform/iphone/osys_video.mm b/backends/platform/iphone/osys_video.mm index c76f432dda..fa5c729a1c 100644 --- a/backends/platform/iphone/osys_video.mm +++ b/backends/platform/iphone/osys_video.mm @@ -23,8 +23,8 @@ // Disable symbol overrides so that we can use system headers. #define FORBIDDEN_SYMBOL_ALLOW_ALL -#include "osys_main.h" -#include "iphone_video.h" +#include "backends/platform/iphone/osys_main.h" +#include "backends/platform/iphone/iphone_video.h" #include "graphics/conversion.h" @@ -2120,7 +2120,7 @@ echo_n "Checking hosttype... " echo $_host_os case $_host_os in amigaos*) - append_var LDFLAGS "-use-dynld -Wl,--export-dynamic" + append_var LDFLAGS "-Wl,--export-dynamic" append_var LDFLAGS "-L/sdk/local/newlib/lib" # We have to use 'long' for our 4 byte typedef because AmigaOS already typedefs (u)int32 # as (unsigned) long, and consequently we'd get a compiler error otherwise. diff --git a/engines/cine/various.cpp b/engines/cine/various.cpp index cd877a3295..74dee1f541 100644 --- a/engines/cine/various.cpp +++ b/engines/cine/various.cpp @@ -1492,7 +1492,7 @@ uint16 addAni(uint16 param1, uint16 objIdx, const int8 *ptr, SeqListElement &ele int16 di; debug(5, "addAni: param1 = %d, objIdx = %d, ptr = %p, element.var8 = %d, element.var14 = %d param3 = %d", - param1, objIdx, ptr, element.var8, element.var14, param3); + param1, objIdx, (const void *)ptr, element.var8, element.var14, param3); // In the original an error string is set and 0 is returned if the following doesn't hold assert(ptr); diff --git a/engines/scumm/insane/insane.cpp b/engines/scumm/insane/insane.cpp index b3e9a0e699..f0bbab53e6 100644 --- a/engines/scumm/insane/insane.cpp +++ b/engines/scumm/insane/insane.cpp @@ -1406,7 +1406,7 @@ int32 Insane::smush_setupSanWithFlu(const char *filename, int32 setupsan2, int32 int32 offset; debugC(DEBUG_INSANE, "smush_setupSanWithFlu(%s, %d, %d, %d, %d, %p, %d)", filename, setupsan2, - step1, step2, setupsan1, fluPtr, numFrames); + step1, step2, setupsan1, (void *)fluPtr, numFrames); _smush_setupsan1 = setupsan1; diff --git a/engines/scumm/resource.cpp b/engines/scumm/resource.cpp index d4e4f43d5c..5456ae4f8f 100644 --- a/engines/scumm/resource.cpp +++ b/engines/scumm/resource.cpp @@ -748,7 +748,7 @@ byte *ScummEngine::getResourceAddress(ResType type, ResId idx) { _res->setResourceCounter(type, idx, 1); - debugC(DEBUG_RESOURCE, "getResourceAddress(%s,%d) == %p", nameOfResType(type), idx, ptr); + debugC(DEBUG_RESOURCE, "getResourceAddress(%s,%d) == %p", nameOfResType(type), idx, (void *)ptr); return ptr; } diff --git a/engines/scumm/smush/imuse_channel.cpp b/engines/scumm/smush/imuse_channel.cpp index 461aff962e..24cb03fbfb 100644 --- a/engines/scumm/smush/imuse_channel.cpp +++ b/engines/scumm/smush/imuse_channel.cpp @@ -156,7 +156,7 @@ void ImuseChannel::decode() { _sbufferSize -= remaining_size; } else { debugC(DEBUG_SMUSH, "impossible ! : %p, %d, %d, %p(%d), %p(%d, %d)", - (const void *)this, _dataSize, _inData, _tbuffer, _tbufferSize, _sbuffer, _sbufferSize, _srbufferSize); + (const void *)this, _dataSize, _inData, (void *)_tbuffer, _tbufferSize, (void *)_sbuffer, _sbufferSize, _srbufferSize); byte *old = _tbuffer; int new_size = remaining_size + _tbufferSize; _tbuffer = (byte *)malloc(new_size); diff --git a/engines/sword2/interpreter.cpp b/engines/sword2/interpreter.cpp index e7fb979d69..a13161625c 100644 --- a/engines/sword2/interpreter.cpp +++ b/engines/sword2/interpreter.cpp @@ -449,7 +449,7 @@ int Logic::runScript2(byte *scriptData, byte *objectData, byte *offsetPtr) { Read16ip(parameter); stack.push(_vm->_memory->encodePtr(localVars + parameter)); - debug(9, "CP_PUSH_LOCAL_ADDR: &localVars[%d] => %p", parameter / 4, localVars + parameter); + debug(9, "CP_PUSH_LOCAL_ADDR: &localVars[%d] => %p", parameter / 4, (void *)(localVars + parameter)); break; case CP_PUSH_STRING: // Push the address of a string on to the stack @@ -467,7 +467,7 @@ int Logic::runScript2(byte *scriptData, byte *objectData, byte *offsetPtr) { Read32ip(parameter); ptr = objectData + 4 + ResHeader::size() + ObjectHub::size() + parameter; stack.push(_vm->_memory->encodePtr(ptr)); - debug(9, "CP_PUSH_DEREFERENCED_STRUCTURE: %d => %p", parameter, ptr); + debug(9, "CP_PUSH_DEREFERENCED_STRUCTURE: %d => %p", parameter, (void *)ptr); break; case CP_POP_LOCAL_VAR32: // Pop a value into a local word variable diff --git a/engines/sword2/memory.cpp b/engines/sword2/memory.cpp index 391983930d..593bb672b6 100644 --- a/engines/sword2/memory.cpp +++ b/engines/sword2/memory.cpp @@ -225,7 +225,7 @@ void MemoryManager::memFree(byte *ptr) { int16 idx = findExactPointerInIndex(ptr); if (idx == -1) { - warning("Freeing non-allocated pointer %p", ptr); + warning("Freeing non-allocated pointer %p", (void *)ptr); return; } diff --git a/engines/tinsel/anim.cpp b/engines/tinsel/anim.cpp index 19e180b57e..e241c7cba0 100644 --- a/engines/tinsel/anim.cpp +++ b/engines/tinsel/anim.cpp @@ -43,7 +43,7 @@ SCRIPTSTATE DoNextFrame(ANIM *pAnim) { while (1) { // repeat until a real image debugC(DEBUG_DETAILED, kTinselDebugAnimations, - "DoNextFrame %ph index=%d, op=%xh", (byte *)pAnim, pAnim->scriptIndex, + "DoNextFrame %ph index=%d, op=%xh", (const void *)pAnim, pAnim->scriptIndex, FROM_32(pAni[pAnim->scriptIndex].op)); switch ((int32)FROM_32(pAni[pAnim->scriptIndex].op)) { @@ -217,7 +217,7 @@ void InitStepAnimScript(ANIM *pAnim, OBJECT *pAniObj, SCNHANDLE hNewScript, int "InitStepAnimScript Object=(%d,%d,%xh) script=%xh aniSpeed=%d rec=%ph", !pAniObj ? 0 : fracToInt(pAniObj->xPos), !pAniObj ? 0 : fracToInt(pAniObj->yPos), - !pAniObj ? 0 : pAniObj->hImg, hNewScript, aniSpeed, (byte *)pAnim); + !pAniObj ? 0 : pAniObj->hImg, hNewScript, aniSpeed, (void *)pAnim); pAnim->aniDelta = 1; // will animate on next call to NextAnimRate pAnim->pObject = pAniObj; // set object to animate |