diff options
| -rw-r--r-- | engines/wintermute/ad/ad_actor.cpp (renamed from engines/wintermute/ad/AdActor.cpp) | 34 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_actor.h (renamed from engines/wintermute/ad/AdActor.h) | 6 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_entity.cpp (renamed from engines/wintermute/ad/AdEntity.cpp) | 40 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_entity.h (renamed from engines/wintermute/ad/AdEntity.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_game.cpp (renamed from engines/wintermute/ad/AdGame.cpp) | 62 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_game.h (renamed from engines/wintermute/ad/AdGame.h) | 4 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_inventory.cpp (renamed from engines/wintermute/ad/AdInventory.cpp) | 6 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_inventory.h (renamed from engines/wintermute/ad/AdInventory.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_inventory_box.cpp (renamed from engines/wintermute/ad/AdInventoryBox.cpp) | 22 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_inventory_box.h (renamed from engines/wintermute/ad/AdInventoryBox.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_item.cpp (renamed from engines/wintermute/ad/AdItem.cpp) | 26 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_item.h (renamed from engines/wintermute/ad/AdItem.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_layer.cpp (renamed from engines/wintermute/ad/AdLayer.cpp) | 18 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_layer.h (renamed from engines/wintermute/ad/AdLayer.h) | 0 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_node_state.cpp (renamed from engines/wintermute/ad/AdNodeState.cpp) | 10 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_node_state.h (renamed from engines/wintermute/ad/AdNodeState.h) | 0 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_object.cpp (renamed from engines/wintermute/ad/AdObject.cpp) | 44 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_object.h (renamed from engines/wintermute/ad/AdObject.h) | 4 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_path.cpp (renamed from engines/wintermute/ad/AdPath.cpp) | 4 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_path.h (renamed from engines/wintermute/ad/AdPath.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_path_point.cpp (renamed from engines/wintermute/ad/AdPathPoint.cpp) | 4 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_path_point.h (renamed from engines/wintermute/ad/AdPathPoint.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_region.cpp (renamed from engines/wintermute/ad/AdRegion.cpp) | 14 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_region.h (renamed from engines/wintermute/ad/AdRegion.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_response.cpp (renamed from engines/wintermute/ad/AdResponse.cpp) | 8 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_response.h (renamed from engines/wintermute/ad/AdResponse.h) | 4 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_response_box.cpp (renamed from engines/wintermute/ad/AdResponseBox.cpp) | 28 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_response_box.h (renamed from engines/wintermute/ad/AdResponseBox.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_response_context.cpp (renamed from engines/wintermute/ad/AdResponseContext.cpp) | 4 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_response_context.h (renamed from engines/wintermute/ad/AdResponseContext.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_rot_level.cpp (renamed from engines/wintermute/ad/AdRotLevel.cpp) | 12 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_rot_level.h (renamed from engines/wintermute/ad/AdRotLevel.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_scale_level.cpp (renamed from engines/wintermute/ad/AdScaleLevel.cpp) | 10 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_scale_level.h (renamed from engines/wintermute/ad/AdScaleLevel.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_scene.cpp (renamed from engines/wintermute/ad/AdScene.cpp) | 60 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_scene.h (renamed from engines/wintermute/ad/AdScene.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_scene_node.cpp (renamed from engines/wintermute/ad/AdSceneNode.cpp) | 4 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_scene_node.h (renamed from engines/wintermute/ad/AdSceneNode.h) | 6 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_scene_state.cpp (renamed from engines/wintermute/ad/AdSceneState.cpp) | 4 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_scene_state.h (renamed from engines/wintermute/ad/AdSceneState.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_sentence.cpp (renamed from engines/wintermute/ad/AdSentence.cpp) | 22 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_sentence.h (renamed from engines/wintermute/ad/AdSentence.h) | 4 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_sprite_set.cpp (renamed from engines/wintermute/ad/AdSpriteSet.cpp) | 10 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_sprite_set.h (renamed from engines/wintermute/ad/AdSpriteSet.h) | 4 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_talk_def.cpp (renamed from engines/wintermute/ad/AdTalkDef.cpp) | 16 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_talk_def.h (renamed from engines/wintermute/ad/AdTalkDef.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_talk_holder.cpp (renamed from engines/wintermute/ad/AdTalkHolder.cpp) | 14 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_talk_holder.h (renamed from engines/wintermute/ad/AdTalkHolder.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_talk_node.cpp (renamed from engines/wintermute/ad/AdTalkNode.cpp) | 12 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_talk_node.h (renamed from engines/wintermute/ad/AdTalkNode.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_types.h (renamed from engines/wintermute/ad/AdTypes.h) | 0 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_waypoint_group.cpp (renamed from engines/wintermute/ad/AdWaypointGroup.cpp) | 14 | ||||
| -rw-r--r-- | engines/wintermute/ad/ad_waypoint_group.h (renamed from engines/wintermute/ad/AdWaypointGroup.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/base.cpp (renamed from engines/wintermute/base/BBase.cpp) | 8 | ||||
| -rw-r--r-- | engines/wintermute/base/base.h (renamed from engines/wintermute/base/BBase.h) | 0 | ||||
| -rw-r--r-- | engines/wintermute/base/base_active_rect.cpp (renamed from engines/wintermute/base/BActiveRect.cpp) | 6 | ||||
| -rw-r--r-- | engines/wintermute/base/base_active_rect.h (renamed from engines/wintermute/base/BActiveRect.h) | 4 | ||||
| -rw-r--r-- | engines/wintermute/base/base_debugger.cpp (renamed from engines/wintermute/base/BDebugger.cpp) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/base_debugger.h (renamed from engines/wintermute/base/BDebugger.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/base_dynamic_buffer.cpp (renamed from engines/wintermute/base/BDynBuffer.cpp) | 4 | ||||
| -rw-r--r-- | engines/wintermute/base/base_dynamic_buffer.h (renamed from engines/wintermute/base/BDynBuffer.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/base_fader.cpp (renamed from engines/wintermute/base/BFader.cpp) | 4 | ||||
| -rw-r--r-- | engines/wintermute/base/base_fader.h (renamed from engines/wintermute/base/BFader.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/base_file_manager.cpp (renamed from engines/wintermute/base/BFileManager.cpp) | 20 | ||||
| -rw-r--r-- | engines/wintermute/base/base_file_manager.h (renamed from engines/wintermute/base/BFileManager.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/base_frame.cpp (renamed from engines/wintermute/base/BFrame.cpp) | 20 | ||||
| -rw-r--r-- | engines/wintermute/base/base_frame.h (renamed from engines/wintermute/base/BFrame.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/base_game.cpp (renamed from engines/wintermute/base/BGame.cpp) | 59 | ||||
| -rw-r--r-- | engines/wintermute/base/base_game.h (renamed from engines/wintermute/base/BGame.h) | 6 | ||||
| -rw-r--r-- | engines/wintermute/base/base_keyboard_state.cpp (renamed from engines/wintermute/base/BKeyboardState.cpp) | 6 | ||||
| -rw-r--r-- | engines/wintermute/base/base_keyboard_state.h (renamed from engines/wintermute/base/BKeyboardState.h) | 4 | ||||
| -rw-r--r-- | engines/wintermute/base/base_named_object.cpp (renamed from engines/wintermute/base/BNamedObject.cpp) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/base_named_object.h (renamed from engines/wintermute/base/BNamedObject.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/base_object.cpp (renamed from engines/wintermute/base/BObject.cpp) | 18 | ||||
| -rw-r--r-- | engines/wintermute/base/base_object.h (renamed from engines/wintermute/base/BObject.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/base_parser.cpp (renamed from engines/wintermute/base/BParser.cpp) | 4 | ||||
| -rw-r--r-- | engines/wintermute/base/base_parser.h (renamed from engines/wintermute/base/BParser.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/base_persistence_manager.cpp (renamed from engines/wintermute/base/BPersistMgr.cpp) | 14 | ||||
| -rw-r--r-- | engines/wintermute/base/base_persistence_manager.h (renamed from engines/wintermute/base/BPersistMgr.h) | 4 | ||||
| -rw-r--r-- | engines/wintermute/base/base_point.cpp (renamed from engines/wintermute/base/BPoint.cpp) | 4 | ||||
| -rw-r--r-- | engines/wintermute/base/base_point.h (renamed from engines/wintermute/base/BPoint.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/base_quick_msg.cpp (renamed from engines/wintermute/base/BQuickMsg.cpp) | 4 | ||||
| -rw-r--r-- | engines/wintermute/base/base_quick_msg.h (renamed from engines/wintermute/base/BQuickMsg.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/base_region.cpp (renamed from engines/wintermute/base/BRegion.cpp) | 16 | ||||
| -rw-r--r-- | engines/wintermute/base/base_region.h (renamed from engines/wintermute/base/BRegion.h) | 4 | ||||
| -rw-r--r-- | engines/wintermute/base/base_registry.cpp (renamed from engines/wintermute/base/BRegistry.cpp) | 8 | ||||
| -rw-r--r-- | engines/wintermute/base/base_registry.h (renamed from engines/wintermute/base/BRegistry.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/base_save_thumb_helper.cpp (renamed from engines/wintermute/base/BSaveThumbHelper.cpp) | 4 | ||||
| -rw-r--r-- | engines/wintermute/base/base_save_thumb_helper.h (renamed from engines/wintermute/base/BSaveThumbHelper.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/base_script_holder.cpp (renamed from engines/wintermute/base/BScriptHolder.cpp) | 14 | ||||
| -rw-r--r-- | engines/wintermute/base/base_script_holder.h (renamed from engines/wintermute/base/BScriptHolder.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/base_scriptable.cpp (renamed from engines/wintermute/base/BScriptable.cpp) | 6 | ||||
| -rw-r--r-- | engines/wintermute/base/base_scriptable.h (renamed from engines/wintermute/base/BScriptable.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/base_sprite.cpp (renamed from engines/wintermute/base/BSprite.cpp) | 26 | ||||
| -rw-r--r-- | engines/wintermute/base/base_sprite.h (renamed from engines/wintermute/base/BSprite.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/base_string_table.cpp (renamed from engines/wintermute/base/BStringTable.cpp) | 8 | ||||
| -rw-r--r-- | engines/wintermute/base/base_string_table.h (renamed from engines/wintermute/base/BStringTable.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/base_sub_frame.cpp (renamed from engines/wintermute/base/BSubFrame.cpp) | 16 | ||||
| -rw-r--r-- | engines/wintermute/base/base_sub_frame.h (renamed from engines/wintermute/base/BSubFrame.h) | 4 | ||||
| -rw-r--r-- | engines/wintermute/base/base_surface_storage.cpp (renamed from engines/wintermute/base/BSurfaceStorage.cpp) | 6 | ||||
| -rw-r--r-- | engines/wintermute/base/base_surface_storage.h (renamed from engines/wintermute/base/BSurfaceStorage.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/base_transition_manager.cpp (renamed from engines/wintermute/base/BTransitionMgr.cpp) | 4 | ||||
| -rw-r--r-- | engines/wintermute/base/base_transition_manager.h (renamed from engines/wintermute/base/BTransitionMgr.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/base_viewport.cpp (renamed from engines/wintermute/base/BViewport.cpp) | 4 | ||||
| -rw-r--r-- | engines/wintermute/base/base_viewport.h (renamed from engines/wintermute/base/BViewport.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/file/BPkgFile.cpp | 6 | ||||
| -rw-r--r-- | engines/wintermute/base/file/BPkgFile.h | 5 | ||||
| -rw-r--r-- | engines/wintermute/base/file/base_disk_file.cpp (renamed from engines/wintermute/base/file/BDiskFile.cpp) | 6 | ||||
| -rw-r--r-- | engines/wintermute/base/file/base_disk_file.h (renamed from engines/wintermute/base/file/BDiskFile.h) | 0 | ||||
| -rw-r--r-- | engines/wintermute/base/file/base_file.cpp (renamed from engines/wintermute/base/file/BFile.cpp) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/file/base_file.h (renamed from engines/wintermute/base/file/BFile.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/file/base_file_entry.cpp (renamed from engines/wintermute/base/file/BFileEntry.cpp) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/file/base_file_entry.h (renamed from engines/wintermute/base/file/BFileEntry.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/file/base_package.cpp (renamed from engines/wintermute/base/file/BPackage.cpp) | 6 | ||||
| -rw-r--r-- | engines/wintermute/base/file/base_package.h (renamed from engines/wintermute/base/file/BPackage.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/file/base_resources.cpp (renamed from engines/wintermute/base/BResources.cpp) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/file/base_resources.h (renamed from engines/wintermute/base/BResources.h) | 0 | ||||
| -rw-r--r-- | engines/wintermute/base/file/base_save_thumb_file.cpp (renamed from engines/wintermute/base/file/BSaveThumbFile.cpp) | 4 | ||||
| -rw-r--r-- | engines/wintermute/base/file/base_save_thumb_file.h (renamed from engines/wintermute/base/file/BSaveThumbFile.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/font/base_font.cpp (renamed from engines/wintermute/base/font/BFont.cpp) | 12 | ||||
| -rw-r--r-- | engines/wintermute/base/font/base_font.h (renamed from engines/wintermute/base/font/BFont.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/font/base_font_bitmap.cpp (renamed from engines/wintermute/base/font/BFontBitmap.cpp) | 18 | ||||
| -rw-r--r-- | engines/wintermute/base/font/base_font_bitmap.h (renamed from engines/wintermute/base/font/BFontBitmap.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/font/base_font_storage.cpp (renamed from engines/wintermute/base/font/BFontStorage.cpp) | 6 | ||||
| -rw-r--r-- | engines/wintermute/base/font/base_font_storage.h (renamed from engines/wintermute/base/font/BFontStorage.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/font/base_font_truetype.cpp (renamed from engines/wintermute/base/font/BFontTT.cpp) | 16 | ||||
| -rw-r--r-- | engines/wintermute/base/font/base_font_truetype.h (renamed from engines/wintermute/base/font/BFontTT.h) | 4 | ||||
| -rw-r--r-- | engines/wintermute/base/gfx/base_image.cpp | 8 | ||||
| -rw-r--r-- | engines/wintermute/base/gfx/base_image.h | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/gfx/base_renderer.cpp | 6 | ||||
| -rw-r--r-- | engines/wintermute/base/gfx/base_renderer.h | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/gfx/base_surface.cpp | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/gfx/base_surface.h | 4 | ||||
| -rw-r--r-- | engines/wintermute/base/gfx/osystem/base_render_osystem.cpp | 12 | ||||
| -rw-r--r-- | engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp | 8 | ||||
| -rw-r--r-- | engines/wintermute/base/particles/part_emitter.cpp (renamed from engines/wintermute/base/particles/PartEmitter.cpp) | 16 | ||||
| -rw-r--r-- | engines/wintermute/base/particles/part_emitter.h (renamed from engines/wintermute/base/particles/PartEmitter.h) | 4 | ||||
| -rw-r--r-- | engines/wintermute/base/particles/part_force.cpp (renamed from engines/wintermute/base/particles/PartForce.cpp) | 4 | ||||
| -rw-r--r-- | engines/wintermute/base/particles/part_force.h (renamed from engines/wintermute/base/particles/PartForce.h) | 6 | ||||
| -rw-r--r-- | engines/wintermute/base/particles/part_particle.cpp (renamed from engines/wintermute/base/particles/PartParticle.cpp) | 8 | ||||
| -rw-r--r-- | engines/wintermute/base/particles/part_particle.h (renamed from engines/wintermute/base/particles/PartParticle.h) | 6 | ||||
| -rw-r--r-- | engines/wintermute/base/scriptables/script.cpp (renamed from engines/wintermute/base/scriptables/ScScript.cpp) | 10 | ||||
| -rw-r--r-- | engines/wintermute/base/scriptables/script.h (renamed from engines/wintermute/base/scriptables/ScScript.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/scriptables/script_engine.cpp (renamed from engines/wintermute/base/scriptables/ScEngine.cpp) | 20 | ||||
| -rw-r--r-- | engines/wintermute/base/scriptables/script_engine.h (renamed from engines/wintermute/base/scriptables/ScEngine.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/scriptables/script_ext_array.cpp (renamed from engines/wintermute/base/scriptables/SXArray.cpp) | 8 | ||||
| -rw-r--r-- | engines/wintermute/base/scriptables/script_ext_array.h (renamed from engines/wintermute/base/scriptables/SXArray.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/scriptables/script_ext_date.cpp (renamed from engines/wintermute/base/scriptables/SXDate.cpp) | 6 | ||||
| -rw-r--r-- | engines/wintermute/base/scriptables/script_ext_date.h (renamed from engines/wintermute/base/scriptables/SXDate.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/scriptables/script_ext_file.cpp (renamed from engines/wintermute/base/scriptables/SXFile.cpp) | 18 | ||||
| -rw-r--r-- | engines/wintermute/base/scriptables/script_ext_file.h (renamed from engines/wintermute/base/scriptables/SXFile.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/scriptables/script_ext_math.cpp (renamed from engines/wintermute/base/scriptables/SXMath.cpp) | 6 | ||||
| -rw-r--r-- | engines/wintermute/base/scriptables/script_ext_math.h (renamed from engines/wintermute/base/scriptables/SXMath.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp (renamed from engines/wintermute/base/scriptables/SXMemBuffer.cpp) | 10 | ||||
| -rw-r--r-- | engines/wintermute/base/scriptables/script_ext_mem_buffer.h (renamed from engines/wintermute/base/scriptables/SXMemBuffer.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/scriptables/script_ext_object.cpp (renamed from engines/wintermute/base/scriptables/SxObject.cpp) | 6 | ||||
| -rw-r--r-- | engines/wintermute/base/scriptables/script_ext_object.h (renamed from engines/wintermute/base/scriptables/SxObject.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/scriptables/script_ext_string.cpp (renamed from engines/wintermute/base/scriptables/SXString.cpp) | 12 | ||||
| -rw-r--r-- | engines/wintermute/base/scriptables/script_ext_string.h (renamed from engines/wintermute/base/scriptables/SXString.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/scriptables/script_stack.cpp (renamed from engines/wintermute/base/scriptables/ScStack.cpp) | 6 | ||||
| -rw-r--r-- | engines/wintermute/base/scriptables/script_stack.h (renamed from engines/wintermute/base/scriptables/ScStack.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/scriptables/script_value.cpp (renamed from engines/wintermute/base/scriptables/ScValue.cpp) | 12 | ||||
| -rw-r--r-- | engines/wintermute/base/scriptables/script_value.h (renamed from engines/wintermute/base/scriptables/ScValue.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/sound/base_sound.cpp (renamed from engines/wintermute/base/BSound.cpp) | 8 | ||||
| -rw-r--r-- | engines/wintermute/base/sound/base_sound.h (renamed from engines/wintermute/base/BSound.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/sound/base_sound_buffer.cpp (renamed from engines/wintermute/base/BSoundBuffer.cpp) | 10 | ||||
| -rw-r--r-- | engines/wintermute/base/sound/base_sound_buffer.h (renamed from engines/wintermute/base/BSoundBuffer.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/sound/base_sound_manager.cpp (renamed from engines/wintermute/base/BSoundMgr.cpp) | 14 | ||||
| -rw-r--r-- | engines/wintermute/base/sound/base_sound_manager.h (renamed from engines/wintermute/base/BSoundMgr.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/coll_templ.h | 4 | ||||
| -rw-r--r-- | engines/wintermute/detection.cpp | 2 | ||||
| -rw-r--r-- | engines/wintermute/graphics/transparent_surface.cpp (renamed from engines/wintermute/graphics/transparentSurface.cpp) | 2 | ||||
| -rw-r--r-- | engines/wintermute/graphics/transparent_surface.h (renamed from engines/wintermute/graphics/transparentSurface.h) | 0 | ||||
| -rw-r--r-- | engines/wintermute/math/math_util.cpp (renamed from engines/wintermute/math/MathUtil.cpp) | 2 | ||||
| -rw-r--r-- | engines/wintermute/math/math_util.h (renamed from engines/wintermute/math/MathUtil.h) | 0 | ||||
| -rw-r--r-- | engines/wintermute/math/matrix4.cpp (renamed from engines/wintermute/math/Matrix4.cpp) | 4 | ||||
| -rw-r--r-- | engines/wintermute/math/matrix4.h (renamed from engines/wintermute/math/Matrix4.h) | 0 | ||||
| -rw-r--r-- | engines/wintermute/math/rect32.h (renamed from engines/wintermute/math/Rect32.h) | 0 | ||||
| -rw-r--r-- | engines/wintermute/math/vector2.cpp (renamed from engines/wintermute/math/Vector2.cpp) | 2 | ||||
| -rw-r--r-- | engines/wintermute/math/vector2.h (renamed from engines/wintermute/math/Vector2.h) | 0 | ||||
| -rw-r--r-- | engines/wintermute/module.mk | 196 | ||||
| -rw-r--r-- | engines/wintermute/persistent.cpp | 122 | ||||
| -rw-r--r-- | engines/wintermute/persistent.h | 2 | ||||
| -rw-r--r-- | engines/wintermute/platform_osystem.cpp | 10 | ||||
| -rw-r--r-- | engines/wintermute/platform_osystem.h | 2 | ||||
| -rw-r--r-- | engines/wintermute/system/sys_class.cpp (renamed from engines/wintermute/system/SysClass.cpp) | 10 | ||||
| -rw-r--r-- | engines/wintermute/system/sys_class.h (renamed from engines/wintermute/system/SysClass.h) | 0 | ||||
| -rw-r--r-- | engines/wintermute/system/sys_class_registry.cpp (renamed from engines/wintermute/system/SysClassRegistry.cpp) | 8 | ||||
| -rw-r--r-- | engines/wintermute/system/sys_class_registry.h (renamed from engines/wintermute/system/SysClassRegistry.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/system/sys_instance.cpp (renamed from engines/wintermute/system/SysInstance.cpp) | 6 | ||||
| -rw-r--r-- | engines/wintermute/system/sys_instance.h (renamed from engines/wintermute/system/SysInstance.h) | 0 | ||||
| -rw-r--r-- | engines/wintermute/ui/ui_button.cpp (renamed from engines/wintermute/ui/UIButton.cpp) | 28 | ||||
| -rw-r--r-- | engines/wintermute/ui/ui_button.h (renamed from engines/wintermute/ui/UIButton.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/ui/ui_edit.cpp (renamed from engines/wintermute/ui/UIEdit.cpp) | 34 | ||||
| -rw-r--r-- | engines/wintermute/ui/ui_edit.h (renamed from engines/wintermute/ui/UIEdit.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/ui/ui_entity.cpp (renamed from engines/wintermute/ui/UIEntity.cpp) | 18 | ||||
| -rw-r--r-- | engines/wintermute/ui/ui_entity.h (renamed from engines/wintermute/ui/UIEntity.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/ui/ui_object.cpp (renamed from engines/wintermute/ui/UIObject.cpp) | 16 | ||||
| -rw-r--r-- | engines/wintermute/ui/ui_object.h (renamed from engines/wintermute/ui/UIObject.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/ui/ui_text.cpp (renamed from engines/wintermute/ui/UIText.cpp) | 26 | ||||
| -rw-r--r-- | engines/wintermute/ui/ui_text.h (renamed from engines/wintermute/ui/UIText.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/ui/ui_tiled_image.cpp (renamed from engines/wintermute/ui/UITiledImage.cpp) | 12 | ||||
| -rw-r--r-- | engines/wintermute/ui/ui_tiled_image.h (renamed from engines/wintermute/ui/UITiledImage.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/ui/ui_window.cpp (renamed from engines/wintermute/ui/UIWindow.cpp) | 38 | ||||
| -rw-r--r-- | engines/wintermute/ui/ui_window.h (renamed from engines/wintermute/ui/UIWindow.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/utils/convert_utf.cpp (renamed from engines/wintermute/utils/ConvertUTF.cpp) | 2 | ||||
| -rw-r--r-- | engines/wintermute/utils/convert_utf.h (renamed from engines/wintermute/utils/ConvertUTF.h) | 0 | ||||
| -rw-r--r-- | engines/wintermute/utils/crc.cpp | 2 | ||||
| -rw-r--r-- | engines/wintermute/utils/path_util.cpp (renamed from engines/wintermute/utils/PathUtil.cpp) | 4 | ||||
| -rw-r--r-- | engines/wintermute/utils/path_util.h (renamed from engines/wintermute/utils/PathUtil.h) | 0 | ||||
| -rw-r--r-- | engines/wintermute/utils/string_util.cpp (renamed from engines/wintermute/utils/StringUtil.cpp) | 4 | ||||
| -rw-r--r-- | engines/wintermute/utils/string_util.h (renamed from engines/wintermute/utils/StringUtil.h) | 0 | ||||
| -rw-r--r-- | engines/wintermute/utils/utils.cpp | 6 | ||||
| -rw-r--r-- | engines/wintermute/utils/utils.h | 2 | ||||
| -rw-r--r-- | engines/wintermute/video/video_player.cpp (renamed from engines/wintermute/video/VidPlayer.cpp) | 2 | ||||
| -rw-r--r-- | engines/wintermute/video/video_player.h (renamed from engines/wintermute/video/VidPlayer.h) | 2 | ||||
| -rw-r--r-- | engines/wintermute/video/video_theora_player.cpp (renamed from engines/wintermute/video/VidTheoraPlayer.cpp) | 10 | ||||
| -rw-r--r-- | engines/wintermute/video/video_theora_player.h (renamed from engines/wintermute/video/VidTheoraPlayer.h) | 4 | ||||
| -rw-r--r-- | engines/wintermute/wintermute.cpp | 8 |
219 files changed, 947 insertions, 943 deletions
diff --git a/engines/wintermute/ad/AdActor.cpp b/engines/wintermute/ad/ad_actor.cpp index 050a419e53..36f1aa8286 100644 --- a/engines/wintermute/ad/AdActor.cpp +++ b/engines/wintermute/ad/ad_actor.cpp @@ -29,23 +29,23 @@ #include "engines/wintermute/dcgf.h"
#include "engines/wintermute/dctypes.h"
#include "engines/wintermute/persistent.h"
-#include "engines/wintermute/base/BObject.h"
-#include "engines/wintermute/ad/AdActor.h"
-#include "engines/wintermute/ad/AdGame.h"
-#include "engines/wintermute/ad/AdScene.h"
-#include "engines/wintermute/ad/AdEntity.h"
-#include "engines/wintermute/ad/AdSpriteSet.h"
-#include "engines/wintermute/ad/AdWaypointGroup.h"
-#include "engines/wintermute/ad/AdPath.h"
-#include "engines/wintermute/ad/AdSentence.h"
-#include "engines/wintermute/base/BObject.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BSound.h"
-#include "engines/wintermute/base/BRegion.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/base/base_object.h"
+#include "engines/wintermute/ad/ad_actor.h"
+#include "engines/wintermute/ad/ad_game.h"
+#include "engines/wintermute/ad/ad_scene.h"
+#include "engines/wintermute/ad/ad_entity.h"
+#include "engines/wintermute/ad/ad_sprite_set.h"
+#include "engines/wintermute/ad/ad_waypoint_group.h"
+#include "engines/wintermute/ad/ad_path.h"
+#include "engines/wintermute/ad/ad_sentence.h"
+#include "engines/wintermute/base/base_object.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/sound/base_sound.h"
+#include "engines/wintermute/base/base_region.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
#include "engines/wintermute/utils/utils.h"
#include "engines/wintermute/platform_osystem.h"
#include "engines/wintermute/wintermute.h"
diff --git a/engines/wintermute/ad/AdActor.h b/engines/wintermute/ad/ad_actor.h index 1be8b8131d..ca79f638d9 100644 --- a/engines/wintermute/ad/AdActor.h +++ b/engines/wintermute/ad/ad_actor.h @@ -31,9 +31,9 @@ #include "engines/wintermute/dctypes.h" // Added by ClassView
-#include "engines/wintermute/ad/AdTypes.h" // Added by ClassView
-#include "engines/wintermute/ad/AdTalkHolder.h"
-#include "engines/wintermute/base/BPoint.h" // Added by ClassView
+#include "engines/wintermute/ad/ad_types.h" // Added by ClassView
+#include "engines/wintermute/ad/ad_talk_holder.h"
+#include "engines/wintermute/base/base_point.h" // Added by ClassView
#include "engines/wintermute/persistent.h"
#include "common/str.h"
diff --git a/engines/wintermute/ad/AdEntity.cpp b/engines/wintermute/ad/ad_entity.cpp index 49c723f66a..5f32017264 100644 --- a/engines/wintermute/ad/AdEntity.cpp +++ b/engines/wintermute/ad/ad_entity.cpp @@ -29,28 +29,28 @@ #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdEntity.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BActiveRect.h"
-#include "engines/wintermute/base/BSurfaceStorage.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/ad/AdGame.h"
-#include "engines/wintermute/ad/AdScene.h"
-#include "engines/wintermute/base/BSound.h"
-#include "engines/wintermute/ad/AdWaypointGroup.h"
-#include "engines/wintermute/base/font/BFontStorage.h"
-#include "engines/wintermute/base/font/BFont.h"
-#include "engines/wintermute/ad/AdSentence.h"
-#include "engines/wintermute/base/BRegion.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/ad/ad_entity.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_active_rect.h"
+#include "engines/wintermute/base/base_surface_storage.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/ad/ad_game.h"
+#include "engines/wintermute/ad/ad_scene.h"
+#include "engines/wintermute/base/sound/base_sound.h"
+#include "engines/wintermute/ad/ad_waypoint_group.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/ad/ad_sentence.h"
+#include "engines/wintermute/base/base_region.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/platform_osystem.h"
#include "engines/wintermute/utils/utils.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/video/VidTheoraPlayer.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/video/video_theora_player.h"
#include "common/str.h"
namespace WinterMute {
diff --git a/engines/wintermute/ad/AdEntity.h b/engines/wintermute/ad/ad_entity.h index a260ca3329..8b67d27c1f 100644 --- a/engines/wintermute/ad/AdEntity.h +++ b/engines/wintermute/ad/ad_entity.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_ADENTITY_H
#define WINTERMUTE_ADENTITY_H
-#include "engines/wintermute/ad/AdTalkHolder.h"
+#include "engines/wintermute/ad/ad_talk_holder.h"
namespace WinterMute {
class CVidTheoraPlayer;
diff --git a/engines/wintermute/ad/AdGame.cpp b/engines/wintermute/ad/ad_game.cpp index 87e3fe14d9..69cda25f29 100644 --- a/engines/wintermute/ad/AdGame.cpp +++ b/engines/wintermute/ad/ad_game.cpp @@ -27,38 +27,38 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdActor.h"
-#include "engines/wintermute/ad/AdGame.h"
-#include "engines/wintermute/ad/AdEntity.h"
-#include "engines/wintermute/ad/AdInventory.h"
-#include "engines/wintermute/ad/AdInventoryBox.h"
-#include "engines/wintermute/ad/AdItem.h"
-#include "engines/wintermute/ad/AdResponse.h"
-#include "engines/wintermute/ad/AdResponseBox.h"
-#include "engines/wintermute/ad/AdResponseContext.h"
-#include "engines/wintermute/ad/AdScene.h"
-#include "engines/wintermute/ad/AdSceneState.h"
-#include "engines/wintermute/ad/AdSentence.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/base/font/BFont.h"
-#include "engines/wintermute/base/BObject.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BSound.h"
-#include "engines/wintermute/base/BStringTable.h"
-#include "engines/wintermute/base/BSurfaceStorage.h"
-#include "engines/wintermute/base/BTransitionMgr.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BViewport.h"
-#include "engines/wintermute/base/particles/PartEmitter.h"
-#include "engines/wintermute/base/scriptables/ScEngine.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/ui/UIEntity.h"
-#include "engines/wintermute/ui/UIWindow.h"
+#include "engines/wintermute/ad/ad_actor.h"
+#include "engines/wintermute/ad/ad_game.h"
+#include "engines/wintermute/ad/ad_entity.h"
+#include "engines/wintermute/ad/ad_inventory.h"
+#include "engines/wintermute/ad/ad_inventory_box.h"
+#include "engines/wintermute/ad/ad_item.h"
+#include "engines/wintermute/ad/ad_response.h"
+#include "engines/wintermute/ad/ad_response_box.h"
+#include "engines/wintermute/ad/ad_response_context.h"
+#include "engines/wintermute/ad/ad_scene.h"
+#include "engines/wintermute/ad/ad_scene_state.h"
+#include "engines/wintermute/ad/ad_sentence.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/base/base_object.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/sound/base_sound.h"
+#include "engines/wintermute/base/base_string_table.h"
+#include "engines/wintermute/base/base_surface_storage.h"
+#include "engines/wintermute/base/base_transition_manager.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_viewport.h"
+#include "engines/wintermute/base/particles/part_emitter.h"
+#include "engines/wintermute/base/scriptables/script_engine.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/ui/ui_entity.h"
+#include "engines/wintermute/ui/ui_window.h"
#include "engines/wintermute/utils/utils.h"
-#include "engines/wintermute/video/VidPlayer.h"
-#include "engines/wintermute/video/VidTheoraPlayer.h"
+#include "engines/wintermute/video/video_player.h"
+#include "engines/wintermute/video/video_theora_player.h"
#include "common/str.h"
namespace WinterMute {
diff --git a/engines/wintermute/ad/AdGame.h b/engines/wintermute/ad/ad_game.h index 4a89fa97d2..09b3e09df0 100644 --- a/engines/wintermute/ad/AdGame.h +++ b/engines/wintermute/ad/ad_game.h @@ -28,8 +28,8 @@ #ifndef WINTERMUTE_ADGAME_H
#define WINTERMUTE_ADGAME_H
-#include "engines/wintermute/ad/AdTypes.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/ad/ad_types.h"
+#include "engines/wintermute/base/base_game.h"
namespace WinterMute {
class CAdItem;
diff --git a/engines/wintermute/ad/AdInventory.cpp b/engines/wintermute/ad/ad_inventory.cpp index f913108404..cfbc9e5029 100644 --- a/engines/wintermute/ad/AdInventory.cpp +++ b/engines/wintermute/ad/ad_inventory.cpp @@ -26,9 +26,9 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/ad/AdInventory.h"
-#include "engines/wintermute/ad/AdGame.h"
-#include "engines/wintermute/ad/AdItem.h"
+#include "engines/wintermute/ad/ad_inventory.h"
+#include "engines/wintermute/ad/ad_game.h"
+#include "engines/wintermute/ad/ad_item.h"
#include "engines/wintermute/platform_osystem.h"
#include "common/str.h"
diff --git a/engines/wintermute/ad/AdInventory.h b/engines/wintermute/ad/ad_inventory.h index cec76c03a0..84d9308d5d 100644 --- a/engines/wintermute/ad/AdInventory.h +++ b/engines/wintermute/ad/ad_inventory.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_ADINVENTORY_H
#define WINTERMUTE_ADINVENTORY_H
-#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/base_object.h"
namespace WinterMute {
diff --git a/engines/wintermute/ad/AdInventoryBox.cpp b/engines/wintermute/ad/ad_inventory_box.cpp index 9509bf9b10..abe8676376 100644 --- a/engines/wintermute/ad/AdInventoryBox.cpp +++ b/engines/wintermute/ad/ad_inventory_box.cpp @@ -26,17 +26,17 @@ * Copyright (c) 2011 Jan Nedoma
*/
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdGame.h"
-#include "engines/wintermute/ad/AdInventoryBox.h"
-#include "engines/wintermute/ad/AdInventory.h"
-#include "engines/wintermute/ad/AdItem.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/base/BViewport.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/ui/UIButton.h"
-#include "engines/wintermute/ui/UIWindow.h"
+#include "engines/wintermute/ad/ad_game.h"
+#include "engines/wintermute/ad/ad_inventory_box.h"
+#include "engines/wintermute/ad/ad_inventory.h"
+#include "engines/wintermute/ad/ad_item.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/base_viewport.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/ui/ui_button.h"
+#include "engines/wintermute/ui/ui_window.h"
#include "engines/wintermute/platform_osystem.h"
#include "common/str.h"
#include "common/rect.h"
diff --git a/engines/wintermute/ad/AdInventoryBox.h b/engines/wintermute/ad/ad_inventory_box.h index cfd8d74021..09d3ef409e 100644 --- a/engines/wintermute/ad/AdInventoryBox.h +++ b/engines/wintermute/ad/ad_inventory_box.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_ADINVENTORYBOX_H
#define WINTERMUTE_ADINVENTORYBOX_H
-#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/base_object.h"
#include "common/rect.h"
namespace WinterMute {
diff --git a/engines/wintermute/ad/AdItem.cpp b/engines/wintermute/ad/ad_item.cpp index 0e443d5c3e..9c49a86bcb 100644 --- a/engines/wintermute/ad/AdItem.cpp +++ b/engines/wintermute/ad/ad_item.cpp @@ -27,21 +27,21 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdItem.h"
-#include "engines/wintermute/ad/AdGame.h"
-#include "engines/wintermute/ad/AdSentence.h"
-#include "engines/wintermute/base/font/BFontStorage.h"
-#include "engines/wintermute/base/font/BFont.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BSound.h"
-#include "engines/wintermute/base/BSprite.h"
+#include "engines/wintermute/ad/ad_item.h"
+#include "engines/wintermute/ad/ad_game.h"
+#include "engines/wintermute/ad/ad_sentence.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/sound/base_sound.h"
+#include "engines/wintermute/base/base_sprite.h"
#include "engines/wintermute/utils/utils.h"
#include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
#include "common/str.h"
namespace WinterMute {
diff --git a/engines/wintermute/ad/AdItem.h b/engines/wintermute/ad/ad_item.h index d45f9cc614..34b19a830f 100644 --- a/engines/wintermute/ad/AdItem.h +++ b/engines/wintermute/ad/ad_item.h @@ -30,7 +30,7 @@ #define WINTERMUTE_ADITEM_H
-#include "engines/wintermute/ad/AdTalkHolder.h"
+#include "engines/wintermute/ad/ad_talk_holder.h"
namespace WinterMute {
diff --git a/engines/wintermute/ad/AdLayer.cpp b/engines/wintermute/ad/ad_layer.cpp index 4549ba4af7..e23948ed87 100644 --- a/engines/wintermute/ad/AdLayer.cpp +++ b/engines/wintermute/ad/ad_layer.cpp @@ -27,15 +27,15 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/ad/AdLayer.h"
-#include "engines/wintermute/ad/AdSceneNode.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/ad/ad_layer.h"
+#include "engines/wintermute/ad/ad_scene_node.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/platform_osystem.h"
#include "common/str.h"
diff --git a/engines/wintermute/ad/AdLayer.h b/engines/wintermute/ad/ad_layer.h index 0ccdb13ae7..0ccdb13ae7 100644 --- a/engines/wintermute/ad/AdLayer.h +++ b/engines/wintermute/ad/ad_layer.h diff --git a/engines/wintermute/ad/AdNodeState.cpp b/engines/wintermute/ad/ad_node_state.cpp index fd72a356c5..06f9c4cf95 100644 --- a/engines/wintermute/ad/AdNodeState.cpp +++ b/engines/wintermute/ad/ad_node_state.cpp @@ -27,11 +27,11 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/ad/AdNodeState.h"
-#include "engines/wintermute/ad/AdEntity.h"
-#include "engines/wintermute/base/BStringTable.h"
-#include "engines/wintermute/base/BSprite.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/ad/ad_node_state.h"
+#include "engines/wintermute/ad/ad_entity.h"
+#include "engines/wintermute/base/base_string_table.h"
+#include "engines/wintermute/base/base_sprite.h"
#include "engines/wintermute/utils/utils.h"
#include "engines/wintermute/platform_osystem.h"
#include "common/str.h"
diff --git a/engines/wintermute/ad/AdNodeState.h b/engines/wintermute/ad/ad_node_state.h index 186f2ebbb2..186f2ebbb2 100644 --- a/engines/wintermute/ad/AdNodeState.h +++ b/engines/wintermute/ad/ad_node_state.h diff --git a/engines/wintermute/ad/AdObject.cpp b/engines/wintermute/ad/ad_object.cpp index c74c8cf6b3..46f2e590fd 100644 --- a/engines/wintermute/ad/AdObject.cpp +++ b/engines/wintermute/ad/ad_object.cpp @@ -27,28 +27,28 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdGame.h"
-#include "engines/wintermute/ad/AdItem.h"
-#include "engines/wintermute/ad/AdObject.h"
-#include "engines/wintermute/ad/AdInventory.h"
-#include "engines/wintermute/ad/AdLayer.h"
-#include "engines/wintermute/ad/AdScene.h"
-#include "engines/wintermute/ad/AdSceneNode.h"
-#include "engines/wintermute/ad/AdSentence.h"
-#include "engines/wintermute/ad/AdWaypointGroup.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFrame.h"
-#include "engines/wintermute/base/BSound.h"
-#include "engines/wintermute/base/BSurfaceStorage.h"
-#include "engines/wintermute/base/BSubFrame.h"
-#include "engines/wintermute/base/font/BFont.h"
-#include "engines/wintermute/base/font/BFontStorage.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BStringTable.h"
-#include "engines/wintermute/base/scriptables/ScEngine.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
+#include "engines/wintermute/ad/ad_game.h"
+#include "engines/wintermute/ad/ad_item.h"
+#include "engines/wintermute/ad/ad_object.h"
+#include "engines/wintermute/ad/ad_inventory.h"
+#include "engines/wintermute/ad/ad_layer.h"
+#include "engines/wintermute/ad/ad_scene.h"
+#include "engines/wintermute/ad/ad_scene_node.h"
+#include "engines/wintermute/ad/ad_sentence.h"
+#include "engines/wintermute/ad/ad_waypoint_group.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_frame.h"
+#include "engines/wintermute/base/sound/base_sound.h"
+#include "engines/wintermute/base/base_surface_storage.h"
+#include "engines/wintermute/base/base_sub_frame.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_string_table.h"
+#include "engines/wintermute/base/scriptables/script_engine.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
#include "common/str.h"
#include "common/util.h"
diff --git a/engines/wintermute/ad/AdObject.h b/engines/wintermute/ad/ad_object.h index d662e84729..dd123092a3 100644 --- a/engines/wintermute/ad/AdObject.h +++ b/engines/wintermute/ad/ad_object.h @@ -29,8 +29,8 @@ #ifndef WINTERMUTE_ADOBJECT_H
#define WINTERMUTE_ADOBJECT_H
-#include "engines/wintermute/ad/AdTypes.h"
-#include "engines/wintermute/base/particles/PartEmitter.h"
+#include "engines/wintermute/ad/ad_types.h"
+#include "engines/wintermute/base/particles/part_emitter.h"
namespace WinterMute {
diff --git a/engines/wintermute/ad/AdPath.cpp b/engines/wintermute/ad/ad_path.cpp index d1b9d87063..780912ce08 100644 --- a/engines/wintermute/ad/AdPath.cpp +++ b/engines/wintermute/ad/ad_path.cpp @@ -27,8 +27,8 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdPath.h"
-#include "engines/wintermute/base/BPoint.h"
+#include "engines/wintermute/ad/ad_path.h"
+#include "engines/wintermute/base/base_point.h"
namespace WinterMute {
diff --git a/engines/wintermute/ad/AdPath.h b/engines/wintermute/ad/ad_path.h index fdc2980042..f27362bfd9 100644 --- a/engines/wintermute/ad/AdPath.h +++ b/engines/wintermute/ad/ad_path.h @@ -31,7 +31,7 @@ #include "engines/wintermute/persistent.h"
#include "engines/wintermute/coll_templ.h"
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
namespace WinterMute {
class CBPoint;
diff --git a/engines/wintermute/ad/AdPathPoint.cpp b/engines/wintermute/ad/ad_path_point.cpp index 184ad8559a..d4b910a30f 100644 --- a/engines/wintermute/ad/AdPathPoint.cpp +++ b/engines/wintermute/ad/ad_path_point.cpp @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/ad/AdPathPoint.h"
-#include "engines/wintermute/base/BPersistMgr.h"
+#include "engines/wintermute/ad/ad_path_point.h"
+#include "engines/wintermute/base/base_persistence_manager.h"
namespace WinterMute {
diff --git a/engines/wintermute/ad/AdPathPoint.h b/engines/wintermute/ad/ad_path_point.h index f58df765b1..2a58237bb9 100644 --- a/engines/wintermute/ad/AdPathPoint.h +++ b/engines/wintermute/ad/ad_path_point.h @@ -30,7 +30,7 @@ #define WINTERMUTE_ADPATHPOINT_H
#include "engines/wintermute/persistent.h"
-#include "engines/wintermute/base/BPoint.h"
+#include "engines/wintermute/base/base_point.h"
namespace WinterMute {
diff --git a/engines/wintermute/ad/AdRegion.cpp b/engines/wintermute/ad/ad_region.cpp index a1864de1ac..ae65be5013 100644 --- a/engines/wintermute/ad/AdRegion.cpp +++ b/engines/wintermute/ad/ad_region.cpp @@ -27,13 +27,13 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdRegion.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/ad/ad_region.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_file_manager.h"
namespace WinterMute {
diff --git a/engines/wintermute/ad/AdRegion.h b/engines/wintermute/ad/ad_region.h index c91feb4012..62c5fd6ba3 100644 --- a/engines/wintermute/ad/AdRegion.h +++ b/engines/wintermute/ad/ad_region.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_ADREGION_H
#define WINTERMUTE_ADREGION_H
-#include "engines/wintermute/base/BRegion.h"
+#include "engines/wintermute/base/base_region.h"
namespace WinterMute {
diff --git a/engines/wintermute/ad/AdResponse.cpp b/engines/wintermute/ad/ad_response.cpp index 20617f9573..b653fbd36a 100644 --- a/engines/wintermute/ad/AdResponse.cpp +++ b/engines/wintermute/ad/ad_response.cpp @@ -27,10 +27,10 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdResponse.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/font/BFontStorage.h"
-#include "engines/wintermute/base/BSprite.h"
+#include "engines/wintermute/ad/ad_response.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
+#include "engines/wintermute/base/base_sprite.h"
#include "engines/wintermute/utils/utils.h"
namespace WinterMute {
diff --git a/engines/wintermute/ad/AdResponse.h b/engines/wintermute/ad/ad_response.h index 646d781b89..da450b2229 100644 --- a/engines/wintermute/ad/AdResponse.h +++ b/engines/wintermute/ad/ad_response.h @@ -30,8 +30,8 @@ #define WINTERMUTE_ADRESPONSE_H
-#include "engines/wintermute/base/BObject.h"
-#include "engines/wintermute/ad/AdTypes.h"
+#include "engines/wintermute/base/base_object.h"
+#include "engines/wintermute/ad/ad_types.h"
namespace WinterMute {
class CBFont;
diff --git a/engines/wintermute/ad/AdResponseBox.cpp b/engines/wintermute/ad/ad_response_box.cpp index 829d58f2ee..2499c9a732 100644 --- a/engines/wintermute/ad/AdResponseBox.cpp +++ b/engines/wintermute/ad/ad_response_box.cpp @@ -27,20 +27,20 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdGame.h"
-#include "engines/wintermute/ad/AdResponseBox.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BSurfaceStorage.h"
-#include "engines/wintermute/ui/UIButton.h"
-#include "engines/wintermute/ui/UIWindow.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/font/BFontStorage.h"
-#include "engines/wintermute/base/font/BFont.h"
-#include "engines/wintermute/ad/AdResponse.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/ad/ad_game.h"
+#include "engines/wintermute/ad/ad_response_box.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_surface_storage.h"
+#include "engines/wintermute/ui/ui_button.h"
+#include "engines/wintermute/ui/ui_window.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/ad/ad_response.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/utils/utils.h"
#include "engines/wintermute/platform_osystem.h"
#include "common/str.h"
diff --git a/engines/wintermute/ad/AdResponseBox.h b/engines/wintermute/ad/ad_response_box.h index 93b677bd4a..7c611ef2d6 100644 --- a/engines/wintermute/ad/AdResponseBox.h +++ b/engines/wintermute/ad/ad_response_box.h @@ -30,7 +30,7 @@ #define WINTERMUTE_ADRESPONSEBOX_H
-#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/base_object.h"
namespace WinterMute {
diff --git a/engines/wintermute/ad/AdResponseContext.cpp b/engines/wintermute/ad/ad_response_context.cpp index 8573e58b95..02b819d6de 100644 --- a/engines/wintermute/ad/AdResponseContext.cpp +++ b/engines/wintermute/ad/ad_response_context.cpp @@ -27,8 +27,8 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdResponseContext.h"
-#include "engines/wintermute/base/BPersistMgr.h"
+#include "engines/wintermute/ad/ad_response_context.h"
+#include "engines/wintermute/base/base_persistence_manager.h"
namespace WinterMute {
diff --git a/engines/wintermute/ad/AdResponseContext.h b/engines/wintermute/ad/ad_response_context.h index 74506405de..79eaa27640 100644 --- a/engines/wintermute/ad/AdResponseContext.h +++ b/engines/wintermute/ad/ad_response_context.h @@ -30,7 +30,7 @@ #define WINTERMUTE_ADRESPONSECONTEXT_H
#include "engines/wintermute/persistent.h"
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
namespace WinterMute {
diff --git a/engines/wintermute/ad/AdRotLevel.cpp b/engines/wintermute/ad/ad_rot_level.cpp index 671d003f35..0ffbaf6919 100644 --- a/engines/wintermute/ad/AdRotLevel.cpp +++ b/engines/wintermute/ad/ad_rot_level.cpp @@ -27,12 +27,12 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdRotLevel.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/ad/ad_rot_level.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_file_manager.h"
namespace WinterMute {
diff --git a/engines/wintermute/ad/AdRotLevel.h b/engines/wintermute/ad/ad_rot_level.h index 9e536a8d8f..2bd9519d65 100644 --- a/engines/wintermute/ad/AdRotLevel.h +++ b/engines/wintermute/ad/ad_rot_level.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_ADROTLEVEL_H
#define WINTERMUTE_ADROTLEVEL_H
-#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/base_object.h"
namespace WinterMute {
diff --git a/engines/wintermute/ad/AdScaleLevel.cpp b/engines/wintermute/ad/ad_scale_level.cpp index 1ac2f7ba6c..220d3c4b39 100644 --- a/engines/wintermute/ad/AdScaleLevel.cpp +++ b/engines/wintermute/ad/ad_scale_level.cpp @@ -27,11 +27,11 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdScaleLevel.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/ad/ad_scale_level.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_file_manager.h"
namespace WinterMute {
diff --git a/engines/wintermute/ad/AdScaleLevel.h b/engines/wintermute/ad/ad_scale_level.h index c360ec4eff..4a81c00dda 100644 --- a/engines/wintermute/ad/AdScaleLevel.h +++ b/engines/wintermute/ad/ad_scale_level.h @@ -30,7 +30,7 @@ #define WINTERMUTE_ADSCALELEVEL_H
-#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/base_object.h"
namespace WinterMute {
diff --git a/engines/wintermute/ad/AdScene.cpp b/engines/wintermute/ad/ad_scene.cpp index b284543a08..11030d6996 100644 --- a/engines/wintermute/ad/AdScene.cpp +++ b/engines/wintermute/ad/ad_scene.cpp @@ -26,37 +26,37 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/ad/AdScene.h"
-#include "engines/wintermute/ad/AdActor.h"
-#include "engines/wintermute/ad/AdEntity.h"
-#include "engines/wintermute/ad/AdGame.h"
-#include "engines/wintermute/ad/AdLayer.h"
-#include "engines/wintermute/ad/AdNodeState.h"
-#include "engines/wintermute/ad/AdObject.h"
-#include "engines/wintermute/ad/AdPath.h"
-#include "engines/wintermute/ad/AdPathPoint.h"
-#include "engines/wintermute/ad/AdRotLevel.h"
-#include "engines/wintermute/ad/AdScaleLevel.h"
-#include "engines/wintermute/ad/AdSceneNode.h"
-#include "engines/wintermute/ad/AdSceneState.h"
-#include "engines/wintermute/ad/AdSentence.h"
-#include "engines/wintermute/ad/AdWaypointGroup.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/base/font/BFont.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BObject.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BPoint.h"
-#include "engines/wintermute/base/BRegion.h"
-#include "engines/wintermute/base/BScriptable.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BViewport.h"
+#include "engines/wintermute/ad/ad_scene.h"
+#include "engines/wintermute/ad/ad_actor.h"
+#include "engines/wintermute/ad/ad_entity.h"
+#include "engines/wintermute/ad/ad_game.h"
+#include "engines/wintermute/ad/ad_layer.h"
+#include "engines/wintermute/ad/ad_node_state.h"
+#include "engines/wintermute/ad/ad_object.h"
+#include "engines/wintermute/ad/ad_path.h"
+#include "engines/wintermute/ad/ad_path_point.h"
+#include "engines/wintermute/ad/ad_rot_level.h"
+#include "engines/wintermute/ad/ad_scale_level.h"
+#include "engines/wintermute/ad/ad_scene_node.h"
+#include "engines/wintermute/ad/ad_scene_state.h"
+#include "engines/wintermute/ad/ad_sentence.h"
+#include "engines/wintermute/ad/ad_waypoint_group.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_object.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_point.h"
+#include "engines/wintermute/base/base_region.h"
+#include "engines/wintermute/base/base_scriptable.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_viewport.h"
#include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/ui/UIWindow.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/ui/ui_window.h"
#include "engines/wintermute/utils/utils.h"
#include <limits.h>
diff --git a/engines/wintermute/ad/AdScene.h b/engines/wintermute/ad/ad_scene.h index f77c64aa9b..ab62a4a7fc 100644 --- a/engines/wintermute/ad/AdScene.h +++ b/engines/wintermute/ad/ad_scene.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_ADSCENE_H
#define WINTERMUTE_ADSCENE_H
-#include "engines/wintermute/base/BFader.h"
+#include "engines/wintermute/base/base_fader.h"
namespace WinterMute {
diff --git a/engines/wintermute/ad/AdSceneNode.cpp b/engines/wintermute/ad/ad_scene_node.cpp index 5f518e5442..da7082105f 100644 --- a/engines/wintermute/ad/AdSceneNode.cpp +++ b/engines/wintermute/ad/ad_scene_node.cpp @@ -27,8 +27,8 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdSceneNode.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/ad/ad_scene_node.h"
+#include "engines/wintermute/base/base_game.h"
namespace WinterMute {
diff --git a/engines/wintermute/ad/AdSceneNode.h b/engines/wintermute/ad/ad_scene_node.h index d081959934..1c25f91a2d 100644 --- a/engines/wintermute/ad/AdSceneNode.h +++ b/engines/wintermute/ad/ad_scene_node.h @@ -30,9 +30,9 @@ #define WINTERMUTE_ADSCENENODE_H
-#include "engines/wintermute/ad/AdTypes.h" // Added by ClassView
-#include "engines/wintermute/ad/AdRegion.h" // Added by ClassView
-#include "engines/wintermute/ad/AdEntity.h"
+#include "engines/wintermute/ad/ad_types.h" // Added by ClassView
+#include "engines/wintermute/ad/ad_region.h" // Added by ClassView
+#include "engines/wintermute/ad/ad_entity.h"
namespace WinterMute {
diff --git a/engines/wintermute/ad/AdSceneState.cpp b/engines/wintermute/ad/ad_scene_state.cpp index 5dfb8c537e..2ac36054a5 100644 --- a/engines/wintermute/ad/AdSceneState.cpp +++ b/engines/wintermute/ad/ad_scene_state.cpp @@ -28,8 +28,8 @@ #include "engines/wintermute/dcgf.h"
#include "engines/wintermute/persistent.h"
-#include "engines/wintermute/ad/AdSceneState.h"
-#include "engines/wintermute/ad/AdNodeState.h"
+#include "engines/wintermute/ad/ad_scene_state.h"
+#include "engines/wintermute/ad/ad_node_state.h"
#include "engines/wintermute/platform_osystem.h"
#include "common/str.h"
diff --git a/engines/wintermute/ad/AdSceneState.h b/engines/wintermute/ad/ad_scene_state.h index 82207f383c..6df20e0578 100644 --- a/engines/wintermute/ad/AdSceneState.h +++ b/engines/wintermute/ad/ad_scene_state.h @@ -30,7 +30,7 @@ #define WINTERMUTE_ADSCENESTATE_H
#include "engines/wintermute/persistent.h"
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
#include "engines/wintermute/coll_templ.h"
namespace WinterMute {
diff --git a/engines/wintermute/ad/AdSentence.cpp b/engines/wintermute/ad/ad_sentence.cpp index 98926caac6..2607993aa0 100644 --- a/engines/wintermute/ad/AdSentence.cpp +++ b/engines/wintermute/ad/ad_sentence.cpp @@ -27,17 +27,17 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdSentence.h"
-#include "engines/wintermute/ad/AdTalkDef.h"
-#include "engines/wintermute/ad/AdTalkNode.h"
-#include "engines/wintermute/ad/AdGame.h"
-#include "engines/wintermute/utils/PathUtil.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BSound.h"
-#include "engines/wintermute/ad/AdScene.h"
-#include "engines/wintermute/base/font/BFont.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/ad/ad_sentence.h"
+#include "engines/wintermute/ad/ad_talk_def.h"
+#include "engines/wintermute/ad/ad_talk_node.h"
+#include "engines/wintermute/ad/ad_game.h"
+#include "engines/wintermute/utils/path_util.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/sound/base_sound.h"
+#include "engines/wintermute/ad/ad_scene.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_file_manager.h"
namespace WinterMute {
diff --git a/engines/wintermute/ad/AdSentence.h b/engines/wintermute/ad/ad_sentence.h index 954568878e..40f99ea830 100644 --- a/engines/wintermute/ad/AdSentence.h +++ b/engines/wintermute/ad/ad_sentence.h @@ -30,9 +30,9 @@ #define WINTERMUTE_ADSENTENCE_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
#include "engines/wintermute/persistent.h"
-#include "engines/wintermute/math/Rect32.h"
+#include "engines/wintermute/math/rect32.h"
#include "engines/wintermute/dctypes.h" // Added by ClassView
#include "common/rect.h"
diff --git a/engines/wintermute/ad/AdSpriteSet.cpp b/engines/wintermute/ad/ad_sprite_set.cpp index 127d42d02b..f0925c6913 100644 --- a/engines/wintermute/ad/AdSpriteSet.cpp +++ b/engines/wintermute/ad/ad_sprite_set.cpp @@ -27,11 +27,11 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdSpriteSet.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/ad/ad_sprite_set.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_file_manager.h"
namespace WinterMute {
diff --git a/engines/wintermute/ad/AdSpriteSet.h b/engines/wintermute/ad/ad_sprite_set.h index ba5c6fb75b..993832cfa3 100644 --- a/engines/wintermute/ad/AdSpriteSet.h +++ b/engines/wintermute/ad/ad_sprite_set.h @@ -30,8 +30,8 @@ #define WINTERMUTE_ADSPRITESET_H
-#include "engines/wintermute/base/BObject.h"
-#include "engines/wintermute/base/BSprite.h" // Added by ClassView
+#include "engines/wintermute/base/base_object.h"
+#include "engines/wintermute/base/base_sprite.h" // Added by ClassView
namespace WinterMute {
diff --git a/engines/wintermute/ad/AdTalkDef.cpp b/engines/wintermute/ad/ad_talk_def.cpp index b598226413..0cd62df603 100644 --- a/engines/wintermute/ad/AdTalkDef.cpp +++ b/engines/wintermute/ad/ad_talk_def.cpp @@ -27,14 +27,14 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdTalkDef.h"
-#include "engines/wintermute/ad/AdTalkNode.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/ad/AdSpriteSet.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/ad/ad_talk_def.h"
+#include "engines/wintermute/ad/ad_talk_node.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/ad/ad_sprite_set.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/utils/utils.h"
namespace WinterMute {
diff --git a/engines/wintermute/ad/AdTalkDef.h b/engines/wintermute/ad/ad_talk_def.h index 81d6475013..0811f5b8f5 100644 --- a/engines/wintermute/ad/AdTalkDef.h +++ b/engines/wintermute/ad/ad_talk_def.h @@ -30,7 +30,7 @@ #define WINTERMUTE_ADTALKDEF_H
#include "engines/wintermute/coll_templ.h"
-#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/base_object.h"
namespace WinterMute {
class CAdTalkNode;
diff --git a/engines/wintermute/ad/AdTalkHolder.cpp b/engines/wintermute/ad/ad_talk_holder.cpp index e1a91792ce..28e62798c2 100644 --- a/engines/wintermute/ad/AdTalkHolder.cpp +++ b/engines/wintermute/ad/ad_talk_holder.cpp @@ -27,13 +27,13 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdTalkHolder.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BSprite.h"
+#include "engines/wintermute/ad/ad_talk_holder.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_sprite.h"
#include "engines/wintermute/platform_osystem.h"
#include "engines/wintermute/wintermute.h"
#include "common/str.h"
diff --git a/engines/wintermute/ad/AdTalkHolder.h b/engines/wintermute/ad/ad_talk_holder.h index 9e6c3bbd63..50c2f3504b 100644 --- a/engines/wintermute/ad/AdTalkHolder.h +++ b/engines/wintermute/ad/ad_talk_holder.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_ADTALKHOLDER_H
#define WINTERMUTE_ADTALKHOLDER_H
-#include "engines/wintermute/ad/AdObject.h"
+#include "engines/wintermute/ad/ad_object.h"
namespace WinterMute {
diff --git a/engines/wintermute/ad/AdTalkNode.cpp b/engines/wintermute/ad/ad_talk_node.cpp index da2195be33..3b82d731c9 100644 --- a/engines/wintermute/ad/AdTalkNode.cpp +++ b/engines/wintermute/ad/ad_talk_node.cpp @@ -27,12 +27,12 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdTalkNode.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/ad/AdSpriteSet.h"
+#include "engines/wintermute/ad/ad_talk_node.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/ad/ad_sprite_set.h"
#include "engines/wintermute/utils/utils.h"
namespace WinterMute {
diff --git a/engines/wintermute/ad/AdTalkNode.h b/engines/wintermute/ad/ad_talk_node.h index 11bbb353c1..55adf88e83 100644 --- a/engines/wintermute/ad/AdTalkNode.h +++ b/engines/wintermute/ad/ad_talk_node.h @@ -30,7 +30,7 @@ #define WINTERMUTE_ADTALKNODE_H
#include "engines/wintermute/persistent.h"
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
namespace WinterMute {
class CAdSpriteSet;
diff --git a/engines/wintermute/ad/AdTypes.h b/engines/wintermute/ad/ad_types.h index b88d6fe259..b88d6fe259 100644 --- a/engines/wintermute/ad/AdTypes.h +++ b/engines/wintermute/ad/ad_types.h diff --git a/engines/wintermute/ad/AdWaypointGroup.cpp b/engines/wintermute/ad/ad_waypoint_group.cpp index 3080b34c09..4a902266ac 100644 --- a/engines/wintermute/ad/AdWaypointGroup.cpp +++ b/engines/wintermute/ad/ad_waypoint_group.cpp @@ -26,13 +26,13 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/ad/AdWaypointGroup.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BRegion.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/ad/ad_waypoint_group.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_region.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include <limits.h>
namespace WinterMute {
diff --git a/engines/wintermute/ad/AdWaypointGroup.h b/engines/wintermute/ad/ad_waypoint_group.h index f7c9e4c361..2cece9e88b 100644 --- a/engines/wintermute/ad/AdWaypointGroup.h +++ b/engines/wintermute/ad/ad_waypoint_group.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_ADWAYPOINTGROUP_H
#define WINTERMUTE_ADWAYPOINTGROUP_H
-#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/base_object.h"
namespace WinterMute {
class CBPoint;
diff --git a/engines/wintermute/base/BBase.cpp b/engines/wintermute/base/base.cpp index 76e1150925..5fabe94312 100644 --- a/engines/wintermute/base/BBase.cpp +++ b/engines/wintermute/base/base.cpp @@ -27,10 +27,10 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BBase.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BDynBuffer.h"
+#include "engines/wintermute/base/base.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BBase.h b/engines/wintermute/base/base.h index e8c87f1f9e..e8c87f1f9e 100644 --- a/engines/wintermute/base/BBase.h +++ b/engines/wintermute/base/base.h diff --git a/engines/wintermute/base/BActiveRect.cpp b/engines/wintermute/base/base_active_rect.cpp index 836a93ad9a..5895b1acd5 100644 --- a/engines/wintermute/base/BActiveRect.cpp +++ b/engines/wintermute/base/base_active_rect.cpp @@ -27,9 +27,9 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BActiveRect.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BRegion.h"
+#include "engines/wintermute/base/base_active_rect.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_region.h"
#include "engines/wintermute/platform_osystem.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BActiveRect.h b/engines/wintermute/base/base_active_rect.h index 935b91eaeb..7c9e8d4a39 100644 --- a/engines/wintermute/base/BActiveRect.h +++ b/engines/wintermute/base/base_active_rect.h @@ -29,8 +29,8 @@ #ifndef WINTERMUTE_BACTIVERECT_H
#define WINTERMUTE_BACTIVERECT_H
-#include "engines/wintermute/math/Rect32.h"
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/math/rect32.h"
+#include "engines/wintermute/base/base.h"
namespace WinterMute {
class CBRegion;
diff --git a/engines/wintermute/base/BDebugger.cpp b/engines/wintermute/base/base_debugger.cpp index 92f282b6d1..f56f08dab2 100644 --- a/engines/wintermute/base/BDebugger.cpp +++ b/engines/wintermute/base/base_debugger.cpp @@ -26,7 +26,7 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/base/BDebugger.h"
+#include "engines/wintermute/base/base_Debugger.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BDebugger.h b/engines/wintermute/base/base_debugger.h index cea432f7a8..35ea56eafe 100644 --- a/engines/wintermute/base/BDebugger.h +++ b/engines/wintermute/base/base_debugger.h @@ -30,7 +30,7 @@ #define WINTERMUTE_BDEBUGGER_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
#include "engines/wintermute/wme_debugger.h"
// TODO: The entire debugger should possibly be removed
diff --git a/engines/wintermute/base/BDynBuffer.cpp b/engines/wintermute/base/base_dynamic_buffer.cpp index 9a2e071287..7453838219 100644 --- a/engines/wintermute/base/BDynBuffer.cpp +++ b/engines/wintermute/base/base_dynamic_buffer.cpp @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BDynBuffer.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BDynBuffer.h b/engines/wintermute/base/base_dynamic_buffer.h index 66e8182c68..5795fe5bd1 100644 --- a/engines/wintermute/base/BDynBuffer.h +++ b/engines/wintermute/base/base_dynamic_buffer.h @@ -30,7 +30,7 @@ #define WINTERMUTE_BDYNBUFFER_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BFader.cpp b/engines/wintermute/base/base_fader.cpp index 9dec5e1e12..712f64eb6f 100644 --- a/engines/wintermute/base/BFader.cpp +++ b/engines/wintermute/base/base_fader.cpp @@ -27,8 +27,8 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BFader.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/base_Fader.h"
+#include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/platform_osystem.h"
#include "common/util.h"
diff --git a/engines/wintermute/base/BFader.h b/engines/wintermute/base/base_fader.h index cc90d4603d..679f5d0903 100644 --- a/engines/wintermute/base/BFader.h +++ b/engines/wintermute/base/base_fader.h @@ -30,7 +30,7 @@ #define WINTERMUTE_BFADER_H
-#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/base_object.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BFileManager.cpp b/engines/wintermute/base/base_file_manager.cpp index 34638f55e8..1cb0464a1f 100644 --- a/engines/wintermute/base/BFileManager.cpp +++ b/engines/wintermute/base/base_file_manager.cpp @@ -27,17 +27,17 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/utils/StringUtil.h"
-#include "engines/wintermute/utils/PathUtil.h"
-#include "engines/wintermute/base/file/BDiskFile.h"
-#include "engines/wintermute/base/file/BSaveThumbFile.h"
-#include "engines/wintermute/base/file/BFileEntry.h"
-#include "engines/wintermute/base/file/BPackage.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/utils/string_util.h"
+#include "engines/wintermute/utils/path_util.h"
+#include "engines/wintermute/base/file/base_disk_file.h"
+#include "engines/wintermute/base/file/base_save_thumb_file.h"
+#include "engines/wintermute/base/file/base_file_entry.h"
+#include "engines/wintermute/base/file/base_package.h"
#include "engines/wintermute/base/file/BPkgFile.h"
-#include "engines/wintermute/base/BResources.h"
-#include "engines/wintermute/base/BRegistry.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/file/base_resources.h"
+#include "engines/wintermute/base/base_registry.h"
+#include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/dcpackage.h"
#include "engines/wintermute/utils/utils.h"
#include "engines/wintermute/platform_osystem.h"
diff --git a/engines/wintermute/base/BFileManager.h b/engines/wintermute/base/base_file_manager.h index 7ea9ff5611..1bf3156ebe 100644 --- a/engines/wintermute/base/BFileManager.h +++ b/engines/wintermute/base/base_file_manager.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_BFILEMANAGER_H
#define WINTERMUTE_BFILEMANAGER_H
-#include "engines/wintermute/base/file/BFileEntry.h"
+#include "engines/wintermute/base/file/base_file_entry.h"
#include "common/archive.h"
#include "common/str.h"
diff --git a/engines/wintermute/base/BFrame.cpp b/engines/wintermute/base/base_frame.cpp index d6d8a3aa5c..468ad29858 100644 --- a/engines/wintermute/base/BFrame.cpp +++ b/engines/wintermute/base/base_frame.cpp @@ -27,17 +27,17 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BFrame.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BSoundMgr.h"
-#include "engines/wintermute/base/BSound.h"
-#include "engines/wintermute/base/BSubFrame.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_frame.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/sound/base_sound_manager.h"
+#include "engines/wintermute/base/sound/base_sound.h"
+#include "engines/wintermute/base/base_sub_frame.h"
#include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
#include "common/str.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BFrame.h b/engines/wintermute/base/base_frame.h index 3d487b4ebc..f3dec4e16f 100644 --- a/engines/wintermute/base/BFrame.h +++ b/engines/wintermute/base/base_frame.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_BFRAME_H
#define WINTERMUTE_BFRAME_H
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base_scriptable.h"
#include "engines/wintermute/coll_templ.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BGame.cpp b/engines/wintermute/base/base_game.cpp index 3e577541b7..d5e9c99dcf 100644 --- a/engines/wintermute/base/BGame.cpp +++ b/engines/wintermute/base/base_game.cpp @@ -27,40 +27,39 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFader.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/base/font/BFont.h"
-#include "engines/wintermute/base/font/BFontStorage.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_Fader.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
#include "engines/wintermute/base/gfx/base_image.h"
#include "engines/wintermute/base/gfx/base_surface.h"
#include "engines/wintermute/base/gfx/base_renderer.h"
-#include "engines/wintermute/base/BKeyboardState.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BQuickMsg.h"
-#include "engines/wintermute/base/BRegistry.h"
-#include "engines/wintermute/base/BSound.h"
-#include "engines/wintermute/base/BSoundMgr.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BSubFrame.h"
-
-#include "engines/wintermute/base/BTransitionMgr.h"
-#include "engines/wintermute/base/BViewport.h"
-#include "engines/wintermute/base/BStringTable.h"
-#include "engines/wintermute/base/BRegion.h"
-#include "engines/wintermute/base/BSaveThumbHelper.h"
-#include "engines/wintermute/base/BSurfaceStorage.h"
+#include "engines/wintermute/base/base_keyboard_state.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_quick_msg.h"
+#include "engines/wintermute/base/base_registry.h"
+#include "engines/wintermute/base/sound/base_sound.h"
+#include "engines/wintermute/base/sound/base_sound_manager.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_sub_frame.h"
+#include "engines/wintermute/base/base_transition_manager.h"
+#include "engines/wintermute/base/base_viewport.h"
+#include "engines/wintermute/base/base_string_table.h"
+#include "engines/wintermute/base/base_region.h"
+#include "engines/wintermute/base/base_save_thumb_helper.h"
+#include "engines/wintermute/base/base_surface_storage.h"
#include "engines/wintermute/utils/crc.h"
-#include "engines/wintermute/utils/PathUtil.h"
-#include "engines/wintermute/utils/StringUtil.h"
-#include "engines/wintermute/ui/UIWindow.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScEngine.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/SXMath.h"
-#include "engines/wintermute/video/VidPlayer.h"
-#include "engines/wintermute/video/VidTheoraPlayer.h"
+#include "engines/wintermute/utils/path_util.h"
+#include "engines/wintermute/utils/string_util.h"
+#include "engines/wintermute/ui/ui_window.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_engine.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_ext_math.h"
+#include "engines/wintermute/video/video_player.h"
+#include "engines/wintermute/video/video_theora_player.h"
#include "engines/wintermute/wintermute.h"
#include "common/savefile.h"
#include "common/textconsole.h"
diff --git a/engines/wintermute/base/BGame.h b/engines/wintermute/base/base_game.h index 7441d81b07..12ab07912b 100644 --- a/engines/wintermute/base/BGame.h +++ b/engines/wintermute/base/base_game.h @@ -29,12 +29,12 @@ #ifndef WINTERMUTE_BGAME_H
#define WINTERMUTE_BGAME_H
-#include "engines/wintermute/base/BDebugger.h"
+#include "engines/wintermute/base/base_Debugger.h"
#include "engines/wintermute/base/gfx/base_renderer.h"
-#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/base_object.h"
#include "engines/wintermute/persistent.h"
#include "engines/wintermute/coll_templ.h"
-#include "engines/wintermute/math/Rect32.h"
+#include "engines/wintermute/math/rect32.h"
#include "common/events.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BKeyboardState.cpp b/engines/wintermute/base/base_keyboard_state.cpp index 85ab15f58e..240f642b7f 100644 --- a/engines/wintermute/base/BKeyboardState.cpp +++ b/engines/wintermute/base/base_keyboard_state.cpp @@ -27,9 +27,9 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BKeyboardState.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/base/base_keyboard_state.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
#include "common/system.h"
#include "common/keyboard.h"
diff --git a/engines/wintermute/base/BKeyboardState.h b/engines/wintermute/base/base_keyboard_state.h index e3a4a903f7..bdf268c601 100644 --- a/engines/wintermute/base/BKeyboardState.h +++ b/engines/wintermute/base/base_keyboard_state.h @@ -30,8 +30,8 @@ #define WINTERMUTE_BKEYBOARD_STATE_H
-#include "engines/wintermute/base/BBase.h"
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base.h"
+#include "engines/wintermute/base/base_scriptable.h"
#include "common/keyboard.h"
#include "common/events.h"
diff --git a/engines/wintermute/base/BNamedObject.cpp b/engines/wintermute/base/base_named_object.cpp index 9587da45e8..da76fb2047 100644 --- a/engines/wintermute/base/BNamedObject.cpp +++ b/engines/wintermute/base/base_named_object.cpp @@ -27,7 +27,7 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BNamedObject.h"
+#include "engines/wintermute/base/base_named_object.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BNamedObject.h b/engines/wintermute/base/base_named_object.h index 4d5fdb0c0e..c03d1417a3 100644 --- a/engines/wintermute/base/BNamedObject.h +++ b/engines/wintermute/base/base_named_object.h @@ -30,7 +30,7 @@ #define WINTERMUTE_BNAMEDOBJECT_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BObject.cpp b/engines/wintermute/base/base_object.cpp index ed5d6fa5b7..0a4a0638f0 100644 --- a/engines/wintermute/base/BObject.cpp +++ b/engines/wintermute/base/base_object.cpp @@ -27,15 +27,15 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BObject.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/BSound.h"
-#include "engines/wintermute/base/BSoundMgr.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BStringTable.h"
-#include "engines/wintermute/base/BSprite.h"
+#include "engines/wintermute/base/base_object.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/sound/base_sound.h"
+#include "engines/wintermute/base/sound/base_sound_manager.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_string_table.h"
+#include "engines/wintermute/base/base_sprite.h"
#include "engines/wintermute/platform_osystem.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BObject.h b/engines/wintermute/base/base_object.h index c855c770b7..70dc69f53d 100644 --- a/engines/wintermute/base/BObject.h +++ b/engines/wintermute/base/base_object.h @@ -30,7 +30,7 @@ #define WINTERMUTE_BOBJECT_H
-#include "engines/wintermute/base/BScriptHolder.h"
+#include "engines/wintermute/base/base_script_holder.h"
#include "engines/wintermute/persistent.h"
#include "common/events.h"
diff --git a/engines/wintermute/base/BParser.cpp b/engines/wintermute/base/base_parser.cpp index 80d3b58213..0f185636aa 100644 --- a/engines/wintermute/base/BParser.cpp +++ b/engines/wintermute/base/base_parser.cpp @@ -27,8 +27,8 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/platform_osystem.h"
#include "common/str.h"
#include "common/util.h"
diff --git a/engines/wintermute/base/BParser.h b/engines/wintermute/base/base_parser.h index ae886953a9..53a02c0f68 100644 --- a/engines/wintermute/base/BParser.h +++ b/engines/wintermute/base/base_parser.h @@ -52,7 +52,7 @@ #define PARSERR_EOF -2
#define PARSERR_TOKENNOTFOUND -1
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
#include "engines/wintermute/coll_templ.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BPersistMgr.cpp b/engines/wintermute/base/base_persistence_manager.cpp index f8faced95f..743eaf355b 100644 --- a/engines/wintermute/base/BPersistMgr.cpp +++ b/engines/wintermute/base/base_persistence_manager.cpp @@ -27,15 +27,15 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BPersistMgr.h"
-#include "engines/wintermute/base/BSaveThumbHelper.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_persistence_manager.h"
+#include "engines/wintermute/base/base_save_thumb_helper.h"
#include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/math/Vector2.h"
-#include "engines/wintermute/utils/StringUtil.h"
+#include "engines/wintermute/math/vector2.h"
+#include "engines/wintermute/utils/string_util.h"
#include "engines/wintermute/base/gfx/base_image.h"
-#include "engines/wintermute/base/BSound.h"
+#include "engines/wintermute/base/sound/base_sound.h"
#include "graphics/decoders/bmp.h"
#include "common/memstream.h"
#include "common/str.h"
diff --git a/engines/wintermute/base/BPersistMgr.h b/engines/wintermute/base/base_persistence_manager.h index 2e6ee8058c..f2fd42ceca 100644 --- a/engines/wintermute/base/BPersistMgr.h +++ b/engines/wintermute/base/base_persistence_manager.h @@ -30,8 +30,8 @@ #define WINTERMUTE_BPERSISTMGR_H
-#include "engines/wintermute/base/BBase.h"
-#include "engines/wintermute/math/Rect32.h"
+#include "engines/wintermute/base/base.h"
+#include "engines/wintermute/math/rect32.h"
#include "engines/savestate.h"
#include "common/stream.h"
#include "common/str.h"
diff --git a/engines/wintermute/base/BPoint.cpp b/engines/wintermute/base/base_point.cpp index 4c80e154f2..6887349a7a 100644 --- a/engines/wintermute/base/BPoint.cpp +++ b/engines/wintermute/base/base_point.cpp @@ -27,8 +27,8 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BPoint.h"
-#include "engines/wintermute/base/BPersistMgr.h"
+#include "engines/wintermute/base/base_Point.h"
+#include "engines/wintermute/base/base_persistence_manager.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BPoint.h b/engines/wintermute/base/base_point.h index 3e4adb5d13..363ab1f919 100644 --- a/engines/wintermute/base/BPoint.h +++ b/engines/wintermute/base/base_point.h @@ -30,7 +30,7 @@ #define WINTERMUTE_BPOINT_H
#include "engines/wintermute/persistent.h"
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BQuickMsg.cpp b/engines/wintermute/base/base_quick_msg.cpp index 32bd04afe2..ac1001a2fe 100644 --- a/engines/wintermute/base/BQuickMsg.cpp +++ b/engines/wintermute/base/base_quick_msg.cpp @@ -27,8 +27,8 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BQuickMsg.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/base_quick_msg.h"
+#include "engines/wintermute/base/base_game.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BQuickMsg.h b/engines/wintermute/base/base_quick_msg.h index c247183714..9a68929932 100644 --- a/engines/wintermute/base/BQuickMsg.h +++ b/engines/wintermute/base/base_quick_msg.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_BQUICKMSG_H
#define WINTERMUTE_BQUICKMSG_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BRegion.cpp b/engines/wintermute/base/base_region.cpp index c8ec87e04a..3e513f9fb8 100644 --- a/engines/wintermute/base/BRegion.cpp +++ b/engines/wintermute/base/base_region.cpp @@ -27,14 +27,14 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BRegion.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_region.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/platform_osystem.h"
#include <limits.h>
diff --git a/engines/wintermute/base/BRegion.h b/engines/wintermute/base/base_region.h index 2a92d9daff..5de1fb9eef 100644 --- a/engines/wintermute/base/BRegion.h +++ b/engines/wintermute/base/base_region.h @@ -29,8 +29,8 @@ #ifndef WINTERMUTE_BREGION_H
#define WINTERMUTE_BREGION_H
-#include "engines/wintermute/base/BPoint.h"
-#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/base_Point.h"
+#include "engines/wintermute/base/base_object.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BRegistry.cpp b/engines/wintermute/base/base_registry.cpp index fef09d7479..350a34b61e 100644 --- a/engines/wintermute/base/BRegistry.cpp +++ b/engines/wintermute/base/base_registry.cpp @@ -27,10 +27,10 @@ */
#include "engines/wintermute/tinyxml/tinyxml.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BRegistry.h"
-#include "engines/wintermute/utils/PathUtil.h"
-#include "engines/wintermute/utils/StringUtil.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_registry.h"
+#include "engines/wintermute/utils/path_util.h"
+#include "engines/wintermute/utils/string_util.h"
#include "engines/wintermute/utils/utils.h"
#include "common/config-manager.h"
#include "common/file.h"
diff --git a/engines/wintermute/base/BRegistry.h b/engines/wintermute/base/base_registry.h index 123d1d8a2f..06e052cd03 100644 --- a/engines/wintermute/base/BRegistry.h +++ b/engines/wintermute/base/base_registry.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_BREGISTRY_H
#define WINTERMUTE_BREGISTRY_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BSaveThumbHelper.cpp b/engines/wintermute/base/base_save_thumb_helper.cpp index 415d4ed1e4..bee63aa307 100644 --- a/engines/wintermute/base/BSaveThumbHelper.cpp +++ b/engines/wintermute/base/base_save_thumb_helper.cpp @@ -27,9 +27,9 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BSaveThumbHelper.h"
+#include "engines/wintermute/base/base_save_thumb_helper.h"
#include "engines/wintermute/base/gfx/base_image.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/base_game.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BSaveThumbHelper.h b/engines/wintermute/base/base_save_thumb_helper.h index 30db32cfb2..e8cdbdc00d 100644 --- a/engines/wintermute/base/BSaveThumbHelper.h +++ b/engines/wintermute/base/base_save_thumb_helper.h @@ -29,7 +29,7 @@ #define WINTERMUTE_BSAVETHUMBHELPER_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BScriptHolder.cpp b/engines/wintermute/base/base_script_holder.cpp index 65d37b2e5c..5192f76f6e 100644 --- a/engines/wintermute/base/BScriptHolder.cpp +++ b/engines/wintermute/base/base_script_holder.cpp @@ -27,13 +27,13 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdGame.h"
-#include "engines/wintermute/base/BScriptHolder.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScEngine.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/ad/ad_game.h"
+#include "engines/wintermute/base/base_script_holder.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_engine.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BScriptHolder.h b/engines/wintermute/base/base_script_holder.h index 1e82b8cacf..0e5bc1b7ec 100644 --- a/engines/wintermute/base/BScriptHolder.h +++ b/engines/wintermute/base/base_script_holder.h @@ -31,7 +31,7 @@ #include "engines/wintermute/coll_templ.h"
#include "engines/wintermute/persistent.h"
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base_scriptable.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BScriptable.cpp b/engines/wintermute/base/base_scriptable.cpp index d1e3556a85..e9489fa407 100644 --- a/engines/wintermute/base/BScriptable.cpp +++ b/engines/wintermute/base/base_scriptable.cpp @@ -27,9 +27,9 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BScriptable.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/BPersistMgr.h"
+#include "engines/wintermute/base/base_scriptable.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/base_persistence_manager.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BScriptable.h b/engines/wintermute/base/base_scriptable.h index 534bd3bdf1..166f3c0bd1 100644 --- a/engines/wintermute/base/BScriptable.h +++ b/engines/wintermute/base/base_scriptable.h @@ -30,7 +30,7 @@ #define WINTERMUTE_BSCRIPTABLE_H
-#include "engines/wintermute/base/BNamedObject.h"
+#include "engines/wintermute/base/base_named_object.h"
#include "engines/wintermute/wme_debugger.h"
#include "engines/wintermute/persistent.h"
diff --git a/engines/wintermute/base/BSprite.cpp b/engines/wintermute/base/base_sprite.cpp index c4dfaa3f8d..ba55d1b88b 100644 --- a/engines/wintermute/base/BSprite.cpp +++ b/engines/wintermute/base/base_sprite.cpp @@ -27,21 +27,21 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/utils/StringUtil.h"
-#include "engines/wintermute/utils/PathUtil.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BDynBuffer.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/utils/string_util.h"
+#include "engines/wintermute/utils/path_util.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
#include "engines/wintermute/base/gfx/base_surface.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFrame.h"
-#include "engines/wintermute/base/BSound.h"
-#include "engines/wintermute/base/BSubFrame.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_frame.h"
+#include "engines/wintermute/base/sound/base_sound.h"
+#include "engines/wintermute/base/base_sub_frame.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BSprite.h b/engines/wintermute/base/base_sprite.h index 3c67e5f3fe..8f3ce84eb4 100644 --- a/engines/wintermute/base/BSprite.h +++ b/engines/wintermute/base/base_sprite.h @@ -31,7 +31,7 @@ #include "engines/wintermute/coll_templ.h"
-#include "engines/wintermute/base/BScriptHolder.h"
+#include "engines/wintermute/base/base_script_holder.h"
namespace WinterMute {
class CBFrame;
diff --git a/engines/wintermute/base/BStringTable.cpp b/engines/wintermute/base/base_string_table.cpp index 470ae8549c..c7789add9d 100644 --- a/engines/wintermute/base/BStringTable.cpp +++ b/engines/wintermute/base/base_string_table.cpp @@ -27,10 +27,10 @@ */
#include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BStringTable.h"
-#include "engines/wintermute/utils/StringUtil.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_string_table.h"
+#include "engines/wintermute/utils/string_util.h"
#include "common/str.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BStringTable.h b/engines/wintermute/base/base_string_table.h index 92d3604b4d..c612c33a41 100644 --- a/engines/wintermute/base/BStringTable.h +++ b/engines/wintermute/base/base_string_table.h @@ -31,7 +31,7 @@ #include "common/hashmap.h"
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BSubFrame.cpp b/engines/wintermute/base/base_sub_frame.cpp index 858f2125c6..adce6c6b75 100644 --- a/engines/wintermute/base/BSubFrame.cpp +++ b/engines/wintermute/base/base_sub_frame.cpp @@ -27,16 +27,16 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BSubFrame.h"
-#include "engines/wintermute/base/BActiveRect.h"
-#include "engines/wintermute/base/BDynBuffer.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_sub_frame.h"
+#include "engines/wintermute/base/base_active_rect.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
#include "engines/wintermute/base/gfx/base_surface.h"
-#include "engines/wintermute/base/BSurfaceStorage.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/base_surface_storage.h"
+#include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BSubFrame.h b/engines/wintermute/base/base_sub_frame.h index 57ffcae675..6fb24c0e4f 100644 --- a/engines/wintermute/base/BSubFrame.h +++ b/engines/wintermute/base/base_sub_frame.h @@ -30,8 +30,8 @@ #define WINTERMUTE_BSUBFRAME_H
-#include "engines/wintermute/base/BBase.h"
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base.h"
+#include "engines/wintermute/base/base_scriptable.h"
namespace WinterMute {
class CBObject;
diff --git a/engines/wintermute/base/BSurfaceStorage.cpp b/engines/wintermute/base/base_surface_storage.cpp index 406535cf39..06c2f1b0cc 100644 --- a/engines/wintermute/base/BSurfaceStorage.cpp +++ b/engines/wintermute/base/base_surface_storage.cpp @@ -27,10 +27,10 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BSurfaceStorage.h"
+#include "engines/wintermute/base/base_surface_storage.h"
#include "engines/wintermute/base/gfx/base_surface.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/platform_osystem.h"
#include "common/str.h"
diff --git a/engines/wintermute/base/BSurfaceStorage.h b/engines/wintermute/base/base_surface_storage.h index c054c2a55b..58f25e6875 100644 --- a/engines/wintermute/base/BSurfaceStorage.h +++ b/engines/wintermute/base/base_surface_storage.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_BSURFACESTORAGE_H
#define WINTERMUTE_BSURFACESTORAGE_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
#include "common/array.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BTransitionMgr.cpp b/engines/wintermute/base/base_transition_manager.cpp index 1cea7285bf..30a1a32e6a 100644 --- a/engines/wintermute/base/BTransitionMgr.cpp +++ b/engines/wintermute/base/base_transition_manager.cpp @@ -27,8 +27,8 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BTransitionMgr.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/base_transition_manager.h"
+#include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/platform_osystem.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BTransitionMgr.h b/engines/wintermute/base/base_transition_manager.h index faedb6fe3e..9b84c653e9 100644 --- a/engines/wintermute/base/BTransitionMgr.h +++ b/engines/wintermute/base/base_transition_manager.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_BTRANSITIONMGR_H
#define WINTERMUTE_BTRANSITIONMGR_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BViewport.cpp b/engines/wintermute/base/base_viewport.cpp index 2b237a0d38..83cbc5b0f0 100644 --- a/engines/wintermute/base/BViewport.cpp +++ b/engines/wintermute/base/base_viewport.cpp @@ -26,9 +26,9 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/BViewport.h"
+#include "engines/wintermute/base/base_viewport.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BViewport.h b/engines/wintermute/base/base_viewport.h index 1150b8ebe7..795e6f404f 100644 --- a/engines/wintermute/base/BViewport.h +++ b/engines/wintermute/base/base_viewport.h @@ -30,7 +30,7 @@ #define WINTERMUTE_BVIEWPORT_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
namespace WinterMute {
class CBObject;
diff --git a/engines/wintermute/base/file/BPkgFile.cpp b/engines/wintermute/base/file/BPkgFile.cpp index b787851290..3acde9c1ff 100644 --- a/engines/wintermute/base/file/BPkgFile.cpp +++ b/engines/wintermute/base/file/BPkgFile.cpp @@ -27,10 +27,10 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/file/BPackage.h"
+#include "engines/wintermute/base/file/base_package.h"
#include "engines/wintermute/base/file/BPkgFile.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include "common/util.h"
#include "common/file.h"
#include "common/stream.h"
diff --git a/engines/wintermute/base/file/BPkgFile.h b/engines/wintermute/base/file/BPkgFile.h index dc8b4b684f..4356ae5519 100644 --- a/engines/wintermute/base/file/BPkgFile.h +++ b/engines/wintermute/base/file/BPkgFile.h @@ -29,7 +29,10 @@ #ifndef WINTERMUTE_BPKGFILE_H
#define WINTERMUTE_BPKGFILE_H
-#include "engines/wintermute/base/file/BFileEntry.h"
+#include "engines/wintermute/base/file/base_file_entry.h"
+
+// This file is only needed until the next merge/rebase, as wrapCompressedStream now can set a known size
+// as such it is not renamed to follow the convention of the rest of the files.
namespace Common {
class SeekableReadStream;
diff --git a/engines/wintermute/base/file/BDiskFile.cpp b/engines/wintermute/base/file/base_disk_file.cpp index 739eafcc73..99bf9cff3f 100644 --- a/engines/wintermute/base/file/BDiskFile.cpp +++ b/engines/wintermute/base/file/base_disk_file.cpp @@ -27,11 +27,11 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/wintypes.h"
#include "engines/wintermute/base/file/BPkgFile.h"
-#include "engines/wintermute/base/file/BDiskFile.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/file/base_disk_file.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include "common/stream.h"
#include "common/memstream.h"
#include "common/file.h"
diff --git a/engines/wintermute/base/file/BDiskFile.h b/engines/wintermute/base/file/base_disk_file.h index 23e1a0a315..23e1a0a315 100644 --- a/engines/wintermute/base/file/BDiskFile.h +++ b/engines/wintermute/base/file/base_disk_file.h diff --git a/engines/wintermute/base/file/BFile.cpp b/engines/wintermute/base/file/base_file.cpp index 911039e36d..88a64cb147 100644 --- a/engines/wintermute/base/file/BFile.cpp +++ b/engines/wintermute/base/file/base_file.cpp @@ -27,7 +27,7 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/file/BFile.h"
+#include "engines/wintermute/base/file/base_file.h"
#include "common/memstream.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/file/BFile.h b/engines/wintermute/base/file/base_file.h index d1737df0ce..b29fc41299 100644 --- a/engines/wintermute/base/file/BFile.h +++ b/engines/wintermute/base/file/base_file.h @@ -30,7 +30,7 @@ #define WINTERMUTE_BFILE_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
#include "common/str.h"
#include "common/stream.h"
diff --git a/engines/wintermute/base/file/BFileEntry.cpp b/engines/wintermute/base/file/base_file_entry.cpp index b00ecb6f9d..3b6f4c7c16 100644 --- a/engines/wintermute/base/file/BFileEntry.cpp +++ b/engines/wintermute/base/file/base_file_entry.cpp @@ -26,7 +26,7 @@ * Copyright (c) 2011 Jan Nedoma
*/
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/file/BFileEntry.h"
+#include "engines/wintermute/base/file/base_file_entry.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/file/BFileEntry.h b/engines/wintermute/base/file/base_file_entry.h index 5fdf2b6308..ed80821004 100644 --- a/engines/wintermute/base/file/BFileEntry.h +++ b/engines/wintermute/base/file/base_file_entry.h @@ -30,7 +30,7 @@ #define WINTERMUTE_BFILEENTRY_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/file/BPackage.cpp b/engines/wintermute/base/file/base_package.cpp index bddf1abc1e..fab6409c00 100644 --- a/engines/wintermute/base/file/BPackage.cpp +++ b/engines/wintermute/base/file/base_package.cpp @@ -27,9 +27,9 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/file/BPackage.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/file/base_package.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include "common/file.h"
#include "common/stream.h"
diff --git a/engines/wintermute/base/file/BPackage.h b/engines/wintermute/base/file/base_package.h index 8c803fddd9..52fc4f9677 100644 --- a/engines/wintermute/base/file/BPackage.h +++ b/engines/wintermute/base/file/base_package.h @@ -30,7 +30,7 @@ #define WINTERMUTE_BPACKAGE_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
namespace Common {
class SeekableReadStream;
diff --git a/engines/wintermute/base/BResources.cpp b/engines/wintermute/base/file/base_resources.cpp index 839be570c5..09cbae88fe 100644 --- a/engines/wintermute/base/BResources.cpp +++ b/engines/wintermute/base/file/base_resources.cpp @@ -27,7 +27,7 @@ */
#include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/BResources.h"
+#include "engines/wintermute/base/file/base_resources.h"
#include "common/str.h"
#include "common/memstream.h"
diff --git a/engines/wintermute/base/BResources.h b/engines/wintermute/base/file/base_resources.h index 6ec0541b5c..6ec0541b5c 100644 --- a/engines/wintermute/base/BResources.h +++ b/engines/wintermute/base/file/base_resources.h diff --git a/engines/wintermute/base/file/BSaveThumbFile.cpp b/engines/wintermute/base/file/base_save_thumb_file.cpp index 4a75b7d7ce..68200d3fc6 100644 --- a/engines/wintermute/base/file/BSaveThumbFile.cpp +++ b/engines/wintermute/base/file/base_save_thumb_file.cpp @@ -27,8 +27,8 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/file/BSaveThumbFile.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/file/base_save_thumb_file.h"
#include "engines/wintermute/platform_osystem.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/file/BSaveThumbFile.h b/engines/wintermute/base/file/base_save_thumb_file.h index 5d33ac2220..42566581e2 100644 --- a/engines/wintermute/base/file/BSaveThumbFile.h +++ b/engines/wintermute/base/file/base_save_thumb_file.h @@ -30,7 +30,7 @@ #define WINTERMUTE_BSAVETHUMBFILE_H
-#include "engines/wintermute/base/file/BFile.h"
+#include "engines/wintermute/base/file/base_file.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/font/BFont.cpp b/engines/wintermute/base/font/base_font.cpp index 5d0086c581..8976cfdabd 100644 --- a/engines/wintermute/base/font/BFont.cpp +++ b/engines/wintermute/base/font/base_font.cpp @@ -27,12 +27,12 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/font/BFont.h"
-#include "engines/wintermute/base/font/BFontBitmap.h"
-#include "engines/wintermute/base/font/BFontTT.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/base/font/base_font_bitmap.h"
+#include "engines/wintermute/base/font/base_font_truetype.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/base_game.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/font/BFont.h b/engines/wintermute/base/font/base_font.h index a6ab757b0d..3df3090bb9 100644 --- a/engines/wintermute/base/font/BFont.h +++ b/engines/wintermute/base/font/base_font.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_BFONT_H
#define WINTERMUTE_BFONT_H
-#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/base_object.h"
#define NUM_CHARACTERS 256
diff --git a/engines/wintermute/base/font/BFontBitmap.cpp b/engines/wintermute/base/font/base_font_bitmap.cpp index 62576cdfea..ef730afb0a 100644 --- a/engines/wintermute/base/font/BFontBitmap.cpp +++ b/engines/wintermute/base/font/base_font_bitmap.cpp @@ -27,16 +27,16 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/font/BFontBitmap.h"
-#include "engines/wintermute/utils/StringUtil.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BFrame.h"
+#include "engines/wintermute/base/font/base_font_bitmap.h"
+#include "engines/wintermute/utils/string_util.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_frame.h"
#include "engines/wintermute/base/gfx/base_surface.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BSubFrame.h"
-#include "engines/wintermute/base/BFrame.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_sub_frame.h"
+#include "engines/wintermute/base/base_frame.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/platform_osystem.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/font/BFontBitmap.h b/engines/wintermute/base/font/base_font_bitmap.h index 17bf433f65..8af530cbc9 100644 --- a/engines/wintermute/base/font/BFontBitmap.h +++ b/engines/wintermute/base/font/base_font_bitmap.h @@ -30,7 +30,7 @@ #define WINTERMUTE_BFONTBITMAP_H
-#include "engines/wintermute/base/font/BFont.h"
+#include "engines/wintermute/base/font/base_font.h"
namespace WinterMute {
class CBSubFrame;
diff --git a/engines/wintermute/base/font/BFontStorage.cpp b/engines/wintermute/base/font/base_font_storage.cpp index b5605cf2bc..13f779f2cb 100644 --- a/engines/wintermute/base/font/BFontStorage.cpp +++ b/engines/wintermute/base/font/base_font_storage.cpp @@ -27,9 +27,9 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/font/BFontStorage.h"
-#include "engines/wintermute/base/font/BFont.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/platform_osystem.h"
#include "common/str.h"
diff --git a/engines/wintermute/base/font/BFontStorage.h b/engines/wintermute/base/font/base_font_storage.h index 9759d5d25e..7c88e9a2f4 100644 --- a/engines/wintermute/base/font/BFontStorage.h +++ b/engines/wintermute/base/font/base_font_storage.h @@ -30,7 +30,7 @@ #define WINTERMUTE_BFONTSTORAGE_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
#include "engines/wintermute/persistent.h"
#include "engines/wintermute/coll_templ.h"
diff --git a/engines/wintermute/base/font/BFontTT.cpp b/engines/wintermute/base/font/base_font_truetype.cpp index 5f0c9fec1a..a52922fb76 100644 --- a/engines/wintermute/base/font/BFontTT.cpp +++ b/engines/wintermute/base/font/base_font_truetype.cpp @@ -27,16 +27,16 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/file/BFile.h"
-#include "engines/wintermute/base/font/BFontTT.h"
-#include "engines/wintermute/utils/PathUtil.h"
-#include "engines/wintermute/utils/StringUtil.h"
-#include "engines/wintermute/math/MathUtil.h"
+#include "engines/wintermute/base/file/base_file.h"
+#include "engines/wintermute/base/font/base_font_truetype.h"
+#include "engines/wintermute/utils/path_util.h"
+#include "engines/wintermute/utils/string_util.h"
+#include "engines/wintermute/math/math_util.h"
#include "engines/wintermute/base/gfx/base_renderer.h"
#include "engines/wintermute/base/gfx/base_surface.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/utils/utils.h"
#include "engines/wintermute/platform_osystem.h"
#include "engines/wintermute/wintermute.h"
diff --git a/engines/wintermute/base/font/BFontTT.h b/engines/wintermute/base/font/base_font_truetype.h index 9b995b293e..4d8e71a3ff 100644 --- a/engines/wintermute/base/font/BFontTT.h +++ b/engines/wintermute/base/font/base_font_truetype.h @@ -29,8 +29,8 @@ #ifndef WINTERMUTE_BFONTTT_H
#define WINTERMUTE_BFONTTT_H
-#include "engines/wintermute/base/font/BFontStorage.h"
-#include "engines/wintermute/base/font/BFont.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
+#include "engines/wintermute/base/font/base_font.h"
#include "engines/wintermute/base/gfx/base_surface.h"
#include "common/rect.h"
#include "graphics/surface.h"
diff --git a/engines/wintermute/base/gfx/base_image.cpp b/engines/wintermute/base/gfx/base_image.cpp index f1e27c9622..fb6b23db2b 100644 --- a/engines/wintermute/base/gfx/base_image.cpp +++ b/engines/wintermute/base/gfx/base_image.cpp @@ -28,10 +28,10 @@ #include "engines/wintermute/dcgf.h"
#include "engines/wintermute/base/gfx/base_image.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/graphics/transparentSurface.h"
-#include "engines/wintermute/utils/StringUtil.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/graphics/transparent_surface.h"
+#include "engines/wintermute/utils/string_util.h"
#include "graphics/decoders/png.h"
#include "graphics/decoders/jpeg.h"
#include "graphics/decoders/bmp.h"
diff --git a/engines/wintermute/base/gfx/base_image.h b/engines/wintermute/base/gfx/base_image.h index 646a9ddd2d..6cda3e6b46 100644 --- a/engines/wintermute/base/gfx/base_image.h +++ b/engines/wintermute/base/gfx/base_image.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_BIMAGE_H
#define WINTERMUTE_BIMAGE_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
#include "graphics/surface.h"
#include "graphics/pixelformat.h"
#include "graphics/decoders/image_decoder.h"
diff --git a/engines/wintermute/base/gfx/base_renderer.cpp b/engines/wintermute/base/gfx/base_renderer.cpp index 5c5ebd91b4..a8c19362f6 100644 --- a/engines/wintermute/base/gfx/base_renderer.cpp +++ b/engines/wintermute/base/gfx/base_renderer.cpp @@ -27,11 +27,11 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BActiveRect.h"
+#include "engines/wintermute/base/base_active_rect.h"
#include "engines/wintermute/base/gfx/base_renderer.h"
#include "engines/wintermute/base/gfx/base_surface.h"
-#include "engines/wintermute/base/BSubFrame.h"
-#include "engines/wintermute/base/BRegion.h"
+#include "engines/wintermute/base/base_sub_frame.h"
+#include "engines/wintermute/base/base_region.h"
#include "engines/wintermute/platform_osystem.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/gfx/base_renderer.h b/engines/wintermute/base/gfx/base_renderer.h index 81c13f8b39..d743f19791 100644 --- a/engines/wintermute/base/gfx/base_renderer.h +++ b/engines/wintermute/base/gfx/base_renderer.h @@ -31,7 +31,7 @@ #include "engines/wintermute/coll_templ.h"
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
#include "common/rect.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/gfx/base_surface.cpp b/engines/wintermute/base/gfx/base_surface.cpp index 6c0ca40765..73b385d180 100644 --- a/engines/wintermute/base/gfx/base_surface.cpp +++ b/engines/wintermute/base/gfx/base_surface.cpp @@ -27,7 +27,7 @@ */
#include "engines/wintermute/wintypes.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/base/gfx/base_surface.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/gfx/base_surface.h b/engines/wintermute/base/gfx/base_surface.h index f5fbd495aa..22c1fb83b8 100644 --- a/engines/wintermute/base/gfx/base_surface.h +++ b/engines/wintermute/base/gfx/base_surface.h @@ -29,8 +29,8 @@ #ifndef WINTERMUTE_BSURFACE_H
#define WINTERMUTE_BSURFACE_H
-#include "engines/wintermute/base/BBase.h"
-#include "engines/wintermute/math/Rect32.h"
+#include "engines/wintermute/base/base.h"
+#include "engines/wintermute/math/rect32.h"
#include "graphics/surface.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp index ee971ab6c9..dbd2511928 100644 --- a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp +++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp @@ -28,15 +28,15 @@ #include "engines/wintermute/dcgf.h"
#include "engines/wintermute/base/gfx/osystem/base_render_osystem.h"
-#include "engines/wintermute/base/BRegistry.h"
+#include "engines/wintermute/base/base_registry.h"
#include "engines/wintermute/base/gfx/osystem/base_surface_osystem.h"
-#include "engines/wintermute/base/BSurfaceStorage.h"
+#include "engines/wintermute/base/base_surface_storage.h"
#include "engines/wintermute/base/gfx/base_image.h"
-#include "engines/wintermute/math/MathUtil.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BSprite.h"
+#include "engines/wintermute/math/math_util.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_sprite.h"
#include "common/system.h"
-#include "engines/wintermute/graphics/transparentSurface.h"
+#include "engines/wintermute/graphics/transparent_surface.h"
#include "common/queue.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp index 66c6e4a61a..87c5731b49 100644 --- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp +++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp @@ -26,9 +26,9 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/base/file/BFile.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/file/base_file.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/base/gfx/osystem/base_surface_osystem.h"
#include "engines/wintermute/base/gfx/osystem/base_render_osystem.h"
#include "engines/wintermute/base/gfx/base_image.h"
@@ -36,7 +36,7 @@ #include "graphics/decoders/png.h"
#include "graphics/decoders/bmp.h"
#include "graphics/decoders/jpeg.h"
-#include "engines/wintermute/graphics/transparentSurface.h"
+#include "engines/wintermute/graphics/transparent_surface.h"
#include "engines/wintermute/graphics/tga.h"
#include "graphics/pixelformat.h"
#include "graphics/surface.h"
diff --git a/engines/wintermute/base/particles/PartEmitter.cpp b/engines/wintermute/base/particles/part_emitter.cpp index 97de1fe044..11ebafd329 100644 --- a/engines/wintermute/base/particles/PartEmitter.cpp +++ b/engines/wintermute/base/particles/part_emitter.cpp @@ -27,15 +27,15 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/particles/PartEmitter.h"
-#include "engines/wintermute/base/particles/PartParticle.h"
-#include "engines/wintermute/math/Vector2.h"
+#include "engines/wintermute/base/particles/part_emitter.h"
+#include "engines/wintermute/base/particles/part_particle.h"
+#include "engines/wintermute/math/vector2.h"
#include "engines/wintermute/math/Matrix4.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BRegion.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_region.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/utils/utils.h"
#include "engines/wintermute/platform_osystem.h"
#include "common/str.h"
diff --git a/engines/wintermute/base/particles/PartEmitter.h b/engines/wintermute/base/particles/part_emitter.h index 5156783653..cff0a1ec83 100644 --- a/engines/wintermute/base/particles/PartEmitter.h +++ b/engines/wintermute/base/particles/part_emitter.h @@ -30,8 +30,8 @@ #define WINTERMUTE_PARTEMITTER_H
-#include "engines/wintermute/base/BObject.h"
-#include "engines/wintermute/base/particles/PartForce.h"
+#include "engines/wintermute/base/base_object.h"
+#include "engines/wintermute/base/particles/part_force.h"
namespace WinterMute {
class CBRegion;
diff --git a/engines/wintermute/base/particles/PartForce.cpp b/engines/wintermute/base/particles/part_force.cpp index b864c05292..2f330c21b0 100644 --- a/engines/wintermute/base/particles/PartForce.cpp +++ b/engines/wintermute/base/particles/part_force.cpp @@ -28,8 +28,8 @@ #include "engines/wintermute/dcgf.h"
#include "engines/wintermute/persistent.h"
-#include "engines/wintermute/base/particles/PartForce.h"
-#include "engines/wintermute/base/BPersistMgr.h"
+#include "engines/wintermute/base/particles/part_force.h"
+#include "engines/wintermute/base/base_persistence_manager.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/particles/PartForce.h b/engines/wintermute/base/particles/part_force.h index 640c8d7f20..f0a6d66c43 100644 --- a/engines/wintermute/base/particles/PartForce.h +++ b/engines/wintermute/base/particles/part_force.h @@ -30,9 +30,9 @@ #define WINTERMUTE_PARTFORCE_H
-#include "engines/wintermute/base/BBase.h"
-#include "engines/wintermute/base/BNamedObject.h"
-#include "engines/wintermute/math/Vector2.h"
+#include "engines/wintermute/base/base.h"
+#include "engines/wintermute/base/base_named_object.h"
+#include "engines/wintermute/math/vector2.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/particles/PartParticle.cpp b/engines/wintermute/base/particles/part_particle.cpp index 1439231993..931f7558c7 100644 --- a/engines/wintermute/base/particles/PartParticle.cpp +++ b/engines/wintermute/base/particles/part_particle.cpp @@ -27,10 +27,10 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/particles/PartParticle.h"
-#include "engines/wintermute/base/particles/PartEmitter.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/particles/part_particle.h"
+#include "engines/wintermute/base/particles/part_emitter.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/utils/utils.h"
#include "engines/wintermute/platform_osystem.h"
#include "common/str.h"
diff --git a/engines/wintermute/base/particles/PartParticle.h b/engines/wintermute/base/particles/part_particle.h index ab5730d3c5..0b256d44ec 100644 --- a/engines/wintermute/base/particles/PartParticle.h +++ b/engines/wintermute/base/particles/part_particle.h @@ -30,9 +30,9 @@ #define WINTERMUTE_PARTPARTICLE_H
-#include "engines/wintermute/base/BBase.h"
-#include "engines/wintermute/math/Rect32.h"
-#include "engines/wintermute/math/Vector2.h"
+#include "engines/wintermute/base/base.h"
+#include "engines/wintermute/math/rect32.h"
+#include "engines/wintermute/math/vector2.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/ScScript.cpp b/engines/wintermute/base/scriptables/script.cpp index 0b5b3c24bf..a9646e0045 100644 --- a/engines/wintermute/base/scriptables/ScScript.cpp +++ b/engines/wintermute/base/scriptables/script.cpp @@ -27,11 +27,11 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/scriptables/ScEngine.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/scriptables/script_engine.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
#include "common/memstream.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/ScScript.h b/engines/wintermute/base/scriptables/script.h index c031f8186f..899e1f3098 100644 --- a/engines/wintermute/base/scriptables/ScScript.h +++ b/engines/wintermute/base/scriptables/script.h @@ -30,7 +30,7 @@ #define WINTERMUTE_SCSCRIPT_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
#include "engines/wintermute/dcscript.h" // Added by ClassView
#include "engines/wintermute/coll_templ.h"
diff --git a/engines/wintermute/base/scriptables/ScEngine.cpp b/engines/wintermute/base/scriptables/script_engine.cpp index db79a7d0e9..387093ac4a 100644 --- a/engines/wintermute/base/scriptables/ScEngine.cpp +++ b/engines/wintermute/base/scriptables/script_engine.cpp @@ -27,16 +27,16 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/scriptables/ScEngine.h"
-#include "engines/wintermute/utils/StringUtil.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/SXMath.h"
-#include "engines/wintermute/base/BRegistry.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BSound.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/scriptables/script_engine.h"
+#include "engines/wintermute/utils/string_util.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_ext_math.h"
+#include "engines/wintermute/base/base_registry.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/sound/base_sound.h"
+#include "engines/wintermute/base/base_file_manager.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/ScEngine.h b/engines/wintermute/base/scriptables/script_engine.h index 0322319b3d..81dc13a73c 100644 --- a/engines/wintermute/base/scriptables/ScEngine.h +++ b/engines/wintermute/base/scriptables/script_engine.h @@ -31,7 +31,7 @@ #include "engines/wintermute/persistent.h"
#include "engines/wintermute/coll_templ.h"
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
#include "engines/wintermute/wme_debugger.h"
#include "engines/wintermute/utils/utils.h"
#include "engines/wintermute/platform_osystem.h"
diff --git a/engines/wintermute/base/scriptables/SXArray.cpp b/engines/wintermute/base/scriptables/script_ext_array.cpp index 425118a3e7..a1b8249cb1 100644 --- a/engines/wintermute/base/scriptables/SXArray.cpp +++ b/engines/wintermute/base/scriptables/script_ext_array.cpp @@ -27,10 +27,10 @@ */
#include "engines/wintermute/persistent.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/system/SysInstance.h"
-#include "engines/wintermute/base/scriptables/SXArray.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/system/sys_instance.h"
+#include "engines/wintermute/base/scriptables/script_ext_array.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SXArray.h b/engines/wintermute/base/scriptables/script_ext_array.h index 0f46bd546e..b873416572 100644 --- a/engines/wintermute/base/scriptables/SXArray.h +++ b/engines/wintermute/base/scriptables/script_ext_array.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_SXARRAY_H
#define WINTERMUTE_SXARRAY_H
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base_scriptable.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SXDate.cpp b/engines/wintermute/base/scriptables/script_ext_date.cpp index cd705cc9d4..211c0d34f0 100644 --- a/engines/wintermute/base/scriptables/SXDate.cpp +++ b/engines/wintermute/base/scriptables/script_ext_date.cpp @@ -26,9 +26,9 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/SXDate.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_ext_date.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SXDate.h b/engines/wintermute/base/scriptables/script_ext_date.h index df0641983f..82f6af1f1d 100644 --- a/engines/wintermute/base/scriptables/SXDate.h +++ b/engines/wintermute/base/scriptables/script_ext_date.h @@ -30,7 +30,7 @@ #define WINTERMUTE_SXDATE_H
#include "common/system.h"
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base_scriptable.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SXFile.cpp b/engines/wintermute/base/scriptables/script_ext_file.cpp index 1924a42d72..58c0416b43 100644 --- a/engines/wintermute/base/scriptables/SXFile.cpp +++ b/engines/wintermute/base/scriptables/script_ext_file.cpp @@ -26,17 +26,17 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/system/SysClassRegistry.h"
-#include "engines/wintermute/system/SysClass.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
+#include "engines/wintermute/system/sys_class_registry.h"
+#include "engines/wintermute/system/sys_class.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
#include "engines/wintermute/utils/utils.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/file/BFile.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/file/base_file.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/scriptables/SXFile.h"
+#include "engines/wintermute/base/scriptables/script_ext_file.h"
// Note: This code is completely untested, as I have yet to find a game that uses SXFile.
diff --git a/engines/wintermute/base/scriptables/SXFile.h b/engines/wintermute/base/scriptables/script_ext_file.h index 709d1f4378..5a6811fe57 100644 --- a/engines/wintermute/base/scriptables/SXFile.h +++ b/engines/wintermute/base/scriptables/script_ext_file.h @@ -30,7 +30,7 @@ #define WINTERMUTES_SXFILE_H
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base_scriptable.h"
#include "common/stream.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SXMath.cpp b/engines/wintermute/base/scriptables/script_ext_math.cpp index fb2838ee94..22b08087b7 100644 --- a/engines/wintermute/base/scriptables/SXMath.cpp +++ b/engines/wintermute/base/scriptables/script_ext_math.cpp @@ -26,9 +26,9 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/base/scriptables/SXMath.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
+#include "engines/wintermute/base/scriptables/script_ext_math.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
#include "engines/wintermute/persistent.h"
#include "common/math.h"
#include <cmath>
diff --git a/engines/wintermute/base/scriptables/SXMath.h b/engines/wintermute/base/scriptables/script_ext_math.h index 4389de611f..422521233f 100644 --- a/engines/wintermute/base/scriptables/SXMath.h +++ b/engines/wintermute/base/scriptables/script_ext_math.h @@ -30,7 +30,7 @@ #define WINTERMUTE_SXMATH_H
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base_scriptable.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SXMemBuffer.cpp b/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp index 9ac98ab11d..df2bf188ff 100644 --- a/engines/wintermute/base/scriptables/SXMemBuffer.cpp +++ b/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp @@ -26,11 +26,11 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/base/BScriptable.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/SXMemBuffer.h"
+#include "engines/wintermute/base/base_scriptable.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_ext_mem_buffer.h"
#include "common/file.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SXMemBuffer.h b/engines/wintermute/base/scriptables/script_ext_mem_buffer.h index 09831bf464..a9d78e50e4 100644 --- a/engines/wintermute/base/scriptables/SXMemBuffer.h +++ b/engines/wintermute/base/scriptables/script_ext_mem_buffer.h @@ -30,7 +30,7 @@ #define WINTERMUTE_SXMEMBUFFER_H
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base_scriptable.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SxObject.cpp b/engines/wintermute/base/scriptables/script_ext_object.cpp index ba961ed2ae..cb0d32d1a3 100644 --- a/engines/wintermute/base/scriptables/SxObject.cpp +++ b/engines/wintermute/base/scriptables/script_ext_object.cpp @@ -26,9 +26,9 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "SxObject.h"
-#include "ScValue.h"
-#include "ScStack.h"
+#include "engines/wintermute/base/scriptables/script_ext_object.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SxObject.h b/engines/wintermute/base/scriptables/script_ext_object.h index b4ec7c6cde..b4e869d5b3 100644 --- a/engines/wintermute/base/scriptables/SxObject.h +++ b/engines/wintermute/base/scriptables/script_ext_object.h @@ -30,7 +30,7 @@ #define WINTERMUTE_SXOBJECT_H
-#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/base_object.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SXString.cpp b/engines/wintermute/base/scriptables/script_ext_string.cpp index ed3d243cb0..bd7541fadd 100644 --- a/engines/wintermute/base/scriptables/SXString.cpp +++ b/engines/wintermute/base/scriptables/script_ext_string.cpp @@ -26,13 +26,13 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
#include "engines/wintermute/utils/utils.h"
-#include "engines/wintermute/base/scriptables/SXString.h"
-#include "engines/wintermute/base/scriptables/SXArray.h"
-#include "engines/wintermute/utils/StringUtil.h"
+#include "engines/wintermute/base/scriptables/script_ext_string.h"
+#include "engines/wintermute/base/scriptables/script_ext_array.h"
+#include "engines/wintermute/utils/string_util.h"
#include "common/tokenizer.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SXString.h b/engines/wintermute/base/scriptables/script_ext_string.h index 348595ad29..52a1524dde 100644 --- a/engines/wintermute/base/scriptables/SXString.h +++ b/engines/wintermute/base/scriptables/script_ext_string.h @@ -30,7 +30,7 @@ #define WINTERMUTE_SXSTRING_H
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base_scriptable.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/ScStack.cpp b/engines/wintermute/base/scriptables/script_stack.cpp index 252cd21dda..188cb2d15c 100644 --- a/engines/wintermute/base/scriptables/ScStack.cpp +++ b/engines/wintermute/base/scriptables/script_stack.cpp @@ -26,9 +26,9 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/base_game.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/ScStack.h b/engines/wintermute/base/scriptables/script_stack.h index 22dae63060..6460f901fe 100644 --- a/engines/wintermute/base/scriptables/ScStack.h +++ b/engines/wintermute/base/scriptables/script_stack.h @@ -30,7 +30,7 @@ #define WINTERMUTE_SCSTACK_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
#include "engines/wintermute/coll_templ.h"
#include "engines/wintermute/persistent.h"
diff --git a/engines/wintermute/base/scriptables/ScValue.cpp b/engines/wintermute/base/scriptables/script_value.cpp index f38a12fc7a..da47ed299f 100644 --- a/engines/wintermute/base/scriptables/ScValue.cpp +++ b/engines/wintermute/base/scriptables/script_value.cpp @@ -27,12 +27,12 @@ */
#include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/utils/StringUtil.h"
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/utils/string_util.h"
+#include "engines/wintermute/base/base_scriptable.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/ScValue.h b/engines/wintermute/base/scriptables/script_value.h index c66a60c22a..eaee3ed773 100644 --- a/engines/wintermute/base/scriptables/ScValue.h +++ b/engines/wintermute/base/scriptables/script_value.h @@ -30,7 +30,7 @@ #define WINTERMUTE_SCVALUE_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
#include "engines/wintermute/persistent.h"
#include "engines/wintermute/dcscript.h" // Added by ClassView
#include "engines/wintermute/wme_debugger.h"
diff --git a/engines/wintermute/base/BSound.cpp b/engines/wintermute/base/sound/base_sound.cpp index 2b54b39500..e1819e3c65 100644 --- a/engines/wintermute/base/BSound.cpp +++ b/engines/wintermute/base/sound/base_sound.cpp @@ -26,10 +26,10 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/base/BSound.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BSoundMgr.h"
-#include "engines/wintermute/base/BSoundBuffer.h"
+#include "engines/wintermute/base/sound/base_sound.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/sound/base_sound_manager.h"
+#include "engines/wintermute/base/sound/base_sound_buffer.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BSound.h b/engines/wintermute/base/sound/base_sound.h index 9dc825e4ac..ef52194090 100644 --- a/engines/wintermute/base/BSound.h +++ b/engines/wintermute/base/sound/base_sound.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_BSOUND_H
#define WINTERMUTE_BSOUND_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
#include "engines/wintermute/dctypes.h" // Added by ClassView
#include "engines/wintermute/persistent.h"
#include "audio/mixer.h"
diff --git a/engines/wintermute/base/BSoundBuffer.cpp b/engines/wintermute/base/sound/base_sound_buffer.cpp index 4808cc9007..a868f99823 100644 --- a/engines/wintermute/base/BSoundBuffer.cpp +++ b/engines/wintermute/base/sound/base_sound_buffer.cpp @@ -27,11 +27,11 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/file/BFile.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BSoundMgr.h"
-#include "engines/wintermute/base/BSoundBuffer.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/file/base_file.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/sound/base_sound_manager.h"
+#include "engines/wintermute/base/sound/base_sound_buffer.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/utils/utils.h"
#include "audio/audiostream.h"
#include "audio/mixer.h"
diff --git a/engines/wintermute/base/BSoundBuffer.h b/engines/wintermute/base/sound/base_sound_buffer.h index 9384670fbb..a491bd49ad 100644 --- a/engines/wintermute/base/BSoundBuffer.h +++ b/engines/wintermute/base/sound/base_sound_buffer.h @@ -30,7 +30,7 @@ #define WINTERMUTE_BSOUNDBUFFER_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
#include "audio/mixer.h"
#include "common/stream.h"
diff --git a/engines/wintermute/base/BSoundMgr.cpp b/engines/wintermute/base/sound/base_sound_manager.cpp index 66baa633e4..c2174dea6a 100644 --- a/engines/wintermute/base/BSoundMgr.cpp +++ b/engines/wintermute/base/sound/base_sound_manager.cpp @@ -27,13 +27,13 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BSoundMgr.h"
-#include "engines/wintermute/base/BRegistry.h"
-#include "engines/wintermute/utils/PathUtil.h"
-#include "engines/wintermute/utils/StringUtil.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/base/BSoundBuffer.h"
+#include "engines/wintermute/base/sound/base_sound_manager.h"
+#include "engines/wintermute/base/base_registry.h"
+#include "engines/wintermute/utils/path_util.h"
+#include "engines/wintermute/utils/string_util.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/sound/base_sound_buffer.h"
#include "engines/wintermute/wintermute.h"
#include "common/config-manager.h"
#include "audio/mixer.h"
diff --git a/engines/wintermute/base/BSoundMgr.h b/engines/wintermute/base/sound/base_sound_manager.h index a021abadaa..2c05bbfcb8 100644 --- a/engines/wintermute/base/BSoundMgr.h +++ b/engines/wintermute/base/sound/base_sound_manager.h @@ -30,7 +30,7 @@ #define WINTERMUTE_BSOUNDMGR_H
#include "engines/wintermute/coll_templ.h"
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
#include "audio/mixer.h"
#include "common/array.h"
diff --git a/engines/wintermute/coll_templ.h b/engines/wintermute/coll_templ.h index e0d7ad8132..865e60b447 100644 --- a/engines/wintermute/coll_templ.h +++ b/engines/wintermute/coll_templ.h @@ -31,10 +31,12 @@ #include <new>
-#include "engines/wintermute/base/BPersistMgr.h"
+#include "engines/wintermute/base/base_persistence_manager.h"
namespace WinterMute {
+// Quite the same as Common::Array, but with persistence-support.
+
/////////////////////////////////////////////////////////////////////////////
template<class TYPE>
inline void DCConstructElements(TYPE *pElements, int nCount) {
diff --git a/engines/wintermute/detection.cpp b/engines/wintermute/detection.cpp index e3fbb15d3f..0abe78fa35 100644 --- a/engines/wintermute/detection.cpp +++ b/engines/wintermute/detection.cpp @@ -22,7 +22,7 @@ #include "engines/advancedDetector.h" #include "engines/wintermute/wintermute.h" -#include "engines/wintermute/base/BPersistMgr.h" +#include "engines/wintermute/base/base_persistence_manager.h" #include "common/config-manager.h" #include "common/error.h" diff --git a/engines/wintermute/graphics/transparentSurface.cpp b/engines/wintermute/graphics/transparent_surface.cpp index a99138ade6..6ab9c621d0 100644 --- a/engines/wintermute/graphics/transparentSurface.cpp +++ b/engines/wintermute/graphics/transparent_surface.cpp @@ -25,7 +25,7 @@ #include "common/rect.h" #include "common/textconsole.h" #include "graphics/primitives.h" -#include "engines/wintermute/graphics/transparentSurface.h" +#include "engines/wintermute/graphics/transparent_surface.h" namespace WinterMute { diff --git a/engines/wintermute/graphics/transparentSurface.h b/engines/wintermute/graphics/transparent_surface.h index e271bf2488..e271bf2488 100644 --- a/engines/wintermute/graphics/transparentSurface.h +++ b/engines/wintermute/graphics/transparent_surface.h diff --git a/engines/wintermute/math/MathUtil.cpp b/engines/wintermute/math/math_util.cpp index 47b472d9cf..d9449294fb 100644 --- a/engines/wintermute/math/MathUtil.cpp +++ b/engines/wintermute/math/math_util.cpp @@ -26,7 +26,7 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "MathUtil.h"
+#include "engines/wintermute/math/math_util.h"
#include <cmath>
namespace WinterMute {
diff --git a/engines/wintermute/math/MathUtil.h b/engines/wintermute/math/math_util.h index db814a59ac..db814a59ac 100644 --- a/engines/wintermute/math/MathUtil.h +++ b/engines/wintermute/math/math_util.h diff --git a/engines/wintermute/math/Matrix4.cpp b/engines/wintermute/math/matrix4.cpp index 557f0d5c9a..a716e937f4 100644 --- a/engines/wintermute/math/Matrix4.cpp +++ b/engines/wintermute/math/matrix4.cpp @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/math/Matrix4.h"
-#include "engines/wintermute/math/Vector2.h"
+#include "engines/wintermute/math/matrix4.h"
+#include "engines/wintermute/math/vector2.h"
#include <math.h>
namespace WinterMute {
diff --git a/engines/wintermute/math/Matrix4.h b/engines/wintermute/math/matrix4.h index 5def8dfe97..5def8dfe97 100644 --- a/engines/wintermute/math/Matrix4.h +++ b/engines/wintermute/math/matrix4.h diff --git a/engines/wintermute/math/Rect32.h b/engines/wintermute/math/rect32.h index e0babcbbb9..e0babcbbb9 100644 --- a/engines/wintermute/math/Rect32.h +++ b/engines/wintermute/math/rect32.h diff --git a/engines/wintermute/math/Vector2.cpp b/engines/wintermute/math/vector2.cpp index 8bd10320a8..9906a59429 100644 --- a/engines/wintermute/math/Vector2.cpp +++ b/engines/wintermute/math/vector2.cpp @@ -26,7 +26,7 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "Vector2.h"
+#include "engines/wintermute/math/vector2.h"
#include <math.h>
namespace WinterMute {
diff --git a/engines/wintermute/math/Vector2.h b/engines/wintermute/math/vector2.h index 96d3a3827d..96d3a3827d 100644 --- a/engines/wintermute/math/Vector2.h +++ b/engines/wintermute/math/vector2.h diff --git a/engines/wintermute/module.mk b/engines/wintermute/module.mk index 0063d072b1..3ad30cf66b 100644 --- a/engines/wintermute/module.mk +++ b/engines/wintermute/module.mk @@ -1,119 +1,119 @@ MODULE := engines/wintermute MODULE_OBJS := \ - ad/AdActor.o \ - ad/AdEntity.o \ - ad/AdGame.o \ - ad/AdInventory.o \ - ad/AdInventoryBox.o \ - ad/AdItem.o \ - ad/AdLayer.o \ - ad/AdNodeState.o \ - ad/AdObject.o \ - ad/AdPath.o \ - ad/AdPathPoint.o \ - ad/AdRegion.o \ - ad/AdResponse.o \ - ad/AdResponseBox.o \ - ad/AdResponseContext.o \ - ad/AdRotLevel.o \ - ad/AdScaleLevel.o \ - ad/AdScene.o \ - ad/AdSceneNode.o \ - ad/AdSceneState.o \ - ad/AdSentence.o \ - ad/AdSpriteSet.o \ - ad/AdTalkDef.o \ - ad/AdTalkHolder.o \ - ad/AdTalkNode.o \ - ad/AdWaypointGroup.o \ - base/scriptables/ScEngine.o \ - base/scriptables/ScScript.o \ - base/scriptables/ScStack.o \ - base/scriptables/ScValue.o \ - base/scriptables/SXArray.o \ - base/scriptables/SXDate.o \ - base/scriptables/SXFile.o \ - base/scriptables/SXMath.o \ - base/scriptables/SxObject.o \ - base/scriptables/SXMemBuffer.o \ - base/scriptables/SXString.o \ - base/file/BDiskFile.o \ - base/file/BFile.o \ - base/file/BFileEntry.o \ - base/file/BPackage.o \ - base/file/BSaveThumbFile.o \ + ad/ad_actor.o \ + ad/ad_entity.o \ + ad/ad_game.o \ + ad/ad_inventory.o \ + ad/ad_inventory_box.o \ + ad/ad_item.o \ + ad/ad_layer.o \ + ad/ad_node_state.o \ + ad/ad_object.o \ + ad/ad_path.o \ + ad/ad_path_point.o \ + ad/ad_region.o \ + ad/ad_response.o \ + ad/ad_response_box.o \ + ad/ad_response_context.o \ + ad/ad_rot_level.o \ + ad/ad_scale_level.o \ + ad/ad_scene.o \ + ad/ad_scene_node.o \ + ad/ad_scene_state.o \ + ad/ad_sentence.o \ + ad/ad_sprite_set.o \ + ad/ad_talk_def.o \ + ad/ad_talk_holder.o \ + ad/ad_talk_node.o \ + ad/ad_waypoint_group.o \ + base/scriptables/script.o \ + base/scriptables/script_engine.o \ + base/scriptables/script_stack.o \ + base/scriptables/script_value.o \ + base/scriptables/script_ext_array.o \ + base/scriptables/script_ext_date.o \ + base/scriptables/script_ext_file.o \ + base/scriptables/script_ext_math.o \ + base/scriptables/script_ext_object.o \ + base/scriptables/script_ext_mem_buffer.o \ + base/scriptables/script_ext_string.o \ + base/file/base_disk_file.o \ + base/file/base_file.o \ + base/file/base_file_entry.o \ + base/file/base_package.o \ + base/file/base_resources.o \ + base/file/base_save_thumb_file.o \ base/file/BPkgFile.o \ - base/font/BFontBitmap.o \ - base/font/BFontTT.o \ - base/font/BFont.o \ - base/font/BFontStorage.o \ + base/font/base_font_bitmap.o \ + base/font/base_font_truetype.o \ + base/font/base_font.o \ + base/font/base_font_storage.o \ base/gfx/base_image.o \ base/gfx/base_renderer.o \ base/gfx/base_surface.o \ base/gfx/osystem/base_surface_osystem.o \ base/gfx/osystem/base_render_osystem.o \ - base/particles/PartParticle.o \ - base/particles/PartEmitter.o \ - base/particles/PartForce.o \ - base/BActiveRect.o \ - base/BBase.o \ - base/BDebugger.o \ - base/BDynBuffer.o \ - base/BFader.o \ - base/BFileManager.o \ - base/BGame.o \ - base/BFrame.o \ - base/BKeyboardState.o \ - base/BNamedObject.o \ - base/BObject.o \ - base/BParser.o \ - base/BPersistMgr.o \ - base/BPoint.o \ - base/BQuickMsg.o \ - base/BRegion.o \ - base/BRegistry.o \ - base/BResources.o \ - base/BSaveThumbHelper.o \ - base/BScriptable.o \ - base/BScriptHolder.o \ - base/BSound.o \ - base/BSoundBuffer.o \ - base/BSoundMgr.o \ - base/BSprite.o \ - base/BStringTable.o \ - base/BSubFrame.o \ - base/BSurfaceStorage.o \ - base/BTransitionMgr.o \ - base/BViewport.o \ + base/particles/part_particle.o \ + base/particles/part_emitter.o \ + base/particles/part_force.o \ + base/sound/base_sound.o \ + base/sound/base_sound_buffer.o \ + base/sound/base_sound_manager.o \ + base/base_active_rect.o \ + base/base.o \ + base/base_debugger.o \ + base/base_dynamic_buffer.o \ + base/base_fader.o \ + base/base_file_manager.o \ + base/base_game.o \ + base/base_frame.o \ + base/base_keyboard_state.o \ + base/base_named_object.o \ + base/base_object.o \ + base/base_parser.o \ + base/base_persistence_manager.o \ + base/base_point.o \ + base/base_quick_msg.o \ + base/base_region.o \ + base/base_registry.o \ + base/base_save_thumb_helper.o \ + base/base_scriptable.o \ + base/base_script_holder.o \ + base/base_sprite.o \ + base/base_string_table.o \ + base/base_sub_frame.o \ + base/base_surface_storage.o \ + base/base_transition_manager.o \ + base/base_viewport.o \ detection.o \ - graphics/transparentSurface.o \ + graphics/transparent_surface.o \ graphics/tga.o \ - math/MathUtil.o \ - math/Matrix4.o \ - math/Vector2.o \ + math/math_util.o \ + math/matrix4.o \ + math/vector2.o \ platform_osystem.o \ - system/SysClass.o \ - system/SysClassRegistry.o \ - system/SysInstance.o \ + system/sys_class.o \ + system/sys_class_registry.o \ + system/sys_instance.o \ tinyxml/tinyxml.o \ tinyxml/tinystr.o \ tinyxml/tinyxmlparser.o \ tinyxml/tinyxmlerror.o \ - ui/UIButton.o \ - ui/UIEdit.o \ - ui/UIEntity.o \ - ui/UIObject.o \ - ui/UIText.o \ - ui/UITiledImage.o \ - ui/UIWindow.o \ - utils/ConvertUTF.o \ + ui/ui_button.o \ + ui/ui_edit.o \ + ui/ui_entity.o \ + ui/ui_object.o \ + ui/ui_text.o \ + ui/ui_tiled_image.o \ + ui/ui_window.o \ + utils/convert_utf.o \ utils/crc.o \ - utils/PathUtil.o \ - utils/StringUtil.o \ + utils/path_util.o \ + utils/string_util.o \ utils/utils.o \ - video/VidPlayer.o \ - video/VidTheoraPlayer.o \ + video/video_player.o \ + video/video_theora_player.o \ video/decoders/theora_decoder.o \ wintermute.o \ persistent.o diff --git a/engines/wintermute/persistent.cpp b/engines/wintermute/persistent.cpp index 10c2132326..57997405de 100644 --- a/engines/wintermute/persistent.cpp +++ b/engines/wintermute/persistent.cpp @@ -26,67 +26,67 @@ * Copyright (c) 2011 Jan Nedoma */ -#include "engines/wintermute/ad/AdActor.h" -#include "engines/wintermute/ad/AdEntity.h" -#include "engines/wintermute/ad/AdGame.h" -#include "engines/wintermute/ad/AdInventory.h" -#include "engines/wintermute/ad/AdInventoryBox.h" -#include "engines/wintermute/ad/AdItem.h" -#include "engines/wintermute/ad/AdLayer.h" -#include "engines/wintermute/ad/AdNodeState.h" -#include "engines/wintermute/ad/AdObject.h" -#include "engines/wintermute/ad/AdPath.h" -#include "engines/wintermute/ad/AdPathPoint.h" -#include "engines/wintermute/ad/AdRegion.h" -#include "engines/wintermute/ad/AdResponse.h" -#include "engines/wintermute/ad/AdResponseBox.h" -#include "engines/wintermute/ad/AdResponseContext.h" -#include "engines/wintermute/ad/AdRotLevel.h" -#include "engines/wintermute/ad/AdScaleLevel.h" -#include "engines/wintermute/ad/AdScene.h" -#include "engines/wintermute/ad/AdSceneNode.h" -#include "engines/wintermute/ad/AdSceneState.h" -#include "engines/wintermute/ad/AdSentence.h" -#include "engines/wintermute/ad/AdSpriteSet.h" -#include "engines/wintermute/ad/AdTalkDef.h" -#include "engines/wintermute/ad/AdTalkHolder.h" -#include "engines/wintermute/ad/AdTalkNode.h" -#include "engines/wintermute/ad/AdWaypointGroup.h" -#include "engines/wintermute/base/BFader.h" -#include "engines/wintermute/base/font/BFontBitmap.h" -#include "engines/wintermute/base/font/BFontStorage.h" -#include "engines/wintermute/base/font/BFontTT.h" -#include "engines/wintermute/base/BFrame.h" -#include "engines/wintermute/base/BGame.h" -#include "engines/wintermute/base/BKeyboardState.h" -#include "engines/wintermute/base/BObject.h" -#include "engines/wintermute/base/BPoint.h" -#include "engines/wintermute/base/BRegion.h" -#include "engines/wintermute/base/BScriptable.h" -#include "engines/wintermute/base/BScriptHolder.h" -#include "engines/wintermute/base/BSound.h" -#include "engines/wintermute/base/BSprite.h" -#include "engines/wintermute/base/BSubFrame.h" -#include "engines/wintermute/base/BViewport.h" -#include "engines/wintermute/base/scriptables/ScEngine.h" -#include "engines/wintermute/base/scriptables/ScScript.h" -#include "engines/wintermute/base/scriptables/ScStack.h" -#include "engines/wintermute/base/scriptables/ScValue.h" -#include "engines/wintermute/base/scriptables/SXArray.h" -#include "engines/wintermute/base/scriptables/SXDate.h" -#include "engines/wintermute/base/scriptables/SXFile.h" -#include "engines/wintermute/base/scriptables/SXMath.h" -#include "engines/wintermute/base/scriptables/SXMemBuffer.h" -#include "engines/wintermute/base/scriptables/SxObject.h" -#include "engines/wintermute/base/scriptables/SXString.h" -#include "engines/wintermute/ui/UIButton.h" -#include "engines/wintermute/ui/UIEdit.h" -#include "engines/wintermute/ui/UIEntity.h" -#include "engines/wintermute/ui/UIText.h" -#include "engines/wintermute/ui/UITiledImage.h" -#include "engines/wintermute/ui/UIWindow.h" -#include "engines/wintermute/video/VidTheoraPlayer.h" -#include "engines/wintermute/system/SysClass.h" +#include "engines/wintermute/ad/ad_actor.h" +#include "engines/wintermute/ad/ad_entity.h" +#include "engines/wintermute/ad/ad_game.h" +#include "engines/wintermute/ad/ad_inventory.h" +#include "engines/wintermute/ad/ad_inventory_box.h" +#include "engines/wintermute/ad/ad_item.h" +#include "engines/wintermute/ad/ad_layer.h" +#include "engines/wintermute/ad/ad_node_state.h" +#include "engines/wintermute/ad/ad_object.h" +#include "engines/wintermute/ad/ad_path.h" +#include "engines/wintermute/ad/ad_path_point.h" +#include "engines/wintermute/ad/ad_region.h" +#include "engines/wintermute/ad/ad_response.h" +#include "engines/wintermute/ad/ad_response_box.h" +#include "engines/wintermute/ad/ad_response_context.h" +#include "engines/wintermute/ad/ad_rot_level.h" +#include "engines/wintermute/ad/ad_scale_level.h" +#include "engines/wintermute/ad/ad_scene.h" +#include "engines/wintermute/ad/ad_scene_node.h" +#include "engines/wintermute/ad/ad_scene_state.h" +#include "engines/wintermute/ad/ad_sentence.h" +#include "engines/wintermute/ad/ad_sprite_set.h" +#include "engines/wintermute/ad/ad_talk_def.h" +#include "engines/wintermute/ad/ad_talk_holder.h" +#include "engines/wintermute/ad/ad_talk_node.h" +#include "engines/wintermute/ad/ad_waypoint_group.h" +#include "engines/wintermute/base/base_Fader.h" +#include "engines/wintermute/base/font/base_font_bitmap.h" +#include "engines/wintermute/base/font/base_font_storage.h" +#include "engines/wintermute/base/font/base_font_truetype.h" +#include "engines/wintermute/base/base_frame.h" +#include "engines/wintermute/base/base_game.h" +#include "engines/wintermute/base/base_Keyboard_state.h" +#include "engines/wintermute/base/base_object.h" +#include "engines/wintermute/base/base_point.h" +#include "engines/wintermute/base/base_region.h" +#include "engines/wintermute/base/base_scriptable.h" +#include "engines/wintermute/base/base_script_holder.h" +#include "engines/wintermute/base/sound/base_sound.h" +#include "engines/wintermute/base/base_sprite.h" +#include "engines/wintermute/base/base_sub_frame.h" +#include "engines/wintermute/base/base_viewport.h" +#include "engines/wintermute/base/scriptables/script_engine.h" +#include "engines/wintermute/base/scriptables/script.h" +#include "engines/wintermute/base/scriptables/script_stack.h" +#include "engines/wintermute/base/scriptables/script_value.h" +#include "engines/wintermute/base/scriptables/script_ext_array.h" +#include "engines/wintermute/base/scriptables/script_ext_date.h" +#include "engines/wintermute/base/scriptables/script_ext_file.h" +#include "engines/wintermute/base/scriptables/script_ext_math.h" +#include "engines/wintermute/base/scriptables/script_ext_mem_buffer.h" +#include "engines/wintermute/base/scriptables/script_ext_object.h" +#include "engines/wintermute/base/scriptables/script_ext_string.h" +#include "engines/wintermute/ui/ui_button.h" +#include "engines/wintermute/ui/ui_edit.h" +#include "engines/wintermute/ui/ui_entity.h" +#include "engines/wintermute/ui/ui_text.h" +#include "engines/wintermute/ui/ui_tiled_image.h" +#include "engines/wintermute/ui/ui_window.h" +#include "engines/wintermute/video/video_theora_player.h" +#include "engines/wintermute/system/sys_class.h" // CSysClass adds these objects to the registry, thus they aren't as leaked as they look #define REGISTER_CLASS(class_name, persistent_class)\ diff --git a/engines/wintermute/persistent.h b/engines/wintermute/persistent.h index a7d028b911..a5dac465b3 100644 --- a/engines/wintermute/persistent.h +++ b/engines/wintermute/persistent.h @@ -39,7 +39,7 @@ typedef bool(*PERSISTLOAD)(void *, CBPersistMgr *); typedef void (*SYS_INSTANCE_CALLBACK)(void *Instance, void *Data); } // end of namespace WinterMute -#include "engines/wintermute/system/SysClassRegistry.h" +#include "engines/wintermute/system/sys_class_registry.h" namespace WinterMute { diff --git a/engines/wintermute/platform_osystem.cpp b/engines/wintermute/platform_osystem.cpp index 82b53da723..2be73b7256 100644 --- a/engines/wintermute/platform_osystem.cpp +++ b/engines/wintermute/platform_osystem.cpp @@ -27,13 +27,13 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/base/gfx/osystem/base_render_osystem.h"
-#include "engines/wintermute/utils/PathUtil.h"
+#include "engines/wintermute/utils/path_util.h"
#include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/BRegistry.h"
-#include "engines/wintermute/base/BSoundMgr.h"
-#include "engines/wintermute/base/scriptables/ScEngine.h"
+#include "engines/wintermute/base/base_registry.h"
+#include "engines/wintermute/base/sound/base_sound_manager.h"
+#include "engines/wintermute/base/scriptables/script_engine.h"
#include "common/str.h"
#include "common/textconsole.h"
#include "common/system.h"
diff --git a/engines/wintermute/platform_osystem.h b/engines/wintermute/platform_osystem.h index e0314898bf..50b07bccb8 100644 --- a/engines/wintermute/platform_osystem.h +++ b/engines/wintermute/platform_osystem.h @@ -30,7 +30,7 @@ #define WINTERMUTE_PLATFORMSDL_H
#include "engines/wintermute/dctypes.h"
-#include "engines/wintermute/math/Rect32.h"
+#include "engines/wintermute/math/rect32.h"
#include "engines/wintermute/wintypes.h"
#include "common/events.h"
diff --git a/engines/wintermute/system/SysClass.cpp b/engines/wintermute/system/sys_class.cpp index 2d1066ab5a..be70f8b8bd 100644 --- a/engines/wintermute/system/SysClass.cpp +++ b/engines/wintermute/system/sys_class.cpp @@ -27,11 +27,11 @@ */
#include "engines/wintermute/persistent.h"
-#include "SysInstance.h"
-#include "SysClass.h"
-#include "SysClassRegistry.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BPersistMgr.h"
+#include "engines/wintermute/system/sys_instance.h"
+#include "engines/wintermute/system/sys_class.h"
+#include "engines/wintermute/system/sys_class_registry.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_persistence_manager.h"
namespace WinterMute {
diff --git a/engines/wintermute/system/SysClass.h b/engines/wintermute/system/sys_class.h index f807ea677c..f807ea677c 100644 --- a/engines/wintermute/system/SysClass.h +++ b/engines/wintermute/system/sys_class.h diff --git a/engines/wintermute/system/SysClassRegistry.cpp b/engines/wintermute/system/sys_class_registry.cpp index 3260fd3d5f..ce14b01385 100644 --- a/engines/wintermute/system/SysClassRegistry.cpp +++ b/engines/wintermute/system/sys_class_registry.cpp @@ -26,12 +26,12 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/platform_osystem.h"
#include "engines/wintermute/wintermute.h"
-#include "SysInstance.h"
-#include "SysClassRegistry.h"
-#include "engines/wintermute/system/SysClass.h"
+#include "engines/wintermute/system/sys_instance.h"
+#include "engines/wintermute/system/sys_class_registry.h"
+#include "engines/wintermute/system/sys_class.h"
#include "common/stream.h"
namespace WinterMute {
diff --git a/engines/wintermute/system/SysClassRegistry.h b/engines/wintermute/system/sys_class_registry.h index c9c4e8c072..e17ae9bf78 100644 --- a/engines/wintermute/system/SysClassRegistry.h +++ b/engines/wintermute/system/sys_class_registry.h @@ -32,7 +32,7 @@ #include "engines/wintermute/wintypes.h"
#include "engines/wintermute/dctypes.h"
#include "engines/wintermute/persistent.h"
-#include "engines/wintermute/system/SysClass.h"
+#include "engines/wintermute/system/sys_class.h"
#include "common/hashmap.h"
#include "common/hash-str.h"
#include "common/func.h"
diff --git a/engines/wintermute/system/SysInstance.cpp b/engines/wintermute/system/sys_instance.cpp index b7f6079912..c34c3cc64a 100644 --- a/engines/wintermute/system/SysInstance.cpp +++ b/engines/wintermute/system/sys_instance.cpp @@ -26,9 +26,9 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "SysInstance.h"
-#include "SysClassRegistry.h"
-#include "SysClass.h"
+#include "engines/wintermute/system/sys_instance.h"
+#include "engines/wintermute/system/sys_class_registry.h"
+#include "engines/wintermute/system/sys_class.h"
namespace WinterMute {
diff --git a/engines/wintermute/system/SysInstance.h b/engines/wintermute/system/sys_instance.h index 6becd491af..6becd491af 100644 --- a/engines/wintermute/system/SysInstance.h +++ b/engines/wintermute/system/sys_instance.h diff --git a/engines/wintermute/ui/UIButton.cpp b/engines/wintermute/ui/ui_button.cpp index 273f923376..5b1867b652 100644 --- a/engines/wintermute/ui/UIButton.cpp +++ b/engines/wintermute/ui/ui_button.cpp @@ -27,21 +27,21 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/ui/UIButton.h"
-#include "engines/wintermute/ui/UITiledImage.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BActiveRect.h"
-#include "engines/wintermute/base/font/BFontStorage.h"
-#include "engines/wintermute/base/font/BFont.h"
-#include "engines/wintermute/base/BStringTable.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/ui/ui_button.h"
+#include "engines/wintermute/ui/ui_tiled_image.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_active_rect.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/base/base_string_table.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
namespace WinterMute {
diff --git a/engines/wintermute/ui/UIButton.h b/engines/wintermute/ui/ui_button.h index 5bdc075ebc..c6538f4423 100644 --- a/engines/wintermute/ui/UIButton.h +++ b/engines/wintermute/ui/ui_button.h @@ -30,7 +30,7 @@ #define WINTERMUTE_UIBUTTON_H
-#include "UIObject.h"
+#include "engines/wintermute/ui/ui_object.h"
#include "engines/wintermute/dctypes.h" // Added by ClassView
namespace WinterMute {
diff --git a/engines/wintermute/ui/UIEdit.cpp b/engines/wintermute/ui/ui_edit.cpp index 610853d8cb..237b944332 100644 --- a/engines/wintermute/ui/UIEdit.cpp +++ b/engines/wintermute/ui/ui_edit.cpp @@ -26,24 +26,24 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/ui/UIEdit.h"
-#include "engines/wintermute/ui/UIObject.h"
-#include "engines/wintermute/ui/UITiledImage.h"
-#include "engines/wintermute/utils/StringUtil.h"
-#include "engines/wintermute/base/BActiveRect.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/base/font/BFont.h"
-#include "engines/wintermute/base/font/BFontStorage.h"
-#include "engines/wintermute/base/BKeyboardState.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BStringTable.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/ui/ui_edit.h"
+#include "engines/wintermute/ui/ui_object.h"
+#include "engines/wintermute/ui/ui_tiled_image.h"
+#include "engines/wintermute/utils/string_util.h"
+#include "engines/wintermute/base/base_active_rect.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
+#include "engines/wintermute/base/base_keyboard_state.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_string_table.h"
+#include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script.h"
#include "engines/wintermute/utils/utils.h"
#include "common/util.h"
#include "common/keyboard.h"
diff --git a/engines/wintermute/ui/UIEdit.h b/engines/wintermute/ui/ui_edit.h index 7249301592..400cd7b578 100644 --- a/engines/wintermute/ui/UIEdit.h +++ b/engines/wintermute/ui/ui_edit.h @@ -30,7 +30,7 @@ #define WINTERMUTE_UIEDIT_H
#include "engines/wintermute/persistent.h"
-#include "UIObject.h"
+#include "engines/wintermute/ui/ui_object.h"
#include "common/events.h"
namespace WinterMute {
diff --git a/engines/wintermute/ui/UIEntity.cpp b/engines/wintermute/ui/ui_entity.cpp index 7fbd2d13ff..012ff0390f 100644 --- a/engines/wintermute/ui/UIEntity.cpp +++ b/engines/wintermute/ui/ui_entity.cpp @@ -26,15 +26,15 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/ad/AdEntity.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/ui/UIEntity.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/ad/ad_entity.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/ui/ui_entity.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
namespace WinterMute {
diff --git a/engines/wintermute/ui/UIEntity.h b/engines/wintermute/ui/ui_entity.h index b0711838a5..6873000681 100644 --- a/engines/wintermute/ui/UIEntity.h +++ b/engines/wintermute/ui/ui_entity.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_UIENTITY_H
#define WINTERMUTE_UIENTITY_H
-#include "UIObject.h"
+#include "engines/wintermute/ui/ui_object.h"
namespace WinterMute {
class CAdEntity;
diff --git a/engines/wintermute/ui/UIObject.cpp b/engines/wintermute/ui/ui_object.cpp index 8b3dc19537..605b5b74b1 100644 --- a/engines/wintermute/ui/UIObject.cpp +++ b/engines/wintermute/ui/ui_object.cpp @@ -26,15 +26,15 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/ui/UIObject.h"
-#include "engines/wintermute/ui/UITiledImage.h"
-#include "engines/wintermute/ui/UIWindow.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/ui/ui_object.h"
+#include "engines/wintermute/ui/ui_tiled_image.h"
+#include "engines/wintermute/ui/ui_window.h"
#include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/font/BFontStorage.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
namespace WinterMute {
diff --git a/engines/wintermute/ui/UIObject.h b/engines/wintermute/ui/ui_object.h index 26eecefe89..35bd092592 100644 --- a/engines/wintermute/ui/UIObject.h +++ b/engines/wintermute/ui/ui_object.h @@ -30,7 +30,7 @@ #define WINTERMUTE_UIOBJECT_H
-#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/base_object.h"
#include "engines/wintermute/dctypes.h" // Added by ClassView
namespace WinterMute {
diff --git a/engines/wintermute/ui/UIText.cpp b/engines/wintermute/ui/ui_text.cpp index a496483f67..6309d05a1e 100644 --- a/engines/wintermute/ui/UIText.cpp +++ b/engines/wintermute/ui/ui_text.cpp @@ -27,19 +27,19 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/ui/UIText.h"
-#include "engines/wintermute/ui/UITiledImage.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/font/BFont.h"
-#include "engines/wintermute/base/font/BFontStorage.h"
-#include "engines/wintermute/base/BStringTable.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/ui/ui_text.h"
+#include "engines/wintermute/ui/ui_tiled_image.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
+#include "engines/wintermute/base/base_string_table.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/platform_osystem.h"
namespace WinterMute {
diff --git a/engines/wintermute/ui/UIText.h b/engines/wintermute/ui/ui_text.h index 62fbf00b0a..dc633dc042 100644 --- a/engines/wintermute/ui/UIText.h +++ b/engines/wintermute/ui/ui_text.h @@ -30,7 +30,7 @@ #define WINTERMUTE_UITEXT_H
-#include "UIObject.h"
+#include "engines/wintermute/ui/ui_object.h"
namespace WinterMute {
diff --git a/engines/wintermute/ui/UITiledImage.cpp b/engines/wintermute/ui/ui_tiled_image.cpp index 04a2cfca58..39b39b556d 100644 --- a/engines/wintermute/ui/UITiledImage.cpp +++ b/engines/wintermute/ui/ui_tiled_image.cpp @@ -27,13 +27,13 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ui/UITiledImage.h"
+#include "engines/wintermute/ui/ui_tiled_image.h"
#include "engines/wintermute/base/gfx/base_surface.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BSubFrame.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_sub_frame.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/platform_osystem.h"
namespace WinterMute {
diff --git a/engines/wintermute/ui/UITiledImage.h b/engines/wintermute/ui/ui_tiled_image.h index 379af85e81..79adf7caac 100644 --- a/engines/wintermute/ui/UITiledImage.h +++ b/engines/wintermute/ui/ui_tiled_image.h @@ -30,7 +30,7 @@ #define WINTERMUTE_UITILEDIMAGE_H
-#include "UIObject.h"
+#include "engines/wintermute/ui/ui_object.h"
#include "common/rect.h"
namespace WinterMute {
diff --git a/engines/wintermute/ui/UIWindow.cpp b/engines/wintermute/ui/ui_window.cpp index 35330e720e..269744a3c2 100644 --- a/engines/wintermute/ui/UIWindow.cpp +++ b/engines/wintermute/ui/ui_window.cpp @@ -27,25 +27,25 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ui/UIWindow.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BActiveRect.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BKeyboardState.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/ui/UIButton.h"
-#include "engines/wintermute/ui/UIEdit.h"
-#include "engines/wintermute/ui/UIText.h"
-#include "engines/wintermute/ui/UITiledImage.h"
-#include "engines/wintermute/base/BViewport.h"
-#include "engines/wintermute/base/font/BFontStorage.h"
-#include "engines/wintermute/base/font/BFont.h"
-#include "engines/wintermute/base/BStringTable.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_active_rect.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_keyboard_state.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/ui/ui_button.h"
+#include "engines/wintermute/ui/ui_edit.h"
+#include "engines/wintermute/ui/ui_text.h"
+#include "engines/wintermute/ui/ui_tiled_image.h"
+#include "engines/wintermute/ui/ui_window.h"
+#include "engines/wintermute/base/base_viewport.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/base/base_string_table.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/platform_osystem.h"
namespace WinterMute {
diff --git a/engines/wintermute/ui/UIWindow.h b/engines/wintermute/ui/ui_window.h index f1d46711ff..6fe24c6a2c 100644 --- a/engines/wintermute/ui/UIWindow.h +++ b/engines/wintermute/ui/ui_window.h @@ -30,7 +30,7 @@ #define WINTERMUTE_UIWINDOW_H
-#include "UIObject.h"
+#include "engines/wintermute/ui/ui_object.h"
#include "common/events.h"
namespace WinterMute {
diff --git a/engines/wintermute/utils/ConvertUTF.cpp b/engines/wintermute/utils/convert_utf.cpp index 8f7d6d2124..db0c0fa9f9 100644 --- a/engines/wintermute/utils/ConvertUTF.cpp +++ b/engines/wintermute/utils/convert_utf.cpp @@ -39,7 +39,7 @@ ------------------------------------------------------------------------ */ -#include "ConvertUTF.h" +#include "engines/wintermute/utils/convert_utf.h" #ifdef CVTUTF_DEBUG #include <stdio.h> #endif diff --git a/engines/wintermute/utils/ConvertUTF.h b/engines/wintermute/utils/convert_utf.h index 03a8bb2bae..03a8bb2bae 100644 --- a/engines/wintermute/utils/ConvertUTF.h +++ b/engines/wintermute/utils/convert_utf.h diff --git a/engines/wintermute/utils/crc.cpp b/engines/wintermute/utils/crc.cpp index 0bce1c4c51..933857e066 100644 --- a/engines/wintermute/utils/crc.cpp +++ b/engines/wintermute/utils/crc.cpp @@ -15,7 +15,7 @@ * expressed or implied by its publication or distribution.
**********************************************************************/
-#include "crc.h"
+#include "engines/wintermute/utils/crc.h"
/*
diff --git a/engines/wintermute/utils/PathUtil.cpp b/engines/wintermute/utils/path_util.cpp index 7fa06cf682..6b6b2d6b96 100644 --- a/engines/wintermute/utils/PathUtil.cpp +++ b/engines/wintermute/utils/path_util.cpp @@ -28,8 +28,8 @@ #include "engines/wintermute/dcgf.h"
#include "common/file.h"
-#include "PathUtil.h"
-#include "StringUtil.h"
+#include "engines/wintermute/utils/path_util.h"
+#include "engines/wintermute/utils/string_util.h"
namespace WinterMute {
diff --git a/engines/wintermute/utils/PathUtil.h b/engines/wintermute/utils/path_util.h index 139ce89ddd..139ce89ddd 100644 --- a/engines/wintermute/utils/PathUtil.h +++ b/engines/wintermute/utils/path_util.h diff --git a/engines/wintermute/utils/StringUtil.cpp b/engines/wintermute/utils/string_util.cpp index 303e7b1131..c3fcb09f1d 100644 --- a/engines/wintermute/utils/StringUtil.cpp +++ b/engines/wintermute/utils/string_util.cpp @@ -28,8 +28,8 @@ #include "engines/wintermute/dcgf.h"
#include "common/tokenizer.h"
-#include "StringUtil.h"
-#include "ConvertUTF.h"
+#include "engines/wintermute/utils/string_util.h"
+#include "engines/wintermute/utils/convert_utf.h"
namespace WinterMute {
diff --git a/engines/wintermute/utils/StringUtil.h b/engines/wintermute/utils/string_util.h index bd1b71f405..bd1b71f405 100644 --- a/engines/wintermute/utils/StringUtil.h +++ b/engines/wintermute/utils/string_util.h diff --git a/engines/wintermute/utils/utils.cpp b/engines/wintermute/utils/utils.cpp index 1735732185..e77f35a0e8 100644 --- a/engines/wintermute/utils/utils.cpp +++ b/engines/wintermute/utils/utils.cpp @@ -27,11 +27,11 @@ */
#include "engines/wintermute/dcgf.h"
-#include "utils.h"
+#include "engines/wintermute/utils/utils.h"
#include "engines/wintermute/platform_osystem.h"
#include "engines/wintermute/wintypes.h"
-#include "PathUtil.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/utils/path_util.h"
+#include "engines/wintermute/base/base_game.h"
#include "common/str.h"
#include "common/textconsole.h"
#include "engines/wintermute/wintermute.h"
diff --git a/engines/wintermute/utils/utils.h b/engines/wintermute/utils/utils.h index 14b8f4aa96..c8ca2e121c 100644 --- a/engines/wintermute/utils/utils.h +++ b/engines/wintermute/utils/utils.h @@ -30,7 +30,7 @@ #define WINTERMUTE_UTILS_H
#include "engines/wintermute/wintypes.h"
-#include "engines/wintermute/math/Rect32.h"
+#include "engines/wintermute/math/rect32.h"
namespace WinterMute {
diff --git a/engines/wintermute/video/VidPlayer.cpp b/engines/wintermute/video/video_player.cpp index 93f3196eee..49d1c6c50f 100644 --- a/engines/wintermute/video/VidPlayer.cpp +++ b/engines/wintermute/video/video_player.cpp @@ -28,7 +28,7 @@ #include "engines/wintermute/dcgf.h" -#include "VidPlayer.h" +#include "engines/wintermute/video/video_player.h" //#pragma comment(lib, "vfw32.lib") diff --git a/engines/wintermute/video/VidPlayer.h b/engines/wintermute/video/video_player.h index a44482e4c6..ca6c7fdec5 100644 --- a/engines/wintermute/video/VidPlayer.h +++ b/engines/wintermute/video/video_player.h @@ -34,7 +34,7 @@ #pragma once #endif // _MSC_VER > 1000 -#include "engines/wintermute/base/BBase.h" +#include "engines/wintermute/base/base.h" #define MAX_AUDIO_STREAMS 5 #define MAX_VIDEO_STREAMS 5 diff --git a/engines/wintermute/video/VidTheoraPlayer.cpp b/engines/wintermute/video/video_theora_player.cpp index ffb24d22dd..e3c120ff86 100644 --- a/engines/wintermute/video/VidTheoraPlayer.cpp +++ b/engines/wintermute/video/video_theora_player.cpp @@ -28,13 +28,13 @@ #include "engines/wintermute/dcgf.h" -#include "engines/wintermute/video/VidTheoraPlayer.h" -#include "engines/wintermute/base/BBase.h" -#include "engines/wintermute/base/BGame.h" -#include "engines/wintermute/base/BFileManager.h" +#include "engines/wintermute/video/video_theora_player.h" +#include "engines/wintermute/base/base.h" +#include "engines/wintermute/base/base_game.h" +#include "engines/wintermute/base/base_file_manager.h" #include "engines/wintermute/base/gfx/osystem/base_surface_osystem.h" #include "engines/wintermute/base/gfx/base_image.h" -#include "engines/wintermute/base/BSoundMgr.h" +#include "engines/wintermute/base/sound/base_sound_manager.h" #include "engines/wintermute/utils/utils.h" #include "engines/wintermute/platform_osystem.h" #include "engines/wintermute/video/decoders/theora_decoder.h" diff --git a/engines/wintermute/video/VidTheoraPlayer.h b/engines/wintermute/video/video_theora_player.h index f624c9a972..5bf8e165c7 100644 --- a/engines/wintermute/video/VidTheoraPlayer.h +++ b/engines/wintermute/video/video_theora_player.h @@ -29,8 +29,8 @@ #ifndef WINTERMUTE_VIDTHEORAPLAYER_H #define WINTERMUTE_VIDTHEORAPLAYER_H -#include "engines/wintermute/base/BBase.h" -#include "engines/wintermute/base/file/BFile.h" +#include "engines/wintermute/base/base.h" +#include "engines/wintermute/base/file/base_file.h" #include "engines/wintermute/persistent.h" #include "video/video_decoder.h" #include "common/stream.h" diff --git a/engines/wintermute/wintermute.cpp b/engines/wintermute/wintermute.cpp index 220e9f4057..2a651baabf 100644 --- a/engines/wintermute/wintermute.cpp +++ b/engines/wintermute/wintermute.cpp @@ -31,13 +31,13 @@ #include "common/fs.h" #include "engines/util.h" -#include "engines/wintermute/ad/AdGame.h" +#include "engines/wintermute/ad/ad_game.h" #include "engines/wintermute/wintermute.h" #include "engines/wintermute/platform_osystem.h" -#include "engines/wintermute/base/BRegistry.h" +#include "engines/wintermute/base/base_registry.h" -#include "engines/wintermute/base/BSoundMgr.h" -#include "engines/wintermute/base/scriptables/ScEngine.h" +#include "engines/wintermute/base/sound/base_sound_manager.h" +#include "engines/wintermute/base/scriptables/script_engine.h" namespace WinterMute { |