diff options
66 files changed, 194 insertions, 194 deletions
diff --git a/engines/wintermute/AdActor.cpp b/engines/wintermute/AdActor.cpp index a020556dd7..d957d08b8c 100644 --- a/engines/wintermute/AdActor.cpp +++ b/engines/wintermute/AdActor.cpp @@ -870,7 +870,7 @@ void CAdActor::InitLine(CBPoint StartPt, CBPoint EndPt) { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdActor::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name) {
+HRESULT CAdActor::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// GoTo / GoToAsync
//////////////////////////////////////////////////////////////////////////
@@ -993,7 +993,7 @@ HRESULT CAdActor::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *Thi //////////////////////////////////////////////////////////////////////////
-CScValue *CAdActor::ScGetProperty(char *Name) {
+CScValue *CAdActor::ScGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -1055,7 +1055,7 @@ CScValue *CAdActor::ScGetProperty(char *Name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CAdActor::ScSetProperty(char *Name, CScValue *Value) {
+HRESULT CAdActor::ScSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Direction
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/AdActor.h b/engines/wintermute/AdActor.h index 7b73131c89..d1c44b8948 100644 --- a/engines/wintermute/AdActor.h +++ b/engines/wintermute/AdActor.h @@ -81,9 +81,9 @@ public: CAdSpriteSet *GetAnimByName(const char *AnimName);
// scripting interface
- virtual CScValue *ScGetProperty(char *Name);
- virtual HRESULT ScSetProperty(char *Name, CScValue *Value);
- virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name);
+ virtual CScValue *ScGetProperty(const char *Name);
+ virtual HRESULT ScSetProperty(const char *Name, CScValue *Value);
+ virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
virtual char *ScToString();
private:
diff --git a/engines/wintermute/AdEntity.cpp b/engines/wintermute/AdEntity.cpp index 1566ad8bbd..91f7bfeace 100644 --- a/engines/wintermute/AdEntity.cpp +++ b/engines/wintermute/AdEntity.cpp @@ -590,7 +590,7 @@ HRESULT CAdEntity::Update() { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdEntity::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name) {
+HRESULT CAdEntity::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// StopSound
//////////////////////////////////////////////////////////////////////////
@@ -697,7 +697,7 @@ HRESULT CAdEntity::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th //////////////////////////////////////////////////////////////////////////
-CScValue *CAdEntity::ScGetProperty(char *Name) {
+CScValue *CAdEntity::ScGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -768,7 +768,7 @@ CScValue *CAdEntity::ScGetProperty(char *Name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CAdEntity::ScSetProperty(char *Name, CScValue *Value) {
+HRESULT CAdEntity::ScSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Item
diff --git a/engines/wintermute/AdEntity.h b/engines/wintermute/AdEntity.h index 1ee0e75fe4..ac93a05d87 100644 --- a/engines/wintermute/AdEntity.h +++ b/engines/wintermute/AdEntity.h @@ -55,9 +55,9 @@ public: TEntityType _subtype;
// scripting interface
- virtual CScValue *ScGetProperty(char *Name);
- virtual HRESULT ScSetProperty(char *Name, CScValue *Value);
- virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name);
+ virtual CScValue *ScGetProperty(const char *Name);
+ virtual HRESULT ScSetProperty(const char *Name, CScValue *Value);
+ virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
virtual char *ScToString();
};
diff --git a/engines/wintermute/AdGame.cpp b/engines/wintermute/AdGame.cpp index 454991af10..ff190dff98 100644 --- a/engines/wintermute/AdGame.cpp +++ b/engines/wintermute/AdGame.cpp @@ -313,7 +313,7 @@ void CAdGame::FinishSentences() { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdGame::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name) {
+HRESULT CAdGame::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// ChangeScene
//////////////////////////////////////////////////////////////////////////
@@ -794,7 +794,7 @@ HRESULT CAdGame::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *This //////////////////////////////////////////////////////////////////////////
-CScValue *CAdGame::ScGetProperty(char *Name) {
+CScValue *CAdGame::ScGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -948,7 +948,7 @@ CScValue *CAdGame::ScGetProperty(char *Name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CAdGame::ScSetProperty(char *Name, CScValue *Value) {
+HRESULT CAdGame::ScSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// SelectedItem
@@ -1450,7 +1450,7 @@ HRESULT CAdGame::LoadItemsBuffer(byte *Buffer, bool Merge) { //////////////////////////////////////////////////////////////////////////
-CAdSceneState *CAdGame::GetSceneState(char *Filename, bool Saving) {
+CAdSceneState *CAdGame::GetSceneState(const char *Filename, bool Saving) {
char *FilenameCor = new char[strlen(Filename) + 1];
strcpy(FilenameCor, Filename);
for (int i = 0; i < strlen(FilenameCor); i++) {
@@ -1514,7 +1514,7 @@ HRESULT CAdGame::WindowLoadHook(CUIWindow *Win, char **Buffer, char **params) { //////////////////////////////////////////////////////////////////////////
-HRESULT CAdGame::WindowScriptMethodHook(CUIWindow *Win, CScScript *Script, CScStack *Stack, char *Name) {
+HRESULT CAdGame::WindowScriptMethodHook(CUIWindow *Win, CScScript *Script, CScStack *Stack, const char *Name) {
if (strcmp(Name, "CreateEntityContainer") == 0) {
Stack->CorrectParams(1);
CScValue *Val = Stack->Pop();
diff --git a/engines/wintermute/AdGame.h b/engines/wintermute/AdGame.h index fbf94d5275..748fda145a 100644 --- a/engines/wintermute/AdGame.h +++ b/engines/wintermute/AdGame.h @@ -93,9 +93,9 @@ public: HRESULT StartDlgBranch(const char *BranchName, const char *ScriptName, const char *EventName);
HRESULT EndDlgBranch(const char *BranchName, const char *ScriptName, const char *EventName);
virtual HRESULT WindowLoadHook(CUIWindow *Win, char **Buf, char **Params);
- virtual HRESULT WindowScriptMethodHook(CUIWindow *Win, CScScript *Script, CScStack *Stack, char *Name);
+ virtual HRESULT WindowScriptMethodHook(CUIWindow *Win, CScScript *Script, CScStack *Stack, const char *Name);
- CAdSceneState *GetSceneState(char *Filename, bool Saving);
+ CAdSceneState *GetSceneState(const char *Filename, bool Saving);
CBViewport *_sceneViewport;
int _texItemLifeTime;
int _texWalkLifeTime;
@@ -151,9 +151,9 @@ public: virtual HRESULT ExternalCall(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name);
// scripting interface
- virtual CScValue *ScGetProperty(char *Name);
- virtual HRESULT ScSetProperty(char *Name, CScValue *Value);
- virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name);
+ virtual CScValue *ScGetProperty(const char *Name);
+ virtual HRESULT ScSetProperty(const char *Name, CScValue *Value);
+ virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
bool ValidMouse();
};
diff --git a/engines/wintermute/AdItem.cpp b/engines/wintermute/AdItem.cpp index 71f13d7c03..cc88b8bb3c 100644 --- a/engines/wintermute/AdItem.cpp +++ b/engines/wintermute/AdItem.cpp @@ -428,7 +428,7 @@ HRESULT CAdItem::Display(int X, int Y) { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdItem::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name) {
+HRESULT CAdItem::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// SetHoverSprite
//////////////////////////////////////////////////////////////////////////
@@ -566,7 +566,7 @@ HRESULT CAdItem::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *This //////////////////////////////////////////////////////////////////////////
-CScValue *CAdItem::ScGetProperty(char *Name) {
+CScValue *CAdItem::ScGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -647,7 +647,7 @@ CScValue *CAdItem::ScGetProperty(char *Name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CAdItem::ScSetProperty(char *Name, CScValue *Value) {
+HRESULT CAdItem::ScSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Name
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/AdItem.h b/engines/wintermute/AdItem.h index 56dc7ccbf3..b5af924092 100644 --- a/engines/wintermute/AdItem.h +++ b/engines/wintermute/AdItem.h @@ -59,9 +59,9 @@ public: HRESULT LoadBuffer(byte *Buffer, bool Complete = true);
// scripting interface
- virtual CScValue *ScGetProperty(char *Name);
- virtual HRESULT ScSetProperty(char *Name, CScValue *Value);
- virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name);
+ virtual CScValue *ScGetProperty(const char *Name);
+ virtual HRESULT ScSetProperty(const char *Name, CScValue *Value);
+ virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
virtual char *ScToString();
};
diff --git a/engines/wintermute/AdLayer.cpp b/engines/wintermute/AdLayer.cpp index 744e278115..023379d142 100644 --- a/engines/wintermute/AdLayer.cpp +++ b/engines/wintermute/AdLayer.cpp @@ -227,7 +227,7 @@ HRESULT CAdLayer::LoadBuffer(byte *Buffer, bool Complete) { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdLayer::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name) {
+HRESULT CAdLayer::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// GetNode
//////////////////////////////////////////////////////////////////////////
@@ -357,7 +357,7 @@ HRESULT CAdLayer::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *Thi //////////////////////////////////////////////////////////////////////////
-CScValue *CAdLayer::ScGetProperty(char *Name) {
+CScValue *CAdLayer::ScGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -421,7 +421,7 @@ CScValue *CAdLayer::ScGetProperty(char *Name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CAdLayer::ScSetProperty(char *Name, CScValue *Value) {
+HRESULT CAdLayer::ScSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Name
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/AdLayer.h b/engines/wintermute/AdLayer.h index 48b9cfdc27..6de980d0a5 100644 --- a/engines/wintermute/AdLayer.h +++ b/engines/wintermute/AdLayer.h @@ -47,9 +47,9 @@ public: virtual HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent);
// scripting interface
- virtual CScValue *ScGetProperty(char *Name);
- virtual HRESULT ScSetProperty(char *Name, CScValue *Value);
- virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name);
+ virtual CScValue *ScGetProperty(const char *Name);
+ virtual HRESULT ScSetProperty(const char *Name, CScValue *Value);
+ virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
virtual char *ScToString();
};
diff --git a/engines/wintermute/AdObject.cpp b/engines/wintermute/AdObject.cpp index 471672e784..2908cee79e 100644 --- a/engines/wintermute/AdObject.cpp +++ b/engines/wintermute/AdObject.cpp @@ -179,7 +179,7 @@ HRESULT CAdObject::Update() { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdObject::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name) {
+HRESULT CAdObject::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// PlayAnim / PlayAnimAsync
@@ -599,7 +599,7 @@ HRESULT CAdObject::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th //////////////////////////////////////////////////////////////////////////
-CScValue *CAdObject::ScGetProperty(char *Name) {
+CScValue *CAdObject::ScGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -706,7 +706,7 @@ CScValue *CAdObject::ScGetProperty(char *Name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CAdObject::ScSetProperty(char *Name, CScValue *Value) {
+HRESULT CAdObject::ScSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Active
diff --git a/engines/wintermute/AdObject.h b/engines/wintermute/AdObject.h index e47248dd17..e017b979e0 100644 --- a/engines/wintermute/AdObject.h +++ b/engines/wintermute/AdObject.h @@ -99,9 +99,9 @@ public: CAdRegion *_currentRegions[MAX_NUM_REGIONS];
// scripting interface
- virtual CScValue *ScGetProperty(char *Name);
- virtual HRESULT ScSetProperty(char *Name, CScValue *Value);
- virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name);
+ virtual CScValue *ScGetProperty(const char *Name);
+ virtual HRESULT ScSetProperty(const char *Name, CScValue *Value);
+ virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
virtual char *ScToString();
CBArray<CAdObject *, CAdObject *> _attachmentsPre;
diff --git a/engines/wintermute/AdRegion.cpp b/engines/wintermute/AdRegion.cpp index 81cb8fc72e..17917066f1 100644 --- a/engines/wintermute/AdRegion.cpp +++ b/engines/wintermute/AdRegion.cpp @@ -221,7 +221,7 @@ HRESULT CAdRegion::LoadBuffer(byte *Buffer, bool Complete) { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdRegion::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name) {
+HRESULT CAdRegion::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
/*
//////////////////////////////////////////////////////////////////////////
// SkipTo
@@ -240,7 +240,7 @@ HRESULT CAdRegion::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th //////////////////////////////////////////////////////////////////////////
-CScValue *CAdRegion::ScGetProperty(char *Name) {
+CScValue *CAdRegion::ScGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -296,7 +296,7 @@ CScValue *CAdRegion::ScGetProperty(char *Name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CAdRegion::ScSetProperty(char *Name, CScValue *Value) {
+HRESULT CAdRegion::ScSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Name
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/AdRegion.h b/engines/wintermute/AdRegion.h index 896db1f772..0af1c743fe 100644 --- a/engines/wintermute/AdRegion.h +++ b/engines/wintermute/AdRegion.h @@ -47,9 +47,9 @@ public: virtual HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent);
// scripting interface
- virtual CScValue *ScGetProperty(char *Name);
- virtual HRESULT ScSetProperty(char *Name, CScValue *Value);
- virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name);
+ virtual CScValue *ScGetProperty(const char *Name);
+ virtual HRESULT ScSetProperty(const char *Name, CScValue *Value);
+ virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
virtual char *ScToString();
};
diff --git a/engines/wintermute/AdScene.cpp b/engines/wintermute/AdScene.cpp index b8ee74eb71..4cd4ea1082 100644 --- a/engines/wintermute/AdScene.cpp +++ b/engines/wintermute/AdScene.cpp @@ -1246,7 +1246,7 @@ void CAdScene::SkipTo(int OffsetX, int OffsetY) { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdScene::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name) {
+HRESULT CAdScene::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// LoadActor
//////////////////////////////////////////////////////////////////////////
@@ -1677,7 +1677,7 @@ HRESULT CAdScene::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *Thi //////////////////////////////////////////////////////////////////////////
-CScValue *CAdScene::ScGetProperty(char *Name) {
+CScValue *CAdScene::ScGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -1840,7 +1840,7 @@ CScValue *CAdScene::ScGetProperty(char *Name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CAdScene::ScSetProperty(char *Name, CScValue *Value) {
+HRESULT CAdScene::ScSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Name
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/AdScene.h b/engines/wintermute/AdScene.h index cfedc8a911..5aa2e9ffb0 100644 --- a/engines/wintermute/AdScene.h +++ b/engines/wintermute/AdScene.h @@ -156,9 +156,9 @@ public: int GetPointsDist(CBPoint p1, CBPoint p2, CBObject *requester = NULL);
// scripting interface
- virtual CScValue *ScGetProperty(char *Name);
- virtual HRESULT ScSetProperty(char *Name, CScValue *Value);
- virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name);
+ virtual CScValue *ScGetProperty(const char *Name);
+ virtual HRESULT ScSetProperty(const char *Name, CScValue *Value);
+ virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
virtual char *ScToString();
diff --git a/engines/wintermute/AdTalkHolder.cpp b/engines/wintermute/AdTalkHolder.cpp index 7caf639c14..6773626523 100644 --- a/engines/wintermute/AdTalkHolder.cpp +++ b/engines/wintermute/AdTalkHolder.cpp @@ -117,7 +117,7 @@ CBSprite *CAdTalkHolder::GetTalkStance(const char *Stance) { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdTalkHolder::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name) {
+HRESULT CAdTalkHolder::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// SetSprite
//////////////////////////////////////////////////////////////////////////
@@ -288,7 +288,7 @@ HRESULT CAdTalkHolder::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack //////////////////////////////////////////////////////////////////////////
-CScValue *CAdTalkHolder::ScGetProperty(char *Name) {
+CScValue *CAdTalkHolder::ScGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -304,7 +304,7 @@ CScValue *CAdTalkHolder::ScGetProperty(char *Name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CAdTalkHolder::ScSetProperty(char *Name, CScValue *Value) {
+HRESULT CAdTalkHolder::ScSetProperty(const char *Name, CScValue *Value) {
/*
//////////////////////////////////////////////////////////////////////////
// Item
diff --git a/engines/wintermute/AdTalkHolder.h b/engines/wintermute/AdTalkHolder.h index 2520d17996..e6d4c322eb 100644 --- a/engines/wintermute/AdTalkHolder.h +++ b/engines/wintermute/AdTalkHolder.h @@ -45,9 +45,9 @@ public: virtual ~CAdTalkHolder();
// scripting interface
- virtual CScValue *ScGetProperty(char *Name);
- virtual HRESULT ScSetProperty(char *Name, CScValue *Value);
- virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name);
+ virtual CScValue *ScGetProperty(const char *Name);
+ virtual HRESULT ScSetProperty(const char *Name, CScValue *Value);
+ virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
virtual char *ScToString();
};
diff --git a/engines/wintermute/AdWaypointGroup.cpp b/engines/wintermute/AdWaypointGroup.cpp index a4f630c572..865279a57e 100644 --- a/engines/wintermute/AdWaypointGroup.cpp +++ b/engines/wintermute/AdWaypointGroup.cpp @@ -198,7 +198,7 @@ HRESULT CAdWaypointGroup::Persist(CBPersistMgr *PersistMgr) { //////////////////////////////////////////////////////////////////////////
-CScValue *CAdWaypointGroup::ScGetProperty(char *Name) {
+CScValue *CAdWaypointGroup::ScGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -222,7 +222,7 @@ CScValue *CAdWaypointGroup::ScGetProperty(char *Name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CAdWaypointGroup::ScSetProperty(char *Name, CScValue *Value) {
+HRESULT CAdWaypointGroup::ScSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Active
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/AdWaypointGroup.h b/engines/wintermute/AdWaypointGroup.h index de28f3fbf4..66fbcfa0e1 100644 --- a/engines/wintermute/AdWaypointGroup.h +++ b/engines/wintermute/AdWaypointGroup.h @@ -49,8 +49,8 @@ public: virtual ~CAdWaypointGroup();
CBArray<CBPoint *, CBPoint *> _points;
int _editorSelectedPoint;
- virtual CScValue *ScGetProperty(char *Name);
- virtual HRESULT ScSetProperty(char *Name, CScValue *Value);
+ virtual CScValue *ScGetProperty(const char *Name);
+ virtual HRESULT ScSetProperty(const char *Name, CScValue *Value);
};
} // end of namespace WinterMute
diff --git a/engines/wintermute/BFrame.cpp b/engines/wintermute/BFrame.cpp index c18d6a55a7..08a0e73f72 100644 --- a/engines/wintermute/BFrame.cpp +++ b/engines/wintermute/BFrame.cpp @@ -401,7 +401,7 @@ HRESULT CBFrame::Persist(CBPersistMgr *PersistMgr) { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CBFrame::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name) {
+HRESULT CBFrame::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// GetSound
@@ -573,7 +573,7 @@ HRESULT CBFrame::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *This //////////////////////////////////////////////////////////////////////////
-CScValue *CBFrame::ScGetProperty(char *Name) {
+CScValue *CBFrame::ScGetProperty(const char *Name) {
if (!_scValue) _scValue = new CScValue(Game);
_scValue->SetNULL();
@@ -650,7 +650,7 @@ CScValue *CBFrame::ScGetProperty(char *Name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CBFrame::ScSetProperty(char *Name, CScValue *Value) {
+HRESULT CBFrame::ScSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Delay
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/BFrame.h b/engines/wintermute/BFrame.h index 279dcd2289..b236e60172 100644 --- a/engines/wintermute/BFrame.h +++ b/engines/wintermute/BFrame.h @@ -61,9 +61,9 @@ public: CBArray<const char *, const char *> _applyEvent;
// scripting interface
- virtual CScValue *ScGetProperty(char *Name);
- virtual HRESULT ScSetProperty(char *Name, CScValue *Value);
- virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name);
+ virtual CScValue *ScGetProperty(const char *Name);
+ virtual HRESULT ScSetProperty(const char *Name, CScValue *Value);
+ virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
virtual char *ScToString();
};
diff --git a/engines/wintermute/BGame.cpp b/engines/wintermute/BGame.cpp index eee7d5299a..0a7885b7e1 100644 --- a/engines/wintermute/BGame.cpp +++ b/engines/wintermute/BGame.cpp @@ -968,7 +968,7 @@ HRESULT CBGame::LoadBuffer(byte *Buffer, bool Complete) { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CBGame::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name) {
+HRESULT CBGame::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// LOG
//////////////////////////////////////////////////////////////////////////
@@ -2094,7 +2094,7 @@ HRESULT CBGame::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisS //////////////////////////////////////////////////////////////////////////
-CScValue *CBGame::ScGetProperty(char *Name) {
+CScValue *CBGame::ScGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -2485,7 +2485,7 @@ CScValue *CBGame::ScGetProperty(char *Name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CBGame::ScSetProperty(char *Name, CScValue *Value) {
+HRESULT CBGame::ScSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Name
//////////////////////////////////////////////////////////////////////////
@@ -3966,7 +3966,7 @@ HRESULT CBGame::WindowLoadHook(CUIWindow *Win, char **Buf, char **Params) { //////////////////////////////////////////////////////////////////////////
-HRESULT CBGame::WindowScriptMethodHook(CUIWindow *Win, CScScript *Script, CScStack *Stack, char *Name) {
+HRESULT CBGame::WindowScriptMethodHook(CUIWindow *Win, CScScript *Script, CScStack *Stack, const char *Name) {
return E_FAIL;
}
diff --git a/engines/wintermute/BGame.h b/engines/wintermute/BGame.h index cdc937afb9..145af7c3f2 100644 --- a/engines/wintermute/BGame.h +++ b/engines/wintermute/BGame.h @@ -226,9 +226,9 @@ public: virtual void PublishNatives();
virtual HRESULT ExternalCall(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name);
// scripting interface
- virtual CScValue *ScGetProperty(char *Name);
- virtual HRESULT ScSetProperty(char *Name, CScValue *Value);
- virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name);
+ virtual CScValue *ScGetProperty(const char *Name);
+ virtual HRESULT ScSetProperty(const char *Name, CScValue *Value);
+ virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
virtual char *ScToString();
// compatibility bits
bool _compatKillMethodThreads;
@@ -331,7 +331,7 @@ public: int _subtitlesSpeed;
void SetInteractive(bool State);
virtual HRESULT WindowLoadHook(CUIWindow *Win, char **Buf, char **Params);
- virtual HRESULT WindowScriptMethodHook(CUIWindow *Win, CScScript *Script, CScStack *Stack, char *Name);
+ virtual HRESULT WindowScriptMethodHook(CUIWindow *Win, CScScript *Script, CScStack *Stack, const char *Name);
HRESULT GetCurrentViewportOffset(int *OffsetX = NULL, int *OffsetY = NULL);
HRESULT GetCurrentViewportRect(RECT *Rect, bool *Custom = NULL);
HRESULT PopViewport();
diff --git a/engines/wintermute/BKeyboardState.cpp b/engines/wintermute/BKeyboardState.cpp index 7499ca70df..7a4c246899 100644 --- a/engines/wintermute/BKeyboardState.cpp +++ b/engines/wintermute/BKeyboardState.cpp @@ -58,7 +58,7 @@ CBKeyboardState::~CBKeyboardState() { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CBKeyboardState::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name) {
+HRESULT CBKeyboardState::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// IsKeyDown
//////////////////////////////////////////////////////////////////////////
@@ -88,7 +88,7 @@ HRESULT CBKeyboardState::ScCallMethod(CScScript *Script, CScStack *Stack, CScSta //////////////////////////////////////////////////////////////////////////
-CScValue *CBKeyboardState::ScGetProperty(char *Name) {
+CScValue *CBKeyboardState::ScGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -158,7 +158,7 @@ CScValue *CBKeyboardState::ScGetProperty(char *Name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CBKeyboardState::ScSetProperty(char *Name, CScValue *Value) {
+HRESULT CBKeyboardState::ScSetProperty(const char *Name, CScValue *Value) {
/*
//////////////////////////////////////////////////////////////////////////
// Name
diff --git a/engines/wintermute/BKeyboardState.h b/engines/wintermute/BKeyboardState.h index 393f93d7da..956765b4a9 100644 --- a/engines/wintermute/BKeyboardState.h +++ b/engines/wintermute/BKeyboardState.h @@ -57,9 +57,9 @@ public: static bool IsAltDown();
// scripting interface
- virtual CScValue *ScGetProperty(char *Name);
- virtual HRESULT ScSetProperty(char *Name, CScValue *Value);
- virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name);
+ virtual CScValue *ScGetProperty(const char *Name);
+ virtual HRESULT ScSetProperty(const char *Name, CScValue *Value);
+ virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
virtual char *ScToString();
private:
diff --git a/engines/wintermute/BObject.cpp b/engines/wintermute/BObject.cpp index eb44636ee9..389953ad14 100644 --- a/engines/wintermute/BObject.cpp +++ b/engines/wintermute/BObject.cpp @@ -165,7 +165,7 @@ HRESULT CBObject::Listen(CBScriptHolder *param1, uint32 param2) { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CBObject::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name) {
+HRESULT CBObject::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// SkipTo
@@ -473,7 +473,7 @@ HRESULT CBObject::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *Thi //////////////////////////////////////////////////////////////////////////
-CScValue *CBObject::ScGetProperty(char *Name) {
+CScValue *CBObject::ScGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -666,7 +666,7 @@ CScValue *CBObject::ScGetProperty(char *Name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CBObject::ScSetProperty(char *Name, CScValue *Value) {
+HRESULT CBObject::ScSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Caption
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/BObject.h b/engines/wintermute/BObject.h index f01d88349f..9908d03e3b 100644 --- a/engines/wintermute/BObject.h +++ b/engines/wintermute/BObject.h @@ -134,9 +134,9 @@ public: public:
// scripting interface
- virtual CScValue *ScGetProperty(char *Name);
- virtual HRESULT ScSetProperty(char *Name, CScValue *Value);
- virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name);
+ virtual CScValue *ScGetProperty(const char *Name);
+ virtual HRESULT ScSetProperty(const char *Name, CScValue *Value);
+ virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
virtual char *ScToString();
};
diff --git a/engines/wintermute/BRegion.cpp b/engines/wintermute/BRegion.cpp index 9190955321..23071f51a6 100644 --- a/engines/wintermute/BRegion.cpp +++ b/engines/wintermute/BRegion.cpp @@ -209,7 +209,7 @@ HRESULT CBRegion::LoadBuffer(byte *Buffer, bool Complete) { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CBRegion::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name) {
+HRESULT CBRegion::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// AddPoint
@@ -309,7 +309,7 @@ HRESULT CBRegion::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *Thi //////////////////////////////////////////////////////////////////////////
-CScValue *CBRegion::ScGetProperty(char *Name) {
+CScValue *CBRegion::ScGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -349,7 +349,7 @@ CScValue *CBRegion::ScGetProperty(char *Name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CBRegion::ScSetProperty(char *Name, CScValue *Value) {
+HRESULT CBRegion::ScSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Name
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/BRegion.h b/engines/wintermute/BRegion.h index 783cb22965..79af62bcae 100644 --- a/engines/wintermute/BRegion.h +++ b/engines/wintermute/BRegion.h @@ -57,9 +57,9 @@ public: virtual HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent, char *NameOverride = NULL);
// scripting interface
- virtual CScValue *ScGetProperty(char *Name);
- virtual HRESULT ScSetProperty(char *Name, CScValue *Value);
- virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name);
+ virtual CScValue *ScGetProperty(const char *Name);
+ virtual HRESULT ScSetProperty(const char *Name, CScValue *Value);
+ virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
virtual char *ScToString();
};
diff --git a/engines/wintermute/BScriptHolder.cpp b/engines/wintermute/BScriptHolder.cpp index a976ae89bb..6210ba2f38 100644 --- a/engines/wintermute/BScriptHolder.cpp +++ b/engines/wintermute/BScriptHolder.cpp @@ -106,7 +106,7 @@ HRESULT CBScriptHolder::Listen(CBScriptHolder *param1, uint32 param2) { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CBScriptHolder::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name) {
+HRESULT CBScriptHolder::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// DEBUG_CrashMe
//////////////////////////////////////////////////////////////////////////
@@ -205,7 +205,7 @@ HRESULT CBScriptHolder::ScCallMethod(CScScript *Script, CScStack *Stack, CScStac //////////////////////////////////////////////////////////////////////////
-CScValue *CBScriptHolder::ScGetProperty(char *Name) {
+CScValue *CBScriptHolder::ScGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -237,7 +237,7 @@ CScValue *CBScriptHolder::ScGetProperty(char *Name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CBScriptHolder::ScSetProperty(char *Name, CScValue *Value) {
+HRESULT CBScriptHolder::ScSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Name
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/BScriptHolder.h b/engines/wintermute/BScriptHolder.h index 1c0842815e..2447bf17d6 100644 --- a/engines/wintermute/BScriptHolder.h +++ b/engines/wintermute/BScriptHolder.h @@ -59,9 +59,9 @@ public: CBArray<CScScript *, CScScript *> _scripts;
// scripting interface
- virtual CScValue *ScGetProperty(char *Name);
- virtual HRESULT ScSetProperty(char *Name, CScValue *Value);
- virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name);
+ virtual CScValue *ScGetProperty(const char *Name);
+ virtual HRESULT ScSetProperty(const char *Name, CScValue *Value);
+ virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
virtual char *ScToString();
virtual void ScDebuggerDesc(char *Buf, int BufSize);
// IWmeObject
diff --git a/engines/wintermute/BScriptable.cpp b/engines/wintermute/BScriptable.cpp index 5de599525f..2ced86b1cf 100644 --- a/engines/wintermute/BScriptable.cpp +++ b/engines/wintermute/BScriptable.cpp @@ -61,7 +61,7 @@ CBScriptable::~CBScriptable() { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CBScriptable::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name) {
+HRESULT CBScriptable::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
/*
Stack->CorrectParams(0);
Stack->PushNULL();
diff --git a/engines/wintermute/BScriptable.h b/engines/wintermute/BScriptable.h index 9b0dcee968..a0142e00ba 100644 --- a/engines/wintermute/BScriptable.h +++ b/engines/wintermute/BScriptable.h @@ -52,7 +52,7 @@ public: virtual bool CanHandleMethod(char *EventMethod);
virtual HRESULT ScSetProperty(const char *Name, CScValue *Value);
virtual CScValue *ScGetProperty(const char *Name);
- virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name);
+ virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
virtual char *ScToString();
virtual void *ScToMemBuffer();
virtual int ScToInt();
diff --git a/engines/wintermute/BSprite.cpp b/engines/wintermute/BSprite.cpp index f84f2f945a..e8e9402fe7 100644 --- a/engines/wintermute/BSprite.cpp +++ b/engines/wintermute/BSprite.cpp @@ -506,7 +506,7 @@ HRESULT CBSprite::Persist(CBPersistMgr *PersistMgr) { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CBSprite::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name) {
+HRESULT CBSprite::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// GetFrame
//////////////////////////////////////////////////////////////////////////
@@ -630,7 +630,7 @@ HRESULT CBSprite::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *Thi //////////////////////////////////////////////////////////////////////////
-CScValue *CBSprite::ScGetProperty(char *Name) {
+CScValue *CBSprite::ScGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -703,7 +703,7 @@ CScValue *CBSprite::ScGetProperty(char *Name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CBSprite::ScSetProperty(char *Name, CScValue *Value) {
+HRESULT CBSprite::ScSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// CurrentFrame
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/BSprite.h b/engines/wintermute/BSprite.h index bec49bc3a4..18731b682e 100644 --- a/engines/wintermute/BSprite.h +++ b/engines/wintermute/BSprite.h @@ -79,9 +79,9 @@ public: HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent);
// scripting interface
- virtual CScValue *ScGetProperty(char *Name);
- virtual HRESULT ScSetProperty(char *Name, CScValue *Value);
- virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name);
+ virtual CScValue *ScGetProperty(const char *Name);
+ virtual HRESULT ScSetProperty(const char *Name, CScValue *Value);
+ virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
virtual char *ScToString();
};
diff --git a/engines/wintermute/BSubFrame.cpp b/engines/wintermute/BSubFrame.cpp index e8abd11927..cea9d93257 100644 --- a/engines/wintermute/BSubFrame.cpp +++ b/engines/wintermute/BSubFrame.cpp @@ -342,7 +342,7 @@ HRESULT CBSubFrame::Persist(CBPersistMgr *PersistMgr) { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CBSubFrame::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name) {
+HRESULT CBSubFrame::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// GetImage
@@ -383,7 +383,7 @@ HRESULT CBSubFrame::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *T //////////////////////////////////////////////////////////////////////////
-CScValue *CBSubFrame::ScGetProperty(char *Name) {
+CScValue *CBSubFrame::ScGetProperty(const char *Name) {
if (!_scValue) _scValue = new CScValue(Game);
_scValue->SetNULL();
@@ -473,7 +473,7 @@ CScValue *CBSubFrame::ScGetProperty(char *Name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CBSubFrame::ScSetProperty(char *Name, CScValue *Value) {
+HRESULT CBSubFrame::ScSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// AlphaColor
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/BSubFrame.h b/engines/wintermute/BSubFrame.h index 3c0a91344d..04be4e86c8 100644 --- a/engines/wintermute/BSubFrame.h +++ b/engines/wintermute/BSubFrame.h @@ -73,9 +73,9 @@ public: CBSurface *_surface;
// scripting interface
- virtual CScValue *ScGetProperty(char *Name);
- virtual HRESULT ScSetProperty(char *Name, CScValue *Value);
- virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name);
+ virtual CScValue *ScGetProperty(const char *Name);
+ virtual HRESULT ScSetProperty(const char *Name, CScValue *Value);
+ virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
virtual char *ScToString();
};
diff --git a/engines/wintermute/PartEmitter.cpp b/engines/wintermute/PartEmitter.cpp index 49bfe67666..6500f172c8 100644 --- a/engines/wintermute/PartEmitter.cpp +++ b/engines/wintermute/PartEmitter.cpp @@ -411,7 +411,7 @@ HRESULT CPartEmitter::RemoveForce(const char *Name) { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CPartEmitter::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name) {
+HRESULT CPartEmitter::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// SetBorder
//////////////////////////////////////////////////////////////////////////
@@ -557,7 +557,7 @@ HRESULT CPartEmitter::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack }
//////////////////////////////////////////////////////////////////////////
-CScValue *CPartEmitter::ScGetProperty(char *Name) {
+CScValue *CPartEmitter::ScGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -829,7 +829,7 @@ CScValue *CPartEmitter::ScGetProperty(char *Name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CPartEmitter::ScSetProperty(char *Name, CScValue *Value) {
+HRESULT CPartEmitter::ScSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// X
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/PartEmitter.h b/engines/wintermute/PartEmitter.h index 92f6a608bf..0949c294c3 100644 --- a/engines/wintermute/PartEmitter.h +++ b/engines/wintermute/PartEmitter.h @@ -115,9 +115,9 @@ public: CBArray<CPartForce *, CPartForce *> _forces;
// scripting interface
- virtual CScValue *ScGetProperty(char *Name);
- virtual HRESULT ScSetProperty(char *Name, CScValue *Value);
- virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name);
+ virtual CScValue *ScGetProperty(const char *Name);
+ virtual HRESULT ScSetProperty(const char *Name, CScValue *Value);
+ virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
virtual char *ScToString();
diff --git a/engines/wintermute/UIButton.cpp b/engines/wintermute/UIButton.cpp index 4b5dde50fe..988760f567 100644 --- a/engines/wintermute/UIButton.cpp +++ b/engines/wintermute/UIButton.cpp @@ -663,7 +663,7 @@ void CUIButton::Press() { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CUIButton::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name) {
+HRESULT CUIButton::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// SetDisabledFont
//////////////////////////////////////////////////////////////////////////
@@ -918,7 +918,7 @@ HRESULT CUIButton::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th //////////////////////////////////////////////////////////////////////////
-CScValue *CUIButton::ScGetProperty(char *Name) {
+CScValue *CUIButton::ScGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -964,7 +964,7 @@ CScValue *CUIButton::ScGetProperty(char *Name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CUIButton::ScSetProperty(char *Name, CScValue *Value) {
+HRESULT CUIButton::ScSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// TextAlign
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/UIButton.h b/engines/wintermute/UIButton.h index 9d1134fdf9..a07b2adce6 100644 --- a/engines/wintermute/UIButton.h +++ b/engines/wintermute/UIButton.h @@ -68,9 +68,9 @@ public: virtual HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent);
// scripting interface
- virtual CScValue *ScGetProperty(char *Name);
- virtual HRESULT ScSetProperty(char *Name, CScValue *Value);
- virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name);
+ virtual CScValue *ScGetProperty(const char *Name);
+ virtual HRESULT ScSetProperty(const char *Name, CScValue *Value);
+ virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
virtual char *ScToString();
};
diff --git a/engines/wintermute/UIEdit.cpp b/engines/wintermute/UIEdit.cpp index 3f81b16395..3c2abebd33 100644 --- a/engines/wintermute/UIEdit.cpp +++ b/engines/wintermute/UIEdit.cpp @@ -361,7 +361,7 @@ HRESULT CUIEdit::SaveAsText(CBDynBuffer *Buffer, int Indent) { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CUIEdit::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name) {
+HRESULT CUIEdit::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// SetSelectedFont
//////////////////////////////////////////////////////////////////////////
@@ -380,7 +380,7 @@ HRESULT CUIEdit::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *This //////////////////////////////////////////////////////////////////////////
-CScValue *CUIEdit::ScGetProperty(char *Name) {
+CScValue *CUIEdit::ScGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -457,7 +457,7 @@ CScValue *CUIEdit::ScGetProperty(char *Name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CUIEdit::ScSetProperty(char *Name, CScValue *Value) {
+HRESULT CUIEdit::ScSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// SelStart
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/UIEdit.h b/engines/wintermute/UIEdit.h index 4d000d5954..05c6f14973 100644 --- a/engines/wintermute/UIEdit.h +++ b/engines/wintermute/UIEdit.h @@ -61,9 +61,9 @@ public: virtual HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent);
// scripting interface
- virtual CScValue *ScGetProperty(char *Name);
- virtual HRESULT ScSetProperty(char *Name, CScValue *Value);
- virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name);
+ virtual CScValue *ScGetProperty(const char *Name);
+ virtual HRESULT ScSetProperty(const char *Name, CScValue *Value);
+ virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
virtual char *ScToString();
};
diff --git a/engines/wintermute/UIEntity.cpp b/engines/wintermute/UIEntity.cpp index 15d36c3d3d..ca4528e6cf 100644 --- a/engines/wintermute/UIEntity.cpp +++ b/engines/wintermute/UIEntity.cpp @@ -251,7 +251,7 @@ HRESULT CUIEntity::Display(int OffsetX, int OffsetY) { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CUIEntity::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name) {
+HRESULT CUIEntity::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// GetEntity
//////////////////////////////////////////////////////////////////////////
@@ -285,7 +285,7 @@ HRESULT CUIEntity::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th //////////////////////////////////////////////////////////////////////////
-CScValue *CUIEntity::ScGetProperty(char *Name) {
+CScValue *CUIEntity::ScGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -310,7 +310,7 @@ CScValue *CUIEntity::ScGetProperty(char *Name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CUIEntity::ScSetProperty(char *Name, CScValue *Value) {
+HRESULT CUIEntity::ScSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Freezable
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/UIEntity.h b/engines/wintermute/UIEntity.h index ab3e74f9e6..3b8107b5d7 100644 --- a/engines/wintermute/UIEntity.h +++ b/engines/wintermute/UIEntity.h @@ -47,9 +47,9 @@ public: HRESULT SetEntity(const char *Filename);
// scripting interface
- virtual CScValue *ScGetProperty(char *Name);
- virtual HRESULT ScSetProperty(char *Name, CScValue *Value);
- virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name);
+ virtual CScValue *ScGetProperty(const char *Name);
+ virtual HRESULT ScSetProperty(const char *Name, CScValue *Value);
+ virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
virtual char *ScToString();
};
diff --git a/engines/wintermute/UIObject.cpp b/engines/wintermute/UIObject.cpp index 75939c5bf6..8a25c56cf5 100644 --- a/engines/wintermute/UIObject.cpp +++ b/engines/wintermute/UIObject.cpp @@ -137,7 +137,7 @@ void CUIObject::CorrectSize() { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CUIObject::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name) {
+HRESULT CUIObject::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// SetFont
//////////////////////////////////////////////////////////////////////////
@@ -317,7 +317,7 @@ HRESULT CUIObject::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th //////////////////////////////////////////////////////////////////////////
-CScValue *CUIObject::ScGetProperty(char *Name) {
+CScValue *CUIObject::ScGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -418,7 +418,7 @@ CScValue *CUIObject::ScGetProperty(char *Name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CUIObject::ScSetProperty(char *Name, CScValue *Value) {
+HRESULT CUIObject::ScSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Name
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/UIObject.h b/engines/wintermute/UIObject.h index bf6b1b079a..6646887a2c 100644 --- a/engines/wintermute/UIObject.h +++ b/engines/wintermute/UIObject.h @@ -72,9 +72,9 @@ public: virtual HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent);
// scripting interface
- virtual CScValue *ScGetProperty(char *Name);
- virtual HRESULT ScSetProperty(char *Name, CScValue *Value);
- virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name);
+ virtual CScValue *ScGetProperty(const char *Name);
+ virtual HRESULT ScSetProperty(const char *Name, CScValue *Value);
+ virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
virtual char *ScToString();
};
diff --git a/engines/wintermute/UIText.cpp b/engines/wintermute/UIText.cpp index b00e652b0a..d0770224c5 100644 --- a/engines/wintermute/UIText.cpp +++ b/engines/wintermute/UIText.cpp @@ -371,7 +371,7 @@ HRESULT CUIText::SaveAsText(CBDynBuffer *Buffer, int Indent) { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CUIText::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name) {
+HRESULT CUIText::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// SizeToFit
//////////////////////////////////////////////////////////////////////////
@@ -397,7 +397,7 @@ HRESULT CUIText::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *This //////////////////////////////////////////////////////////////////////////
-CScValue *CUIText::ScGetProperty(char *Name) {
+CScValue *CUIText::ScGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -429,7 +429,7 @@ CScValue *CUIText::ScGetProperty(char *Name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CUIText::ScSetProperty(char *Name, CScValue *Value) {
+HRESULT CUIText::ScSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// TextAlign
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/UIText.h b/engines/wintermute/UIText.h index 7f89fb6b30..aef5ea1be7 100644 --- a/engines/wintermute/UIText.h +++ b/engines/wintermute/UIText.h @@ -48,9 +48,9 @@ public: virtual HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent);
// scripting interface
- virtual CScValue *ScGetProperty(char *Name);
- virtual HRESULT ScSetProperty(char *Name, CScValue *Value);
- virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name);
+ virtual CScValue *ScGetProperty(const char *Name);
+ virtual HRESULT ScSetProperty(const char *Name, CScValue *Value);
+ virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
virtual char *ScToString();
};
diff --git a/engines/wintermute/UIWindow.cpp b/engines/wintermute/UIWindow.cpp index f70da3cb1e..db5e91a23c 100644 --- a/engines/wintermute/UIWindow.cpp +++ b/engines/wintermute/UIWindow.cpp @@ -688,7 +688,7 @@ HRESULT CUIWindow::ShowWidget(const char *Name, bool Visible) { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CUIWindow::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name) {
+HRESULT CUIWindow::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// GetWidget / GetControl
//////////////////////////////////////////////////////////////////////////
@@ -915,7 +915,7 @@ HRESULT CUIWindow::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th //////////////////////////////////////////////////////////////////////////
-CScValue *CUIWindow::ScGetProperty(char *Name) {
+CScValue *CUIWindow::ScGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -1003,7 +1003,7 @@ CScValue *CUIWindow::ScGetProperty(char *Name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CUIWindow::ScSetProperty(char *Name, CScValue *Value) {
+HRESULT CUIWindow::ScSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Name
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/UIWindow.h b/engines/wintermute/UIWindow.h index e0051e9360..e2a134282d 100644 --- a/engines/wintermute/UIWindow.h +++ b/engines/wintermute/UIWindow.h @@ -81,9 +81,9 @@ public: virtual HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent);
// scripting interface
- virtual CScValue *ScGetProperty(char *Name);
- virtual HRESULT ScSetProperty(char *Name, CScValue *Value);
- virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name);
+ virtual CScValue *ScGetProperty(const char *Name);
+ virtual HRESULT ScSetProperty(const char *Name, CScValue *Value);
+ virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
virtual char *ScToString();
};
diff --git a/engines/wintermute/scriptables/SXArray.cpp b/engines/wintermute/scriptables/SXArray.cpp index 978de4ae52..77a90b7f12 100644 --- a/engines/wintermute/scriptables/SXArray.cpp +++ b/engines/wintermute/scriptables/SXArray.cpp @@ -89,7 +89,7 @@ char *CSXArray::ScToString() { //////////////////////////////////////////////////////////////////////////
-HRESULT CSXArray::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name) {
+HRESULT CSXArray::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// Push
//////////////////////////////////////////////////////////////////////////
@@ -130,7 +130,7 @@ HRESULT CSXArray::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *Thi //////////////////////////////////////////////////////////////////////////
-CScValue *CSXArray::ScGetProperty(char *Name) {
+CScValue *CSXArray::ScGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -162,7 +162,7 @@ CScValue *CSXArray::ScGetProperty(char *Name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CSXArray::ScSetProperty(char *Name, CScValue *Value) {
+HRESULT CSXArray::ScSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Length
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/scriptables/SXArray.h b/engines/wintermute/scriptables/SXArray.h index 0605d6c4f8..8907ec2602 100644 --- a/engines/wintermute/scriptables/SXArray.h +++ b/engines/wintermute/scriptables/SXArray.h @@ -41,9 +41,9 @@ public: CSXArray(CBGame *inGame, CScStack *Stack);
CSXArray(CBGame *inGame);
virtual ~CSXArray();
- CScValue *ScGetProperty(char *Name);
- HRESULT ScSetProperty(char *Name, CScValue *Value);
- HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name);
+ CScValue *ScGetProperty(const char *Name);
+ HRESULT ScSetProperty(const char *Name, CScValue *Value);
+ HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
char *ScToString();
int _length;
CScValue *_values;
diff --git a/engines/wintermute/scriptables/SXDate.cpp b/engines/wintermute/scriptables/SXDate.cpp index 65e6a43782..193521d44d 100644 --- a/engines/wintermute/scriptables/SXDate.cpp +++ b/engines/wintermute/scriptables/SXDate.cpp @@ -72,7 +72,7 @@ char *CSXDate::ScToString() { //////////////////////////////////////////////////////////////////////////
-HRESULT CSXDate::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name) {
+HRESULT CSXDate::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
#if 0
//////////////////////////////////////////////////////////////////////////
// GetYear
@@ -214,7 +214,7 @@ HRESULT CSXDate::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *This //////////////////////////////////////////////////////////////////////////
-CScValue *CSXDate::ScGetProperty(char *Name) {
+CScValue *CSXDate::ScGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -230,7 +230,7 @@ CScValue *CSXDate::ScGetProperty(char *Name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CSXDate::ScSetProperty(char *Name, CScValue *Value) {
+HRESULT CSXDate::ScSetProperty(const char *Name, CScValue *Value) {
/*
//////////////////////////////////////////////////////////////////////////
// Name
diff --git a/engines/wintermute/scriptables/SXDate.h b/engines/wintermute/scriptables/SXDate.h index 677b7e7dd1..ca9744e6ab 100644 --- a/engines/wintermute/scriptables/SXDate.h +++ b/engines/wintermute/scriptables/SXDate.h @@ -40,9 +40,9 @@ public: DECLARE_PERSISTENT(CSXDate, CBScriptable)
CSXDate(CBGame *inGame, CScStack *Stack);
virtual ~CSXDate();
- CScValue *ScGetProperty(char *Name);
- HRESULT ScSetProperty(char *Name, CScValue *Value);
- HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name);
+ CScValue *ScGetProperty(const char *Name);
+ HRESULT ScSetProperty(const char *Name, CScValue *Value);
+ HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
char *ScToString();
char *_string;
//struct tm _tm; // TODO!
diff --git a/engines/wintermute/scriptables/SXFile.cpp b/engines/wintermute/scriptables/SXFile.cpp index a24615e01d..fa860e56b6 100644 --- a/engines/wintermute/scriptables/SXFile.cpp +++ b/engines/wintermute/scriptables/SXFile.cpp @@ -90,7 +90,7 @@ char *CSXFile::ScToString() { #define FILE_BUFFER_SIZE 32768
//////////////////////////////////////////////////////////////////////////
-HRESULT CSXFile::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name) {
+HRESULT CSXFile::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// SetFilename
//////////////////////////////////////////////////////////////////////////
@@ -570,7 +570,7 @@ HRESULT CSXFile::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *This //////////////////////////////////////////////////////////////////////////
-CScValue *CSXFile::ScGetProperty(char *Name) {
+CScValue *CSXFile::ScGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -626,7 +626,7 @@ CScValue *CSXFile::ScGetProperty(char *Name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CSXFile::ScSetProperty(char *Name, CScValue *Value) {
+HRESULT CSXFile::ScSetProperty(const char *Name, CScValue *Value) {
/*
//////////////////////////////////////////////////////////////////////////
// Length
diff --git a/engines/wintermute/scriptables/SXFile.h b/engines/wintermute/scriptables/SXFile.h index 085700d0e1..22bfc5ec70 100644 --- a/engines/wintermute/scriptables/SXFile.h +++ b/engines/wintermute/scriptables/SXFile.h @@ -36,9 +36,9 @@ class CBFile; class CSXFile : public CBScriptable {
public:
DECLARE_PERSISTENT(CSXFile, CBScriptable)
- CScValue *ScGetProperty(char *Name);
- HRESULT ScSetProperty(char *Name, CScValue *Value);
- HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name);
+ CScValue *ScGetProperty(const char *Name);
+ HRESULT ScSetProperty(const char *Name, CScValue *Value);
+ HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
char *ScToString();
CSXFile(CBGame *inGame, CScStack *Stack);
virtual ~CSXFile();
diff --git a/engines/wintermute/scriptables/SXMath.cpp b/engines/wintermute/scriptables/SXMath.cpp index fcc85d527c..bcd2e96495 100644 --- a/engines/wintermute/scriptables/SXMath.cpp +++ b/engines/wintermute/scriptables/SXMath.cpp @@ -54,7 +54,7 @@ CSXMath::~CSXMath() { //////////////////////////////////////////////////////////////////////////
-HRESULT CSXMath::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name) {
+HRESULT CSXMath::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// Abs
//////////////////////////////////////////////////////////////////////////
@@ -245,7 +245,7 @@ HRESULT CSXMath::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *This //////////////////////////////////////////////////////////////////////////
-CScValue *CSXMath::ScGetProperty(char *Name) {
+CScValue *CSXMath::ScGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/scriptables/SXMath.h b/engines/wintermute/scriptables/SXMath.h index a8c34e954e..3169990159 100644 --- a/engines/wintermute/scriptables/SXMath.h +++ b/engines/wintermute/scriptables/SXMath.h @@ -39,8 +39,8 @@ public: DECLARE_PERSISTENT(CSXMath, CBScriptable)
CSXMath(CBGame *inGame);
virtual ~CSXMath();
- virtual CScValue *ScGetProperty(char *Name);
- virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name);
+ virtual CScValue *ScGetProperty(const char *Name);
+ virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
private:
double DegreeToRadian(double Value);
diff --git a/engines/wintermute/scriptables/SXMemBuffer.cpp b/engines/wintermute/scriptables/SXMemBuffer.cpp index d1c4242ae8..93d8e2e23b 100644 --- a/engines/wintermute/scriptables/SXMemBuffer.cpp +++ b/engines/wintermute/scriptables/SXMemBuffer.cpp @@ -117,7 +117,7 @@ char *CSXMemBuffer::ScToString() { //////////////////////////////////////////////////////////////////////////
-HRESULT CSXMemBuffer::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name) {
+HRESULT CSXMemBuffer::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// SetSize
//////////////////////////////////////////////////////////////////////////
@@ -400,7 +400,7 @@ HRESULT CSXMemBuffer::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack //////////////////////////////////////////////////////////////////////////
-CScValue *CSXMemBuffer::ScGetProperty(char *Name) {
+CScValue *CSXMemBuffer::ScGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -424,7 +424,7 @@ CScValue *CSXMemBuffer::ScGetProperty(char *Name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CSXMemBuffer::ScSetProperty(char *Name, CScValue *Value) {
+HRESULT CSXMemBuffer::ScSetProperty(const char *Name, CScValue *Value) {
/*
//////////////////////////////////////////////////////////////////////////
// Length
diff --git a/engines/wintermute/scriptables/SXMemBuffer.h b/engines/wintermute/scriptables/SXMemBuffer.h index 715d860302..9c6553bd89 100644 --- a/engines/wintermute/scriptables/SXMemBuffer.h +++ b/engines/wintermute/scriptables/SXMemBuffer.h @@ -38,9 +38,9 @@ class CSXMemBuffer : public CBScriptable { public:
virtual int ScCompare(CBScriptable *Val);
DECLARE_PERSISTENT(CSXMemBuffer, CBScriptable)
- CScValue *ScGetProperty(char *Name);
- HRESULT ScSetProperty(char *Name, CScValue *Value);
- HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name);
+ CScValue *ScGetProperty(const char *Name);
+ HRESULT ScSetProperty(const char *Name, CScValue *Value);
+ HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
char *ScToString();
CSXMemBuffer(CBGame *inGame, CScStack *Stack);
CSXMemBuffer(CBGame *inGame, void *Buffer);
diff --git a/engines/wintermute/scriptables/SXStore.cpp b/engines/wintermute/scriptables/SXStore.cpp index f24896f611..79a4f9bbc0 100644 --- a/engines/wintermute/scriptables/SXStore.cpp +++ b/engines/wintermute/scriptables/SXStore.cpp @@ -77,7 +77,7 @@ void CSXStore::Cleanup() { }
//////////////////////////////////////////////////////////////////////////
-HRESULT CSXStore::ScCallMethod(CScScript *script, CScStack *stack, CScStack *thisStack, char *name) {
+HRESULT CSXStore::ScCallMethod(CScScript *script, CScStack *stack, CScStack *thisStack, const char *name) {
//////////////////////////////////////////////////////////////////////////
// EnableEvents
//////////////////////////////////////////////////////////////////////////
@@ -220,7 +220,7 @@ HRESULT CSXStore::ScCallMethod(CScScript *script, CScStack *stack, CScStack *thi //////////////////////////////////////////////////////////////////////////
-CScValue *CSXStore::ScGetProperty(char *name) {
+CScValue *CSXStore::ScGetProperty(const char *name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/scriptables/SXStore.h b/engines/wintermute/scriptables/SXStore.h index dd11416a0f..8c921958f8 100644 --- a/engines/wintermute/scriptables/SXStore.h +++ b/engines/wintermute/scriptables/SXStore.h @@ -126,8 +126,8 @@ public: DECLARE_PERSISTENT(CSXStore, CBObject)
CSXStore(CBGame *inGame);
virtual ~CSXStore();
- virtual CScValue *ScGetProperty(char *name);
- virtual HRESULT ScCallMethod(CScScript *script, CScStack *stack, CScStack *thisStack, char *name);
+ virtual CScValue *ScGetProperty(const char *Name);
+ virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
void AfterLoad();
void OnObjectDestroyed(CBScriptHolder *obj);
diff --git a/engines/wintermute/scriptables/SXString.cpp b/engines/wintermute/scriptables/SXString.cpp index b2e5faf1db..d9e1c246c4 100644 --- a/engines/wintermute/scriptables/SXString.cpp +++ b/engines/wintermute/scriptables/SXString.cpp @@ -91,7 +91,7 @@ void CSXString::ScSetString(const char *Val) { //////////////////////////////////////////////////////////////////////////
-HRESULT CSXString::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name) {
+HRESULT CSXString::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// Substring
//////////////////////////////////////////////////////////////////////////
@@ -304,7 +304,7 @@ HRESULT CSXString::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th //////////////////////////////////////////////////////////////////////////
-CScValue *CSXString::ScGetProperty(char *Name) {
+CScValue *CSXString::ScGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -339,7 +339,7 @@ CScValue *CSXString::ScGetProperty(char *Name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CSXString::ScSetProperty(char *Name, CScValue *Value) {
+HRESULT CSXString::ScSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Capacity
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/scriptables/SXString.h b/engines/wintermute/scriptables/SXString.h index 1cd3a7f52c..8abddf244d 100644 --- a/engines/wintermute/scriptables/SXString.h +++ b/engines/wintermute/scriptables/SXString.h @@ -38,9 +38,9 @@ class CSXString : public CBScriptable { public:
virtual int ScCompare(CBScriptable *Val);
DECLARE_PERSISTENT(CSXString, CBScriptable)
- CScValue *ScGetProperty(char *Name);
- HRESULT ScSetProperty(char *Name, CScValue *Value);
- HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name);
+ CScValue *ScGetProperty(const char *Name);
+ HRESULT ScSetProperty(const char *Name, CScValue *Value);
+ HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
void ScSetString(const char *Val);
char *ScToString();
void SetStringVal(const char *Val);
|