UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-27 20:21:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #133 from pharan/patch-3

Browse Source 
changed findEvent to FindEvent (to match change in SkeletonData.cs)
This commit is contained in:
Nathan Sweet 2013-10-09 04:37:42 -07:00
commit 90c49a86f4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spine-csharp/src/SkeletonJson.cs
View File

@ -29,8 +29,8 @@
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*****************************************************************************/ *****************************************************************************/
using System; using System;
using System.IO; using System.IO;
using System.Collections.Generic; using System.Collections.Generic;
@ -354,7 +354,7 @@ namespace Spine {
EventTimeline timeline = new EventTimeline(eventsMap.Count); EventTimeline timeline = new EventTimeline(eventsMap.Count);
int frameIndex = 0; int frameIndex = 0;
foreach (Dictionary<String, Object> eventMap in eventsMap) { foreach (Dictionary<String, Object> eventMap in eventsMap) {
EventData eventData = skeletonData.findEvent((String)eventMap["name"]); EventData eventData = skeletonData.FindEvent((String)eventMap["name"]);
if (eventData == null) throw new Exception("Event not found: " + eventMap["name"]); if (eventData == null) throw new Exception("Event not found: " + eventMap["name"]);
Event e = new Event(eventData); Event e = new Event(eventData);
e.Int = GetInt(eventMap, "int", eventData.Int); e.Int = GetInt(eventMap, "int", eventData.Int);
@ -418,4 +418,4 @@ namespace Spine {
} }
} }
} }
} }