History

bring over code from entity-level-locking branch

Seth Alves committed 11 years ago

Commit 2dc49221 parent 5312bee10 files · +245 −122Browse files

Showing the changes to interface/src/InterfaceActionFactory.cpp (1 of 10 files). Show all

Unified · Split

interface/src/InterfaceActionFactory.cpp+2−5
@@ -35,8 +35,7 @@ EntityActionPointer interfaceActionFactory(EntityActionType type, const QUuid& i · 34 unmodified lines
35}35}
36 36
37 37
38EntityActionPointer InterfaceActionFactory::factory(EntitySimulation* simulation,38EntityActionPointer InterfaceActionFactory::factory(EntityActionType type,
39 EntityActionType type,
40 const QUuid& id,39 const QUuid& id,
41 EntityItemPointer ownerEntity,40 EntityItemPointer ownerEntity,
42 QVariantMap arguments) {41 QVariantMap arguments) {
@@ -51,9 +50,7 @@ EntityActionPointer InterfaceActionFactory::factory(EntitySimulation* simulation · 8 unmodified lines
51}50}
52 51
53 52
54EntityActionPointer InterfaceActionFactory::factoryBA(EntitySimulation* simulation,53EntityActionPointer InterfaceActionFactory::factoryBA(EntityItemPointer ownerEntity, QByteArray data) {
55 EntityItemPointer ownerEntity,
56 QByteArray data) {
57 QDataStream serializedArgumentStream(data);54 QDataStream serializedArgumentStream(data);
58 EntityActionType type;55 EntityActionType type;
59 QUuid id;56 QUuid id;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t