aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorMatthew Hoops2011-05-25 10:45:38 -0400
committerMatthew Hoops2011-05-25 10:50:47 -0400
commite18401a07c7defe7a461d2a78150748ca7833474 (patch)
tree9bb36a1d8db84ec84a988203393b0c640164a3d1 /engines
parentad9c46344cbd1bab1685858ad743f1f12ed15c02 (diff)
downloadscummvm-rg350-e18401a07c7defe7a461d2a78150748ca7833474.tar.gz
scummvm-rg350-e18401a07c7defe7a461d2a78150748ca7833474.tar.bz2
scummvm-rg350-e18401a07c7defe7a461d2a78150748ca7833474.zip
ALL: armour -> armor
Diffstat (limited to 'engines')
-rw-r--r--engines/sky/sound.cpp4
-rw-r--r--engines/sword1/sworddefs.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/sky/sound.cpp b/engines/sky/sound.cpp
index c6bcb2a4c4..e94a2a61d9 100644
--- a/engines/sky/sound.cpp
+++ b/engines/sky/sound.cpp
@@ -313,7 +313,7 @@ static const Sfx fx_hello_helga = {
}
};
-static const Sfx fx_statue_on_armour = {
+static const Sfx fx_statue_on_armor = {
8,
0,
{
@@ -985,7 +985,7 @@ static const Sfx *musicList[] = {
&fx_null, // 365
&fx_break_crystals, // 366
&fx_disintegrate, // 367
- &fx_statue_on_armour, // 368
+ &fx_statue_on_armor, // 368
&fx_null, // 369
&fx_null, // 360
&fx_ping, // 371
diff --git a/engines/sword1/sworddefs.h b/engines/sword1/sworddefs.h
index 460b4dd2d1..15736dcae0 100644
--- a/engines/sword1/sworddefs.h
+++ b/engines/sword1/sworddefs.h
@@ -499,7 +499,7 @@ enum ScriptVariableNames {
CASE_2_LOCKED_FLAG,
CASE_3_LOCKED_FLAG,
CASE_4_LOCKED_FLAG,
- SEEN_ARMOUR_28_FLAG,
+ SEEN_ARMOR_28_FLAG,
CLOSED_WINDOW_28_FLAG,
WINDOW_28_FLAG,
WINDOW_DRAUGHT_FLAG,
@@ -1405,7 +1405,7 @@ enum ScriptVariableNames {
SEEN_STATUE_FLAG,
SYRIA_DEAD_FLAG,
SYRIA_NICHE_FLAG,
- ARMOUR_HIDE_FLAG,
+ ARMOR_HIDE_FLAG,
CANDLE59_FLAG,
CANDLE_BURNT,
CHALICE_FLAG,