|
| From: | Kenneth Gangstoe |
| Subject: | [Pingus-CVS] rev 2220 - in trunk: . src src/editor src/gui src/input/axes src/sound src/win32 |
| Date: | Wed, 07 Apr 2004 10:35:55 +0200 |
Author: sphair
Date: 2004-04-07 10:35:55 +0200 (Wed, 07 Apr 2004)
New Revision: 2220
Added:
trunk/Pingus.sln
trunk/Pingus.vcproj
Modified:
trunk/src/console.cxx
trunk/src/editor/editor_event.cxx
trunk/src/gui/display_graphic_context.cxx
trunk/src/gui/gui_screen.cxx
trunk/src/indexed_canvas.cxx
trunk/src/input/axes/mouse_axis.cxx
trunk/src/level_desc.hxx
trunk/src/level_result.cxx
trunk/src/level_result.hxx
trunk/src/sound/slot_manager.cxx
trunk/src/sound/slot_manager.hxx
trunk/src/sound/sound_real.cxx
trunk/src/win32/config.h
Log:
- Many win32 porting issues fixed.
Added: trunk/Pingus.sln
===================================================================
--- trunk/Pingus.sln 2004-04-06 07:55:17 UTC (rev 2219)
+++ trunk/Pingus.sln 2004-04-07 08:35:55 UTC (rev 2220)
@@ -0,0 +1,21 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Pingus", "Pingus.vcproj",
"{BDBBA2EB-B1A9-42FF-A105-EE61D8827854}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Global
+ GlobalSection(SolutionConfiguration) = preSolution
+ Debug = Debug
+ Release = Release
+ EndGlobalSection
+ GlobalSection(ProjectConfiguration) = postSolution
+ {BDBBA2EB-B1A9-42FF-A105-EE61D8827854}.Debug.ActiveCfg =
Debug|Win32
+ {BDBBA2EB-B1A9-42FF-A105-EE61D8827854}.Debug.Build.0 =
Debug|Win32
+ {BDBBA2EB-B1A9-42FF-A105-EE61D8827854}.Release.ActiveCfg =
Release|Win32
+ {BDBBA2EB-B1A9-42FF-A105-EE61D8827854}.Release.Build.0 =
Release|Win32
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ EndGlobalSection
+ GlobalSection(ExtensibilityAddIns) = postSolution
+ EndGlobalSection
+EndGlobal
Added: trunk/Pingus.vcproj
===================================================================
--- trunk/Pingus.vcproj 2004-04-06 07:55:17 UTC (rev 2219)
+++ trunk/Pingus.vcproj 2004-04-07 08:35:55 UTC (rev 2220)
@@ -0,0 +1,2248 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="Pingus"
+ ProjectGUID="{BDBBA2EB-B1A9-42FF-A105-EE61D8827854}"
+ Keyword="Win32Proj">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="1"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="src\win32"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+ MinimalRebuild="TRUE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="iconv.lib intl.lib
libxml2.lib"
+ OutputFile="$(OutDir)/Pingus.exe"
+ LinkIncremental="2"
+ IgnoreDefaultLibraryNames="LIBCMT"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="$(OutDir)/Pingus.pdb"
+ SubSystem="2"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
+ ConfigurationType="1"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+ RuntimeLibrary="4"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)/Pingus.exe"
+ LinkIncremental="1"
+ GenerateDebugInformation="TRUE"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="src"
+ Filter="">
+ <Filter
+ Name="actions"
+ Filter="">
+ <File
+ RelativePath=".\src\actions\angel.cxx">
+ </File>
+ <File
+ RelativePath=".\src\actions\angel.hxx">
+ </File>
+ <File
+ RelativePath=".\src\actions\basher.cxx">
+ </File>
+ <File
+ RelativePath=".\src\actions\basher.hxx">
+ </File>
+ <File
+
RelativePath=".\src\actions\blocker.cxx">
+ </File>
+ <File
+
RelativePath=".\src\actions\blocker.hxx">
+ </File>
+ <File
+
RelativePath=".\src\actions\boarder.cxx">
+ </File>
+ <File
+
RelativePath=".\src\actions\boarder.hxx">
+ </File>
+ <File
+ RelativePath=".\src\actions\bomber.cxx">
+ </File>
+ <File
+ RelativePath=".\src\actions\bomber.hxx">
+ </File>
+ <File
+
RelativePath=".\src\actions\bridger.cxx">
+ </File>
+ <File
+
RelativePath=".\src\actions\bridger.hxx">
+ </File>
+ <File
+
RelativePath=".\src\actions\climber.cxx">
+ </File>
+ <File
+
RelativePath=".\src\actions\climber.hxx">
+ </File>
+ <File
+ RelativePath=".\src\actions\digger.cxx">
+ </File>
+ <File
+ RelativePath=".\src\actions\digger.hxx">
+ </File>
+ <File
+ RelativePath=".\src\actions\drown.cxx">
+ </File>
+ <File
+ RelativePath=".\src\actions\drown.hxx">
+ </File>
+ <File
+ RelativePath=".\src\actions\exiter.cxx">
+ </File>
+ <File
+ RelativePath=".\src\actions\exiter.hxx">
+ </File>
+ <File
+ RelativePath=".\src\actions\faller.cxx">
+ </File>
+ <File
+ RelativePath=".\src\actions\faller.hxx">
+ </File>
+ <File
+
RelativePath=".\src\actions\floater.cxx">
+ </File>
+ <File
+
RelativePath=".\src\actions\floater.hxx">
+ </File>
+ <File
+ RelativePath=".\src\actions\jumper.cxx">
+ </File>
+ <File
+ RelativePath=".\src\actions\jumper.hxx">
+ </File>
+ <File
+
RelativePath=".\src\actions\laser_kill.cxx">
+ </File>
+ <File
+
RelativePath=".\src\actions\laser_kill.hxx">
+ </File>
+ <File
+ RelativePath=".\src\actions\miner.cxx">
+ </File>
+ <File
+ RelativePath=".\src\actions\miner.hxx">
+ </File>
+ <File
+
RelativePath=".\src\actions\rocket_launcher.cxx">
+ </File>
+ <File
+
RelativePath=".\src\actions\rocket_launcher.hxx">
+ </File>
+ <File
+ RelativePath=".\src\actions\slider.cxx">
+ </File>
+ <File
+ RelativePath=".\src\actions\slider.hxx">
+ </File>
+ <File
+
RelativePath=".\src\actions\smashed.cxx">
+ </File>
+ <File
+
RelativePath=".\src\actions\smashed.hxx">
+ </File>
+ <File
+
RelativePath=".\src\actions\splashed.cxx">
+ </File>
+ <File
+
RelativePath=".\src\actions\splashed.hxx">
+ </File>
+ <File
+
RelativePath=".\src\actions\superman.cxx">
+ </File>
+ <File
+
RelativePath=".\src\actions\superman.hxx">
+ </File>
+ <File
+
RelativePath=".\src\actions\teleported.cxx">
+ </File>
+ <File
+
RelativePath=".\src\actions\teleported.hxx">
+ </File>
+ <File
+ RelativePath=".\src\actions\waiter.cxx">
+ </File>
+ <File
+ RelativePath=".\src\actions\waiter.hxx">
+ </File>
+ <File
+ RelativePath=".\src\actions\walker.cxx">
+ </File>
+ <File
+ RelativePath=".\src\actions\walker.hxx">
+ </File>
+ </Filter>
+ <Filter
+ Name="colliders"
+ Filter="">
+ <File
+
RelativePath=".\src\colliders\pingu_collider.cxx">
+ </File>
+ <File
+
RelativePath=".\src\colliders\pingu_collider.hxx">
+ </File>
+ </Filter>
+ <Filter
+ Name="editor"
+ Filter="">
+ <File
+
RelativePath=".\src\editor\action_window.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\action_window.hxx">
+ </File>
+ <File
+ RelativePath=".\src\editor\editor.cxx">
+ </File>
+ <File
+ RelativePath=".\src\editor\editor.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\editor_event.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\editor_event.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\editor_help_screen.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\editor_help_screen.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\editor_view.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\editor_view.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\editorobj.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\editorobj.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\editorobj_group.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\editorobj_group.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\editorobj_mgr.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\generic_property_frame.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\generic_property_frame.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\level_property_window.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\level_property_window.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\level_resizer.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\level_resizer.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\object_manager.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\object_manager.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\object_selector.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\object_selector.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\object_selector_window.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\object_selector_window.hxx">
+ </File>
+ <File
+ RelativePath=".\src\editor\panel.cxx">
+ </File>
+ <File
+ RelativePath=".\src\editor\panel.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\panel_icons.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\panel_icons.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\property_frame.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\property_frame.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\property_window.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\property_window.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\rect_editorobj.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\rect_editorobj.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\scroll_map.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\scroll_map.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\selection.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\selection.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\sprite_editorobj.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\sprite_editorobj.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\start_pos.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\start_pos.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\status_line.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\status_line.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\string_reader.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\string_reader.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\surface_selector.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\surface_selector.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\thumb_cache.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\thumb_cache.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\weather_obj.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editor\weather_obj.hxx">
+ </File>
+ </Filter>
+ <Filter
+ Name="editorobjs"
+ Filter="">
+ <File
+
RelativePath=".\src\editorobjs\bumper_obj.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\bumper_obj.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\conveyor_belt_obj.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\conveyor_belt_obj.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\entrance_obj.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\entrance_obj.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\exit_obj.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\exit_obj.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\fake_exit_obj.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\fake_exit_obj.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\groundpiece_obj.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\groundpiece_obj.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\guillotine_obj.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\guillotine_obj.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\hammer_obj.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\hammer_obj.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\hotspot_obj.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\hotspot_obj.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\ice_block_obj.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\ice_block_obj.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\info_box_obj.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\info_box_obj.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\laser_exit_obj.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\laser_exit_obj.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\liquid_obj.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\liquid_obj.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\prefab_obj.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\prefab_obj.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\smasher_obj.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\smasher_obj.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\solid_color_background_obj.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\solid_color_background_obj.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\spike_obj.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\spike_obj.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\starfield_background_obj.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\starfield_background_obj.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\surface_background_obj.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\surface_background_obj.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\switch_door_obj.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\switch_door_obj.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\switch_door_switch_obj.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\switch_door_switch_obj.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\teleporter_obj.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\teleporter_obj.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\teleporter_target_obj.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\teleporter_target_obj.hxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\thunderstorm_background_obj.cxx">
+ </File>
+ <File
+
RelativePath=".\src\editorobjs\thunderstorm_background_obj.hxx">
+ </File>
+ </Filter>
+ <Filter
+ Name="gui"
+ Filter="">
+ <File
+
RelativePath=".\src\gui\buffer_graphic_context.cxx">
+ </File>
+ <File
+
RelativePath=".\src\gui\buffer_graphic_context.hxx">
+ </File>
+ <File
+ RelativePath=".\src\gui\button.hxx">
+ </File>
+ <File
+ RelativePath=".\src\gui\component.hxx">
+ </File>
+ <File
+ RelativePath=".\src\gui\cursor.cxx">
+ </File>
+ <File
+ RelativePath=".\src\gui\cursor.hxx">
+ </File>
+ <File
+ RelativePath=".\src\gui\display.cxx">
+ </File>
+ <File
+ RelativePath=".\src\gui\display.hxx">
+ </File>
+ <File
+
RelativePath=".\src\gui\display_graphic_context.cxx">
+ </File>
+ <File
+
RelativePath=".\src\gui\display_graphic_context.hxx">
+ </File>
+ <File
+ RelativePath=".\src\gui\game_delta.hxx">
+ </File>
+ <File
+
RelativePath=".\src\gui\game_delta_recorder.hxx">
+ </File>
+ <File
+
RelativePath=".\src\gui\graphic_context.cxx">
+ </File>
+ <File
+
RelativePath=".\src\gui\graphic_context.hxx">
+ </File>
+ <File
+
RelativePath=".\src\gui\gui_manager.cxx">
+ </File>
+ <File
+
RelativePath=".\src\gui\gui_manager.hxx">
+ </File>
+ <File
+ RelativePath=".\src\gui\gui_screen.cxx">
+ </File>
+ <File
+ RelativePath=".\src\gui\gui_screen.hxx">
+ </File>
+ <File
+
RelativePath=".\src\gui\input_debug_screen.cxx">
+ </File>
+ <File
+
RelativePath=".\src\gui\input_debug_screen.hxx">
+ </File>
+ <File
+
RelativePath=".\src\gui\root_gui_manager.cxx">
+ </File>
+ <File
+
RelativePath=".\src\gui\root_gui_manager.hxx">
+ </File>
+ <File
+ RelativePath=".\src\gui\screen.cxx">
+ </File>
+ <File
+ RelativePath=".\src\gui\screen.hxx">
+ </File>
+ <File
+
RelativePath=".\src\gui\screen_manager.cxx">
+ </File>
+ <File
+
RelativePath=".\src\gui\screen_manager.hxx">
+ </File>
+ <File
+
RelativePath=".\src\gui\screen_manager_impl.hxx">
+ </File>
+ <File
+ RelativePath=".\src\gui\screen_ptr.cxx">
+ </File>
+ <File
+ RelativePath=".\src\gui\screen_ptr.hxx">
+ </File>
+ <File
+
RelativePath=".\src\gui\surface_button.cxx">
+ </File>
+ <File
+
RelativePath=".\src\gui\surface_button.hxx">
+ </File>
+ </Filter>
+ <Filter
+ Name="input"
+ Filter="">
+ <File
+ RelativePath=".\src\input\axis.hxx">
+ </File>
+ <File
+
RelativePath=".\src\input\axis_factory.cxx">
+ </File>
+ <File
+
RelativePath=".\src\input\axis_factory.hxx">
+ </File>
+ <File
+ RelativePath=".\src\input\button.hxx">
+ </File>
+ <File
+
RelativePath=".\src\input\button_factory.cxx">
+ </File>
+ <File
+
RelativePath=".\src\input\button_factory.hxx">
+ </File>
+ <File
+
RelativePath=".\src\input\controller.cxx">
+ </File>
+ <File
+
RelativePath=".\src\input\controller.hxx">
+ </File>
+ <File
+ RelativePath=".\src\input\event.hxx">
+ </File>
+ <File
+
RelativePath=".\src\input\event_fwd.hxx">
+ </File>
+ <File
+
RelativePath=".\src\input\key_helper.cxx">
+ </File>
+ <File
+
RelativePath=".\src\input\key_helper.hxx">
+ </File>
+ <File
+ RelativePath=".\src\input\pointer.hxx">
+ </File>
+ <File
+
RelativePath=".\src\input\pointer_factory.cxx">
+ </File>
+ <File
+
RelativePath=".\src\input\pointer_factory.hxx">
+ </File>
+ <File
+ RelativePath=".\src\input\scroller.hxx">
+ </File>
+ <File
+
RelativePath=".\src\input\scroller_factory.cxx">
+ </File>
+ <File
+
RelativePath=".\src\input\scroller_factory.hxx">
+ </File>
+ <Filter
+ Name="axes"
+ Filter="">
+ <File
+
RelativePath=".\src\input\axes\button_axis.cxx">
+ </File>
+ <File
+
RelativePath=".\src\input\axes\button_axis.hxx">
+ </File>
+ <File
+
RelativePath=".\src\input\axes\dummy_axis.hxx">
+ </File>
+ <File
+
RelativePath=".\src\input\axes\inverted_axis.cxx">
+ </File>
+ <File
+
RelativePath=".\src\input\axes\inverted_axis.hxx">
+ </File>
+ <File
+
RelativePath=".\src\input\axes\joystick_axis.cxx">
+ </File>
+ <File
+
RelativePath=".\src\input\axes\joystick_axis.hxx">
+ </File>
+ <File
+
RelativePath=".\src\input\axes\mouse_axis.cxx">
+ <FileConfiguration
+ Name="Debug|Win32"
+
ExcludedFromBuild="TRUE">
+ <Tool
+
Name="VCCLCompilerTool"/>
+ </FileConfiguration>
+ </File>
+ <File
+
RelativePath=".\src\input\axes\mouse_axis.hxx">
+ <FileConfiguration
+ Name="Debug|Win32"
+
ExcludedFromBuild="TRUE">
+ <Tool
+
Name="VCCustomBuildTool"/>
+ </FileConfiguration>
+ </File>
+ <File
+
RelativePath=".\src\input\axes\multiple_axis.cxx">
+ </File>
+ <File
+
RelativePath=".\src\input\axes\multiple_axis.hxx">
+ </File>
+ </Filter>
+ <Filter
+ Name="buttons"
+ Filter="">
+ <File
+
RelativePath=".\src\input\buttons\double_button.cxx">
+ </File>
+ <File
+
RelativePath=".\src\input\buttons\double_button.hxx">
+ </File>
+ <File
+
RelativePath=".\src\input\buttons\dummy_button.hxx">
+ </File>
+ <File
+
RelativePath=".\src\input\buttons\joystick_button.cxx">
+ </File>
+ <File
+
RelativePath=".\src\input\buttons\joystick_button.hxx">
+ </File>
+ <File
+
RelativePath=".\src\input\buttons\key_button.cxx">
+ </File>
+ <File
+
RelativePath=".\src\input\buttons\key_button.hxx">
+ </File>
+ <File
+
RelativePath=".\src\input\buttons\mouse_button.cxx">
+ </File>
+ <File
+
RelativePath=".\src\input\buttons\mouse_button.hxx">
+ </File>
+ <File
+
RelativePath=".\src\input\buttons\multiple_button.cxx">
+ </File>
+ <File
+
RelativePath=".\src\input\buttons\multiple_button.hxx">
+ </File>
+ <File
+
RelativePath=".\src\input\buttons\triple_button.cxx">
+ </File>
+ <File
+
RelativePath=".\src\input\buttons\triple_button.hxx">
+ </File>
+ </Filter>
+ <Filter
+ Name="pointers"
+ Filter="">
+ <File
+
RelativePath=".\src\input\pointers\axis_pointer.cxx">
+ </File>
+ <File
+
RelativePath=".\src\input\pointers\axis_pointer.hxx">
+ </File>
+ <File
+
RelativePath=".\src\input\pointers\dummy_pointer.hxx">
+ </File>
+ <File
+
RelativePath=".\src\input\pointers\mouse_pointer.cxx">
+ </File>
+ <File
+
RelativePath=".\src\input\pointers\mouse_pointer.hxx">
+ </File>
+ <File
+
RelativePath=".\src\input\pointers\multiple_pointer.cxx">
+ </File>
+ <File
+
RelativePath=".\src\input\pointers\multiple_pointer.hxx">
+ </File>
+ </Filter>
+ <Filter
+ Name="scrollers"
+ Filter="">
+ <File
+
RelativePath=".\src\input\scrollers\axis_scroller.cxx">
+ </File>
+ <File
+
RelativePath=".\src\input\scrollers\axis_scroller.hxx">
+ </File>
+ <File
+
RelativePath=".\src\input\scrollers\dummy_scroller.hxx">
+ </File>
+ <File
+
RelativePath=".\src\input\scrollers\inverted_scroller.cxx">
+ </File>
+ <File
+
RelativePath=".\src\input\scrollers\inverted_scroller.hxx">
+ </File>
+ <File
+
RelativePath=".\src\input\scrollers\joystick_scroller.cxx">
+ </File>
+ <File
+
RelativePath=".\src\input\scrollers\joystick_scroller.hxx">
+ </File>
+ <File
+
RelativePath=".\src\input\scrollers\mouse_scroller.cxx">
+ </File>
+ <File
+
RelativePath=".\src\input\scrollers\mouse_scroller.hxx">
+ </File>
+ <File
+
RelativePath=".\src\input\scrollers\multiple_scroller.cxx">
+ </File>
+ <File
+
RelativePath=".\src\input\scrollers\multiple_scroller.hxx">
+ </File>
+ <File
+
RelativePath=".\src\input\scrollers\pointer_scroller.cxx">
+ </File>
+ <File
+
RelativePath=".\src\input\scrollers\pointer_scroller.hxx">
+ </File>
+ </Filter>
+ </Filter>
+ <Filter
+ Name="movers"
+ Filter="">
+ <File
+
RelativePath=".\src\movers\linear_mover.cxx">
+ </File>
+ <File
+
RelativePath=".\src\movers\linear_mover.hxx">
+ </File>
+ </Filter>
+ <Filter
+ Name="particles"
+ Filter="">
+ <File
+
RelativePath=".\src\particles\explosive_particle.cxx">
+ </File>
+ <File
+
RelativePath=".\src\particles\explosive_particle.hxx">
+ </File>
+ <File
+
RelativePath=".\src\particles\ground_particle.cxx">
+ </File>
+ <File
+
RelativePath=".\src\particles\ground_particle.hxx">
+ </File>
+ <File
+
RelativePath=".\src\particles\pingu_particle_holder.cxx">
+ </File>
+ <File
+
RelativePath=".\src\particles\pingu_particle_holder.hxx">
+ </File>
+ <File
+
RelativePath=".\src\particles\rain_particle_holder.cxx">
+ </File>
+ <File
+
RelativePath=".\src\particles\rain_particle_holder.hxx">
+ </File>
+ <File
+
RelativePath=".\src\particles\smoke_particle_holder.cxx">
+ </File>
+ <File
+
RelativePath=".\src\particles\smoke_particle_holder.hxx">
+ </File>
+ <File
+
RelativePath=".\src\particles\snow_particle_holder.cxx">
+ </File>
+ <File
+
RelativePath=".\src\particles\snow_particle_holder.hxx">
+ </File>
+ </Filter>
+ <Filter
+ Name="sound"
+ Filter="">
+ <File
+
RelativePath=".\src\sound\slot_manager.cxx">
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+
Name="VCCLCompilerTool"/>
+ </FileConfiguration>
+ </File>
+ <File
+
RelativePath=".\src\sound\slot_manager.hxx">
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+
Name="VCCustomBuildTool"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\src\sound\sound.cxx">
+ </File>
+ <File
+ RelativePath=".\src\sound\sound.hxx">
+ </File>
+ <File
+
RelativePath=".\src\sound\sound_dummy.cxx">
+ </File>
+ <File
+
RelativePath=".\src\sound\sound_dummy.hxx">
+ </File>
+ <File
+
RelativePath=".\src\sound\sound_real.cxx">
+ </File>
+ <File
+
RelativePath=".\src\sound\sound_real.hxx">
+ </File>
+ <File
+
RelativePath=".\src\sound\sound_res_mgr.cxx">
+ </File>
+ <File
+
RelativePath=".\src\sound\sound_res_mgr.hxx">
+ </File>
+ <File
+ RelativePath=".\src\sound\sounds.hxx">
+ </File>
+ </Filter>
+ <Filter
+ Name="win32"
+ Filter="">
+ <File
+ RelativePath=".\src\win32\config.h">
+ </File>
+ <File
+ RelativePath=".\src\win32\Getopt.c">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ CompileAs="2"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\src\win32\Getopt.h">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+
Name="VCCustomBuildTool"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\src\win32\Getopt1.c">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ CompileAs="2"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\src\win32\pingus.rc">
+ </File>
+ <File
+ RelativePath=".\src\win32\resource.h">
+ </File>
+ </Filter>
+ <Filter
+ Name="worldmap"
+ Filter="">
+ <File
+ RelativePath=".\src\worldmap\dot.cxx">
+ </File>
+ <File
+ RelativePath=".\src\worldmap\dot.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldmap\dot_factory.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldmap\dot_factory.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldmap\drawable.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldmap\drawable.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldmap\drawable_factory.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldmap\drawable_factory.hxx">
+ </File>
+ <File
+ RelativePath=".\src\worldmap\graph.cxx">
+ </File>
+ <File
+ RelativePath=".\src\worldmap\graph.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldmap\level_dot.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldmap\level_dot.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldmap\manager.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldmap\manager.hxx">
+ </File>
+ <File
+ RelativePath=".\src\worldmap\path.cxx">
+ </File>
+ <File
+ RelativePath=".\src\worldmap\path.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldmap\path_drawable.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldmap\path_drawable.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldmap\path_graph.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldmap\path_graph.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldmap\pathfinder.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldmap\pingus.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldmap\pingus.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldmap\sprite_drawable.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldmap\sprite_drawable.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldmap\surface_drawable.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldmap\surface_drawable.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldmap\worldmap.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldmap\worldmap.hxx">
+ </File>
+ </Filter>
+ <Filter
+ Name="worldobjs"
+ Filter="">
+ <File
+
RelativePath=".\src\worldobjs\bumper.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\bumper.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\conveyor_belt.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\conveyor_belt.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\entrance.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\entrance.hxx">
+ </File>
+ <File
+ RelativePath=".\src\worldobjs\exit.cxx">
+ </File>
+ <File
+ RelativePath=".\src\worldobjs\exit.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\fake_exit.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\fake_exit.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\groundpiece.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\groundpiece.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\guillotine.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\guillotine.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\hammer.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\hammer.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\hotspot.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\hotspot.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\ice_block.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\ice_block.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\info_box.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\info_box.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\laser_exit.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\laser_exit.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\liquid.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\liquid.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\rain_generator.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\rain_generator.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\smasher.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\smasher.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\snow_generator.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\snow_generator.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\solid_color_background.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\solid_color_background.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\spike.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\spike.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\starfield_background.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\starfield_background.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\starfield_background_stars.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\starfield_background_stars.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\surface_background.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\surface_background.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\switch_door.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\switch_door.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\teleporter.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\teleporter.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\thunderstorm_background.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\thunderstorm_background.hxx">
+ </File>
+ <Filter
+ Name="entrances"
+ Filter="">
+ <File
+
RelativePath=".\src\worldobjs\entrances\cloud.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\entrances\cloud.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\entrances\woodthing.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjs\entrances\woodthing.hxx">
+ </File>
+ </Filter>
+ </Filter>
+ <Filter
+ Name="worldobjsdata"
+ Filter="">
+ <File
+
RelativePath=".\src\worldobjsdata\bumper_data.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\bumper_data.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\conveyor_belt_data.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\conveyor_belt_data.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\entrance_data.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\entrance_data.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\exit_data.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\exit_data.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\fake_exit_data.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\fake_exit_data.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\groundpiece_data.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\groundpiece_data.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\guillotine_data.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\guillotine_data.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\hammer_data.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\hammer_data.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\hotspot_data.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\hotspot_data.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\ice_block_data.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\ice_block_data.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\info_box_data.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\info_box_data.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\laser_exit_data.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\laser_exit_data.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\liquid_data.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\liquid_data.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\prefab_obj_data.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\prefab_obj_data.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\rain_generator_data.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\rain_generator_data.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\smasher_data.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\smasher_data.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\snow_generator_data.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\snow_generator_data.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\solid_color_background_data.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\solid_color_background_data.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\spike_data.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\spike_data.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\starfield_background_data.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\starfield_background_data.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\surface_background_data.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\surface_background_data.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\switch_door_data.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\switch_door_data.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\teleporter_data.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\teleporter_data.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\thunderstorm_background_data.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\thunderstorm_background_data.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\worldobj_group_data.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobjsdata\worldobj_group_data.hxx">
+ </File>
+ </Filter>
+ <Filter
+ Name="src"
+ Filter="">
+ <File
+ RelativePath=".\src\action_button.cxx">
+ </File>
+ <File
+ RelativePath=".\src\action_button.hxx">
+ </File>
+ <File
+ RelativePath=".\src\action_data.cxx">
+ </File>
+ <File
+ RelativePath=".\src\action_data.hxx">
+ </File>
+ <File
+ RelativePath=".\src\action_holder.cxx">
+ </File>
+ <File
+ RelativePath=".\src\action_holder.hxx">
+ </File>
+ <File
+ RelativePath=".\src\alpha_button.cxx">
+ </File>
+ <File
+ RelativePath=".\src\alpha_button.hxx">
+ </File>
+ <File
+ RelativePath=".\src\blitter.cxx">
+ </File>
+ <File
+ RelativePath=".\src\blitter.hxx">
+ </File>
+ <File
+ RelativePath=".\src\blitter_impl.hxx">
+ </File>
+ <File
+ RelativePath=".\src\button_panel.cxx">
+ </File>
+ <File
+ RelativePath=".\src\button_panel.hxx">
+ </File>
+ <File
+ RelativePath=".\src\canvas.cxx">
+ </File>
+ <File
+ RelativePath=".\src\canvas.hxx">
+ </File>
+ <File
+
RelativePath=".\src\capture_rectangle.cxx">
+ </File>
+ <File
+
RelativePath=".\src\capture_rectangle.hxx">
+ </File>
+ <File
+ RelativePath=".\src\cheat.cxx">
+ </File>
+ <File
+ RelativePath=".\src\cheat.hxx">
+ </File>
+ <File
+ RelativePath=".\src\client.cxx">
+ </File>
+ <File
+ RelativePath=".\src\client.hxx">
+ </File>
+ <File
+ RelativePath=".\src\col_map.cxx">
+ </File>
+ <File
+ RelativePath=".\src\col_map.hxx">
+ </File>
+ <File
+ RelativePath=".\src\collider.cxx">
+ </File>
+ <File
+ RelativePath=".\src\collider.hxx">
+ </File>
+ <File
+ RelativePath=".\src\color.cxx">
+ </File>
+ <File
+ RelativePath=".\src\color.hxx">
+ </File>
+ <File
+ RelativePath=".\src\config.cxx">
+ </File>
+ <File
+ RelativePath=".\src\config.hxx">
+ </File>
+ <File
+ RelativePath=".\src\config_xml.cxx">
+ </File>
+ <File
+ RelativePath=".\src\config_xml.hxx">
+ </File>
+ <File
+ RelativePath=".\src\console.cxx">
+ </File>
+ <File
+ RelativePath=".\src\console.hxx">
+ </File>
+ <File
+ RelativePath=".\src\counter.cxx">
+ </File>
+ <File
+ RelativePath=".\src\counter.hxx">
+ </File>
+ <File
+ RelativePath=".\src\credits.cxx">
+ </File>
+ <File
+ RelativePath=".\src\credits.hxx">
+ </File>
+ <File
+ RelativePath=".\src\debug.cxx">
+ </File>
+ <File
+ RelativePath=".\src\debug.hxx">
+ </File>
+ <File
+ RelativePath=".\src\debug_stream.cxx">
+ </File>
+ <File
+ RelativePath=".\src\debug_stream.hxx">
+ </File>
+ <File
+ RelativePath=".\src\delta_manager.hxx">
+ </File>
+ <File
+ RelativePath=".\src\demo_player.cxx">
+ </File>
+ <File
+ RelativePath=".\src\demo_player.hxx">
+ </File>
+ <File
+ RelativePath=".\src\demo_recorder.cxx">
+ </File>
+ <File
+ RelativePath=".\src\demo_recorder.hxx">
+ </File>
+ <File
+ RelativePath=".\src\demo_session.cxx">
+ </File>
+ <File
+ RelativePath=".\src\demo_session.hxx">
+ </File>
+ <File
+ RelativePath=".\src\direction.cxx">
+ </File>
+ <File
+ RelativePath=".\src\direction.hxx">
+ </File>
+ <File
+ RelativePath=".\src\exit_menu.cxx">
+ </File>
+ <File
+ RelativePath=".\src\exit_menu.hxx">
+ </File>
+ <File
+ RelativePath=".\src\fade_out.cxx">
+ </File>
+ <File
+ RelativePath=".\src\fade_out.hxx">
+ </File>
+ <File
+ RelativePath=".\src\file_reader.hxx">
+ </File>
+ <File
+ RelativePath=".\src\file_writer.hxx">
+ </File>
+ <File
+ RelativePath=".\src\fonts.cxx">
+ </File>
+ <File
+ RelativePath=".\src\fonts.hxx">
+ </File>
+ <File
+ RelativePath=".\src\fps_counter.cxx">
+ </File>
+ <File
+ RelativePath=".\src\fps_counter.hxx">
+ </File>
+ <File
+ RelativePath=".\src\game_counter.cxx">
+ </File>
+ <File
+ RelativePath=".\src\game_counter.hxx">
+ </File>
+ <File
+ RelativePath=".\src\game_event.hxx">
+ </File>
+ <File
+ RelativePath=".\src\game_session.cxx">
+ </File>
+ <File
+ RelativePath=".\src\game_session.hxx">
+ </File>
+ <File
+
RelativePath=".\src\game_session_result.cxx">
+ </File>
+ <File
+
RelativePath=".\src\game_session_result.hxx">
+ </File>
+ <File
+ RelativePath=".\src\game_time.cxx">
+ </File>
+ <File
+ RelativePath=".\src\game_time.hxx">
+ </File>
+ <File
+ RelativePath=".\src\gettext.h">
+ </File>
+ <File
+ RelativePath=".\src\global_event.cxx">
+ </File>
+ <File
+ RelativePath=".\src\global_event.hxx">
+ </File>
+ <File
+ RelativePath=".\src\globals.cxx">
+ </File>
+ <File
+ RelativePath=".\src\globals.hxx">
+ </File>
+ <File
+ RelativePath=".\src\goal_manager.cxx">
+ </File>
+ <File
+ RelativePath=".\src\goal_manager.hxx">
+ </File>
+ <File
+ RelativePath=".\src\groundtype.cxx">
+ </File>
+ <File
+ RelativePath=".\src\groundtype.hxx">
+ </File>
+ <File
+ RelativePath=".\src\gui_obj.cxx">
+ </File>
+ <File
+ RelativePath=".\src\gui_obj.hxx">
+ </File>
+ <File
+ RelativePath=".\src\hierHeader.inc">
+ </File>
+ <File
+ RelativePath=".\src\html_browser.cxx">
+ </File>
+ <File
+ RelativePath=".\src\html_browser.hxx">
+ </File>
+ <File
+ RelativePath=".\src\hurry_up.cxx">
+ </File>
+ <File
+ RelativePath=".\src\hurry_up.hxx">
+ </File>
+ <File
+ RelativePath=".\src\indexed_canvas.cxx">
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+
Name="VCCLCompilerTool"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\src\indexed_canvas.hxx">
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+
Name="VCCustomBuildTool"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\src\indexHeader.inc">
+ </File>
+ <File
+ RelativePath=".\src\input_event.hxx">
+ </File>
+ <File
+ RelativePath=".\src\layer_manager.cxx">
+ </File>
+ <File
+ RelativePath=".\src\layer_manager.hxx">
+ </File>
+ <File
+ RelativePath=".\src\level_desc.cxx">
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+
Name="VCCLCompilerTool"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\src\level_desc.hxx">
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+
Name="VCCustomBuildTool"/>
+ </FileConfiguration>
+ </File>
+ <File
+
RelativePath=".\src\level_interrupt.cxx">
+ </File>
+ <File
+
RelativePath=".\src\level_interrupt.hxx">
+ </File>
+ <File
+ RelativePath=".\src\level_result.cxx">
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+
Name="VCCLCompilerTool"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\src\level_result.hxx">
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+
Name="VCCustomBuildTool"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\src\libxmlfwd.hxx">
+ </File>
+ <File
+ RelativePath=".\src\loading.cxx">
+ </File>
+ <File
+ RelativePath=".\src\loading.hxx">
+ </File>
+ <File
+ RelativePath=".\src\main_menu.cxx">
+ </File>
+ <File
+ RelativePath=".\src\main_menu.hxx">
+ </File>
+ <File
+ RelativePath=".\src\math.hxx">
+ </File>
+ <File
+
RelativePath=".\src\menu_background.cxx">
+ </File>
+ <File
+
RelativePath=".\src\menu_background.hxx">
+ </File>
+ <File
+ RelativePath=".\src\menu_button.cxx">
+ </File>
+ <File
+ RelativePath=".\src\menu_button.hxx">
+ </File>
+ <File
+ RelativePath=".\src\mover.cxx">
+ </File>
+ <File
+ RelativePath=".\src\mover.hxx">
+ </File>
+ <File
+ RelativePath=".\src\multiline_text.cxx">
+ </File>
+ <File
+ RelativePath=".\src\multiline_text.hxx">
+ </File>
+ <File
+ RelativePath=".\src\path_manager.cxx">
+ </File>
+ <File
+ RelativePath=".\src\path_manager.hxx">
+ </File>
+ <File
+ RelativePath=".\src\pingu.cxx">
+ </File>
+ <File
+ RelativePath=".\src\pingu.hxx">
+ </File>
+ <File
+ RelativePath=".\src\pingu_action.cxx">
+ </File>
+ <File
+ RelativePath=".\src\pingu_action.hxx">
+ </File>
+ <File
+
RelativePath=".\src\pingu_action_factory.cxx">
+ </File>
+ <File
+
RelativePath=".\src\pingu_action_factory.hxx">
+ </File>
+ <File
+ RelativePath=".\src\pingu_enums.cxx">
+ </File>
+ <File
+ RelativePath=".\src\pingu_enums.hxx">
+ </File>
+ <File
+ RelativePath=".\src\pingu_holder.cxx">
+ </File>
+ <File
+ RelativePath=".\src\pingu_holder.hxx">
+ </File>
+ <File
+ RelativePath=".\src\pingu_map.cxx">
+ </File>
+ <File
+ RelativePath=".\src\pingu_map.hxx">
+ </File>
+ <File
+ RelativePath=".\src\pingus.hxx">
+ </File>
+ <File
+ RelativePath=".\src\pingus_counter.cxx">
+ </File>
+ <File
+ RelativePath=".\src\pingus_counter.hxx">
+ </File>
+ <File
+
RelativePath=".\src\pingus_counter_bar.cxx">
+ </File>
+ <File
+
RelativePath=".\src\pingus_counter_bar.hxx">
+ </File>
+ <File
+ RelativePath=".\src\pingus_error.cxx">
+ </File>
+ <File
+ RelativePath=".\src\pingus_error.hxx">
+ </File>
+ <File
+ RelativePath=".\src\pingus_main.cxx">
+ </File>
+ <File
+ RelativePath=".\src\pingus_main.hxx">
+ </File>
+ <File
+
RelativePath=".\src\pingus_map_manager.cxx">
+ </File>
+ <File
+
RelativePath=".\src\pingus_map_manager.hxx">
+ </File>
+ <File
+ RelativePath=".\src\pingus_menu.cxx">
+ </File>
+ <File
+ RelativePath=".\src\pingus_menu.hxx">
+ </File>
+ <File
+
RelativePath=".\src\pingus_menu_manager.cxx">
+ </File>
+ <File
+
RelativePath=".\src\pingus_menu_manager.hxx">
+ </File>
+ <File
+
RelativePath=".\src\pingus_resource.cxx">
+ </File>
+ <File
+
RelativePath=".\src\pingus_resource.hxx">
+ </File>
+ <File
+
RelativePath=".\src\pingus_sub_menu.cxx">
+ </File>
+ <File
+
RelativePath=".\src\pingus_sub_menu.hxx">
+ </File>
+ <File
+ RelativePath=".\src\playfield.cxx">
+ </File>
+ <File
+ RelativePath=".\src\playfield.hxx">
+ </File>
+ <File
+ RelativePath=".\src\playfield_view.cxx">
+ </File>
+ <File
+ RelativePath=".\src\playfield_view.hxx">
+ </File>
+ <File
+ RelativePath=".\src\plf.cxx">
+ </File>
+ <File
+ RelativePath=".\src\plf.hxx">
+ </File>
+ <File
+ RelativePath=".\src\plf_handle.hxx">
+ </File>
+ <File
+ RelativePath=".\src\plf_res_mgr.cxx">
+ </File>
+ <File
+ RelativePath=".\src\plf_res_mgr.hxx">
+ </File>
+ <File
+ RelativePath=".\src\plt_xml.cxx">
+ </File>
+ <File
+ RelativePath=".\src\plt_xml.hxx">
+ </File>
+ <File
+ RelativePath=".\src\prefab.cxx">
+ </File>
+ <File
+ RelativePath=".\src\prefab.hxx">
+ </File>
+ <File
+
RelativePath=".\src\preview_renderer.cxx">
+ </File>
+ <File
+
RelativePath=".\src\preview_renderer.hxx">
+ </File>
+ <File
+ RelativePath=".\src\range.cxx">
+ </File>
+ <File
+ RelativePath=".\src\range.hxx">
+ </File>
+ <File
+ RelativePath=".\src\res_descriptor.cxx">
+ </File>
+ <File
+ RelativePath=".\src\res_descriptor.hxx">
+ </File>
+ <File
+
RelativePath=".\src\resource_modifier.cxx">
+ </File>
+ <File
+
RelativePath=".\src\resource_modifier.hxx">
+ </File>
+ <File
+ RelativePath=".\src\resources.cxx">
+ </File>
+ <File
+ RelativePath=".\src\resources.hxx">
+ </File>
+ <File
+ RelativePath=".\src\result.cxx">
+ </File>
+ <File
+ RelativePath=".\src\result.hxx">
+ </File>
+ <File
+ RelativePath=".\src\result_screen.cxx">
+ </File>
+ <File
+ RelativePath=".\src\result_screen.hxx">
+ </File>
+ <File
+ RelativePath=".\src\savegame.cxx">
+ </File>
+ <File
+ RelativePath=".\src\savegame.hxx">
+ </File>
+ <File
+
RelativePath=".\src\savegame_manager.cxx">
+ </File>
+ <File
+
RelativePath=".\src\savegame_manager.hxx">
+ </File>
+ <File
+ RelativePath=".\src\screenshot.cxx">
+ </File>
+ <File
+ RelativePath=".\src\screenshot.hxx">
+ </File>
+ <File
+ RelativePath=".\src\server.cxx">
+ </File>
+ <File
+ RelativePath=".\src\server.hxx">
+ </File>
+ <File
+ RelativePath=".\src\server_event.cxx">
+ </File>
+ <File
+ RelativePath=".\src\server_event.hxx">
+ </File>
+ <File
+ RelativePath=".\src\smallmap.cxx">
+ </File>
+ <File
+ RelativePath=".\src\smallmap.hxx">
+ </File>
+ <File
+ RelativePath=".\src\smallmap_image.cxx">
+ </File>
+ <File
+ RelativePath=".\src\smallmap_image.hxx">
+ </File>
+ <File
+ RelativePath=".\src\spot_map.cxx">
+ </File>
+ <File
+ RelativePath=".\src\spot_map.hxx">
+ </File>
+ <File
+ RelativePath=".\src\sprite.cxx">
+ </File>
+ <File
+ RelativePath=".\src\sprite.hxx">
+ </File>
+ <File
+ RelativePath=".\src\start_screen.cxx">
+ </File>
+ <File
+ RelativePath=".\src\start_screen.hxx">
+ </File>
+ <File
+ RelativePath=".\src\stat_manager.cxx">
+ </File>
+ <File
+ RelativePath=".\src\stat_manager.hxx">
+ </File>
+ <File
+ RelativePath=".\src\story.cxx">
+ </File>
+ <File
+ RelativePath=".\src\story.hxx">
+ </File>
+ <File
+ RelativePath=".\src\story_screen.cxx">
+ </File>
+ <File
+ RelativePath=".\src\story_screen.hxx">
+ </File>
+ <File
+
RelativePath=".\src\string_converter.cxx">
+ </File>
+ <File
+
RelativePath=".\src\string_converter.hxx">
+ </File>
+ <File
+ RelativePath=".\src\string_format.cxx">
+ </File>
+ <File
+ RelativePath=".\src\string_format.hxx">
+ </File>
+ <File
+
RelativePath=".\src\string_tokenizer.cxx">
+ </File>
+ <File
+
RelativePath=".\src\string_tokenizer.hxx">
+ </File>
+ <File
+ RelativePath=".\src\system.cxx">
+ </File>
+ <File
+ RelativePath=".\src\system.hxx">
+ </File>
+ <File
+
RelativePath=".\src\target_provider.cxx">
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+
Name="VCCLCompilerTool"/>
+ </FileConfiguration>
+ </File>
+ <File
+
RelativePath=".\src\target_provider.hxx">
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+
Name="VCCustomBuildTool"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\src\theme.cxx">
+ </File>
+ <File
+ RelativePath=".\src\theme.hxx">
+ </File>
+ <File
+ RelativePath=".\src\theme_selector.cxx">
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+
Name="VCCLCompilerTool"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\src\theme_selector.hxx">
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+
Name="VCCustomBuildTool"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\src\time_display.cxx">
+ </File>
+ <File
+ RelativePath=".\src\time_display.hxx">
+ </File>
+ <File
+ RelativePath=".\src\timer.cxx">
+ </File>
+ <File
+ RelativePath=".\src\timer.hxx">
+ </File>
+ <File
+ RelativePath=".\src\true_server.cxx">
+ </File>
+ <File
+ RelativePath=".\src\true_server.hxx">
+ </File>
+ <File
+
RelativePath=".\src\usb_mouse_controller.cxx">
+ </File>
+ <File
+
RelativePath=".\src\usb_mouse_controller.hxx">
+ </File>
+ <File
+ RelativePath=".\src\vector.cxx">
+ </File>
+ <File
+ RelativePath=".\src\vector.hxx">
+ </File>
+ <File
+ RelativePath=".\src\view.cxx">
+ </File>
+ <File
+ RelativePath=".\src\view.hxx">
+ </File>
+ <File
+ RelativePath=".\src\wav_provider.cxx">
+ </File>
+ <File
+ RelativePath=".\src\wav_provider.hxx">
+ </File>
+ <File
+ RelativePath=".\src\world.cxx">
+ </File>
+ <File
+ RelativePath=".\src\world.hxx">
+ </File>
+ <File
+ RelativePath=".\src\worldobj.cxx">
+ </File>
+ <File
+ RelativePath=".\src\worldobj.hxx">
+ </File>
+ <File
+ RelativePath=".\src\worldobj_data.hxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobj_data_factory.cxx">
+ </File>
+ <File
+
RelativePath=".\src\worldobj_data_factory.hxx">
+ </File>
+ <File
+ RelativePath=".\src\xml_eval.cxx">
+ </File>
+ <File
+ RelativePath=".\src\xml_eval.hxx">
+ </File>
+ <File
+
RelativePath=".\src\xml_file_reader.cxx">
+ </File>
+ <File
+
RelativePath=".\src\xml_file_reader.hxx">
+ </File>
+ <File
+
RelativePath=".\src\xml_file_writer.cxx">
+ </File>
+ <File
+
RelativePath=".\src\xml_file_writer.hxx">
+ </File>
+ <File
+ RelativePath=".\src\xml_helper.cxx">
+ </File>
+ <File
+ RelativePath=".\src\xml_helper.hxx">
+ </File>
+ <File
+ RelativePath=".\src\xml_pdf.cxx">
+ </File>
+ <File
+ RelativePath=".\src\xml_pdf.hxx">
+ </File>
+ <File
+ RelativePath=".\src\xml_plf.cxx">
+ </File>
+ <File
+ RelativePath=".\src\xml_plf.hxx">
+ </File>
+ </Filter>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Modified: trunk/src/console.cxx
===================================================================
--- trunk/src/console.cxx 2004-04-06 07:55:17 UTC (rev 2219)
+++ trunk/src/console.cxx 2004-04-07 08:35:55 UTC (rev 2220)
@@ -228,13 +228,13 @@
void
Console::puts(const std::string& str)
{
- (*this) << str << std::endl;
+ (*this) << str.c_str() << std::endl;
}
void
Console::newline()
{
- (*this) << std::endl;
+ (*this) << std::endl;
}
void
Modified: trunk/src/editor/editor_event.cxx
===================================================================
--- trunk/src/editor/editor_event.cxx 2004-04-06 07:55:17 UTC (rev 2219)
+++ trunk/src/editor/editor_event.cxx 2004-04-07 08:35:55 UTC (rev 2220)
@@ -329,13 +329,6 @@
}
else if (event.device.get_type() == CL_InputDevice::mouse)
{
- if (0)
- {
- std::cout << "Mouse: (" << CL_Mouse::get_x () << ", " <<
CL_Mouse::get_y () << ") "
- << "World: " << editor->view->screen_to_world
(Vector(CL_Mouse::get_x (), CL_Mouse::get_y ()))
- << std::endl;
- }
-
switch (event.id)
{
case CL_MOUSE_LEFT:
Modified: trunk/src/gui/display_graphic_context.cxx
===================================================================
--- trunk/src/gui/display_graphic_context.cxx 2004-04-06 07:55:17 UTC (rev
2219)
+++ trunk/src/gui/display_graphic_context.cxx 2004-04-07 08:35:55 UTC (rev
2220)
@@ -23,8 +23,8 @@
#include <config.h>
#include "display.hxx"
#include "display_graphic_context.hxx"
+#include "../sprite.hxx"
#include "../math.hxx"
-#include "../sprite.hxx"
namespace Pingus {
@@ -82,7 +82,7 @@
{
CL_Rect rect;
- rect.left = Math::min (arg_rect.left, arg_rect.right);
+ rect.left = Math::min (arg_rect.left, (int)arg_rect.right);
rect.right = Math::max (arg_rect.left, arg_rect.right);
rect.top = Math::min (arg_rect.top, arg_rect.bottom);
rect.bottom = Math::max (arg_rect.top, arg_rect.bottom);
Modified: trunk/src/gui/gui_screen.cxx
===================================================================
--- trunk/src/gui/gui_screen.cxx 2004-04-06 07:55:17 UTC (rev 2219)
+++ trunk/src/gui/gui_screen.cxx 2004-04-07 08:35:55 UTC (rev 2220)
@@ -23,7 +23,6 @@
#include "gui_manager.hxx"
namespace Pingus {
-namespace GUI {
GUIScreen::GUIScreen()
: gui_manager (new GUI::GUIManager())
@@ -159,7 +158,6 @@
}
}
-} // namespace GUI
} // namespace Pingus
/* EOF */
Modified: trunk/src/indexed_canvas.cxx
===================================================================
--- trunk/src/indexed_canvas.cxx 2004-04-06 07:55:17 UTC (rev 2219)
+++ trunk/src/indexed_canvas.cxx 2004-04-07 08:35:55 UTC (rev 2220)
@@ -20,6 +20,8 @@
#include "indexed_canvas.hxx"
#include <assert.h>
+namespace Pingus {
+
IndexedCanvas::IndexedCanvas(int w, int h)
: width(w),
height(h),
@@ -46,4 +48,6 @@
return const_cast<CL_Palette*>(&palette);
}
+} // namespace Pingus
+
/* EOF */
Modified: trunk/src/input/axes/mouse_axis.cxx
===================================================================
--- trunk/src/input/axes/mouse_axis.cxx 2004-04-06 07:55:17 UTC (rev 2219)
+++ trunk/src/input/axes/mouse_axis.cxx 2004-04-07 08:35:55 UTC (rev 2220)
@@ -17,7 +17,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#include <ClanLib/Display/Input/input.h>
+#include <ClanLib/Display/input.h>
#include <ClanLib/Display/Input/inputdevice.h>
#include <ClanLib/Display/Input/inputcursor.h>
#include "mouse_axis.hxx"
Modified: trunk/src/level_desc.hxx
===================================================================
--- trunk/src/level_desc.hxx 2004-04-06 07:55:17 UTC (rev 2219)
+++ trunk/src/level_desc.hxx 2004-04-07 08:35:55 UTC (rev 2220)
@@ -35,12 +35,12 @@
private:
CL_Surface background;
CL_Surface level;
- CL_Font* font;
- CL_Font* title;
+ CL_Font font;
+ CL_Font title;
PLF* plf;
MultiLineText description;
- std::string levelname;
+ std::string levelname;
public:
enum LoadingStatus { LOADING, FINISHED };
PingusLevelDesc(PLF*);
Modified: trunk/src/level_result.cxx
===================================================================
--- trunk/src/level_result.cxx 2004-04-06 07:55:17 UTC (rev 2219)
+++ trunk/src/level_result.cxx 2004-04-07 08:35:55 UTC (rev 2220)
@@ -31,21 +31,24 @@
#include "pingu_holder.hxx"
#include "fonts.hxx"
#include "gettext.h"
+#include "input\controller.hxx"
+namespace Pingus {
+
PingusLevelResult::PingusLevelResult(World* w, Controller* c)
- : controller (c)
{
font = Fonts::pingus_small;
title = Fonts::pingus_large;
background = PingusResource::load_surface("Textures/stone", "textures");
//result = r;
world = w;
+ controller = c;
}
void
PingusLevelResult::draw(void)
{
- char str[128];
+ char str[128];
PingusSound::play_music("pingus-2.it");
@@ -126,4 +129,6 @@
}
}
+} // namespace Pingus
+
/* EOF */
Modified: trunk/src/level_result.hxx
===================================================================
--- trunk/src/level_result.hxx 2004-04-06 07:55:17 UTC (rev 2219)
+++ trunk/src/level_result.hxx 2004-04-07 08:35:55 UTC (rev 2220)
@@ -24,22 +24,25 @@
#include <ClanLib/Display/surface.h>
class CL_Font;
+
+namespace Pingus {
+
class World;
class Controller;
class PingusLevelResult
{
private:
- CL_Surface background;
- CL_Font* title;
- CL_Font* font;
+ CL_Surface background;
+ CL_Font title;
+ CL_Font font;
World* world;
Controller* controller;
public:
PingusLevelResult(World*, Controller* c);
- void draw(void);
+ void draw(void);
std::string get_message(int);
private:
@@ -47,6 +50,8 @@
PingusLevelResult& operator= (const PingusLevelResult&);
};
+} // namespace Pingus
+
#endif
/* EOF */
Modified: trunk/src/sound/slot_manager.cxx
===================================================================
--- trunk/src/sound/slot_manager.cxx 2004-04-06 07:55:17 UTC (rev 2219)
+++ trunk/src/sound/slot_manager.cxx 2004-04-07 08:35:55 UTC (rev 2220)
@@ -35,7 +35,7 @@
CL_SoundBuffer_Session sess;
try {
- buffer = new CL_SoundBuffer (new CL_Sample(filename.c_str(), NULL), true);
+ buffer = new CL_SoundBuffer (name.c_str());
sess = buffer -> prepare();
} catch (const CL_Error & e) {
perr(PINGUS_DEBUG_SOUND) << "Can't open file " << filename << " --
skipping\n"
Modified: trunk/src/sound/slot_manager.hxx
===================================================================
--- trunk/src/sound/slot_manager.hxx 2004-04-06 07:55:17 UTC (rev 2219)
+++ trunk/src/sound/slot_manager.hxx 2004-04-07 08:35:55 UTC (rev 2220)
@@ -20,6 +20,12 @@
#ifndef HEADER_PINGUS_SLOT_MANAGER_HXX
#define HEADER_PINGUS_SLOT_MANAGER_HXX
+#include <string>
+#include <vector>
+#include <map>
+
+#include <ClanLib/sound.h>
+
namespace Pingus {
namespace Sound {
@@ -54,8 +60,8 @@
private:
SlotEntry& find_slot(const std::string& name);
- SlotManager (const Slot_Manager&);
- SlotManager& operator= (const Slot_Manager&);
+ SlotManager (const SlotManager&);
+ SlotManager& operator= (const SlotManager&);
};
} // namespace Sound
Modified: trunk/src/sound/sound_real.cxx
===================================================================
--- trunk/src/sound/sound_real.cxx 2004-04-06 07:55:17 UTC (rev 2219)
+++ trunk/src/sound/sound_real.cxx 2004-04-07 08:35:55 UTC (rev 2220)
@@ -136,28 +136,41 @@
music_sample = 0;
+#ifdef CLANLIB_0_6
if (filename.substr(filename.size()-4, 4) == ".ogg")
{
-#ifdef HAVE_LIBCLANVORBIS
+ #ifdef HAVE_LIBCLANVORBIS
music_sample = new CL_SoundBuffer (new
CL_VorbisSoundProvider(filename.c_str()), true);
-#else
- music_sample = 0;
-#endif
+ #endif
}
else if (filename.substr(filename.size()-4, 4) == ".wav")
{
-#ifdef CLANLIB_0_6
music_sample = new CL_SoundBuffer (new CL_Sample(filename.c_str(),
NULL), true);
-#endif
}
else
{ // MikMod should support the rest...
-#ifdef HAVE_LIBCLANMIKMOD
+ #ifdef HAVE_LIBCLANMIKMOD
music_sample = new CL_SoundBuffer (new
CL_Streamed_MikModSample(filename.c_str()), true);
+ #endif
+ }
#else
- music_sample = 0;
+ if (filename.substr(filename.size()-4, 4) == ".ogg")
+ {
+ #ifdef HAVE_LIBCLANVORBIS
+ music_sample = new CL_SoundBuffer (filename.c_str());
+ #endif
+ }
+ else if (filename.substr(filename.size()-4, 4) == ".wav")
+ {
+ music_sample = new CL_SoundBuffer (filename.c_str());
+ }
+ else
+ { // MikMod should support the rest...
+ #ifdef HAVE_LIBCLANMIKMOD
+ music_sample = new CL_SoundBuffer (filename.c_str());
+ #endif
+ }
#endif
- }
if (music_sample)
{
Modified: trunk/src/win32/config.h
===================================================================
--- trunk/src/win32/config.h 2004-04-06 07:55:17 UTC (rev 2219)
+++ trunk/src/win32/config.h 2004-04-07 08:35:55 UTC (rev 2220)
@@ -4,11 +4,12 @@
#include <assert.h>
#define PACKAGE "Pingus"
-#define VERSION "0.6.0"
+#define VERSION "0.7.0"
+#define PACKAGE_STRING "Pingus 0.7.0"
#define MAJOR_VERSION 0
-#define MINOR_VERSION 6
+#define MINOR_VERSION 7
#define PATCH_VERSION 0
-#define VERSION_STRING "0.6.0"
+#define VERSION_STRING "0.7.0"
#define PINGUS_DATADIR "data"
#define LIBXML_2 1
#define ENABLE_NLS 1
| [Prev in Thread] | Current Thread | [Next in Thread] |