diff options
| author | Einar Johan Trøan Sømåen | 2012-06-25 16:44:44 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-06-25 16:44:44 +0200 |
| commit | c2a8af7ae567e8869aac9a18d479af943cbf4a95 (patch) | |
| tree | e0833b2ca834464c439716634938087d987eac5f /engines | |
| parent | 1c26b37ef2f4571e28a95d83d923b8eed9225231 (diff) | |
| download | scummvm-rg350-c2a8af7ae567e8869aac9a18d479af943cbf4a95.tar.gz scummvm-rg350-c2a8af7ae567e8869aac9a18d479af943cbf4a95.tar.bz2 scummvm-rg350-c2a8af7ae567e8869aac9a18d479af943cbf4a95.zip | |
WINTERMUTE: Rename functions and arguments in BScriptable.
Diffstat (limited to 'engines')
69 files changed, 419 insertions, 419 deletions
diff --git a/engines/wintermute/Ad/AdActor.cpp b/engines/wintermute/Ad/AdActor.cpp index da73b5161c..a5a3895dc3 100644 --- a/engines/wintermute/Ad/AdActor.cpp +++ b/engines/wintermute/Ad/AdActor.cpp @@ -850,7 +850,7 @@ void CAdActor::InitLine(CBPoint StartPt, CBPoint EndPt) { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdActor::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
+HRESULT CAdActor::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// GoTo / GoToAsync
//////////////////////////////////////////////////////////////////////////
@@ -968,12 +968,12 @@ HRESULT CAdActor::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *Thi return S_OK;
}
- else return CAdTalkHolder::ScCallMethod(Script, Stack, ThisStack, Name);
+ else return CAdTalkHolder::scCallMethod(Script, Stack, ThisStack, Name);
}
//////////////////////////////////////////////////////////////////////////
-CScValue *CAdActor::ScGetProperty(const char *Name) {
+CScValue *CAdActor::scGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -1030,12 +1030,12 @@ CScValue *CAdActor::ScGetProperty(const char *Name) { return _scValue;
}
- else return CAdTalkHolder::ScGetProperty(Name);
+ else return CAdTalkHolder::scGetProperty(Name);
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdActor::ScSetProperty(const char *Name, CScValue *Value) {
+HRESULT CAdActor::scSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Direction
//////////////////////////////////////////////////////////////////////////
@@ -1090,12 +1090,12 @@ HRESULT CAdActor::ScSetProperty(const char *Name, CScValue *Value) { return S_OK;
}
- else return CAdTalkHolder::ScSetProperty(Name, Value);
+ else return CAdTalkHolder::scSetProperty(Name, Value);
}
//////////////////////////////////////////////////////////////////////////
-const char *CAdActor::ScToString() {
+const char *CAdActor::scToString() {
return "[actor object]";
}
diff --git a/engines/wintermute/Ad/AdActor.h b/engines/wintermute/Ad/AdActor.h index 1a689bafd4..32df33d39a 100644 --- a/engines/wintermute/Ad/AdActor.h +++ b/engines/wintermute/Ad/AdActor.h @@ -81,10 +81,10 @@ public: CAdSpriteSet *GetAnimByName(const Common::String &animName);
// scripting interface
- 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 const char *ScToString();
+ 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 const char *scToString();
private:
HRESULT SetDefaultAnimNames();
diff --git a/engines/wintermute/Ad/AdEntity.cpp b/engines/wintermute/Ad/AdEntity.cpp index 1f98d15f36..dae511982d 100644 --- a/engines/wintermute/Ad/AdEntity.cpp +++ b/engines/wintermute/Ad/AdEntity.cpp @@ -625,7 +625,7 @@ HRESULT CAdEntity::Update() { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdEntity::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
+HRESULT CAdEntity::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// StopSound
//////////////////////////////////////////////////////////////////////////
@@ -755,12 +755,12 @@ HRESULT CAdEntity::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th return S_OK;
}
- else return CAdTalkHolder::ScCallMethod(Script, Stack, ThisStack, Name);
+ else return CAdTalkHolder::scCallMethod(Script, Stack, ThisStack, Name);
}
//////////////////////////////////////////////////////////////////////////
-CScValue *CAdEntity::ScGetProperty(const char *Name) {
+CScValue *CAdEntity::scGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -826,12 +826,12 @@ CScValue *CAdEntity::ScGetProperty(const char *Name) { return _scValue;
}
- else return CAdTalkHolder::ScGetProperty(Name);
+ else return CAdTalkHolder::scGetProperty(Name);
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdEntity::ScSetProperty(const char *Name, CScValue *Value) {
+HRESULT CAdEntity::scSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Item
@@ -866,12 +866,12 @@ HRESULT CAdEntity::ScSetProperty(const char *Name, CScValue *Value) { return S_OK;
}
- else return CAdTalkHolder::ScSetProperty(Name, Value);
+ else return CAdTalkHolder::scSetProperty(Name, Value);
}
//////////////////////////////////////////////////////////////////////////
-const char *CAdEntity::ScToString() {
+const char *CAdEntity::scToString() {
return "[entity object]";
}
diff --git a/engines/wintermute/Ad/AdEntity.h b/engines/wintermute/Ad/AdEntity.h index 6590007021..7dff8c072b 100644 --- a/engines/wintermute/Ad/AdEntity.h +++ b/engines/wintermute/Ad/AdEntity.h @@ -56,10 +56,10 @@ public: TEntityType _subtype;
// scripting interface
- 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 const char *ScToString();
+ 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 const char *scToString();
};
diff --git a/engines/wintermute/Ad/AdGame.cpp b/engines/wintermute/Ad/AdGame.cpp index adcae6a4bd..b852ec4469 100644 --- a/engines/wintermute/Ad/AdGame.cpp +++ b/engines/wintermute/Ad/AdGame.cpp @@ -316,7 +316,7 @@ void CAdGame::FinishSentences() { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdGame::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
+HRESULT CAdGame::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// ChangeScene
//////////////////////////////////////////////////////////////////////////
@@ -618,28 +618,28 @@ HRESULT CAdGame::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *This // TakeItem
//////////////////////////////////////////////////////////////////////////
else if (strcmp(Name, "TakeItem") == 0) {
- return _invObject->ScCallMethod(Script, Stack, ThisStack, Name);
+ return _invObject->scCallMethod(Script, Stack, ThisStack, Name);
}
//////////////////////////////////////////////////////////////////////////
// DropItem
//////////////////////////////////////////////////////////////////////////
else if (strcmp(Name, "DropItem") == 0) {
- return _invObject->ScCallMethod(Script, Stack, ThisStack, Name);
+ return _invObject->scCallMethod(Script, Stack, ThisStack, Name);
}
//////////////////////////////////////////////////////////////////////////
// GetItem
//////////////////////////////////////////////////////////////////////////
else if (strcmp(Name, "GetItem") == 0) {
- return _invObject->ScCallMethod(Script, Stack, ThisStack, Name);
+ return _invObject->scCallMethod(Script, Stack, ThisStack, Name);
}
//////////////////////////////////////////////////////////////////////////
// HasItem
//////////////////////////////////////////////////////////////////////////
else if (strcmp(Name, "HasItem") == 0) {
- return _invObject->ScCallMethod(Script, Stack, ThisStack, Name);
+ return _invObject->scCallMethod(Script, Stack, ThisStack, Name);
}
//////////////////////////////////////////////////////////////////////////
@@ -793,12 +793,12 @@ HRESULT CAdGame::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *This }
- else return CBGame::ScCallMethod(Script, Stack, ThisStack, Name);
+ else return CBGame::scCallMethod(Script, Stack, ThisStack, Name);
}
//////////////////////////////////////////////////////////////////////////
-CScValue *CAdGame::ScGetProperty(const char *Name) {
+CScValue *CAdGame::scGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -831,7 +831,7 @@ CScValue *CAdGame::ScGetProperty(const char *Name) { // NumItems
//////////////////////////////////////////////////////////////////////////
else if (strcmp(Name, "NumItems") == 0) {
- return _invObject->ScGetProperty(Name);
+ return _invObject->scGetProperty(Name);
}
//////////////////////////////////////////////////////////////////////////
@@ -947,12 +947,12 @@ CScValue *CAdGame::ScGetProperty(const char *Name) { return _scValue;
}
- else return CBGame::ScGetProperty(Name);
+ else return CBGame::scGetProperty(Name);
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdGame::ScSetProperty(const char *Name, CScValue *Value) {
+HRESULT CAdGame::scSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// SelectedItem
@@ -1042,7 +1042,7 @@ HRESULT CAdGame::ScSetProperty(const char *Name, CScValue *Value) { return S_OK;
}
- else return CBGame::ScSetProperty(Name, Value);
+ else return CBGame::scSetProperty(Name, Value);
}
diff --git a/engines/wintermute/Ad/AdGame.h b/engines/wintermute/Ad/AdGame.h index d4c6ae3b6f..8139102a22 100644 --- a/engines/wintermute/Ad/AdGame.h +++ b/engines/wintermute/Ad/AdGame.h @@ -151,9 +151,9 @@ public: virtual HRESULT ExternalCall(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name);
// scripting interface
- 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 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/Ad/AdItem.cpp b/engines/wintermute/Ad/AdItem.cpp index 8d891f7d19..bb7d9a1607 100644 --- a/engines/wintermute/Ad/AdItem.cpp +++ b/engines/wintermute/Ad/AdItem.cpp @@ -429,7 +429,7 @@ HRESULT CAdItem::Display(int X, int Y) { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdItem::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
+HRESULT CAdItem::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// SetHoverSprite
//////////////////////////////////////////////////////////////////////////
@@ -562,12 +562,12 @@ HRESULT CAdItem::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *This return S_OK;
}
- else return CAdTalkHolder::ScCallMethod(Script, Stack, ThisStack, Name);
+ else return CAdTalkHolder::scCallMethod(Script, Stack, ThisStack, Name);
}
//////////////////////////////////////////////////////////////////////////
-CScValue *CAdItem::ScGetProperty(const char *Name) {
+CScValue *CAdItem::scGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -643,12 +643,12 @@ CScValue *CAdItem::ScGetProperty(const char *Name) { return _scValue;
}
- else return CAdTalkHolder::ScGetProperty(Name);
+ else return CAdTalkHolder::scGetProperty(Name);
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdItem::ScSetProperty(const char *Name, CScValue *Value) {
+HRESULT CAdItem::scSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Name
//////////////////////////////////////////////////////////////////////////
@@ -718,12 +718,12 @@ HRESULT CAdItem::ScSetProperty(const char *Name, CScValue *Value) { return S_OK;
}
- else return CAdTalkHolder::ScSetProperty(Name, Value);
+ else return CAdTalkHolder::scSetProperty(Name, Value);
}
//////////////////////////////////////////////////////////////////////////
-const char *CAdItem::ScToString() {
+const char *CAdItem::scToString() {
return "[item]";
}
diff --git a/engines/wintermute/Ad/AdItem.h b/engines/wintermute/Ad/AdItem.h index 0168ff7ca8..9e970c1b58 100644 --- a/engines/wintermute/Ad/AdItem.h +++ b/engines/wintermute/Ad/AdItem.h @@ -59,10 +59,10 @@ public: HRESULT LoadBuffer(byte *Buffer, bool Complete = true);
// scripting interface
- 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 const char *ScToString();
+ 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 const char *scToString();
};
} // end of namespace WinterMute
diff --git a/engines/wintermute/Ad/AdLayer.cpp b/engines/wintermute/Ad/AdLayer.cpp index 28f437e703..eec0754793 100644 --- a/engines/wintermute/Ad/AdLayer.cpp +++ b/engines/wintermute/Ad/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, const char *Name) {
+HRESULT CAdLayer::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// GetNode
//////////////////////////////////////////////////////////////////////////
@@ -352,12 +352,12 @@ HRESULT CAdLayer::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *Thi return S_OK;
}
- else return CBObject::ScCallMethod(Script, Stack, ThisStack, Name);
+ else return CBObject::scCallMethod(Script, Stack, ThisStack, Name);
}
//////////////////////////////////////////////////////////////////////////
-CScValue *CAdLayer::ScGetProperty(const char *Name) {
+CScValue *CAdLayer::scGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -416,12 +416,12 @@ CScValue *CAdLayer::ScGetProperty(const char *Name) { return _scValue;
}
- else return CBObject::ScGetProperty(Name);
+ else return CBObject::scGetProperty(Name);
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdLayer::ScSetProperty(const char *Name, CScValue *Value) {
+HRESULT CAdLayer::scSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Name
//////////////////////////////////////////////////////////////////////////
@@ -467,12 +467,12 @@ HRESULT CAdLayer::ScSetProperty(const char *Name, CScValue *Value) { return S_OK;
}
- else return CBObject::ScSetProperty(Name, Value);
+ else return CBObject::scSetProperty(Name, Value);
}
//////////////////////////////////////////////////////////////////////////
-const char *CAdLayer::ScToString() {
+const char *CAdLayer::scToString() {
return "[layer]";
}
diff --git a/engines/wintermute/Ad/AdLayer.h b/engines/wintermute/Ad/AdLayer.h index 1c0e3fa946..c06c1e7c92 100644 --- a/engines/wintermute/Ad/AdLayer.h +++ b/engines/wintermute/Ad/AdLayer.h @@ -47,10 +47,10 @@ public: virtual HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent);
// scripting interface
- 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 const char *ScToString();
+ 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 const char *scToString();
};
} // end of namespace WinterMute
diff --git a/engines/wintermute/Ad/AdObject.cpp b/engines/wintermute/Ad/AdObject.cpp index 896bdfdaf5..bbd51907fe 100644 --- a/engines/wintermute/Ad/AdObject.cpp +++ b/engines/wintermute/Ad/AdObject.cpp @@ -187,7 +187,7 @@ HRESULT CAdObject::Update() { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdObject::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
+HRESULT CAdObject::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// PlayAnim / PlayAnimAsync
@@ -603,12 +603,12 @@ HRESULT CAdObject::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th return S_OK;
}
- else return CBObject::ScCallMethod(Script, Stack, ThisStack, Name);
+ else return CBObject::scCallMethod(Script, Stack, ThisStack, Name);
}
//////////////////////////////////////////////////////////////////////////
-CScValue *CAdObject::ScGetProperty(const char *Name) {
+CScValue *CAdObject::scGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -710,12 +710,12 @@ CScValue *CAdObject::ScGetProperty(const char *Name) { }
- else return CBObject::ScGetProperty(Name);
+ else return CBObject::scGetProperty(Name);
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdObject::ScSetProperty(const char *Name, CScValue *Value) {
+HRESULT CAdObject::scSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Active
@@ -781,12 +781,12 @@ HRESULT CAdObject::ScSetProperty(const char *Name, CScValue *Value) { return S_OK;
}
- else return CBObject::ScSetProperty(Name, Value);
+ else return CBObject::scSetProperty(Name, Value);
}
//////////////////////////////////////////////////////////////////////////
-const char *CAdObject::ScToString() {
+const char *CAdObject::scToString() {
return "[ad object]";
}
diff --git a/engines/wintermute/Ad/AdObject.h b/engines/wintermute/Ad/AdObject.h index 34873c89fc..a7527bd8f6 100644 --- a/engines/wintermute/Ad/AdObject.h +++ b/engines/wintermute/Ad/AdObject.h @@ -99,10 +99,10 @@ public: CAdRegion *_currentRegions[MAX_NUM_REGIONS];
// scripting interface
- 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 const char *ScToString();
+ 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 const char *scToString();
CBArray<CAdObject *, CAdObject *> _attachmentsPre;
CBArray<CAdObject *, CAdObject *> _attachmentsPost;
diff --git a/engines/wintermute/Ad/AdRegion.cpp b/engines/wintermute/Ad/AdRegion.cpp index 19e817dd04..8ec34d3fe8 100644 --- a/engines/wintermute/Ad/AdRegion.cpp +++ b/engines/wintermute/Ad/AdRegion.cpp @@ -219,7 +219,7 @@ HRESULT CAdRegion::LoadBuffer(byte *Buffer, bool Complete) { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdRegion::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
+HRESULT CAdRegion::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
/*
//////////////////////////////////////////////////////////////////////////
// SkipTo
@@ -233,12 +233,12 @@ HRESULT CAdRegion::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th return S_OK;
}
- else*/ return CBRegion::ScCallMethod(Script, Stack, ThisStack, Name);
+ else*/ return CBRegion::scCallMethod(Script, Stack, ThisStack, Name);
}
//////////////////////////////////////////////////////////////////////////
-CScValue *CAdRegion::ScGetProperty(const char *Name) {
+CScValue *CAdRegion::scGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -289,12 +289,12 @@ CScValue *CAdRegion::ScGetProperty(const char *Name) { return _scValue;
}
- else return CBRegion::ScGetProperty(Name);
+ else return CBRegion::scGetProperty(Name);
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdRegion::ScSetProperty(const char *Name, CScValue *Value) {
+HRESULT CAdRegion::scSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Name
//////////////////////////////////////////////////////////////////////////
@@ -335,12 +335,12 @@ HRESULT CAdRegion::ScSetProperty(const char *Name, CScValue *Value) { return S_OK;
}
- else return CBRegion::ScSetProperty(Name, Value);
+ else return CBRegion::scSetProperty(Name, Value);
}
//////////////////////////////////////////////////////////////////////////
-const char *CAdRegion::ScToString() {
+const char *CAdRegion::scToString() {
return "[ad region]";
}
diff --git a/engines/wintermute/Ad/AdRegion.h b/engines/wintermute/Ad/AdRegion.h index 0d119b1ac3..a7db643104 100644 --- a/engines/wintermute/Ad/AdRegion.h +++ b/engines/wintermute/Ad/AdRegion.h @@ -47,10 +47,10 @@ public: virtual HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent);
// scripting interface
- 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 const char *ScToString();
+ 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 const char *scToString();
};
} // end of namespace WinterMute
diff --git a/engines/wintermute/Ad/AdScene.cpp b/engines/wintermute/Ad/AdScene.cpp index c21d694468..9637d09516 100644 --- a/engines/wintermute/Ad/AdScene.cpp +++ b/engines/wintermute/Ad/AdScene.cpp @@ -1248,7 +1248,7 @@ void CAdScene::SkipTo(int OffsetX, int OffsetY) { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdScene::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
+HRESULT CAdScene::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// LoadActor
//////////////////////////////////////////////////////////////////////////
@@ -1674,12 +1674,12 @@ HRESULT CAdScene::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *Thi return S_OK;
}
- else return CBObject::ScCallMethod(Script, Stack, ThisStack, Name);
+ else return CBObject::scCallMethod(Script, Stack, ThisStack, Name);
}
//////////////////////////////////////////////////////////////////////////
-CScValue *CAdScene::ScGetProperty(const char *Name) {
+CScValue *CAdScene::scGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -1837,12 +1837,12 @@ CScValue *CAdScene::ScGetProperty(const char *Name) { return _scValue;
}
- else return CBObject::ScGetProperty(Name);
+ else return CBObject::scGetProperty(Name);
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdScene::ScSetProperty(const char *Name, CScValue *Value) {
+HRESULT CAdScene::scSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Name
//////////////////////////////////////////////////////////////////////////
@@ -1939,12 +1939,12 @@ HRESULT CAdScene::ScSetProperty(const char *Name, CScValue *Value) { return S_OK;
}
- else return CBObject::ScSetProperty(Name, Value);
+ else return CBObject::scSetProperty(Name, Value);
}
//////////////////////////////////////////////////////////////////////////
-const char *CAdScene::ScToString() {
+const char *CAdScene::scToString() {
return "[scene object]";
}
diff --git a/engines/wintermute/Ad/AdScene.h b/engines/wintermute/Ad/AdScene.h index 046db15b21..f772183cb4 100644 --- a/engines/wintermute/Ad/AdScene.h +++ b/engines/wintermute/Ad/AdScene.h @@ -156,10 +156,10 @@ public: int GetPointsDist(CBPoint p1, CBPoint p2, CBObject *requester = NULL);
// scripting interface
- 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 const char *ScToString();
+ 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 const char *scToString();
private:
diff --git a/engines/wintermute/Ad/AdTalkHolder.cpp b/engines/wintermute/Ad/AdTalkHolder.cpp index 162fcf0f2b..a5022e32c5 100644 --- a/engines/wintermute/Ad/AdTalkHolder.cpp +++ b/engines/wintermute/Ad/AdTalkHolder.cpp @@ -118,7 +118,7 @@ CBSprite *CAdTalkHolder::GetTalkStance(const char *Stance) { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdTalkHolder::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
+HRESULT CAdTalkHolder::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// SetSprite
//////////////////////////////////////////////////////////////////////////
@@ -284,12 +284,12 @@ HRESULT CAdTalkHolder::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack return S_OK;
}
- else return CAdObject::ScCallMethod(Script, Stack, ThisStack, Name);
+ else return CAdObject::scCallMethod(Script, Stack, ThisStack, Name);
}
//////////////////////////////////////////////////////////////////////////
-CScValue *CAdTalkHolder::ScGetProperty(const char *Name) {
+CScValue *CAdTalkHolder::scGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -300,12 +300,12 @@ CScValue *CAdTalkHolder::ScGetProperty(const char *Name) { return _scValue;
}
- else return CAdObject::ScGetProperty(Name);
+ else return CAdObject::scGetProperty(Name);
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdTalkHolder::ScSetProperty(const char *Name, CScValue *Value) {
+HRESULT CAdTalkHolder::scSetProperty(const char *Name, CScValue *Value) {
/*
//////////////////////////////////////////////////////////////////////////
// Item
@@ -315,12 +315,12 @@ HRESULT CAdTalkHolder::ScSetProperty(const char *Name, CScValue *Value) { return S_OK;
}
- else*/ return CAdObject::ScSetProperty(Name, Value);
+ else*/ return CAdObject::scSetProperty(Name, Value);
}
//////////////////////////////////////////////////////////////////////////
-const char *CAdTalkHolder::ScToString() {
+const char *CAdTalkHolder::scToString() {
return "[talk-holder object]";
}
diff --git a/engines/wintermute/Ad/AdTalkHolder.h b/engines/wintermute/Ad/AdTalkHolder.h index 7c10783057..ec30decece 100644 --- a/engines/wintermute/Ad/AdTalkHolder.h +++ b/engines/wintermute/Ad/AdTalkHolder.h @@ -45,10 +45,10 @@ public: virtual ~CAdTalkHolder();
// scripting interface
- 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 const char *ScToString();
+ 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 const char *scToString();
};
diff --git a/engines/wintermute/Ad/AdWaypointGroup.cpp b/engines/wintermute/Ad/AdWaypointGroup.cpp index a9d29692c5..5f03fa7898 100644 --- a/engines/wintermute/Ad/AdWaypointGroup.cpp +++ b/engines/wintermute/Ad/AdWaypointGroup.cpp @@ -200,7 +200,7 @@ HRESULT CAdWaypointGroup::persist(CBPersistMgr *persistMgr) { //////////////////////////////////////////////////////////////////////////
-CScValue *CAdWaypointGroup::ScGetProperty(const char *Name) {
+CScValue *CAdWaypointGroup::scGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -219,12 +219,12 @@ CScValue *CAdWaypointGroup::ScGetProperty(const char *Name) { return _scValue;
}
- else return CBObject::ScGetProperty(Name);
+ else return CBObject::scGetProperty(Name);
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdWaypointGroup::ScSetProperty(const char *Name, CScValue *Value) {
+HRESULT CAdWaypointGroup::scSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Active
//////////////////////////////////////////////////////////////////////////
@@ -233,7 +233,7 @@ HRESULT CAdWaypointGroup::ScSetProperty(const char *Name, CScValue *Value) { return S_OK;
}
- else return CBObject::ScSetProperty(Name, Value);
+ else return CBObject::scSetProperty(Name, Value);
}
diff --git a/engines/wintermute/Ad/AdWaypointGroup.h b/engines/wintermute/Ad/AdWaypointGroup.h index 2c7d981c58..00852fce41 100644 --- a/engines/wintermute/Ad/AdWaypointGroup.h +++ b/engines/wintermute/Ad/AdWaypointGroup.h @@ -49,8 +49,8 @@ public: virtual ~CAdWaypointGroup();
CBArray<CBPoint *, CBPoint *> _points;
int _editorSelectedPoint;
- virtual CScValue *ScGetProperty(const char *Name);
- virtual HRESULT ScSetProperty(const 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/Base/BFrame.cpp b/engines/wintermute/Base/BFrame.cpp index 1f14c4ea8f..cdf3eab96b 100644 --- a/engines/wintermute/Base/BFrame.cpp +++ b/engines/wintermute/Base/BFrame.cpp @@ -401,7 +401,7 @@ HRESULT CBFrame::persist(CBPersistMgr *persistMgr) { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CBFrame::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
+HRESULT CBFrame::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// GetSound
@@ -566,14 +566,14 @@ HRESULT CBFrame::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *This //////////////////////////////////////////////////////////////////////////
else {
- if (_subframes.GetSize() == 1) return _subframes[0]->ScCallMethod(Script, Stack, ThisStack, Name);
- else return CBScriptable::ScCallMethod(Script, Stack, ThisStack, Name);
+ if (_subframes.GetSize() == 1) return _subframes[0]->scCallMethod(Script, Stack, ThisStack, Name);
+ else return CBScriptable::scCallMethod(Script, Stack, ThisStack, Name);
}
}
//////////////////////////////////////////////////////////////////////////
-CScValue *CBFrame::ScGetProperty(const char *Name) {
+CScValue *CBFrame::scGetProperty(const char *Name) {
if (!_scValue) _scValue = new CScValue(Game);
_scValue->SetNULL();
@@ -643,14 +643,14 @@ CScValue *CBFrame::ScGetProperty(const char *Name) { //////////////////////////////////////////////////////////////////////////
else {
- if (_subframes.GetSize() == 1) return _subframes[0]->ScGetProperty(Name);
- else return CBScriptable::ScGetProperty(Name);
+ if (_subframes.GetSize() == 1) return _subframes[0]->scGetProperty(Name);
+ else return CBScriptable::scGetProperty(Name);
}
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CBFrame::ScSetProperty(const char *Name, CScValue *Value) {
+HRESULT CBFrame::scSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Delay
//////////////////////////////////////////////////////////////////////////
@@ -693,14 +693,14 @@ HRESULT CBFrame::ScSetProperty(const char *Name, CScValue *Value) { //////////////////////////////////////////////////////////////////////////
else {
- if (_subframes.GetSize() == 1) return _subframes[0]->ScSetProperty(Name, Value);
- else return CBScriptable::ScSetProperty(Name, Value);
+ if (_subframes.GetSize() == 1) return _subframes[0]->scSetProperty(Name, Value);
+ else return CBScriptable::scSetProperty(Name, Value);
}
}
//////////////////////////////////////////////////////////////////////////
-const char *CBFrame::ScToString() {
+const char *CBFrame::scToString() {
return "[frame]";
}
diff --git a/engines/wintermute/Base/BFrame.h b/engines/wintermute/Base/BFrame.h index ac7c88fbf7..64887bd802 100644 --- a/engines/wintermute/Base/BFrame.h +++ b/engines/wintermute/Base/BFrame.h @@ -61,10 +61,10 @@ public: CBArray<const char *, const char *> _applyEvent;
// scripting interface
- 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 const char *ScToString();
+ 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 const char *scToString();
};
diff --git a/engines/wintermute/Base/BGame.cpp b/engines/wintermute/Base/BGame.cpp index 3ccd6d6a12..c54f73fd49 100644 --- a/engines/wintermute/Base/BGame.cpp +++ b/engines/wintermute/Base/BGame.cpp @@ -978,7 +978,7 @@ HRESULT CBGame::LoadBuffer(byte *Buffer, bool Complete) { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CBGame::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
+HRESULT CBGame::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// LOG
//////////////////////////////////////////////////////////////////////////
@@ -993,7 +993,7 @@ HRESULT CBGame::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisS // Caption
//////////////////////////////////////////////////////////////////////////
else if (strcmp(Name, "Caption") == 0) {
- HRESULT res = CBObject::ScCallMethod(Script, Stack, ThisStack, Name);
+ HRESULT res = CBObject::scCallMethod(Script, Stack, ThisStack, Name);
SetWindowTitle();
return res;
}
@@ -2160,12 +2160,12 @@ HRESULT CBGame::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisS return S_OK;
}
- else return CBObject::ScCallMethod(Script, Stack, ThisStack, Name);
+ else return CBObject::scCallMethod(Script, Stack, ThisStack, Name);
}
//////////////////////////////////////////////////////////////////////////
-CScValue *CBGame::ScGetProperty(const char *Name) {
+CScValue *CBGame::scGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -2551,12 +2551,12 @@ CScValue *CBGame::ScGetProperty(const char *Name) { return _scValue;
}
- else return CBObject::ScGetProperty(Name);
+ else return CBObject::scGetProperty(Name);
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CBGame::ScSetProperty(const char *Name, CScValue *Value) {
+HRESULT CBGame::scSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Name
//////////////////////////////////////////////////////////////////////////
@@ -2588,7 +2588,7 @@ HRESULT CBGame::ScSetProperty(const char *Name, CScValue *Value) { // Caption
//////////////////////////////////////////////////////////////////////////
else if (strcmp(Name, "Name") == 0) {
- HRESULT res = CBObject::ScSetProperty(Name, Value);
+ HRESULT res = CBObject::scSetProperty(Name, Value);
SetWindowTitle();
return res;
}
@@ -2746,12 +2746,12 @@ HRESULT CBGame::ScSetProperty(const char *Name, CScValue *Value) { return S_OK;
}
- else return CBObject::ScSetProperty(Name, Value);
+ else return CBObject::scSetProperty(Name, Value);
}
//////////////////////////////////////////////////////////////////////////
-const char *CBGame::ScToString() {
+const char *CBGame::scToString() {
return "[game object]";
}
diff --git a/engines/wintermute/Base/BGame.h b/engines/wintermute/Base/BGame.h index e920fab2b9..ecbad813c6 100644 --- a/engines/wintermute/Base/BGame.h +++ b/engines/wintermute/Base/BGame.h @@ -225,10 +225,10 @@ public: virtual void PublishNatives();
virtual HRESULT ExternalCall(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name);
// scripting interface
- 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 const char *ScToString();
+ 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 const char *scToString();
// compatibility bits
bool _compatKillMethodThreads;
diff --git a/engines/wintermute/Base/BKeyboardState.cpp b/engines/wintermute/Base/BKeyboardState.cpp index 2d95c34d4f..953270c03b 100644 --- a/engines/wintermute/Base/BKeyboardState.cpp +++ b/engines/wintermute/Base/BKeyboardState.cpp @@ -73,7 +73,7 @@ void CBKeyboardState::handleKeyRelease(Common::Event *event) { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CBKeyboardState::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
+HRESULT CBKeyboardState::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// IsKeyDown
//////////////////////////////////////////////////////////////////////////
@@ -98,12 +98,12 @@ HRESULT CBKeyboardState::ScCallMethod(CScScript *Script, CScStack *Stack, CScSta return S_OK;
}
- else return CBScriptable::ScCallMethod(Script, Stack, ThisStack, Name);
+ else return CBScriptable::scCallMethod(Script, Stack, ThisStack, Name);
}
//////////////////////////////////////////////////////////////////////////
-CScValue *CBKeyboardState::ScGetProperty(const char *Name) {
+CScValue *CBKeyboardState::scGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -168,12 +168,12 @@ CScValue *CBKeyboardState::ScGetProperty(const char *Name) { return _scValue;
}
- else return CBScriptable::ScGetProperty(Name);
+ else return CBScriptable::scGetProperty(Name);
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CBKeyboardState::ScSetProperty(const char *Name, CScValue *Value) {
+HRESULT CBKeyboardState::scSetProperty(const char *Name, CScValue *Value) {
/*
//////////////////////////////////////////////////////////////////////////
// Name
@@ -184,12 +184,12 @@ HRESULT CBKeyboardState::ScSetProperty(const char *Name, CScValue *Value) { return S_OK;
}
- else*/ return CBScriptable::ScSetProperty(Name, Value);
+ else*/ return CBScriptable::scSetProperty(Name, Value);
}
//////////////////////////////////////////////////////////////////////////
-const char *CBKeyboardState::ScToString() {
+const char *CBKeyboardState::scToString() {
return "[keyboard state]";
}
diff --git a/engines/wintermute/Base/BKeyboardState.h b/engines/wintermute/Base/BKeyboardState.h index 0db409f64b..d5b61cfb9a 100644 --- a/engines/wintermute/Base/BKeyboardState.h +++ b/engines/wintermute/Base/BKeyboardState.h @@ -59,10 +59,10 @@ public: static bool IsAltDown();
// scripting interface
- 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 const char *ScToString();
+ 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 const char *scToString();
private:
uint8 *_keyStates;
diff --git a/engines/wintermute/Base/BObject.cpp b/engines/wintermute/Base/BObject.cpp index 66de667645..92ac56f5de 100644 --- a/engines/wintermute/Base/BObject.cpp +++ b/engines/wintermute/Base/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, const char *Name) {
+HRESULT CBObject::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// SkipTo
@@ -468,12 +468,12 @@ HRESULT CBObject::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *Thi return S_OK;
}
- else return CBScriptHolder::ScCallMethod(Script, Stack, ThisStack, Name);
+ else return CBScriptHolder::scCallMethod(Script, Stack, ThisStack, Name);
}
//////////////////////////////////////////////////////////////////////////
-CScValue *CBObject::ScGetProperty(const char *Name) {
+CScValue *CBObject::scGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -661,12 +661,12 @@ CScValue *CBObject::ScGetProperty(const char *Name) { return _scValue;
}
- else return CBScriptHolder::ScGetProperty(Name);
+ else return CBScriptHolder::scGetProperty(Name);
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CBObject::ScSetProperty(const char *Name, CScValue *Value) {
+HRESULT CBObject::scSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Caption
//////////////////////////////////////////////////////////////////////////
@@ -840,12 +840,12 @@ HRESULT CBObject::ScSetProperty(const char *Name, CScValue *Value) { return S_OK;
}
- else return CBScriptHolder::ScSetProperty(Name, Value);
+ else return CBScriptHolder::scSetProperty(Name, Value);
}
//////////////////////////////////////////////////////////////////////////
-const char *CBObject::ScToString() {
+const char *CBObject::scToString() {
return "[object]";
}
diff --git a/engines/wintermute/Base/BObject.h b/engines/wintermute/Base/BObject.h index 20bc17baac..8bd980a710 100644 --- a/engines/wintermute/Base/BObject.h +++ b/engines/wintermute/Base/BObject.h @@ -133,10 +133,10 @@ public: public:
// scripting interface
- 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 const char *ScToString();
+ 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 const char *scToString();
};
} // end of namespace WinterMute
diff --git a/engines/wintermute/Base/BRegion.cpp b/engines/wintermute/Base/BRegion.cpp index 355070ba26..867cc33cfe 100644 --- a/engines/wintermute/Base/BRegion.cpp +++ b/engines/wintermute/Base/BRegion.cpp @@ -210,7 +210,7 @@ HRESULT CBRegion::LoadBuffer(byte *Buffer, bool Complete) { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CBRegion::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
+HRESULT CBRegion::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// AddPoint
@@ -305,12 +305,12 @@ HRESULT CBRegion::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *Thi return S_OK;
}
- else return CBObject::ScCallMethod(Script, Stack, ThisStack, Name);
+ else return CBObject::scCallMethod(Script, Stack, ThisStack, Name);
}
//////////////////////////////////////////////////////////////////////////
-CScValue *CBRegion::ScGetProperty(const char *Name) {
+CScValue *CBRegion::scGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -345,12 +345,12 @@ CScValue *CBRegion::ScGetProperty(const char *Name) { return _scValue;
}
- else return CBObject::ScGetProperty(Name);
+ else return CBObject::scGetProperty(Name);
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CBRegion::ScSetProperty(const char *Name, CScValue *Value) {
+HRESULT CBRegion::scSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Name
//////////////////////////////////////////////////////////////////////////
@@ -367,12 +367,12 @@ HRESULT CBRegion::ScSetProperty(const char *Name, CScValue *Value) { return S_OK;
}
- else return CBObject::ScSetProperty(Name, Value);
+ else return CBObject::scSetProperty(Name, Value);
}
//////////////////////////////////////////////////////////////////////////
-const char *CBRegion::ScToString() {
+const char *CBRegion::scToString() {
return "[region]";
}
diff --git a/engines/wintermute/Base/BRegion.h b/engines/wintermute/Base/BRegion.h index c2fe086655..0a4549d003 100644 --- a/engines/wintermute/Base/BRegion.h +++ b/engines/wintermute/Base/BRegion.h @@ -57,10 +57,10 @@ public: virtual HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent, const char *NameOverride = NULL);
// scripting interface
- 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 const char *ScToString();
+ 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 const char *scToString();
};
} // end of namespace WinterMute
diff --git a/engines/wintermute/Base/BScriptHolder.cpp b/engines/wintermute/Base/BScriptHolder.cpp index a721619538..0b4d09641e 100644 --- a/engines/wintermute/Base/BScriptHolder.cpp +++ b/engines/wintermute/Base/BScriptHolder.cpp @@ -109,7 +109,7 @@ HRESULT CBScriptHolder::Listen(CBScriptHolder *param1, uint32 param2) { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CBScriptHolder::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
+HRESULT CBScriptHolder::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// DEBUG_CrashMe
//////////////////////////////////////////////////////////////////////////
@@ -152,7 +152,7 @@ HRESULT CBScriptHolder::ScCallMethod(CScScript *Script, CScStack *Stack, CScStac //////////////////////////////////////////////////////////////////////////
else if (strcmp(Name, "CanHandleMethod") == 0) {
Stack->CorrectParams(1);
- Stack->PushBool(CanHandleMethod(Stack->Pop()->GetString()));
+ Stack->PushBool(canHandleMethod(Stack->Pop()->GetString()));
return S_OK;
}
@@ -203,12 +203,12 @@ HRESULT CBScriptHolder::ScCallMethod(CScScript *Script, CScStack *Stack, CScStac Stack->PushBool(ret);
return S_OK;
- } else return CBScriptable::ScCallMethod(Script, Stack, ThisStack, Name);
+ } else return CBScriptable::scCallMethod(Script, Stack, ThisStack, Name);
}
//////////////////////////////////////////////////////////////////////////
-CScValue *CBScriptHolder::ScGetProperty(const char *Name) {
+CScValue *CBScriptHolder::scGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -235,24 +235,24 @@ CScValue *CBScriptHolder::ScGetProperty(const char *Name) { return _scValue;
}
- else return CBScriptable::ScGetProperty(Name);
+ else return CBScriptable::scGetProperty(Name);
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CBScriptHolder::ScSetProperty(const char *Name, CScValue *Value) {
+HRESULT CBScriptHolder::scSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Name
//////////////////////////////////////////////////////////////////////////
if (strcmp(Name, "Name") == 0) {
SetName(Value->GetString());
return S_OK;
- } else return CBScriptable::ScSetProperty(Name, Value);
+ } else return CBScriptable::scSetProperty(Name, Value);
}
//////////////////////////////////////////////////////////////////////////
-const char *CBScriptHolder::ScToString() {
+const char *CBScriptHolder::scToString() {
return "[script_holder]";
}
@@ -331,9 +331,9 @@ bool CBScriptHolder::CanHandleEvent(const char *EventName) { //////////////////////////////////////////////////////////////////////////
-bool CBScriptHolder::CanHandleMethod(const char *MethodName) {
+bool CBScriptHolder::canHandleMethod(const char *MethodName) {
for (int i = 0; i < _scripts.GetSize(); i++) {
- if (!_scripts[i]->_thread && _scripts[i]->CanHandleMethod(MethodName)) return true;
+ if (!_scripts[i]->_thread && _scripts[i]->canHandleMethod(MethodName)) return true;
}
return false;
}
@@ -405,7 +405,7 @@ HRESULT CBScriptHolder::ParseProperty(byte *Buffer, bool Complete) { CScValue *val = new CScValue(Game);
val->SetString(PropValue);
- ScSetProperty(PropName, val);
+ scSetProperty(PropName, val);
delete val;
delete[] PropName;
@@ -427,16 +427,16 @@ void CBScriptHolder::MakeFreezable(bool Freezable) { //////////////////////////////////////////////////////////////////////////
-CScScript *CBScriptHolder::InvokeMethodThread(const char *MethodName) {
+CScScript *CBScriptHolder::invokeMethodThread(const char *methodName) {
for (int i = _scripts.GetSize() - 1; i >= 0; i--) {
- if (_scripts[i]->CanHandleMethod(MethodName)) {
+ if (_scripts[i]->canHandleMethod(methodName)) {
CScScript *thread = new CScScript(Game, _scripts[i]->_engine);
if (thread) {
- HRESULT ret = thread->CreateMethodThread(_scripts[i], MethodName);
+ HRESULT ret = thread->CreateMethodThread(_scripts[i], methodName);
if (SUCCEEDED(ret)) {
_scripts[i]->_engine->_scripts.Add(thread);
- Game->GetDebugMgr()->OnScriptMethodThreadInit(thread, _scripts[i], MethodName);
+ Game->GetDebugMgr()->OnScriptMethodThreadInit(thread, _scripts[i], methodName);
return thread;
} else {
@@ -450,8 +450,8 @@ CScScript *CBScriptHolder::InvokeMethodThread(const char *MethodName) { //////////////////////////////////////////////////////////////////////////
-void CBScriptHolder::ScDebuggerDesc(char *Buf, int BufSize) {
- strcpy(Buf, ScToString());
+void CBScriptHolder::scDebuggerDesc(char *Buf, int BufSize) {
+ strcpy(Buf, scToString());
if (_name && strcmp(_name, "<unnamed>") != 0) {
strcat(Buf, " Name: ");
strcat(Buf, _name);
diff --git a/engines/wintermute/Base/BScriptHolder.h b/engines/wintermute/Base/BScriptHolder.h index 83df7dc3e0..efedb093a0 100644 --- a/engines/wintermute/Base/BScriptHolder.h +++ b/engines/wintermute/Base/BScriptHolder.h @@ -41,10 +41,10 @@ public: CBScriptHolder(CBGame *inGame);
virtual ~CBScriptHolder();
- virtual CScScript *InvokeMethodThread(const char *MethodName);
+ virtual CScScript *invokeMethodThread(const char *MethodName);
virtual void MakeFreezable(bool Freezable);
bool CanHandleEvent(const char *EventName);
- virtual bool CanHandleMethod(const char *EventMethod);
+ virtual bool canHandleMethod(const char *EventMethod);
HRESULT Cleanup();
HRESULT RemoveScript(CScScript *Script);
HRESULT AddScript(const char *Filename);
@@ -59,11 +59,11 @@ public: CBArray<CScScript *, CScScript *> _scripts;
// scripting interface
- 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 const char *ScToString();
- virtual void ScDebuggerDesc(char *Buf, int BufSize);
+ 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 const char *scToString();
+ virtual void scDebuggerDesc(char *Buf, int BufSize);
// IWmeObject
public:
virtual bool SendEvent(const char *EventName);
diff --git a/engines/wintermute/Base/BScriptable.cpp b/engines/wintermute/Base/BScriptable.cpp index 38a3325f91..d75f6c1994 100644 --- a/engines/wintermute/Base/BScriptable.cpp +++ b/engines/wintermute/Base/BScriptable.cpp @@ -36,13 +36,13 @@ namespace WinterMute { IMPLEMENT_PERSISTENT(CBScriptable, false)
//////////////////////////////////////////////////////////////////////////
-CBScriptable::CBScriptable(CBGame *inGame, bool NoValue, bool Persistable): CBNamedObject(inGame) {
+CBScriptable::CBScriptable(CBGame *inGame, bool noValue, bool persistable): CBNamedObject(inGame) {
_refCount = 0;
- if (NoValue) _scValue = NULL;
+ if (noValue) _scValue = NULL;
else _scValue = new CScValue(Game);
- _persistable = Persistable;
+ _persistable = persistable;
_scProp = NULL;
}
@@ -61,7 +61,7 @@ CBScriptable::~CBScriptable() { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CBScriptable::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
+HRESULT CBScriptable::scCallMethod(CScScript *script, CScStack *stack, CScStack *thisStack, const char *name) {
/*
Stack->CorrectParams(0);
Stack->PushNULL();
@@ -74,67 +74,67 @@ HRESULT CBScriptable::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack //////////////////////////////////////////////////////////////////////////
-CScValue *CBScriptable::ScGetProperty(const char *Name) {
+CScValue *CBScriptable::scGetProperty(const char *name) {
if (!_scProp) _scProp = new CScValue(Game);
- if (_scProp) return _scProp->GetProp(Name);
+ if (_scProp) return _scProp->GetProp(name);
else return NULL;
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CBScriptable::ScSetProperty(const char *Name, CScValue *Value) {
+HRESULT CBScriptable::scSetProperty(const char *name, CScValue *value) {
if (!_scProp) _scProp = new CScValue(Game);
- if (_scProp) return _scProp->SetProp(Name, Value);
+ if (_scProp) return _scProp->SetProp(name, value);
else return E_FAIL;
}
//////////////////////////////////////////////////////////////////////////
-const char *CBScriptable::ScToString() {
+const char *CBScriptable::scToString() {
return "[native object]";
}
//////////////////////////////////////////////////////////////////////////
-void *CBScriptable::ScToMemBuffer() {
+void *CBScriptable::scToMemBuffer() {
return (void *)NULL;
}
//////////////////////////////////////////////////////////////////////////
-int CBScriptable::ScToInt() {
+int CBScriptable::scToInt() {
return 0;
}
//////////////////////////////////////////////////////////////////////////
-double CBScriptable::ScToFloat() {
+double CBScriptable::scToFloat() {
return 0.0f;
}
//////////////////////////////////////////////////////////////////////////
-bool CBScriptable::ScToBool() {
+bool CBScriptable::scToBool() {
return false;
}
//////////////////////////////////////////////////////////////////////////
-void CBScriptable::ScSetString(const char *Val) {
+void CBScriptable::scSetString(const char *val) {
}
//////////////////////////////////////////////////////////////////////////
-void CBScriptable::ScSetInt(int Val) {
+void CBScriptable::scSetInt(int val) {
}
//////////////////////////////////////////////////////////////////////////
-void CBScriptable::ScSetFloat(double Val) {
+void CBScriptable::scSetFloat(double val) {
}
//////////////////////////////////////////////////////////////////////////
-void CBScriptable::ScSetBool(bool Val) {
+void CBScriptable::scSetBool(bool val) {
}
@@ -150,25 +150,25 @@ HRESULT CBScriptable::persist(CBPersistMgr *persistMgr) { //////////////////////////////////////////////////////////////////////////
-int CBScriptable::ScCompare(CBScriptable *Val) {
+int CBScriptable::scCompare(CBScriptable *Val) {
if (this < Val) return -1;
else if (this > Val) return 1;
else return 0;
}
//////////////////////////////////////////////////////////////////////////
-void CBScriptable::ScDebuggerDesc(char *Buf, int BufSize) {
- strcpy(Buf, ScToString());
+void CBScriptable::scDebuggerDesc(char *buf, int bufSize) {
+ strcpy(buf, scToString());
}
//////////////////////////////////////////////////////////////////////////
-bool CBScriptable::CanHandleMethod(const char *EventMethod) {
+bool CBScriptable::canHandleMethod(const char *eventMethod) {
return false;
}
//////////////////////////////////////////////////////////////////////////
-CScScript *CBScriptable::InvokeMethodThread(const char *MethodName) {
+CScScript *CBScriptable::invokeMethodThread(const char *methodName) {
return NULL;
}
@@ -181,8 +181,8 @@ const char *CBScriptable::DbgGetNativeClass() { }
//////////////////////////////////////////////////////////////////////////
-IWmeDebugProp *CBScriptable::DbgGetProperty(const char *Name) {
- return ScGetProperty(Name);
+IWmeDebugProp *CBScriptable::DbgGetProperty(const char *name) {
+ return scGetProperty(name);
}
} // end of namespace WinterMute
diff --git a/engines/wintermute/Base/BScriptable.h b/engines/wintermute/Base/BScriptable.h index 0ee7808445..40e7460b92 100644 --- a/engines/wintermute/Base/BScriptable.h +++ b/engines/wintermute/Base/BScriptable.h @@ -42,28 +42,28 @@ class CScScript; class CBScriptable : public CBNamedObject, public IWmeDebugObject {
public:
- virtual CScScript *InvokeMethodThread(const char *MethodName);
+ virtual CScScript *invokeMethodThread(const char *methodName);
DECLARE_PERSISTENT(CBScriptable, CBNamedObject)
- CBScriptable(CBGame *inGame, bool NoValue = false, bool Persistable = true);
+ CBScriptable(CBGame *inGame, bool noValue = false, bool persistable = true);
virtual ~CBScriptable();
// high level scripting interface
- virtual bool CanHandleMethod(const 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, const char *Name);
- virtual const char *ScToString();
- virtual void *ScToMemBuffer();
- virtual int ScToInt();
- virtual double ScToFloat();
- virtual bool ScToBool();
- virtual void ScSetString(const char *Val);
- virtual void ScSetInt(int Val);
- virtual void ScSetFloat(double Val);
- virtual void ScSetBool(bool Val);
- virtual int ScCompare(CBScriptable *Val);
- virtual void ScDebuggerDesc(char *Buf, int BufSize);
+ virtual bool canHandleMethod(const 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, const char *name);
+ virtual const char *scToString();
+ virtual void *scToMemBuffer();
+ virtual int scToInt();
+ virtual double scToFloat();
+ virtual bool scToBool();
+ virtual void scSetString(const char *val);
+ virtual void scSetInt(int val);
+ virtual void scSetFloat(double val);
+ virtual void scSetBool(bool val);
+ virtual int scCompare(CBScriptable *val);
+ virtual void scDebuggerDesc(char *buf, int bufSize);
int _refCount;
CScValue *_scValue;
CScValue *_scProp;
diff --git a/engines/wintermute/Base/BSprite.cpp b/engines/wintermute/Base/BSprite.cpp index f4f6e8b232..ae88a17d44 100644 --- a/engines/wintermute/Base/BSprite.cpp +++ b/engines/wintermute/Base/BSprite.cpp @@ -507,7 +507,7 @@ HRESULT CBSprite::persist(CBPersistMgr *persistMgr) { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CBSprite::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
+HRESULT CBSprite::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// GetFrame
//////////////////////////////////////////////////////////////////////////
@@ -626,12 +626,12 @@ HRESULT CBSprite::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *Thi return S_OK;
}
- else return CBScriptHolder::ScCallMethod(Script, Stack, ThisStack, Name);
+ else return CBScriptHolder::scCallMethod(Script, Stack, ThisStack, Name);
}
//////////////////////////////////////////////////////////////////////////
-CScValue *CBSprite::ScGetProperty(const char *Name) {
+CScValue *CBSprite::scGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -699,12 +699,12 @@ CScValue *CBSprite::ScGetProperty(const char *Name) { return _scValue;
}
- else return CBScriptHolder::ScGetProperty(Name);
+ else return CBScriptHolder::scGetProperty(Name);
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CBSprite::ScSetProperty(const char *Name, CScValue *Value) {
+HRESULT CBSprite::scSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// CurrentFrame
//////////////////////////////////////////////////////////////////////////
@@ -733,12 +733,12 @@ HRESULT CBSprite::ScSetProperty(const char *Name, CScValue *Value) { return S_OK;
}
- else return CBScriptHolder::ScSetProperty(Name, Value);
+ else return CBScriptHolder::scSetProperty(Name, Value);
}
//////////////////////////////////////////////////////////////////////////
-const char *CBSprite::ScToString() {
+const char *CBSprite::scToString() {
return "[sprite]";
}
diff --git a/engines/wintermute/Base/BSprite.h b/engines/wintermute/Base/BSprite.h index 8fa1656b37..faa74b4ba3 100644 --- a/engines/wintermute/Base/BSprite.h +++ b/engines/wintermute/Base/BSprite.h @@ -79,10 +79,10 @@ public: HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent);
// scripting interface
- 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 const char *ScToString();
+ 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 const char *scToString();
};
} // end of namespace WinterMute
diff --git a/engines/wintermute/Base/BSubFrame.cpp b/engines/wintermute/Base/BSubFrame.cpp index 5ab1a10a9b..b63ccc0d3c 100644 --- a/engines/wintermute/Base/BSubFrame.cpp +++ b/engines/wintermute/Base/BSubFrame.cpp @@ -342,7 +342,7 @@ HRESULT CBSubFrame::persist(CBPersistMgr *persistMgr) { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CBSubFrame::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
+HRESULT CBSubFrame::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// GetImage
@@ -378,12 +378,12 @@ HRESULT CBSubFrame::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *T return S_OK;
}
- else return CBScriptable::ScCallMethod(Script, Stack, ThisStack, Name);
+ else return CBScriptable::scCallMethod(Script, Stack, ThisStack, Name);
}
//////////////////////////////////////////////////////////////////////////
-CScValue *CBSubFrame::ScGetProperty(const char *Name) {
+CScValue *CBSubFrame::scGetProperty(const char *Name) {
if (!_scValue) _scValue = new CScValue(Game);
_scValue->SetNULL();
@@ -468,12 +468,12 @@ CScValue *CBSubFrame::ScGetProperty(const char *Name) { return _scValue;
}
- else return CBScriptable::ScGetProperty(Name);
+ else return CBScriptable::scGetProperty(Name);
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CBSubFrame::ScSetProperty(const char *Name, CScValue *Value) {
+HRESULT CBSubFrame::scSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// AlphaColor
//////////////////////////////////////////////////////////////////////////
@@ -538,12 +538,12 @@ HRESULT CBSubFrame::ScSetProperty(const char *Name, CScValue *Value) { return S_OK;
}
- else return CBScriptable::ScSetProperty(Name, Value);
+ else return CBScriptable::scSetProperty(Name, Value);
}
//////////////////////////////////////////////////////////////////////////
-const char *CBSubFrame::ScToString() {
+const char *CBSubFrame::scToString() {
return "[subframe]";
}
diff --git a/engines/wintermute/Base/BSubFrame.h b/engines/wintermute/Base/BSubFrame.h index 00462b1298..fb91e66a21 100644 --- a/engines/wintermute/Base/BSubFrame.h +++ b/engines/wintermute/Base/BSubFrame.h @@ -73,10 +73,10 @@ public: CBSurface *_surface;
// scripting interface
- 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 const char *ScToString();
+ 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 const char *scToString();
};
diff --git a/engines/wintermute/Base/PartEmitter.cpp b/engines/wintermute/Base/PartEmitter.cpp index 89de02a074..2ff9a56679 100644 --- a/engines/wintermute/Base/PartEmitter.cpp +++ b/engines/wintermute/Base/PartEmitter.cpp @@ -416,7 +416,7 @@ HRESULT CPartEmitter::RemoveForce(const char *Name) { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CPartEmitter::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
+HRESULT CPartEmitter::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// SetBorder
//////////////////////////////////////////////////////////////////////////
@@ -558,11 +558,11 @@ HRESULT CPartEmitter::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack return S_OK;
}
- else return CBObject::ScCallMethod(Script, Stack, ThisStack, Name);
+ else return CBObject::scCallMethod(Script, Stack, ThisStack, Name);
}
//////////////////////////////////////////////////////////////////////////
-CScValue *CPartEmitter::ScGetProperty(const char *Name) {
+CScValue *CPartEmitter::scGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -829,12 +829,12 @@ CScValue *CPartEmitter::ScGetProperty(const char *Name) { return _scValue;
}
- else return CBObject::ScGetProperty(Name);
+ else return CBObject::scGetProperty(Name);
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CPartEmitter::ScSetProperty(const char *Name, CScValue *Value) {
+HRESULT CPartEmitter::scSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// X
//////////////////////////////////////////////////////////////////////////
@@ -1086,12 +1086,12 @@ HRESULT CPartEmitter::ScSetProperty(const char *Name, CScValue *Value) { return S_OK;
}
- else return CBObject::ScSetProperty(Name, Value);
+ else return CBObject::scSetProperty(Name, Value);
}
//////////////////////////////////////////////////////////////////////////
-const char *CPartEmitter::ScToString() {
+const char *CPartEmitter::scToString() {
return "[particle emitter]";
}
diff --git a/engines/wintermute/Base/PartEmitter.h b/engines/wintermute/Base/PartEmitter.h index 76d4bcdbd2..45997b280e 100644 --- a/engines/wintermute/Base/PartEmitter.h +++ b/engines/wintermute/Base/PartEmitter.h @@ -117,10 +117,10 @@ public: CBArray<CPartForce *, CPartForce *> _forces;
// scripting interface
- 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 const char *ScToString();
+ 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 const char *scToString();
private:
diff --git a/engines/wintermute/Base/scriptables/SXArray.cpp b/engines/wintermute/Base/scriptables/SXArray.cpp index 41b3514f92..b7d69bd2f2 100644 --- a/engines/wintermute/Base/scriptables/SXArray.cpp +++ b/engines/wintermute/Base/scriptables/SXArray.cpp @@ -73,7 +73,7 @@ CSXArray::~CSXArray() { //////////////////////////////////////////////////////////////////////////
-const char *CSXArray::ScToString() {
+const char *CSXArray::scToString() {
static char Dummy[32768];
strcpy(Dummy, "");
char PropName[20];
@@ -93,7 +93,7 @@ const char *CSXArray::ScToString() { //////////////////////////////////////////////////////////////////////////
-HRESULT CSXArray::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
+HRESULT CSXArray::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// Push
//////////////////////////////////////////////////////////////////////////
@@ -134,7 +134,7 @@ HRESULT CSXArray::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *Thi //////////////////////////////////////////////////////////////////////////
-CScValue *CSXArray::ScGetProperty(const char *Name) {
+CScValue *CSXArray::scGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -166,7 +166,7 @@ CScValue *CSXArray::ScGetProperty(const char *Name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CSXArray::ScSetProperty(const char *Name, CScValue *Value) {
+HRESULT CSXArray::scSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Length
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/Base/scriptables/SXArray.h b/engines/wintermute/Base/scriptables/SXArray.h index d1cc4ce4db..938e020d93 100644 --- a/engines/wintermute/Base/scriptables/SXArray.h +++ b/engines/wintermute/Base/scriptables/SXArray.h @@ -41,10 +41,10 @@ public: CSXArray(CBGame *inGame, CScStack *Stack);
CSXArray(CBGame *inGame);
virtual ~CSXArray();
- CScValue *ScGetProperty(const char *Name);
- HRESULT ScSetProperty(const char *Name, CScValue *Value);
- HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
- const char *ScToString();
+ CScValue *scGetProperty(const char *Name);
+ HRESULT scSetProperty(const char *Name, CScValue *Value);
+ HRESULT scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
+ const char *scToString();
int _length;
CScValue *_values;
};
diff --git a/engines/wintermute/Base/scriptables/SXDate.cpp b/engines/wintermute/Base/scriptables/SXDate.cpp index 465999241f..669b072d2f 100644 --- a/engines/wintermute/Base/scriptables/SXDate.cpp +++ b/engines/wintermute/Base/scriptables/SXDate.cpp @@ -64,7 +64,7 @@ CSXDate::~CSXDate() { }
//////////////////////////////////////////////////////////////////////////
-const char *CSXDate::ScToString() {
+const char *CSXDate::scToString() {
// TODO: Make this more stringy, and less ISO 8601-like
_strRep.format("%04d-%02d-%02d - %02d:%02d:%02d", _tm.tm_year, _tm.tm_mon, _tm.tm_mday, _tm.tm_hour, _tm.tm_min, _tm.tm_sec);
return _strRep.c_str();
@@ -75,7 +75,7 @@ const char *CSXDate::ScToString() { //////////////////////////////////////////////////////////////////////////
-HRESULT CSXDate::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
+HRESULT CSXDate::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// GetYear
//////////////////////////////////////////////////////////////////////////
@@ -207,7 +207,7 @@ HRESULT CSXDate::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *This //////////////////////////////////////////////////////////////////////////
-CScValue *CSXDate::ScGetProperty(const char *Name) {
+CScValue *CSXDate::scGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -223,7 +223,7 @@ CScValue *CSXDate::ScGetProperty(const char *Name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CSXDate::ScSetProperty(const char *Name, CScValue *Value) {
+HRESULT CSXDate::scSetProperty(const char *Name, CScValue *Value) {
/*
//////////////////////////////////////////////////////////////////////////
// Name
@@ -251,7 +251,7 @@ HRESULT CSXDate::persist(CBPersistMgr *persistMgr) { }
//////////////////////////////////////////////////////////////////////////
-int CSXDate::ScCompare(CBScriptable *Value) {
+int CSXDate::scCompare(CBScriptable *Value) {
TimeDate time1 = _tm;
TimeDate time2 = ((CSXDate *)Value)->_tm;
diff --git a/engines/wintermute/Base/scriptables/SXDate.h b/engines/wintermute/Base/scriptables/SXDate.h index 95334d0196..28d2590c31 100644 --- a/engines/wintermute/Base/scriptables/SXDate.h +++ b/engines/wintermute/Base/scriptables/SXDate.h @@ -36,14 +36,14 @@ namespace WinterMute { class CSXDate : public CBScriptable {
public:
- int ScCompare(CBScriptable *Value);
+ int scCompare(CBScriptable *Value);
DECLARE_PERSISTENT(CSXDate, CBScriptable)
CSXDate(CBGame *inGame, CScStack *Stack);
virtual ~CSXDate();
- CScValue *ScGetProperty(const char *Name);
- HRESULT ScSetProperty(const char *Name, CScValue *Value);
- HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
- const char *ScToString();
+ CScValue *scGetProperty(const char *Name);
+ HRESULT scSetProperty(const char *Name, CScValue *Value);
+ HRESULT scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
+ const char *scToString();
char *_string;
TimeDate _tm;
private:
diff --git a/engines/wintermute/Base/scriptables/SXFile.cpp b/engines/wintermute/Base/scriptables/SXFile.cpp index 9e61181ad0..2be008edaf 100644 --- a/engines/wintermute/Base/scriptables/SXFile.cpp +++ b/engines/wintermute/Base/scriptables/SXFile.cpp @@ -98,14 +98,14 @@ void CSXFile::Close() { }
//////////////////////////////////////////////////////////////////////////
-const char *CSXFile::ScToString() {
+const char *CSXFile::scToString() {
if (_filename) return _filename;
else return "[file object]";
}
#define FILE_BUFFER_SIZE 32768
//////////////////////////////////////////////////////////////////////////
-HRESULT CSXFile::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
+HRESULT CSXFile::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// SetFilename
//////////////////////////////////////////////////////////////////////////
@@ -580,12 +580,12 @@ HRESULT CSXFile::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *This }
- else return CBScriptable::ScCallMethod(Script, Stack, ThisStack, Name);
+ else return CBScriptable::scCallMethod(Script, Stack, ThisStack, Name);
}
//////////////////////////////////////////////////////////////////////////
-CScValue *CSXFile::ScGetProperty(const char *Name) {
+CScValue *CSXFile::scGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -636,12 +636,12 @@ CScValue *CSXFile::ScGetProperty(const char *Name) { return _scValue;
}
- else return CBScriptable::ScGetProperty(Name);
+ else return CBScriptable::scGetProperty(Name);
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CSXFile::ScSetProperty(const char *Name, CScValue *Value) {
+HRESULT CSXFile::scSetProperty(const char *Name, CScValue *Value) {
/*
//////////////////////////////////////////////////////////////////////////
// Length
@@ -659,7 +659,7 @@ HRESULT CSXFile::ScSetProperty(const char *Name, CScValue *Value) { }
return S_OK;
}
- else*/ return CBScriptable::ScSetProperty(Name, Value);
+ else*/ return CBScriptable::scSetProperty(Name, Value);
}
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/Base/scriptables/SXFile.h b/engines/wintermute/Base/scriptables/SXFile.h index 8c37127f7b..d36f8ec3ae 100644 --- a/engines/wintermute/Base/scriptables/SXFile.h +++ b/engines/wintermute/Base/scriptables/SXFile.h @@ -40,10 +40,10 @@ class CBFile; class CSXFile : public CBScriptable {
public:
DECLARE_PERSISTENT(CSXFile, CBScriptable)
- CScValue *ScGetProperty(const char *Name);
- HRESULT ScSetProperty(const char *Name, CScValue *Value);
- HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
- const char *ScToString();
+ CScValue *scGetProperty(const char *Name);
+ HRESULT scSetProperty(const char *Name, CScValue *Value);
+ HRESULT scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
+ const char *scToString();
CSXFile(CBGame *inGame, CScStack *Stack);
virtual ~CSXFile();
private:
diff --git a/engines/wintermute/Base/scriptables/SXMath.cpp b/engines/wintermute/Base/scriptables/SXMath.cpp index da05de0e95..f6ee46e33b 100644 --- a/engines/wintermute/Base/scriptables/SXMath.cpp +++ b/engines/wintermute/Base/scriptables/SXMath.cpp @@ -58,7 +58,7 @@ CSXMath::~CSXMath() { //////////////////////////////////////////////////////////////////////////
-HRESULT CSXMath::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
+HRESULT CSXMath::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// Abs
//////////////////////////////////////////////////////////////////////////
@@ -249,7 +249,7 @@ HRESULT CSXMath::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *This //////////////////////////////////////////////////////////////////////////
-CScValue *CSXMath::ScGetProperty(const char *Name) {
+CScValue *CSXMath::scGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/Base/scriptables/SXMath.h b/engines/wintermute/Base/scriptables/SXMath.h index 0e61738161..355bb78890 100644 --- a/engines/wintermute/Base/scriptables/SXMath.h +++ b/engines/wintermute/Base/scriptables/SXMath.h @@ -39,8 +39,8 @@ public: DECLARE_PERSISTENT(CSXMath, CBScriptable)
CSXMath(CBGame *inGame);
virtual ~CSXMath();
- virtual CScValue *ScGetProperty(const char *Name);
- virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const 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/Base/scriptables/SXMemBuffer.cpp b/engines/wintermute/Base/scriptables/SXMemBuffer.cpp index 6769d3fda9..de635e1c72 100644 --- a/engines/wintermute/Base/scriptables/SXMemBuffer.cpp +++ b/engines/wintermute/Base/scriptables/SXMemBuffer.cpp @@ -64,7 +64,7 @@ CSXMemBuffer::~CSXMemBuffer() { }
//////////////////////////////////////////////////////////////////////////
-void *CSXMemBuffer::ScToMemBuffer() {
+void *CSXMemBuffer::scToMemBuffer() {
return _buffer;
}
@@ -116,13 +116,13 @@ bool CSXMemBuffer::CheckBounds(CScScript *Script, int Start, int Length) { }
//////////////////////////////////////////////////////////////////////////
-const char *CSXMemBuffer::ScToString() {
+const char *CSXMemBuffer::scToString() {
return "[membuffer object]";
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CSXMemBuffer::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
+HRESULT CSXMemBuffer::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// SetSize
//////////////////////////////////////////////////////////////////////////
@@ -407,7 +407,7 @@ HRESULT CSXMemBuffer::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack //////////////////////////////////////////////////////////////////////////
-CScValue *CSXMemBuffer::ScGetProperty(const char *Name) {
+CScValue *CSXMemBuffer::scGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -426,12 +426,12 @@ CScValue *CSXMemBuffer::ScGetProperty(const char *Name) { return _scValue;
}
- else return CBScriptable::ScGetProperty(Name);
+ else return CBScriptable::scGetProperty(Name);
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CSXMemBuffer::ScSetProperty(const char *Name, CScValue *Value) {
+HRESULT CSXMemBuffer::scSetProperty(const char *Name, CScValue *Value) {
/*
//////////////////////////////////////////////////////////////////////////
// Length
@@ -449,7 +449,7 @@ HRESULT CSXMemBuffer::ScSetProperty(const char *Name, CScValue *Value) { }
return S_OK;
}
- else*/ return CBScriptable::ScSetProperty(Name, Value);
+ else*/ return CBScriptable::scSetProperty(Name, Value);
}
@@ -474,8 +474,8 @@ HRESULT CSXMemBuffer::persist(CBPersistMgr *persistMgr) { //////////////////////////////////////////////////////////////////////////
-int CSXMemBuffer::ScCompare(CBScriptable *Val) {
- if (_buffer == Val->ScToMemBuffer()) return 0;
+int CSXMemBuffer::scCompare(CBScriptable *Val) {
+ if (_buffer == Val->scToMemBuffer()) return 0;
else return 1;
}
diff --git a/engines/wintermute/Base/scriptables/SXMemBuffer.h b/engines/wintermute/Base/scriptables/SXMemBuffer.h index 54074b183d..d080b1f136 100644 --- a/engines/wintermute/Base/scriptables/SXMemBuffer.h +++ b/engines/wintermute/Base/scriptables/SXMemBuffer.h @@ -36,16 +36,16 @@ namespace WinterMute { class CSXMemBuffer : public CBScriptable {
public:
- virtual int ScCompare(CBScriptable *Val);
+ virtual int scCompare(CBScriptable *Val);
DECLARE_PERSISTENT(CSXMemBuffer, CBScriptable)
- CScValue *ScGetProperty(const char *Name);
- HRESULT ScSetProperty(const char *Name, CScValue *Value);
- HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
- const char *ScToString();
+ CScValue *scGetProperty(const char *Name);
+ HRESULT scSetProperty(const char *Name, CScValue *Value);
+ HRESULT scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name);
+ const char *scToString();
CSXMemBuffer(CBGame *inGame, CScStack *Stack);
CSXMemBuffer(CBGame *inGame, void *Buffer);
virtual ~CSXMemBuffer();
- virtual void *ScToMemBuffer();
+ virtual void *scToMemBuffer();
int _size;
private:
HRESULT Resize(int NewSize);
diff --git a/engines/wintermute/Base/scriptables/SXStore.cpp b/engines/wintermute/Base/scriptables/SXStore.cpp index 52e7d2d53f..322ef8930d 100644 --- a/engines/wintermute/Base/scriptables/SXStore.cpp +++ b/engines/wintermute/Base/scriptables/SXStore.cpp @@ -84,7 +84,7 @@ void CSXStore::Cleanup() { }
//////////////////////////////////////////////////////////////////////////
-HRESULT CSXStore::ScCallMethod(CScScript *script, CScStack *stack, CScStack *thisStack, const char *name) {
+HRESULT CSXStore::scCallMethod(CScScript *script, CScStack *stack, CScStack *thisStack, const char *name) {
//////////////////////////////////////////////////////////////////////////
// EnableEvents
//////////////////////////////////////////////////////////////////////////
@@ -227,7 +227,7 @@ HRESULT CSXStore::ScCallMethod(CScScript *script, CScStack *stack, CScStack *thi //////////////////////////////////////////////////////////////////////////
-CScValue *CSXStore::ScGetProperty(const char *name) {
+CScValue *CSXStore::scGetProperty(const char *name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/Base/scriptables/SXStore.h b/engines/wintermute/Base/scriptables/SXStore.h index 200349addf..fd5f36a882 100644 --- a/engines/wintermute/Base/scriptables/SXStore.h +++ b/engines/wintermute/Base/scriptables/SXStore.h @@ -129,8 +129,8 @@ public: DECLARE_PERSISTENT(CSXStore, CBObject)
CSXStore(CBGame *inGame);
virtual ~CSXStore();
- virtual CScValue *ScGetProperty(const char *Name);
- virtual HRESULT ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const 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/Base/scriptables/SXString.cpp b/engines/wintermute/Base/scriptables/SXString.cpp index fdbcea5ef2..35343d095a 100644 --- a/engines/wintermute/Base/scriptables/SXString.cpp +++ b/engines/wintermute/Base/scriptables/SXString.cpp @@ -86,20 +86,20 @@ void CSXString::SetStringVal(const char *Val) { //////////////////////////////////////////////////////////////////////////
-const char *CSXString::ScToString() {
+const char *CSXString::scToString() {
if (_string) return _string;
else return "[null string]";
}
//////////////////////////////////////////////////////////////////////////
-void CSXString::ScSetString(const char *Val) {
+void CSXString::scSetString(const char *Val) {
SetStringVal(Val);
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CSXString::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
+HRESULT CSXString::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// Substring
//////////////////////////////////////////////////////////////////////////
@@ -317,7 +317,7 @@ HRESULT CSXString::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th //////////////////////////////////////////////////////////////////////////
-CScValue *CSXString::ScGetProperty(const char *Name) {
+CScValue *CSXString::scGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -352,7 +352,7 @@ CScValue *CSXString::ScGetProperty(const char *Name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CSXString::ScSetProperty(const char *Name, CScValue *Value) {
+HRESULT CSXString::scSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Capacity
//////////////////////////////////////////////////////////////////////////
@@ -397,7 +397,7 @@ HRESULT CSXString::persist(CBPersistMgr *persistMgr) { //////////////////////////////////////////////////////////////////////////
-int CSXString::ScCompare(CBScriptable *Val) {
+int CSXString::scCompare(CBScriptable *Val) {
return strcmp(_string, ((CSXString *)Val)->_string);
}
diff --git a/engines/wintermute/Base/scriptables/SXString.h b/engines/wintermute/Base/scriptables/SXString.h index 649a6c6f24..1adc0cad1e 100644 --- a/engines/wintermute/Base/scriptables/SXString.h +++ b/engines/wintermute/Base/scriptables/SXString.h @@ -36,13 +36,13 @@ namespace WinterMute { class CSXString : public CBScriptable {
public:
- virtual int ScCompare(CBScriptable *Val);
+ virtual int scCompare(CBScriptable *Val);
DECLARE_PERSISTENT(CSXString, CBScriptable)
- 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);
- const char *ScToString();
+ 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);
+ const char *scToString();
void SetStringVal(const char *Val);
CSXString(CBGame *inGame, CScStack *Stack);
diff --git a/engines/wintermute/Base/scriptables/ScScript.cpp b/engines/wintermute/Base/scriptables/ScScript.cpp index c293009da1..33e697ffd7 100644 --- a/engines/wintermute/Base/scriptables/ScScript.cpp +++ b/engines/wintermute/Base/scriptables/ScScript.cpp @@ -534,13 +534,13 @@ HRESULT CScScript::ExecuteInstruction() { // we are already calling this method, try native
if (_thread && _methodThread && strcmp(MethodName, _threadEvent) == 0 && var->_type == VAL_NATIVE && _owner == var->GetNative()) {
TriedNative = true;
- res = var->_valNative->ScCallMethod(this, _stack, _thisStack, MethodName);
+ res = var->_valNative->scCallMethod(this, _stack, _thisStack, MethodName);
}
if (FAILED(res)) {
- if (var->IsNative() && var->GetNative()->CanHandleMethod(MethodName)) {
+ if (var->IsNative() && var->GetNative()->canHandleMethod(MethodName)) {
if (!_unbreakable) {
- _waitScript = var->GetNative()->InvokeMethodThread(MethodName);
+ _waitScript = var->GetNative()->invokeMethodThread(MethodName);
if (!_waitScript) {
_stack->CorrectParams(0);
RuntimeError("Error invoking method '%s'.", MethodName);
@@ -581,7 +581,7 @@ HRESULT CScScript::ExecuteInstruction() { */
else {
res = E_FAIL;
- if (var->_type == VAL_NATIVE && !TriedNative) res = var->_valNative->ScCallMethod(this, _stack, _thisStack, MethodName);
+ if (var->_type == VAL_NATIVE && !TriedNative) res = var->_valNative->scCallMethod(this, _stack, _thisStack, MethodName);
if (FAILED(res)) {
_stack->CorrectParams(0);
@@ -1250,7 +1250,7 @@ bool CScScript::CanHandleEvent(const char *EventName) { //////////////////////////////////////////////////////////////////////////
-bool CScScript::CanHandleMethod(const char *MethodName) {
+bool CScScript::canHandleMethod(const char *MethodName) {
return GetMethodPos(MethodName) != 0;
}
diff --git a/engines/wintermute/Base/scriptables/ScScript.h b/engines/wintermute/Base/scriptables/ScScript.h index 226e6d8031..dd6fcb1f4a 100644 --- a/engines/wintermute/Base/scriptables/ScScript.h +++ b/engines/wintermute/Base/scriptables/ScScript.h @@ -69,7 +69,7 @@ public: HRESULT Resume();
HRESULT Pause();
bool CanHandleEvent(const char *EventName);
- bool CanHandleMethod(const char *MethodName);
+ bool canHandleMethod(const char *MethodName);
HRESULT CreateThread(CScScript *Original, uint32 InitIP, const char *EventName);
HRESULT CreateMethodThread(CScScript *Original, const char *MethodName);
CScScript *InvokeEventHandler(const char *EventName, bool Unbreakable = false);
diff --git a/engines/wintermute/Base/scriptables/ScValue.cpp b/engines/wintermute/Base/scriptables/ScValue.cpp index 4dce85c1a0..c75487a268 100644 --- a/engines/wintermute/Base/scriptables/ScValue.cpp +++ b/engines/wintermute/Base/scriptables/ScValue.cpp @@ -178,7 +178,7 @@ CScValue *CScValue::GetProp(const char *Name) { CScValue *ret = NULL;
- if (_type == VAL_NATIVE && _valNative) ret = _valNative->ScGetProperty(Name);
+ if (_type == VAL_NATIVE && _valNative) ret = _valNative->scGetProperty(Name);
if (ret == NULL) {
_valIter = _valObject.find(Name);
@@ -208,7 +208,7 @@ HRESULT CScValue::SetProp(const char *Name, CScValue *Val, bool CopyWhole, bool HRESULT ret = E_FAIL;
if (_type == VAL_NATIVE && _valNative) {
- ret = _valNative->ScSetProperty(Name, Val);
+ ret = _valNative->scSetProperty(Name, Val);
}
if (FAILED(ret)) {
@@ -347,7 +347,7 @@ void CScValue::SetBool(bool Val) { }
if (_type == VAL_NATIVE) {
- _valNative->ScSetBool(Val);
+ _valNative->scSetBool(Val);
return;
}
@@ -364,7 +364,7 @@ void CScValue::SetInt(int Val) { }
if (_type == VAL_NATIVE) {
- _valNative->ScSetInt(Val);
+ _valNative->scSetInt(Val);
return;
}
@@ -381,7 +381,7 @@ void CScValue::SetFloat(double Val) { }
if (_type == VAL_NATIVE) {
- _valNative->ScSetFloat(Val);
+ _valNative->scSetFloat(Val);
return;
}
@@ -398,7 +398,7 @@ void CScValue::SetString(const char *Val) { }
if (_type == VAL_NATIVE) {
- _valNative->ScSetString(Val);
+ _valNative->scSetString(Val);
return;
}
@@ -503,7 +503,7 @@ bool CScValue::GetBool(bool Default) { return _valBool;
case VAL_NATIVE:
- return _valNative->ScToBool();
+ return _valNative->scToBool();
case VAL_INT:
return (_valInt != 0);
@@ -529,7 +529,7 @@ int CScValue::GetInt(int Default) { return _valBool ? 1 : 0;
case VAL_NATIVE:
- return _valNative->ScToInt();
+ return _valNative->scToInt();
case VAL_INT:
return _valInt;
@@ -555,7 +555,7 @@ double CScValue::GetFloat(double Default) { return _valBool ? 1.0f : 0.0f;
case VAL_NATIVE:
- return _valNative->ScToFloat();
+ return _valNative->scToFloat();
case VAL_INT:
return (double)_valInt;
@@ -575,7 +575,7 @@ double CScValue::GetFloat(double Default) { void *CScValue::GetMemBuffer() {
if (_type == VAL_VARIABLE_REF) return _valRef->GetMemBuffer();
- if (_type == VAL_NATIVE) return _valNative->ScToMemBuffer();
+ if (_type == VAL_NATIVE) return _valNative->scToMemBuffer();
else return (void *)NULL;
}
@@ -594,7 +594,7 @@ const char *CScValue::GetString() { break;
case VAL_NATIVE: {
- const char *StrVal = _valNative->ScToString();
+ const char *StrVal = _valNative->scToString();
SetStringVal(StrVal);
return StrVal;
break;
@@ -696,16 +696,16 @@ void CScValue::SetValue(CScValue *Val) { if (_type == VAL_NATIVE && (Val->_type == VAL_INT || Val->_type == VAL_STRING || Val->_type == VAL_BOOL)) {
switch (Val->_type) {
case VAL_INT:
- _valNative->ScSetInt(Val->GetInt());
+ _valNative->scSetInt(Val->GetInt());
break;
case VAL_FLOAT:
- _valNative->ScSetFloat(Val->GetFloat());
+ _valNative->scSetFloat(Val->GetFloat());
break;
case VAL_BOOL:
- _valNative->ScSetBool(Val->GetBool());
+ _valNative->scSetBool(Val->GetBool());
break;
case VAL_STRING:
- _valNative->ScSetString(Val->GetString());
+ _valNative->scSetString(Val->GetString());
break;
default:
warning("CScValue::SetValue - unhandled enum");
@@ -823,7 +823,7 @@ int CScValue::Compare(CScValue *Val1, CScValue *Val2) { if (Val1->IsNative() && Val2->IsNative()) {
// same class?
if (strcmp(Val1->GetNative()->GetClassName(), Val2->GetNative()->GetClassName()) == 0) {
- return Val1->GetNative()->ScCompare(Val2->GetNative());
+ return Val1->GetNative()->scCompare(Val2->GetNative());
} else return strcmp(Val1->GetString(), Val2->GetString());
}
@@ -1024,7 +1024,7 @@ bool CScValue::DbgGetDescription(char *Buf, int BufSize) { if (_type == VAL_VARIABLE_REF) return _valRef->DbgGetDescription(Buf, BufSize);
if (_type == VAL_NATIVE) {
- _valNative->ScDebuggerDesc(Buf, BufSize);
+ _valNative->scDebuggerDesc(Buf, BufSize);
} else {
strncpy(Buf, GetString(), BufSize);
}
diff --git a/engines/wintermute/UI/UIButton.cpp b/engines/wintermute/UI/UIButton.cpp index 9ce8230104..493c41649c 100644 --- a/engines/wintermute/UI/UIButton.cpp +++ b/engines/wintermute/UI/UIButton.cpp @@ -666,7 +666,7 @@ void CUIButton::Press() { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CUIButton::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
+HRESULT CUIButton::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// SetDisabledFont
//////////////////////////////////////////////////////////////////////////
@@ -916,12 +916,12 @@ HRESULT CUIButton::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th }
- else return CUIObject::ScCallMethod(Script, Stack, ThisStack, Name);
+ else return CUIObject::scCallMethod(Script, Stack, ThisStack, Name);
}
//////////////////////////////////////////////////////////////////////////
-CScValue *CUIButton::ScGetProperty(const char *Name) {
+CScValue *CUIButton::scGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -962,12 +962,12 @@ CScValue *CUIButton::ScGetProperty(const char *Name) { return _scValue;
}
- else return CUIObject::ScGetProperty(Name);
+ else return CUIObject::scGetProperty(Name);
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CUIButton::ScSetProperty(const char *Name, CScValue *Value) {
+HRESULT CUIButton::scSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// TextAlign
//////////////////////////////////////////////////////////////////////////
@@ -1000,12 +1000,12 @@ HRESULT CUIButton::ScSetProperty(const char *Name, CScValue *Value) { return S_OK;
}
- else return CUIObject::ScSetProperty(Name, Value);
+ else return CUIObject::scSetProperty(Name, Value);
}
//////////////////////////////////////////////////////////////////////////
-const char *CUIButton::ScToString() {
+const char *CUIButton::scToString() {
return "[button]";
}
diff --git a/engines/wintermute/UI/UIButton.h b/engines/wintermute/UI/UIButton.h index 75133e2c0a..29496bdf79 100644 --- a/engines/wintermute/UI/UIButton.h +++ b/engines/wintermute/UI/UIButton.h @@ -68,10 +68,10 @@ public: virtual HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent);
// scripting interface
- 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 const char *ScToString();
+ 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 const char *scToString();
};
} // end of namespace WinterMute
diff --git a/engines/wintermute/UI/UIEdit.cpp b/engines/wintermute/UI/UIEdit.cpp index 3b4b274bd0..8e9708526f 100644 --- a/engines/wintermute/UI/UIEdit.cpp +++ b/engines/wintermute/UI/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, const char *Name) {
+HRESULT CUIEdit::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// SetSelectedFont
//////////////////////////////////////////////////////////////////////////
@@ -375,12 +375,12 @@ HRESULT CUIEdit::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *This return S_OK;
}
- else return CUIObject::ScCallMethod(Script, Stack, ThisStack, Name);
+ else return CUIObject::scCallMethod(Script, Stack, ThisStack, Name);
}
//////////////////////////////////////////////////////////////////////////
-CScValue *CUIEdit::ScGetProperty(const char *Name) {
+CScValue *CUIEdit::scGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -452,12 +452,12 @@ CScValue *CUIEdit::ScGetProperty(const char *Name) { return _scValue;
}
- else return CUIObject::ScGetProperty(Name);
+ else return CUIObject::scGetProperty(Name);
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CUIEdit::ScSetProperty(const char *Name, CScValue *Value) {
+HRESULT CUIEdit::scSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// SelStart
//////////////////////////////////////////////////////////////////////////
@@ -523,12 +523,12 @@ HRESULT CUIEdit::ScSetProperty(const char *Name, CScValue *Value) { return S_OK;
}
- else return CUIObject::ScSetProperty(Name, Value);
+ else return CUIObject::scSetProperty(Name, Value);
}
//////////////////////////////////////////////////////////////////////////
-const char *CUIEdit::ScToString() {
+const char *CUIEdit::scToString() {
return "[edit]";
}
diff --git a/engines/wintermute/UI/UIEdit.h b/engines/wintermute/UI/UIEdit.h index 4771a0f772..44bd6198a6 100644 --- a/engines/wintermute/UI/UIEdit.h +++ b/engines/wintermute/UI/UIEdit.h @@ -61,10 +61,10 @@ public: virtual HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent);
// scripting interface
- 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 const char *ScToString();
+ 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 const char *scToString();
};
} // end of namespace WinterMute
diff --git a/engines/wintermute/UI/UIEntity.cpp b/engines/wintermute/UI/UIEntity.cpp index d8d53270ef..d473f18a1a 100644 --- a/engines/wintermute/UI/UIEntity.cpp +++ b/engines/wintermute/UI/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, const char *Name) {
+HRESULT CUIEntity::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// GetEntity
//////////////////////////////////////////////////////////////////////////
@@ -280,12 +280,12 @@ HRESULT CUIEntity::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th return S_OK;
}
- else return CUIObject::ScCallMethod(Script, Stack, ThisStack, Name);
+ else return CUIObject::scCallMethod(Script, Stack, ThisStack, Name);
}
//////////////////////////////////////////////////////////////////////////
-CScValue *CUIEntity::ScGetProperty(const char *Name) {
+CScValue *CUIEntity::scGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -305,24 +305,24 @@ CScValue *CUIEntity::ScGetProperty(const char *Name) { return _scValue;
}
- else return CUIObject::ScGetProperty(Name);
+ else return CUIObject::scGetProperty(Name);
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CUIEntity::ScSetProperty(const char *Name, CScValue *Value) {
+HRESULT CUIEntity::scSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Freezable
//////////////////////////////////////////////////////////////////////////
if (strcmp(Name, "Freezable") == 0) {
if (_entity) _entity->MakeFreezable(Value->GetBool());
return S_OK;
- } else return CUIObject::ScSetProperty(Name, Value);
+ } else return CUIObject::scSetProperty(Name, Value);
}
//////////////////////////////////////////////////////////////////////////
-const char *CUIEntity::ScToString() {
+const char *CUIEntity::scToString() {
return "[entity container]";
}
diff --git a/engines/wintermute/UI/UIEntity.h b/engines/wintermute/UI/UIEntity.h index c18fd952dc..1db2eb5ccc 100644 --- a/engines/wintermute/UI/UIEntity.h +++ b/engines/wintermute/UI/UIEntity.h @@ -47,10 +47,10 @@ public: HRESULT SetEntity(const char *Filename);
// scripting interface
- 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 const char *ScToString();
+ 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 const char *scToString();
};
} // end of namespace WinterMute
diff --git a/engines/wintermute/UI/UIObject.cpp b/engines/wintermute/UI/UIObject.cpp index 64a2b28084..9ed7e36182 100644 --- a/engines/wintermute/UI/UIObject.cpp +++ b/engines/wintermute/UI/UIObject.cpp @@ -137,7 +137,7 @@ void CUIObject::CorrectSize() { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CUIObject::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
+HRESULT CUIObject::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// SetFont
//////////////////////////////////////////////////////////////////////////
@@ -312,12 +312,12 @@ HRESULT CUIObject::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th return S_OK;
}
- else return CBObject::ScCallMethod(Script, Stack, ThisStack, Name);
+ else return CBObject::scCallMethod(Script, Stack, ThisStack, Name);
}
//////////////////////////////////////////////////////////////////////////
-CScValue *CUIObject::ScGetProperty(const char *Name) {
+CScValue *CUIObject::scGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -413,12 +413,12 @@ CScValue *CUIObject::ScGetProperty(const char *Name) { return _scValue;
}
- else return CBObject::ScGetProperty(Name);
+ else return CBObject::scGetProperty(Name);
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CUIObject::ScSetProperty(const char *Name, CScValue *Value) {
+HRESULT CUIObject::scSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Name
//////////////////////////////////////////////////////////////////////////
@@ -475,12 +475,12 @@ HRESULT CUIObject::ScSetProperty(const char *Name, CScValue *Value) { return S_OK;
}
- else return CBObject::ScSetProperty(Name, Value);
+ else return CBObject::scSetProperty(Name, Value);
}
//////////////////////////////////////////////////////////////////////////
-const char *CUIObject::ScToString() {
+const char *CUIObject::scToString() {
return "[ui_object]";
}
diff --git a/engines/wintermute/UI/UIObject.h b/engines/wintermute/UI/UIObject.h index 7d6dfb41f5..b91be5ac92 100644 --- a/engines/wintermute/UI/UIObject.h +++ b/engines/wintermute/UI/UIObject.h @@ -72,10 +72,10 @@ public: virtual HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent);
// scripting interface
- 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 const char *ScToString();
+ 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 const char *scToString();
};
} // end of namespace WinterMute
diff --git a/engines/wintermute/UI/UIText.cpp b/engines/wintermute/UI/UIText.cpp index 7213c34534..adfb4801e4 100644 --- a/engines/wintermute/UI/UIText.cpp +++ b/engines/wintermute/UI/UIText.cpp @@ -376,7 +376,7 @@ HRESULT CUIText::SaveAsText(CBDynBuffer *Buffer, int Indent) { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CUIText::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
+HRESULT CUIText::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// SizeToFit
//////////////////////////////////////////////////////////////////////////
@@ -397,12 +397,12 @@ HRESULT CUIText::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *This return S_OK;
}
- else return CUIObject::ScCallMethod(Script, Stack, ThisStack, Name);
+ else return CUIObject::scCallMethod(Script, Stack, ThisStack, Name);
}
//////////////////////////////////////////////////////////////////////////
-CScValue *CUIText::ScGetProperty(const char *Name) {
+CScValue *CUIText::scGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -429,12 +429,12 @@ CScValue *CUIText::ScGetProperty(const char *Name) { return _scValue;
}
- else return CUIObject::ScGetProperty(Name);
+ else return CUIObject::scGetProperty(Name);
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CUIText::ScSetProperty(const char *Name, CScValue *Value) {
+HRESULT CUIText::scSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// TextAlign
//////////////////////////////////////////////////////////////////////////
@@ -455,12 +455,12 @@ HRESULT CUIText::ScSetProperty(const char *Name, CScValue *Value) { return S_OK;
}
- else return CUIObject::ScSetProperty(Name, Value);
+ else return CUIObject::scSetProperty(Name, Value);
}
//////////////////////////////////////////////////////////////////////////
-const char *CUIText::ScToString() {
+const char *CUIText::scToString() {
return "[static]";
}
diff --git a/engines/wintermute/UI/UIText.h b/engines/wintermute/UI/UIText.h index 756834fd5c..74e70acdd7 100644 --- a/engines/wintermute/UI/UIText.h +++ b/engines/wintermute/UI/UIText.h @@ -48,10 +48,10 @@ public: virtual HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent);
// scripting interface
- 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 const char *ScToString();
+ 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 const char *scToString();
};
} // end of namespace WinterMute
diff --git a/engines/wintermute/UI/UIWindow.cpp b/engines/wintermute/UI/UIWindow.cpp index d0d91084d9..cc1b0bc806 100644 --- a/engines/wintermute/UI/UIWindow.cpp +++ b/engines/wintermute/UI/UIWindow.cpp @@ -690,7 +690,7 @@ HRESULT CUIWindow::ShowWidget(const char *Name, bool Visible) { //////////////////////////////////////////////////////////////////////////
// high level scripting interface
//////////////////////////////////////////////////////////////////////////
-HRESULT CUIWindow::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
+HRESULT CUIWindow::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisStack, const char *Name) {
//////////////////////////////////////////////////////////////////////////
// GetWidget / GetControl
//////////////////////////////////////////////////////////////////////////
@@ -912,12 +912,12 @@ HRESULT CUIWindow::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th return S_OK;
} else if SUCCEEDED(Game->WindowScriptMethodHook(this, Script, Stack, Name)) return S_OK;
- else return CUIObject::ScCallMethod(Script, Stack, ThisStack, Name);
+ else return CUIObject::scCallMethod(Script, Stack, ThisStack, Name);
}
//////////////////////////////////////////////////////////////////////////
-CScValue *CUIWindow::ScGetProperty(const char *Name) {
+CScValue *CUIWindow::scGetProperty(const char *Name) {
_scValue->SetNULL();
//////////////////////////////////////////////////////////////////////////
@@ -1000,12 +1000,12 @@ CScValue *CUIWindow::ScGetProperty(const char *Name) { return _scValue;
}
- else return CUIObject::ScGetProperty(Name);
+ else return CUIObject::scGetProperty(Name);
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CUIWindow::ScSetProperty(const char *Name, CScValue *Value) {
+HRESULT CUIWindow::scSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
// Name
//////////////////////////////////////////////////////////////////////////
@@ -1089,12 +1089,12 @@ HRESULT CUIWindow::ScSetProperty(const char *Name, CScValue *Value) { return S_OK;
}
- else return CUIObject::ScSetProperty(Name, Value);
+ else return CUIObject::scSetProperty(Name, Value);
}
//////////////////////////////////////////////////////////////////////////
-const char *CUIWindow::ScToString() {
+const char *CUIWindow::scToString() {
return "[window]";
}
diff --git a/engines/wintermute/UI/UIWindow.h b/engines/wintermute/UI/UIWindow.h index 43d5961e7e..4b376b1929 100644 --- a/engines/wintermute/UI/UIWindow.h +++ b/engines/wintermute/UI/UIWindow.h @@ -82,10 +82,10 @@ public: virtual HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent);
// scripting interface
- 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 const char *ScToString();
+ 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 const char *scToString();
};
} // end of namespace WinterMute
|