From 7ea6a75a26a1e3a7936939c4950738fd05ee8a72 Mon Sep 17 00:00:00 2001 From: Marc Zinnschlag Date: Fri, 10 Sep 2010 13:01:37 +0200 Subject: [PATCH] another merge fix --- apps/openmw/mwscript/cellextensions.cpp | 2 +- apps/openmw/mwscript/docs/vmformat.txt | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/apps/openmw/mwscript/cellextensions.cpp b/apps/openmw/mwscript/cellextensions.cpp index 7d633b59d..93e77ee48 100644 --- a/apps/openmw/mwscript/cellextensions.cpp +++ b/apps/openmw/mwscript/cellextensions.cpp @@ -75,7 +75,7 @@ namespace MWScript const int opcodeCellChanged = 0x2000000; const int opcodeCOC = 0x2000026; - const int opcodeCOE = 0x200007c; + const int opcodeCOE = 0x200008e; void registerExtensions (Compiler::Extensions& extensions) { diff --git a/apps/openmw/mwscript/docs/vmformat.txt b/apps/openmw/mwscript/docs/vmformat.txt index 5eee9dd55..8f606a819 100644 --- a/apps/openmw/mwscript/docs/vmformat.txt +++ b/apps/openmw/mwscript/docs/vmformat.txt @@ -88,15 +88,11 @@ op 0x2000078: GetItemCount op 0x2000079: GetItemCount, explicit reference op 0x200007a: RemoveItem op 0x200007b: RemoveItem, explicit reference -<<<<<<< HEAD:apps/openmw/mwscript/docs/vmformat.txt -op 0x200007c: COC -opcodes 0x200007d-0x3ffffff unused -======= op 0x200007c: GetAiPackageDone op 0x200007d: GetAiPackageDone, explicit reference op 0x200007e-0x2000084: Enable Controls op 0x2000085-0x200008b: Disable Controls op 0x200008c: Unlock op 0x200008d: Unlock, explicit reference -opcodes 0x200008e-0x3ffffff unused ->>>>>>> master:apps/openmw/mwscript/docs/vmformat.txt +op 0x200008e: COE +opcodes 0x200008f-0x3ffffff unused