aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2014-02-06 23:33:16 +0200
committerEugene Sandulenko2014-02-06 23:50:38 +0200
commit998e86ae4e5c8f76523e789de54e09f6184e5244 (patch)
treeee16e708a1fb7a02fa459b486742a78c06ed7fff
parentd492457c34fb13494dfb66786e55dce33d01175c (diff)
downloadscummvm-rg350-998e86ae4e5c8f76523e789de54e09f6184e5244.tar.gz
scummvm-rg350-998e86ae4e5c8f76523e789de54e09f6184e5244.tar.bz2
scummvm-rg350-998e86ae4e5c8f76523e789de54e09f6184e5244.zip
FULLPIPE: Removed cyrillic constants
-rw-r--r--engines/fullpipe/scenes.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index c8916f3a4c..3f9d6c372e 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -31,6 +31,7 @@
#include "fullpipe/behavior.h"
#include "fullpipe/constants.h"
+#include "fullpipe/objectnames.h"
#include "fullpipe/scenes.h"
#include "fullpipe/interaction.h"
@@ -1229,7 +1230,7 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
break;
case SC_23:
- if (getObjectState("Верхний люк_23") == getObjectEnumState("Верхний люк_23", "Открыт")) {
+ if (getObjectState(sO_UpperHatch_23) == getObjectEnumState(sO_UpperHatch_23, sO_Opened)) {
updateMapPiece(PIC_MAP_S23_1, 0);
updateMapPiece(PIC_MAP_S23_2, 1);
updateMapPiece(PIC_MAP_P07, 1);
@@ -1302,7 +1303,7 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
case SC_31:
updateMapPiece(PIC_MAP_S31_2, 1);
- if (getObjectState("Кактус") == getObjectEnumState("Кактус", "Вырос"))
+ if (getObjectState(sO_Cactus) == getObjectEnumState(sO_Cactus, sO_HasGrown))
updateMapPiece(PIC_MAP_S31_1, 1);
if (pre->keyCode == TrubaRight)
@@ -1313,7 +1314,7 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
case SC_32:
updateMapPiece(PIC_MAP_S32_2, 1);
- if (getObjectState("Кактус") == getObjectEnumState("Кактус", "Вырос"))
+ if (getObjectState(sO_Cactus) == getObjectEnumState(sO_Cactus, sO_HasGrown))
updateMapPiece(PIC_MAP_S32_1, 1);
break;