mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 23:53:52 +00:00
Code Issues Releases Wiki Activity

another merge fix

Browse source
This commit is contained in:
Marc Zinnschlag 2010-09-10 13:01:37 +02:00
parent 058f2d0cce
commit 7ea6a75a26
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwscript/cellextensions.cpp
View file

@ -75,7 +75,7 @@ namespace MWScript
const int opcodeCellChanged = 0x2000000; const int opcodeCellChanged = 0x2000000;
const int opcodeCOC = 0x2000026; const int opcodeCOC = 0x2000026;
const int opcodeCOE = 0x200007c; const int opcodeCOE = 0x200008e;
void registerExtensions (Compiler::Extensions& extensions) void registerExtensions (Compiler::Extensions& extensions)
{ {

8
apps/openmw/mwscript/docs/vmformat.txt
View file

@ -88,15 +88,11 @@ op 0x2000078: GetItemCount
op 0x2000079: GetItemCount, explicit reference op 0x2000079: GetItemCount, explicit reference
op 0x200007a: RemoveItem op 0x200007a: RemoveItem
op 0x200007b: RemoveItem, explicit reference op 0x200007b: RemoveItem, explicit reference
<<<<<<< HEAD:apps/openmw/mwscript/docs/vmformat.txt
op 0x200007c: COC
opcodes 0x200007d-0x3ffffff unused
=======
op 0x200007c: GetAiPackageDone op 0x200007c: GetAiPackageDone
op 0x200007d: GetAiPackageDone, explicit reference op 0x200007d: GetAiPackageDone, explicit reference
op 0x200007e-0x2000084: Enable Controls op 0x200007e-0x2000084: Enable Controls
op 0x2000085-0x200008b: Disable Controls op 0x2000085-0x200008b: Disable Controls
op 0x200008c: Unlock op 0x200008c: Unlock
op 0x200008d: Unlock, explicit reference op 0x200008d: Unlock, explicit reference
opcodes 0x200008e-0x3ffffff unused op 0x200008e: COE
>>>>>>> master:apps/openmw/mwscript/docs/vmformat.txt opcodes 0x200008f-0x3ffffff unused