Browse Source

Merge MOULa build 912 from Cyan

- Update Scripts/Python/plasma/* with our changes from MOULSCRIPT-ou (apparently their build process uses or produces these, ours doesn't).
- Bump build ID.
avatar-spawn
Christian Walther 13 years ago
parent
commit
97b9503cb1
  1. 16
      MOULOpenSourceClientPlugin/Plasma20/Scripts/Python/plasma/Plasma.py
  2. 4
      MOULOpenSourceClientPlugin/Plasma20/Scripts/Python/plasma/PlasmaConstants.py
  3. 10
      MOULOpenSourceClientPlugin/Plasma20/Scripts/Python/plasma/PlasmaTypes.py
  4. 2
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrBuildId.cpp

16
MOULOpenSourceClientPlugin/Plasma20/Scripts/Python/plasma/Plasma.py

@ -5480,6 +5480,22 @@ This event record is used to pass a ptKey variable to another python program"""
def addVarNumber(self,name,number): def addVarNumber(self,name,number):
"""Add a number variable event record to the Notify message """Add a number variable event record to the Notify message
Method will try to pick appropriate variable type
This event record is used to pass a number variable to another python program"""
pass
def addVarFloat(self,name,number):
"""Add a float variable event record to the Notify message
This event record is used to pass a number variable to another python program"""
pass
def addVarInt(self,name,number):
"""Add a integer variable event record to the Notify message
This event record is used to pass a number variable to another python program"""
pass
def addVarNull(self,name):
"""Add a null (no data) variable event record to the Notify message
This event record is used to pass a number variable to another python program""" This event record is used to pass a number variable to another python program"""
pass pass

4
MOULOpenSourceClientPlugin/Plasma20/Scripts/Python/plasma/PlasmaConstants.py

@ -215,8 +215,10 @@ class PtNotificationType:
class PtNotifyDataType: class PtNotifyDataType:
"""(none)""" """(none)"""
kNumber = 1 kFloat = 1
kKey = 2 kKey = 2
kInt = 3
kNull = 4
class PtSDLReadWriteOptions: class PtSDLReadWriteOptions:
"""(none)""" """(none)"""

10
MOULOpenSourceClientPlugin/Plasma20/Scripts/Python/plasma/PlasmaTypes.py

@ -69,7 +69,7 @@ kOfferLinkingBook=PtEventType.kOfferLinkingBook # [1]=offerer, [2]=link panel ID
# OnNotify Var Event Data Types # OnNotify Var Event Data Types
kVarNumberType=PtNotifyDataType.kNumber kVarNumberType=PtNotifyDataType.kFloat
kVarKeyType=PtNotifyDataType.kKey kVarKeyType=PtNotifyDataType.kKey
# OnNotify MultiStageEvent - what event types # OnNotify MultiStageEvent - what event types
kEnterStage=PtMultiStageEventType.kEnterStage kEnterStage=PtMultiStageEventType.kEnterStage
@ -179,8 +179,12 @@ def PtAddEvent(notify,event):
elif event[0] == kControlKeyEvent: elif event[0] == kControlKeyEvent:
notify.addControlKeyEvent(event[1],event[2]) notify.addControlKeyEvent(event[1],event[2])
elif event[0] == kVariableEvent: elif event[0] == kVariableEvent:
if event[2] == kVarNumberType: if event[2] == PtNotifyDataType.kFloat:
notify.addVarNumber(event[1],event[3]) notify.addVarFloat(event[1],event[3])
elif event[2] == PtNotifyDataType.kInt:
notify.addVarInt(event[1],event[3])
elif event[2] == PtNotifyDataType.kNull:
notify.addVarNull(event[1])
elif event[2] == kVarKeyType: elif event[2] == kVarKeyType:
notify.addVarKey(event[1],event[3]) notify.addVarKey(event[1],event[3])
elif event[0] == kFacingEvent: elif event[0] == kFacingEvent:

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrBuildId.cpp

@ -57,7 +57,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// This line must NEVER be modified manually; it is automatically updated // This line must NEVER be modified manually; it is automatically updated
// by the build server. // by the build server.
#define BUILD_ID 906 #define BUILD_ID 912
COMPILER_ASSERT(BUILD_ID != 0); COMPILER_ASSERT(BUILD_ID != 0);

Loading…
Cancel
Save