diff options
| author | Paul Gilbert | 2016-03-05 00:12:53 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2016-03-05 00:12:53 -0500 |
| commit | 7e966dbc5e9285da69a55312a81ff280845752ea (patch) | |
| tree | cc72f0be3e71932d4e3290509ba85bd3cc773114 /engines/titanic | |
| parent | 5bdb873c47be734a6086510a6c8ff4cae19db21c (diff) | |
| download | scummvm-rg350-7e966dbc5e9285da69a55312a81ff280845752ea.tar.gz scummvm-rg350-7e966dbc5e9285da69a55312a81ff280845752ea.tar.bz2 scummvm-rg350-7e966dbc5e9285da69a55312a81ff280845752ea.zip | |
TITANIC: gcc compilation fixes
Diffstat (limited to 'engines/titanic')
| -rw-r--r-- | engines/titanic/core/list.h | 2 | ||||
| -rw-r--r-- | engines/titanic/module.mk | 4 | ||||
| -rw-r--r-- | engines/titanic/pet_control/pet_val.cpp | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/engines/titanic/core/list.h b/engines/titanic/core/list.h index 00474b9f23..0ede36e9cc 100644 --- a/engines/titanic/core/list.h +++ b/engines/titanic/core/list.h @@ -70,7 +70,7 @@ public: file->writeNumberLine(Common::List<T *>::size(), indent); // Iterate through writing entries - typename Common::List<typename T *>::const_iterator i; + typename Common::List<T *>::const_iterator i; for (i = Common::List<T *>::begin(); i != Common::List<T *>::end(); ++i) { const ListItem *item = *i; item->saveHeader(file, indent); diff --git a/engines/titanic/module.mk b/engines/titanic/module.mk index 258dc2ede5..f11512eced 100644 --- a/engines/titanic/module.mk +++ b/engines/titanic/module.mk @@ -117,7 +117,6 @@ MODULE_OBJS := \ game/desk_click_responder.o \ game/doorbot_elevator_handler.o \ game/doorbot_home_handler.o \ - game/drawer.o \ game/ear_sweet_bowl.o \ game/eject_phonograph_button.o \ game/elevator_action_area.o \ @@ -166,7 +165,6 @@ MODULE_OBJS := \ game/nose_holder.o \ game/null_port_hole.o \ game/nut_replacer.o \ - game/pet_controler.o \ game/pet_disabler.o \ game/phonograph.o \ game/phonograph_lid.o \ @@ -375,8 +373,6 @@ MODULE_OBJS := \ pet_control/pet_control_list_item.o \ pet_control/pet_control_list_item2.o \ pet_control/pet_control_sub_base.o \ - pet_control/pet_control_sub_list_item.o \ - pet_control/pet_control_sub_list_item2.o \ pet_control/pet_control_sub1.o \ pet_control/pet_control_sub2.o \ pet_control/pet_control_sub3.o \ diff --git a/engines/titanic/pet_control/pet_val.cpp b/engines/titanic/pet_control/pet_val.cpp index f3ee2bf9bf..f0b9b92cde 100644 --- a/engines/titanic/pet_control/pet_val.cpp +++ b/engines/titanic/pet_control/pet_val.cpp @@ -46,7 +46,7 @@ void CPetVal::proc5(CLinkItemSub *linkItem) { } int CPetVal::proc16() { - switch (!_field14) { + switch (_field14) { case 0: return _field18; case 1: |