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
3535 }
3636
3737
38−EntityActionPointer InterfaceActionFactory::factory(EntitySimulation* simulation,
39− EntityActionType type,
38+EntityActionPointer InterfaceActionFactory::factory(EntityActionType type,
4039 const QUuid& id,
4140 EntityItemPointer ownerEntity,
4241 QVariantMap arguments) {
@@ -51,9 +50,7 @@ EntityActionPointer InterfaceActionFactory::factory(EntitySimulation* simulation · 8 unmodified lines
5150 }
5251
5352
54−EntityActionPointer InterfaceActionFactory::factoryBA(EntitySimulation* simulation,
55− EntityItemPointer ownerEntity,
56− QByteArray data) {
53+EntityActionPointer InterfaceActionFactory::factoryBA(EntityItemPointer ownerEntity, QByteArray data) {
5754 QDataStream serializedArgumentStream(data);
5855 EntityActionType type;
5956 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