From ded3c2a4b47a34c93c8129c58feedf2bcecd848b Mon Sep 17 00:00:00 2001 From: Einar Johan Trøan Sømåen Date: Fri, 11 May 2012 15:05:03 +0200 Subject: WINTERMUTE: Add const to even more char-pointers. --- engines/wintermute/AdActor.cpp | 4 ++-- engines/wintermute/AdActor.h | 4 ++-- engines/wintermute/AdGame.cpp | 4 ++-- engines/wintermute/AdGame.h | 4 ++-- engines/wintermute/AdItem.cpp | 2 +- engines/wintermute/AdItem.h | 2 +- engines/wintermute/AdNodeState.cpp | 4 ++-- engines/wintermute/AdNodeState.h | 4 ++-- engines/wintermute/AdObject.cpp | 2 +- engines/wintermute/AdObject.h | 2 +- engines/wintermute/AdResponseBox.cpp | 2 +- engines/wintermute/AdResponseBox.h | 2 +- engines/wintermute/AdResponseContext.cpp | 2 +- engines/wintermute/AdResponseContext.h | 2 +- engines/wintermute/AdTalkHolder.cpp | 2 +- engines/wintermute/AdTalkHolder.h | 2 +- engines/wintermute/BEvent.cpp | 4 ++-- engines/wintermute/BEvent.h | 4 ++-- engines/wintermute/BFileManager.cpp | 8 ++++---- engines/wintermute/BFileManager.h | 8 ++++---- engines/wintermute/BObject.cpp | 2 +- engines/wintermute/BObject.h | 2 +- engines/wintermute/BPersistMgr.cpp | 2 +- engines/wintermute/BPersistMgr.h | 2 +- engines/wintermute/BScriptHolder.cpp | 2 +- engines/wintermute/BScriptHolder.h | 2 +- engines/wintermute/BScriptable.cpp | 2 +- engines/wintermute/BScriptable.h | 2 +- engines/wintermute/BSprite.h | 2 +- engines/wintermute/UIWindow.cpp | 4 ++-- engines/wintermute/UIWindow.h | 4 ++-- engines/wintermute/scriptables/ScEngine.cpp | 4 ++-- engines/wintermute/scriptables/ScEngine.h | 4 ++-- engines/wintermute/scriptables/ScValue.cpp | 4 ++-- engines/wintermute/scriptables/ScValue.h | 4 ++-- 35 files changed, 55 insertions(+), 55 deletions(-) diff --git a/engines/wintermute/AdActor.cpp b/engines/wintermute/AdActor.cpp index f7203e7d3b..a020556dd7 100644 --- a/engines/wintermute/AdActor.cpp +++ b/engines/wintermute/AdActor.cpp @@ -1121,7 +1121,7 @@ char *CAdActor::ScToString() { ////////////////////////////////////////////////////////////////////////// -CBSprite *CAdActor::GetTalkStance(char *Stance) { +CBSprite *CAdActor::GetTalkStance(const char *Stance) { // forced stance? if (_forcedTalkAnimName && !_forcedTalkAnimUsed) { _forcedTalkAnimUsed = true; @@ -1171,7 +1171,7 @@ CBSprite *CAdActor::GetTalkStance(char *Stance) { } ////////////////////////////////////////////////////////////////////////// -CBSprite *CAdActor::GetTalkStanceOld(char *Stance) { +CBSprite *CAdActor::GetTalkStanceOld(const char *Stance) { CBSprite *ret = NULL; if (Stance != NULL) { diff --git a/engines/wintermute/AdActor.h b/engines/wintermute/AdActor.h index 85b54060c9..7b73131c89 100644 --- a/engines/wintermute/AdActor.h +++ b/engines/wintermute/AdActor.h @@ -49,7 +49,7 @@ public: TDirection AngleToDirection(int Angle); DECLARE_PERSISTENT(CAdActor, CAdTalkHolder) virtual int GetHeight(); - CBSprite *GetTalkStance(char *Stance); + CBSprite *GetTalkStance(const char *Stance); virtual void GoTo(int X, int Y, TDirection AfterWalkDir = DI_NONE); CBPoint *_targetPoint; virtual HRESULT Update(); @@ -88,7 +88,7 @@ public: private: HRESULT SetDefaultAnimNames(); - CBSprite *GetTalkStanceOld(char *Stance); + CBSprite *GetTalkStanceOld(const char *Stance); HRESULT MergeAnims(const char *AnimsFilename); CBSprite *_animSprite2; diff --git a/engines/wintermute/AdGame.cpp b/engines/wintermute/AdGame.cpp index cce3d5950b..454991af10 100644 --- a/engines/wintermute/AdGame.cpp +++ b/engines/wintermute/AdGame.cpp @@ -1330,7 +1330,7 @@ void CAdGame::AfterLoadScene(void *Scene, void *Data) { ////////////////////////////////////////////////////////////////////////// -void CAdGame::SetPrevSceneName(char *Name) { +void CAdGame::SetPrevSceneName(const char *Name) { delete[] _prevSceneName; _prevSceneName = NULL; if (Name) { @@ -1341,7 +1341,7 @@ void CAdGame::SetPrevSceneName(char *Name) { ////////////////////////////////////////////////////////////////////////// -void CAdGame::SetPrevSceneFilename(char *Name) { +void CAdGame::SetPrevSceneFilename(const char *Name) { delete[] _prevSceneFilename; _prevSceneFilename = NULL; if (Name) { diff --git a/engines/wintermute/AdGame.h b/engines/wintermute/AdGame.h index 1558a2ad0e..fbf94d5275 100644 --- a/engines/wintermute/AdGame.h +++ b/engines/wintermute/AdGame.h @@ -108,8 +108,8 @@ public: HRESULT ScheduleChangeScene(const char *Filename, bool FadeIn); char *_scheduledScene; bool _scheduledFadeIn; - void SetPrevSceneName(char *Name); - void SetPrevSceneFilename(char *Name); + void SetPrevSceneName(const char *Name); + void SetPrevSceneFilename(const char *Name); char *_prevSceneName; char *_prevSceneFilename; virtual HRESULT LoadGame(const char *Filename); diff --git a/engines/wintermute/AdItem.cpp b/engines/wintermute/AdItem.cpp index 82cdb5e349..71f13d7c03 100644 --- a/engines/wintermute/AdItem.cpp +++ b/engines/wintermute/AdItem.cpp @@ -745,7 +745,7 @@ HRESULT CAdItem::Persist(CBPersistMgr *PersistMgr) { ////////////////////////////////////////////////////////////////////////// -bool CAdItem::GetExtendedFlag(char *FlagName) { +bool CAdItem::GetExtendedFlag(const char *FlagName) { if (!FlagName) return false; else if (strcmp(FlagName, "usable") == 0) return true; else return CAdObject::GetExtendedFlag(FlagName); diff --git a/engines/wintermute/AdItem.h b/engines/wintermute/AdItem.h index 46993d935f..56dc7ccbf3 100644 --- a/engines/wintermute/AdItem.h +++ b/engines/wintermute/AdItem.h @@ -47,7 +47,7 @@ public: HRESULT Update(); DECLARE_PERSISTENT(CAdItem, CAdTalkHolder) HRESULT Display(int X, int Y); - bool GetExtendedFlag(char *FlagName); + bool GetExtendedFlag(const char *FlagName); bool _inInventory; bool _cursorCombined; CBSprite *_spriteHover; diff --git a/engines/wintermute/AdNodeState.cpp b/engines/wintermute/AdNodeState.cpp index f3cdb6cc4d..27c796c77b 100644 --- a/engines/wintermute/AdNodeState.cpp +++ b/engines/wintermute/AdNodeState.cpp @@ -68,7 +68,7 @@ CAdNodeState::~CAdNodeState() { ////////////////////////////////////////////////////////////////////////// -void CAdNodeState::SetName(char *Name) { +void CAdNodeState::SetName(const char *Name) { delete[] _name; _name = NULL; CBUtils::SetString(&_name, Name); @@ -107,7 +107,7 @@ HRESULT CAdNodeState::Persist(CBPersistMgr *PersistMgr) { ////////////////////////////////////////////////////////////////////////// -void CAdNodeState::SetCaption(char *Caption, int Case) { +void CAdNodeState::SetCaption(const char *Caption, int Case) { if (Case == 0) Case = 1; if (Case < 1 || Case > 7) return; diff --git a/engines/wintermute/AdNodeState.h b/engines/wintermute/AdNodeState.h index 7c959e3168..da8dc541b1 100644 --- a/engines/wintermute/AdNodeState.h +++ b/engines/wintermute/AdNodeState.h @@ -36,7 +36,7 @@ class CAdEntity; class CAdNodeState : public CBBase { public: HRESULT TransferEntity(CAdEntity *Entity, bool IncludingSprites, bool Saving); - void SetName(char *Name); + void SetName(const char *Name); void SetFilename(const char *Filename); void SetCursor(const char *Filename); DECLARE_PERSISTENT(CAdNodeState, CBBase) @@ -45,7 +45,7 @@ public: char *_name; bool _active; char *_caption[7]; - void SetCaption(char *Caption, int Case); + void SetCaption(const char *Caption, int Case); char *GetCaption(int Case); uint32 _alphaColor; char *_filename; diff --git a/engines/wintermute/AdObject.cpp b/engines/wintermute/AdObject.cpp index 38c3336eae..471672e784 100644 --- a/engines/wintermute/AdObject.cpp +++ b/engines/wintermute/AdObject.cpp @@ -1004,7 +1004,7 @@ HRESULT CAdObject::ResetSoundPan() { ////////////////////////////////////////////////////////////////////////// -bool CAdObject::GetExtendedFlag(char *FlagName) { +bool CAdObject::GetExtendedFlag(const char *FlagName) { if (!FlagName) return false; else if (strcmp(FlagName, "usable") == 0) return true; diff --git a/engines/wintermute/AdObject.h b/engines/wintermute/AdObject.h index f229fb7653..e47248dd17 100644 --- a/engines/wintermute/AdObject.h +++ b/engines/wintermute/AdObject.h @@ -64,7 +64,7 @@ public: HRESULT UpdateBlockRegion(); bool _forcedTalkAnimUsed; char *_forcedTalkAnimName; - virtual bool GetExtendedFlag(char *FlagName); + virtual bool GetExtendedFlag(const char *FlagName); virtual HRESULT ResetSoundPan(); virtual HRESULT UpdateSounds(); HRESULT Reset(); diff --git a/engines/wintermute/AdResponseBox.cpp b/engines/wintermute/AdResponseBox.cpp index d64230ceb7..4d9608ea9a 100644 --- a/engines/wintermute/AdResponseBox.cpp +++ b/engines/wintermute/AdResponseBox.cpp @@ -552,7 +552,7 @@ HRESULT CAdResponseBox::WeedResponses() { ////////////////////////////////////////////////////////////////////////// -void CAdResponseBox::SetLastResponseText(char *Text, char *TextOrig) { +void CAdResponseBox::SetLastResponseText(const char *Text, const char *TextOrig) { CBUtils::SetString(&_lastResponseText, Text); CBUtils::SetString(&_lastResponseTextOrig, TextOrig); } diff --git a/engines/wintermute/AdResponseBox.h b/engines/wintermute/AdResponseBox.h index de22874e72..b50d91da03 100644 --- a/engines/wintermute/AdResponseBox.h +++ b/engines/wintermute/AdResponseBox.h @@ -45,7 +45,7 @@ public: HRESULT GetObjects(CBArray& Objects, bool InteractiveOnly); HRESULT HandleResponse(CAdResponse *Response); - void SetLastResponseText(char *Text, char *TextOrig); + void SetLastResponseText(const char *Text, const char *TextOrig); char *_lastResponseText; char *_lastResponseTextOrig; DECLARE_PERSISTENT(CAdResponseBox, CBObject) diff --git a/engines/wintermute/AdResponseContext.cpp b/engines/wintermute/AdResponseContext.cpp index c984ad079c..670604fb68 100644 --- a/engines/wintermute/AdResponseContext.cpp +++ b/engines/wintermute/AdResponseContext.cpp @@ -58,7 +58,7 @@ HRESULT CAdResponseContext::Persist(CBPersistMgr *PersistMgr) { } ////////////////////////////////////////////////////////////////////////// -void CAdResponseContext::SetContext(char *Context) { +void CAdResponseContext::SetContext(const char *Context) { delete[] _context; _context = NULL; if (Context) { diff --git a/engines/wintermute/AdResponseContext.h b/engines/wintermute/AdResponseContext.h index c4927a79e9..7ae1b14ed2 100644 --- a/engines/wintermute/AdResponseContext.h +++ b/engines/wintermute/AdResponseContext.h @@ -36,7 +36,7 @@ namespace WinterMute { class CAdResponseContext : public CBBase { public: - void SetContext(char *Context); + void SetContext(const char *Context); int _iD; char *_context; DECLARE_PERSISTENT(CAdResponseContext, CBBase) diff --git a/engines/wintermute/AdTalkHolder.cpp b/engines/wintermute/AdTalkHolder.cpp index 5cd8432292..7caf639c14 100644 --- a/engines/wintermute/AdTalkHolder.cpp +++ b/engines/wintermute/AdTalkHolder.cpp @@ -61,7 +61,7 @@ CAdTalkHolder::~CAdTalkHolder() { } ////////////////////////////////////////////////////////////////////////// -CBSprite *CAdTalkHolder::GetTalkStance(char *Stance) { +CBSprite *CAdTalkHolder::GetTalkStance(const char *Stance) { CBSprite *ret = NULL; diff --git a/engines/wintermute/AdTalkHolder.h b/engines/wintermute/AdTalkHolder.h index 3b30779de8..2520d17996 100644 --- a/engines/wintermute/AdTalkHolder.h +++ b/engines/wintermute/AdTalkHolder.h @@ -36,7 +36,7 @@ namespace WinterMute { class CAdTalkHolder : public CAdObject { public: DECLARE_PERSISTENT(CAdTalkHolder, CAdObject) - virtual CBSprite *GetTalkStance(char *Stance); + virtual CBSprite *GetTalkStance(const char *Stance); virtual HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent); CBSprite *_sprite; CBArray _talkSprites; diff --git a/engines/wintermute/BEvent.cpp b/engines/wintermute/BEvent.cpp index 68cc581abf..05876784a1 100644 --- a/engines/wintermute/BEvent.cpp +++ b/engines/wintermute/BEvent.cpp @@ -100,7 +100,7 @@ const char *CBEvent::GetEventName(TEventType Type) { ////////////////////////////////////////////////////////////////////////// -void CBEvent::SetScript(char *Script) { +void CBEvent::SetScript(const char *Script) { if (_script) delete [] _script; _script = new char [strlen(Script) + 1]; @@ -109,7 +109,7 @@ void CBEvent::SetScript(char *Script) { ////////////////////////////////////////////////////////////////////////// -void CBEvent::SetName(char *Name) { +void CBEvent::SetName(const char *Name) { if (_name) delete [] _name; _name = new char [strlen(Name) + 1]; diff --git a/engines/wintermute/BEvent.h b/engines/wintermute/BEvent.h index a1e071fe94..e09f0ff3a8 100644 --- a/engines/wintermute/BEvent.h +++ b/engines/wintermute/BEvent.h @@ -38,8 +38,8 @@ namespace WinterMute { class CBEvent : public CBBase { public: DECLARE_PERSISTENT(CBEvent, CBBase) - void SetScript(char *Script); - void SetName(char *Name); + void SetScript(const char *Script); + void SetName(const char *Name); static const char *GetEventName(TEventType Type); char *_script; char *_name; diff --git a/engines/wintermute/BFileManager.cpp b/engines/wintermute/BFileManager.cpp index a3b756eb87..4cfe031090 100644 --- a/engines/wintermute/BFileManager.cpp +++ b/engines/wintermute/BFileManager.cpp @@ -675,7 +675,7 @@ bool CBFileManager::IsValidPackage(const AnsiString &fileName) const { } ////////////////////////////////////////////////////////////////////////// -Common::File *CBFileManager::OpenPackage(char *Name) { +Common::File *CBFileManager::OpenPackage(const char *Name) { //TODO: Is it really necessary to do this when we have the ScummVM-system? //RestoreCurrentDir(); @@ -703,7 +703,7 @@ Common::File *CBFileManager::OpenPackage(char *Name) { ////////////////////////////////////////////////////////////////////////// -Common::File *CBFileManager::OpenSingleFile(char *Name) { +Common::File *CBFileManager::OpenSingleFile(const char *Name) { RestoreCurrentDir(); Common::File *ret = NULL; @@ -728,7 +728,7 @@ Common::File *CBFileManager::OpenSingleFile(char *Name) { ////////////////////////////////////////////////////////////////////////// -bool CBFileManager::GetFullPath(char *Filename, char *Fullname) { +bool CBFileManager::GetFullPath(const char *Filename, char *Fullname) { RestoreCurrentDir(); FILE *f = NULL; @@ -848,7 +848,7 @@ HRESULT CBFileManager::RestoreCurrentDir() { ////////////////////////////////////////////////////////////////////////// -HRESULT CBFileManager::SetBasePath(char *Path) { +HRESULT CBFileManager::SetBasePath(const char *Path) { Cleanup(); if (Path) { diff --git a/engines/wintermute/BFileManager.h b/engines/wintermute/BFileManager.h index 7a9593915a..f021afa275 100644 --- a/engines/wintermute/BFileManager.h +++ b/engines/wintermute/BFileManager.h @@ -45,16 +45,16 @@ class CBFileManager: CBBase { public: bool FindPackageSignature(Common::File *f, uint32 *Offset); HRESULT Cleanup(); - HRESULT SetBasePath(char *Path); + HRESULT SetBasePath(const char *Path); HRESULT RestoreCurrentDir(); char *_basePath; - bool GetFullPath(char *Filename, char *Fullname); + bool GetFullPath(const char *Filename, char *Fullname); CBFile *OpenFileRaw(const char *Filename); HRESULT CloseFile(CBFile *File); CBFile *OpenFile(const char *Filename, bool AbsPathWarning = true); CBFileEntry *GetPackageEntry(const char *Filename); - Common::File *OpenSingleFile(char *Name); - Common::File *OpenPackage(char *Name); + Common::File *OpenSingleFile(const char *Name); + Common::File *OpenPackage(const char *Name); HRESULT RegisterPackages(); HRESULT InitPaths(); HRESULT ReloadPaths(); diff --git a/engines/wintermute/BObject.cpp b/engines/wintermute/BObject.cpp index 4c63672bc6..eb44636ee9 100644 --- a/engines/wintermute/BObject.cpp +++ b/engines/wintermute/BObject.cpp @@ -1093,7 +1093,7 @@ HRESULT CBObject::ResetSoundPan() { ////////////////////////////////////////////////////////////////////////// -bool CBObject::GetExtendedFlag(char *FlagName) { +bool CBObject::GetExtendedFlag(const char *FlagName) { return false; } diff --git a/engines/wintermute/BObject.h b/engines/wintermute/BObject.h index f896428417..f01d88349f 100644 --- a/engines/wintermute/BObject.h +++ b/engines/wintermute/BObject.h @@ -59,7 +59,7 @@ public: float _scaleY; float _relativeScale; virtual bool IsReady(); - virtual bool GetExtendedFlag(char *FlagName); + virtual bool GetExtendedFlag(const char *FlagName); virtual HRESULT ResetSoundPan(); virtual HRESULT UpdateSounds(); HRESULT UpdateOneSound(CBSound *Sound); diff --git a/engines/wintermute/BPersistMgr.cpp b/engines/wintermute/BPersistMgr.cpp index 297efeec81..e1e84505ca 100644 --- a/engines/wintermute/BPersistMgr.cpp +++ b/engines/wintermute/BPersistMgr.cpp @@ -107,7 +107,7 @@ uint32 makeUint32(byte first, byte second, byte third, byte fourth) { } ////////////////////////////////////////////////////////////////////////// -HRESULT CBPersistMgr::InitSave(char *Desc) { +HRESULT CBPersistMgr::InitSave(const char *Desc) { if (!Desc) return E_FAIL; HRESULT res; diff --git a/engines/wintermute/BPersistMgr.h b/engines/wintermute/BPersistMgr.h index 3f55146ce8..01d2fda40a 100644 --- a/engines/wintermute/BPersistMgr.h +++ b/engines/wintermute/BPersistMgr.h @@ -52,7 +52,7 @@ public: void PutString(const char *Val); void Cleanup(); HRESULT InitLoad(const char *Filename); - HRESULT InitSave(char *Desc); + HRESULT InitSave(const char *Desc); HRESULT GetBytes(byte *Buffer, uint32 Size); HRESULT PutBytes(byte *Buffer, uint32 Size); uint32 _offset; diff --git a/engines/wintermute/BScriptHolder.cpp b/engines/wintermute/BScriptHolder.cpp index a13ef750e8..a976ae89bb 100644 --- a/engines/wintermute/BScriptHolder.cpp +++ b/engines/wintermute/BScriptHolder.cpp @@ -424,7 +424,7 @@ void CBScriptHolder::MakeFreezable(bool Freezable) { ////////////////////////////////////////////////////////////////////////// -CScScript *CBScriptHolder::InvokeMethodThread(char *MethodName) { +CScScript *CBScriptHolder::InvokeMethodThread(const char *MethodName) { for (int i = _scripts.GetSize() - 1; i >= 0; i--) { if (_scripts[i]->CanHandleMethod(MethodName)) { diff --git a/engines/wintermute/BScriptHolder.h b/engines/wintermute/BScriptHolder.h index 2a96817541..1c0842815e 100644 --- a/engines/wintermute/BScriptHolder.h +++ b/engines/wintermute/BScriptHolder.h @@ -41,7 +41,7 @@ public: CBScriptHolder(CBGame *inGame); virtual ~CBScriptHolder(); - virtual CScScript *InvokeMethodThread(char *MethodName); + virtual CScScript *InvokeMethodThread(const char *MethodName); virtual void MakeFreezable(bool Freezable); bool CanHandleEvent(const char *EventName); virtual bool CanHandleMethod(const char *EventMethod); diff --git a/engines/wintermute/BScriptable.cpp b/engines/wintermute/BScriptable.cpp index 2f898078c6..5de599525f 100644 --- a/engines/wintermute/BScriptable.cpp +++ b/engines/wintermute/BScriptable.cpp @@ -168,7 +168,7 @@ bool CBScriptable::CanHandleMethod(char *EventMethod) { ////////////////////////////////////////////////////////////////////////// -CScScript *CBScriptable::InvokeMethodThread(char *MethodName) { +CScScript *CBScriptable::InvokeMethodThread(const char *MethodName) { return NULL; } diff --git a/engines/wintermute/BScriptable.h b/engines/wintermute/BScriptable.h index b841d1578d..9b0dcee968 100644 --- a/engines/wintermute/BScriptable.h +++ b/engines/wintermute/BScriptable.h @@ -42,7 +42,7 @@ class CScScript; class CBScriptable : public CBNamedObject, public IWmeDebugObject { public: - virtual CScScript *InvokeMethodThread(char *MethodName); + virtual CScScript *InvokeMethodThread(const char *MethodName); DECLARE_PERSISTENT(CBScriptable, CBNamedObject) CBScriptable(CBGame *inGame, bool NoValue = false, bool Persistable = true); diff --git a/engines/wintermute/BSprite.h b/engines/wintermute/BSprite.h index 983b7bb62f..bec49bc3a4 100644 --- a/engines/wintermute/BSprite.h +++ b/engines/wintermute/BSprite.h @@ -72,7 +72,7 @@ public: HRESULT Draw(int X, int Y, CBObject *Register = NULL, float ZoomX = 100, float ZoomY = 100, uint32 Alpha = 0xFFFFFFFF); bool _looping; int _currentFrame; - HRESULT AddFrame(char *Filename, uint32 Delay = 0, int HotspotX = 0, int HotspotY = 0, RECT *Rect = NULL); + HRESULT AddFrame(const char *Filename, uint32 Delay = 0, int HotspotX = 0, int HotspotY = 0, RECT *Rect = NULL); CBSprite(CBGame *inGame, CBObject *Owner = NULL); virtual ~CBSprite(); CBArray _frames; diff --git a/engines/wintermute/UIWindow.cpp b/engines/wintermute/UIWindow.cpp index e450ae7c0d..f70da3cb1e 100644 --- a/engines/wintermute/UIWindow.cpp +++ b/engines/wintermute/UIWindow.cpp @@ -668,7 +668,7 @@ HRESULT CUIWindow::SaveAsText(CBDynBuffer *Buffer, int Indent) { } ////////////////////////////////////////////////////////////////////////// -HRESULT CUIWindow::EnableWidget(char *Name, bool Enable) { +HRESULT CUIWindow::EnableWidget(const char *Name, bool Enable) { for (int i = 0; i < _widgets.GetSize(); i++) { if (scumm_stricmp(_widgets[i]->_name, Name) == 0) _widgets[i]->_disable = !Enable; } @@ -677,7 +677,7 @@ HRESULT CUIWindow::EnableWidget(char *Name, bool Enable) { ////////////////////////////////////////////////////////////////////////// -HRESULT CUIWindow::ShowWidget(char *Name, bool Visible) { +HRESULT CUIWindow::ShowWidget(const char *Name, bool Visible) { for (int i = 0; i < _widgets.GetSize(); i++) { if (scumm_stricmp(_widgets[i]->_name, Name) == 0) _widgets[i]->_visible = Visible; } diff --git a/engines/wintermute/UIWindow.h b/engines/wintermute/UIWindow.h index 46649dda18..e0051e9360 100644 --- a/engines/wintermute/UIWindow.h +++ b/engines/wintermute/UIWindow.h @@ -62,8 +62,8 @@ public: bool _dragging; DECLARE_PERSISTENT(CUIWindow, CUIObject) bool _transparent; - HRESULT ShowWidget(char *Name, bool Visible = true); - HRESULT EnableWidget(char *Name, bool Enable = true); + HRESULT ShowWidget(const char *Name, bool Visible = true); + HRESULT EnableWidget(const char *Name, bool Enable = true); RECT _titleRect; RECT _dragRect; virtual HRESULT Display(int OffsetX = 0, int OffsetY = 0); diff --git a/engines/wintermute/scriptables/ScEngine.cpp b/engines/wintermute/scriptables/ScEngine.cpp index b5f66bbb14..bfdfb53fa0 100644 --- a/engines/wintermute/scriptables/ScEngine.cpp +++ b/engines/wintermute/scriptables/ScEngine.cpp @@ -667,7 +667,7 @@ HRESULT CScEngine::DbgSendScripts(IWmeDebugClient *Client) { } ////////////////////////////////////////////////////////////////////////// -HRESULT CScEngine::AddBreakpoint(char *ScriptFilename, int Line) { +HRESULT CScEngine::AddBreakpoint(const char *ScriptFilename, int Line) { if (!Game->GetDebugMgr()->_enabled) return S_OK; CScBreakpoint *Bp = NULL; @@ -694,7 +694,7 @@ HRESULT CScEngine::AddBreakpoint(char *ScriptFilename, int Line) { } ////////////////////////////////////////////////////////////////////////// -HRESULT CScEngine::RemoveBreakpoint(char *ScriptFilename, int Line) { +HRESULT CScEngine::RemoveBreakpoint(const char *ScriptFilename, int Line) { if (!Game->GetDebugMgr()->_enabled) return S_OK; for (int i = 0; i < _breakpoints.GetSize(); i++) { diff --git a/engines/wintermute/scriptables/ScEngine.h b/engines/wintermute/scriptables/ScEngine.h index 6a258688c4..d034bf8ed6 100644 --- a/engines/wintermute/scriptables/ScEngine.h +++ b/engines/wintermute/scriptables/ScEngine.h @@ -96,8 +96,8 @@ public: HRESULT DbgSendScripts(IWmeDebugClient *Client); CBArray _breakpoints; - HRESULT AddBreakpoint(char *ScriptFilename, int Line); - HRESULT RemoveBreakpoint(char *ScriptFilename, int Line); + HRESULT AddBreakpoint(const char *ScriptFilename, int Line); + HRESULT RemoveBreakpoint(const char *ScriptFilename, int Line); HRESULT RefreshScriptBreakpoints(); HRESULT RefreshScriptBreakpoints(CScScript *Script); HRESULT SaveBreakpoints(); diff --git a/engines/wintermute/scriptables/ScValue.cpp b/engines/wintermute/scriptables/ScValue.cpp index 250a61ad67..3576c0a618 100644 --- a/engines/wintermute/scriptables/ScValue.cpp +++ b/engines/wintermute/scriptables/ScValue.cpp @@ -188,7 +188,7 @@ CScValue *CScValue::GetProp(const char *Name) { } ////////////////////////////////////////////////////////////////////////// -HRESULT CScValue::DeleteProp(char *Name) { +HRESULT CScValue::DeleteProp(const char *Name) { if (_type == VAL_VARIABLE_REF) return _valRef->DeleteProp(Name); _valIter = _valObject.find(Name); @@ -247,7 +247,7 @@ HRESULT CScValue::SetProp(const char *Name, CScValue *Val, bool CopyWhole, bool ////////////////////////////////////////////////////////////////////////// -bool CScValue::PropExists(char *Name) { +bool CScValue::PropExists(const char *Name) { if (_type == VAL_VARIABLE_REF) return _valRef->PropExists(Name); _valIter = _valObject.find(Name); diff --git a/engines/wintermute/scriptables/ScValue.h b/engines/wintermute/scriptables/ScValue.h index 8696808ad4..7c87c8e707 100644 --- a/engines/wintermute/scriptables/ScValue.h +++ b/engines/wintermute/scriptables/ScValue.h @@ -57,7 +57,7 @@ public: HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent); void SetValue(CScValue *Val); bool _persistent; - bool PropExists(char *Name); + bool PropExists(const char *Name); void Copy(CScValue *orig, bool CopyWhole = false); void SetStringVal(const char *Val); TValType GetType(); @@ -67,7 +67,7 @@ public: const char *GetString(); void *GetMemBuffer(); CBScriptable *GetNative(); - HRESULT DeleteProp(char *Name); + HRESULT DeleteProp(const char *Name); void DeleteProps(); void CleanProps(bool IncludingNatives); void SetBool(bool Val); -- cgit v1.2.3