diff options
| author | Oystein Eftevaag | 2007-10-14 17:00:44 +0000 |
|---|---|---|
| committer | Oystein Eftevaag | 2007-10-14 17:00:44 +0000 |
| commit | 979121ae12997df0b3d282e6421d25fca2638a72 (patch) | |
| tree | 9389fbff252e863dfe92c369a72ff53a518d3901 /engines/kyra | |
| parent | af3b84c29746a2f38de8d009b8e7149470564726 (diff) | |
| download | scummvm-rg350-979121ae12997df0b3d282e6421d25fca2638a72.tar.gz scummvm-rg350-979121ae12997df0b3d282e6421d25fca2638a72.tar.bz2 scummvm-rg350-979121ae12997df0b3d282e6421d25fca2638a72.zip | |
A change got lost while resolving a conflict
svn-id: r29218
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/kyra_v2.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp index 87ab508773..19a4215680 100644 --- a/engines/kyra/kyra_v2.cpp +++ b/engines/kyra/kyra_v2.cpp @@ -1641,7 +1641,6 @@ void KyraEngine_v2::setupOpcodeTable() { // 0x88 Opcode(o2_countItemInstances), OpcodeUnImpl(), - OpcodeUnImpl(), Opcode(o2_initObject), OpcodeUnImpl(), // 0x8c |