From 5b7f9214cb929399f1a855ef5807018a9447d510 Mon Sep 17 00:00:00 2001 From: Matthias Braun Date: Sun, 26 Jun 2005 13:38:53 +0000 Subject: [PATCH] renamed all .h to .hpp SVN-Revision: 2642 --- Jamrules | 2 +- src/Jamfile | 28 ++++---- src/audio/sound_file.cpp | 2 +- src/audio/{sound_file.h => sound_file.hpp} | 0 src/audio/sound_manager.cpp | 8 +-- src/audio/{sound_manager.h => sound_manager.hpp} | 2 +- src/audio/sound_source.cpp | 4 +- src/audio/{sound_source.h => sound_source.hpp} | 2 +- src/audio/stream_sound_source.cpp | 6 +- ...ream_sound_source.h => stream_sound_source.hpp} | 2 +- src/badguy/badguy.cpp | 6 +- src/badguy/{badguy.h => badguy.hpp} | 34 +++++----- src/badguy/bomb.cpp | 2 +- src/badguy/{bomb.h => bomb.hpp} | 2 +- src/badguy/bouncing_snowball.cpp | 2 +- .../{bouncing_snowball.h => bouncing_snowball.hpp} | 2 +- src/badguy/dispenser.cpp | 14 ++-- src/badguy/{dispenser.h => dispenser.hpp} | 4 +- src/badguy/flame.cpp | 2 +- src/badguy/{flame.h => flame.hpp} | 2 +- src/badguy/flyingsnowball.cpp | 2 +- .../{flyingsnowball.h => flyingsnowball.hpp} | 2 +- src/badguy/jumpy.cpp | 2 +- src/badguy/{jumpy.h => jumpy.hpp} | 2 +- src/badguy/mrbomb.cpp | 4 +- src/badguy/{mrbomb.h => mrbomb.hpp} | 2 +- src/badguy/mriceblock.cpp | 4 +- src/badguy/{mriceblock.h => mriceblock.hpp} | 2 +- src/badguy/mrrocket.cpp | 2 +- src/badguy/{mrrocket.h => mrrocket.hpp} | 6 +- src/badguy/mrtree.cpp | 2 +- src/badguy/{mrtree.h => mrtree.hpp} | 2 +- src/badguy/nolok_01.cpp | 6 +- src/badguy/{nolok_01.h => nolok_01.hpp} | 4 +- src/badguy/poisonivy.cpp | 2 +- src/badguy/{poisonivy.h => poisonivy.hpp} | 2 +- src/badguy/rocketexplosion.cpp | 2 +- .../{rocketexplosion.h => rocketexplosion.hpp} | 2 +- src/badguy/snowball.cpp | 2 +- src/badguy/{snowball.h => snowball.hpp} | 2 +- src/badguy/spike.cpp | 2 +- src/badguy/{spike.h => spike.hpp} | 2 +- src/badguy/spiky.cpp | 2 +- src/badguy/{spiky.h => spiky.hpp} | 2 +- src/badguy/stalactite.cpp | 2 +- src/badguy/{stalactite.h => stalactite.hpp} | 2 +- src/badguy/yeti.cpp | 12 ++-- src/badguy/{yeti.h => yeti.hpp} | 2 +- src/badguy/yeti_stalactite.cpp | 2 +- .../{yeti_stalactite.h => yeti_stalactite.hpp} | 2 +- src/badguy/zeekling.cpp | 2 +- src/badguy/{zeekling.h => zeekling.hpp} | 2 +- src/collision.cpp | 10 +-- src/{collision.h => collision.hpp} | 0 src/collision_grid.cpp | 8 +-- src/{collision_grid.h => collision_grid.hpp} | 2 +- ...grid_iterator.h => collision_grid_iterator.hpp} | 2 +- src/{collision_hit.h => collision_hit.hpp} | 2 +- src/control/codecontroller.cpp | 2 +- .../{codecontroller.h => codecontroller.hpp} | 2 +- src/control/controller.cpp | 2 +- src/control/{controller.h => controller.hpp} | 0 src/control/joystickkeyboardcontroller.cpp | 12 ++-- ...controller.h => joystickkeyboardcontroller.hpp} | 6 +- src/{direction.h => direction.hpp} | 0 src/file_system.cpp | 2 +- src/{file_system.h => file_system.hpp} | 0 src/flip_level_transformer.cpp | 14 ++-- ...el_transformer.h => flip_level_transformer.hpp} | 2 +- src/game_object.cpp | 4 +- src/{game_object.h => game_object.hpp} | 0 src/game_session.cpp | 56 ++++++++-------- src/{game_session.h => game_session.hpp} | 6 +- src/gameconfig.cpp | 14 ++-- src/{gameconfig.h => gameconfig.hpp} | 0 src/{gettext.h => gettext.hpp} | 2 +- src/gui/button.cpp | 12 ++-- src/gui/{button.h => button.hpp} | 4 +- src/gui/menu.cpp | 16 ++--- src/gui/{menu.h => menu.hpp} | 8 +-- src/gui/mousecursor.cpp | 6 +- src/gui/{mousecursor.h => mousecursor.hpp} | 2 +- src/level.cpp | 32 +++++----- src/{level.h => level.hpp} | 0 src/level_subset.cpp | 16 ++--- src/{level_subset.h => level_subset.hpp} | 0 src/level_transformer.cpp | 4 +- src/{level_transformer.h => level_transformer.hpp} | 0 src/lisp/lexer.cpp | 2 +- src/lisp/{lexer.h => lexer.hpp} | 0 src/lisp/lisp.cpp | 2 +- src/lisp/{lisp.h => lisp.hpp} | 0 src/lisp/list_iterator.cpp | 2 +- src/lisp/{list_iterator.h => list_iterator.hpp} | 2 +- src/lisp/parser.cpp | 21 ++++-- src/lisp/{parser.h => parser.hpp} | 2 +- src/lisp/writer.cpp | 4 +- src/lisp/{writer.h => writer.hpp} | 0 src/main.cpp | 24 +++---- src/{main.h => main.hpp} | 0 src/math/{aatriangle.h => aatriangle.hpp} | 2 +- src/math/{rect.h => rect.hpp} | 2 +- src/math/vector.cpp | 2 +- src/math/{vector.h => vector.hpp} | 0 src/misc.cpp | 24 +++---- src/{misc.h => misc.hpp} | 0 src/moving_object.cpp | 2 +- src/{moving_object.h => moving_object.hpp} | 8 +-- src/object/ambient_sound.cpp | 12 ++-- src/object/{ambient_sound.h => ambient_sound.hpp} | 7 +- src/object/background.cpp | 16 ++--- src/object/{background.h => background.hpp} | 8 +-- src/object/bell.cpp | 16 ++--- src/object/{bell.h => bell.hpp} | 8 +-- src/object/block.cpp | 40 ++++++------ src/object/{block.h => block.hpp} | 4 +- src/object/bullet.cpp | 14 ++-- src/object/{bullet.h => bullet.hpp} | 6 +- src/object/camera.cpp | 20 +++--- src/object/{camera.h => camera.hpp} | 10 +-- src/object/coin.cpp | 20 +++--- src/object/{coin.h => coin.hpp} | 4 +- src/object/display_effect.cpp | 6 +- .../{display_effect.h => display_effect.hpp} | 4 +- src/object/fireworks.cpp | 16 ++--- src/object/{fireworks.h => fireworks.hpp} | 6 +- src/object/flower.cpp | 14 ++-- src/object/{flower.h => flower.hpp} | 6 +- src/object/gameobjs.cpp | 22 +++---- src/object/{gameobjs.h => gameobjs.hpp} | 12 ++-- src/object/growup.cpp | 14 ++-- src/object/{growup.h => growup.hpp} | 6 +- src/object/infoblock.cpp | 14 ++-- src/object/{infoblock.h => infoblock.hpp} | 4 +- src/object/invisible_block.cpp | 14 ++-- .../{invisible_block.h => invisible_block.hpp} | 2 +- src/object/level_time.cpp | 18 +++--- src/object/{level_time.h => level_time.hpp} | 6 +- src/object/oneup.cpp | 14 ++-- src/object/{oneup.h => oneup.hpp} | 6 +- src/object/particlesystem.cpp | 14 ++-- .../{particlesystem.h => particlesystem.hpp} | 10 +-- src/object/particlesystem_interactive.cpp | 30 ++++----- ...nteractive.h => particlesystem_interactive.hpp} | 10 +-- src/object/platform.cpp | 16 ++--- src/object/{platform.h => platform.hpp} | 4 +- src/object/player.cpp | 36 +++++------ src/object/{player.h => player.hpp} | 20 +++--- src/object/{portable.h => portable.hpp} | 2 +- src/object/powerup.cpp | 16 ++--- src/object/{powerup.h => powerup.hpp} | 10 +-- src/object/rainsplash.cpp | 4 +- src/object/{rainsplash.h => rainsplash.hpp} | 12 ++-- src/object/rock.cpp | 14 ++-- src/object/{rock.h => rock.hpp} | 10 +-- src/object/scripted_object.cpp | 12 ++-- .../{scripted_object.h => scripted_object.hpp} | 10 +-- src/object/specialriser.cpp | 10 +-- src/object/{specialriser.h => specialriser.hpp} | 2 +- src/object/star.cpp | 12 ++-- src/object/{star.h => star.hpp} | 6 +- src/object/text_object.cpp | 6 +- src/object/{text_object.h => text_object.hpp} | 4 +- src/object/tilemap.cpp | 20 +++--- src/object/{tilemap.h => tilemap.hpp} | 6 +- src/object/unstable_tile.cpp | 16 ++--- src/object/{unstable_tile.h => unstable_tile.hpp} | 8 +-- src/object_factory.cpp | 6 +- src/{object_factory.h => object_factory.hpp} | 6 +- ...emove_listener.h => object_remove_listener.hpp} | 0 src/physfs/physfs_sdl.cpp | 2 +- src/physfs/{physfs_sdl.h => physfs_sdl.hpp} | 0 src/physfs/physfs_stream.cpp | 2 +- src/physfs/{physfs_stream.h => physfs_stream.hpp} | 0 src/physic.cpp | 2 +- src/{physic.h => physic.hpp} | 2 +- src/player_status.cpp | 16 ++--- src/{player_status.h => player_status.hpp} | 6 +- src/resources.cpp | 16 ++--- src/{resources.h => resources.hpp} | 0 src/scripting/Jamfile | 2 +- src/scripting/camera.cpp | 2 +- src/scripting/{camera.h => camera.hpp} | 0 .../{display_effect.h => display_effect.hpp} | 0 src/scripting/functions.cpp | 12 ++-- src/scripting/{functions.h => functions.hpp} | 0 src/scripting/level.cpp | 6 +- src/scripting/{level.h => level.hpp} | 0 src/scripting/{player.h => player.hpp} | 0 src/scripting/script_interpreter.cpp | 28 ++++---- ...script_interpreter.h => script_interpreter.hpp} | 8 +-- .../{scripted_object.h => scripted_object.hpp} | 0 src/scripting/sound.cpp | 6 +- src/scripting/{sound.h => sound.hpp} | 0 src/scripting/{text.h => text.hpp} | 0 src/scripting/wrapper.cpp | 6 +- src/scripting/{wrapper.h => wrapper.hpp} | 2 +- src/scripting/wrapper.interface.h | 9 --- src/scripting/wrapper.interface.hpp | 9 +++ src/scripting/wrapper_util.cpp | 2 +- src/scripting/{wrapper_util.h => wrapper_util.hpp} | 0 src/sector.cpp | 74 +++++++++++----------- src/{sector.h => sector.hpp} | 6 +- src/{serializable.h => serializable.hpp} | 0 src/spawn_point.cpp | 6 +- src/{spawn_point.h => spawn_point.hpp} | 4 +- src/sprite/sprite.cpp | 4 +- src/sprite/{sprite.h => sprite.hpp} | 6 +- src/sprite/sprite_data.cpp | 8 +-- src/sprite/{sprite_data.h => sprite_data.hpp} | 4 +- src/sprite/sprite_manager.cpp | 12 ++-- .../{sprite_manager.h => sprite_manager.hpp} | 2 +- src/statistics.cpp | 12 ++-- src/{statistics.h => statistics.hpp} | 6 +- src/textscroller.cpp | 18 +++--- src/{textscroller.h => textscroller.hpp} | 0 src/tile.cpp | 12 ++-- src/{tile.h => tile.hpp} | 6 +- src/tile_manager.cpp | 14 ++-- src/{tile_manager.h => tile_manager.hpp} | 2 +- src/timer.cpp | 2 +- src/{timer.h => timer.hpp} | 0 src/tinygettext/tinygettext.cpp | 4 +- src/tinygettext/{tinygettext.h => tinygettext.hpp} | 0 src/title.cpp | 52 +++++++-------- src/{title.h => title.hpp} | 0 src/trigger/door.cpp | 18 +++--- src/trigger/{door.h => door.hpp} | 10 +-- src/trigger/hatch.cpp | 18 +++--- src/trigger/{hatch.h => hatch.hpp} | 10 +-- src/trigger/scripttrigger.cpp | 14 ++-- src/trigger/{scripttrigger.h => scripttrigger.hpp} | 4 +- src/trigger/secretarea_trigger.cpp | 12 ++-- ...secretarea_trigger.h => secretarea_trigger.hpp} | 10 +-- src/trigger/sequence_trigger.cpp | 10 +-- .../{sequence_trigger.h => sequence_trigger.hpp} | 4 +- src/trigger/trigger_base.cpp | 6 +- src/trigger/{trigger_base.h => trigger_base.hpp} | 6 +- src/video/drawing_context.cpp | 10 +-- .../{drawing_context.h => drawing_context.hpp} | 8 +-- src/video/font.cpp | 10 +-- src/video/{font.h => font.hpp} | 4 +- src/video/screen.cpp | 10 +-- src/video/{screen.h => screen.hpp} | 2 +- src/video/surface.cpp | 8 +-- src/video/{surface.h => surface.hpp} | 4 +- src/worldmap.cpp | 52 +++++++-------- src/{worldmap.h => worldmap.hpp} | 16 ++--- tools/miniswig/create_wrapper.cpp | 6 +- 249 files changed, 956 insertions(+), 950 deletions(-) rename src/audio/{sound_file.h => sound_file.hpp} (100%) rename src/audio/{sound_manager.h => sound_manager.hpp} (98%) rename src/audio/{sound_source.h => sound_source.hpp} (94%) rename src/audio/{stream_sound_source.h => stream_sound_source.hpp} (95%) rename src/badguy/{badguy.h => badguy.hpp} (89%) rename src/badguy/{bomb.h => bomb.hpp} (98%) rename src/badguy/{bouncing_snowball.h => bouncing_snowball.hpp} (98%) rename src/badguy/{dispenser.h => dispenser.hpp} (96%) rename src/badguy/{flame.h => flame.hpp} (98%) rename src/badguy/{flyingsnowball.h => flyingsnowball.hpp} (98%) rename src/badguy/{jumpy.h => jumpy.hpp} (98%) rename src/badguy/{mrbomb.h => mrbomb.hpp} (98%) rename src/badguy/{mriceblock.h => mriceblock.hpp} (98%) rename src/badguy/{mrrocket.h => mrrocket.hpp} (94%) rename src/badguy/{mrtree.h => mrtree.hpp} (98%) rename src/badguy/{nolok_01.h => nolok_01.hpp} (96%) rename src/badguy/{poisonivy.h => poisonivy.hpp} (98%) rename src/badguy/{rocketexplosion.h => rocketexplosion.hpp} (98%) rename src/badguy/{snowball.h => snowball.hpp} (98%) rename src/badguy/{spike.h => spike.hpp} (98%) rename src/badguy/{spiky.h => spiky.hpp} (98%) rename src/badguy/{stalactite.h => stalactite.hpp} (98%) rename src/badguy/{yeti.h => yeti.hpp} (98%) rename src/badguy/{yeti_stalactite.h => yeti_stalactite.hpp} (97%) rename src/badguy/{zeekling.h => zeekling.hpp} (98%) rename src/{collision.h => collision.hpp} (100%) rename src/{collision_grid.h => collision_grid.hpp} (98%) rename src/{collision_grid_iterator.h => collision_grid_iterator.hpp} (99%) rename src/{collision_hit.h => collision_hit.hpp} (98%) rename src/control/{codecontroller.h => codecontroller.hpp} (97%) rename src/control/{controller.h => controller.hpp} (100%) rename src/control/{joystickkeyboardcontroller.h => joystickkeyboardcontroller.hpp} (97%) rename src/{direction.h => direction.hpp} (100%) rename src/{file_system.h => file_system.hpp} (100%) rename src/{flip_level_transformer.h => flip_level_transformer.hpp} (97%) rename src/{game_object.h => game_object.hpp} (100%) rename src/{game_session.h => game_session.hpp} (98%) rename src/{gameconfig.h => gameconfig.hpp} (100%) rename src/{gettext.h => gettext.hpp} (97%) rename src/gui/{button.h => button.hpp} (96%) rename src/gui/{menu.h => menu.hpp} (98%) rename src/gui/{mousecursor.h => mousecursor.hpp} (98%) rename src/{level.h => level.hpp} (100%) rename src/{level_subset.h => level_subset.hpp} (100%) rename src/{level_transformer.h => level_transformer.hpp} (100%) rename src/lisp/{lexer.h => lexer.hpp} (100%) rename src/lisp/{lisp.h => lisp.hpp} (100%) rename src/lisp/{list_iterator.h => list_iterator.hpp} (98%) rename src/lisp/{parser.h => parser.hpp} (98%) rename src/lisp/{writer.h => writer.hpp} (100%) rename src/{main.h => main.hpp} (100%) rename src/math/{aatriangle.h => aatriangle.hpp} (97%) rename src/math/{rect.h => rect.hpp} (98%) rename src/math/{vector.h => vector.hpp} (100%) rename src/{misc.h => misc.hpp} (100%) rename src/{moving_object.h => moving_object.hpp} (95%) rename src/object/{ambient_sound.h => ambient_sound.hpp} (96%) rename src/object/{background.h => background.hpp} (93%) rename src/object/{bell.h => bell.hpp} (92%) rename src/object/{block.h => block.hpp} (97%) rename src/object/{bullet.h => bullet.hpp} (94%) rename src/object/{camera.h => camera.hpp} (94%) rename src/object/{coin.h => coin.hpp} (95%) rename src/object/{display_effect.h => display_effect.hpp} (89%) rename src/object/{fireworks.h => fireworks.hpp} (92%) rename src/object/{flower.h => flower.hpp} (93%) rename src/object/{gameobjs.h => gameobjs.hpp} (94%) rename src/object/{growup.h => growup.hpp} (93%) rename src/object/{infoblock.h => infoblock.hpp} (95%) rename src/object/{invisible_block.h => invisible_block.hpp} (98%) rename src/object/{level_time.h => level_time.hpp} (79%) rename src/object/{oneup.h => oneup.hpp} (93%) rename src/object/{particlesystem.h => particlesystem.hpp} (96%) rename src/object/{particlesystem_interactive.h => particlesystem_interactive.hpp} (95%) rename src/object/{platform.h => platform.hpp} (95%) rename src/object/{player.h => player.hpp} (94%) rename src/object/{portable.h => portable.hpp} (98%) rename src/object/{powerup.h => powerup.hpp} (89%) rename src/object/{rainsplash.h => rainsplash.hpp} (86%) rename src/object/{rock.h => rock.hpp} (91%) rename src/object/{scripted_object.h => scripted_object.hpp} (86%) rename src/object/{specialriser.h => specialriser.hpp} (97%) rename src/object/{star.h => star.hpp} (93%) rename src/object/{text_object.h => text_object.hpp} (91%) rename src/object/{tilemap.h => tilemap.hpp} (96%) rename src/object/{unstable_tile.h => unstable_tile.hpp} (93%) rename src/{object_factory.h => object_factory.hpp} (97%) rename src/{object_remove_listener.h => object_remove_listener.hpp} (100%) rename src/physfs/{physfs_sdl.h => physfs_sdl.hpp} (100%) rename src/physfs/{physfs_stream.h => physfs_stream.hpp} (100%) rename src/{physic.h => physic.hpp} (98%) rename src/{player_status.h => player_status.hpp} (95%) rename src/{resources.h => resources.hpp} (100%) rename src/scripting/{camera.h => camera.hpp} (100%) rename src/scripting/{display_effect.h => display_effect.hpp} (100%) rename src/scripting/{functions.h => functions.hpp} (100%) rename src/scripting/{level.h => level.hpp} (100%) rename src/scripting/{player.h => player.hpp} (100%) rename src/scripting/{script_interpreter.h => script_interpreter.hpp} (91%) rename src/scripting/{scripted_object.h => scripted_object.hpp} (100%) rename src/scripting/{sound.h => sound.hpp} (100%) rename src/scripting/{text.h => text.hpp} (100%) rename src/scripting/{wrapper.h => wrapper.hpp} (91%) delete mode 100644 src/scripting/wrapper.interface.h create mode 100644 src/scripting/wrapper.interface.hpp rename src/scripting/{wrapper_util.h => wrapper_util.hpp} (100%) rename src/{sector.h => sector.hpp} (97%) rename src/{serializable.h => serializable.hpp} (100%) rename src/{spawn_point.h => spawn_point.hpp} (82%) rename src/sprite/{sprite.h => sprite.hpp} (96%) rename src/sprite/{sprite_data.h => sprite_data.hpp} (97%) rename src/sprite/{sprite_manager.h => sprite_manager.hpp} (98%) rename src/{statistics.h => statistics.hpp} (96%) rename src/{textscroller.h => textscroller.hpp} (100%) rename src/{tile.h => tile.hpp} (97%) rename src/{tile_manager.h => tile_manager.hpp} (99%) rename src/{timer.h => timer.hpp} (100%) rename src/tinygettext/{tinygettext.h => tinygettext.hpp} (100%) rename src/{title.h => title.hpp} (100%) rename src/trigger/{door.h => door.hpp} (91%) rename src/trigger/{hatch.h => hatch.hpp} (91%) rename src/trigger/{scripttrigger.h => scripttrigger.hpp} (95%) rename src/trigger/{secretarea_trigger.h => secretarea_trigger.hpp} (90%) rename src/trigger/{sequence_trigger.h => sequence_trigger.hpp} (95%) rename src/trigger/{trigger_base.h => trigger_base.hpp} (94%) rename src/video/{drawing_context.h => drawing_context.hpp} (97%) rename src/video/{font.h => font.hpp} (98%) rename src/video/{screen.h => screen.hpp} (98%) rename src/video/{surface.h => surface.hpp} (99%) rename src/{worldmap.h => worldmap.hpp} (96%) diff --git a/Jamrules b/Jamrules index 524a8c59a..2e3d6b0ae 100644 --- a/Jamrules +++ b/Jamrules @@ -46,7 +46,7 @@ include $(TOP)/mk/jam/build.jam ; # Include Dirs IncludeDir $(top_builddir) ; # for config.h -IncludeDir lib src ; +IncludeDir $(top_srcdir)/src ; if $(XGETTEXT) != "" { diff --git a/src/Jamfile b/src/Jamfile index f5efe6ab5..38492e855 100644 --- a/src/Jamfile +++ b/src/Jamfile @@ -4,20 +4,20 @@ SubInclude TOP src squirrel ; SubInclude TOP src scripting ; sources = - [ Wildcard *.cpp *.h ] - [ Wildcard audio : *.cpp *.h ] - [ Wildcard audio/newapi : *.cpp *.h ] - [ Wildcard badguy : *.cpp *.h ] - [ Wildcard control : *.cpp *.h ] - [ Wildcard gui : *.cpp *.h ] - [ Wildcard lisp : *.cpp *.h ] - [ Wildcard math : *.cpp *.h ] - [ Wildcard object : *.cpp *.h ] - [ Wildcard physfs : *.cpp *.h ] - [ Wildcard sprite : *.cpp *.h ] - [ Wildcard tinygettext : *.cpp *.h ] - [ Wildcard trigger : *.cpp *.h ] - [ Wildcard video : *.cpp *.h ] + [ Wildcard *.cpp *.hpp ] + [ Wildcard audio : *.cpp *.hpp ] + [ Wildcard audio/newapi : *.cpp *.hpp ] + [ Wildcard badguy : *.cpp *.hpp ] + [ Wildcard control : *.cpp *.hpp ] + [ Wildcard gui : *.cpp *.hpp ] + [ Wildcard lisp : *.cpp *.hpp ] + [ Wildcard math : *.cpp *.hpp ] + [ Wildcard object : *.cpp *.hpp ] + [ Wildcard physfs : *.cpp *.hpp ] + [ Wildcard sprite : *.cpp *.hpp ] + [ Wildcard tinygettext : *.cpp *.hpp ] + [ Wildcard trigger : *.cpp *.hpp ] + [ Wildcard video : *.cpp *.hpp ] ; TRANSLATABLE_SOURCES += [ SearchSource $(sources) ] ; diff --git a/src/audio/sound_file.cpp b/src/audio/sound_file.cpp index b9aa051b9..0012661cf 100644 --- a/src/audio/sound_file.cpp +++ b/src/audio/sound_file.cpp @@ -1,7 +1,7 @@ /** Used SDL_mixer and glest source as reference */ #include -#include "sound_file.h" +#include "sound_file.hpp" #include #include diff --git a/src/audio/sound_file.h b/src/audio/sound_file.hpp similarity index 100% rename from src/audio/sound_file.h rename to src/audio/sound_file.hpp diff --git a/src/audio/sound_manager.cpp b/src/audio/sound_manager.cpp index 3803fdf88..d5ade6ffd 100644 --- a/src/audio/sound_manager.cpp +++ b/src/audio/sound_manager.cpp @@ -1,13 +1,13 @@ -#include "sound_manager.h" +#include "sound_manager.hpp" #include #include #include #include -#include "sound_file.h" -#include "sound_source.h" -#include "stream_sound_source.h" +#include "sound_file.hpp" +#include "sound_source.hpp" +#include "stream_sound_source.hpp" SoundManager::SoundManager() : device(0), context(0), sound_enabled(false), music_source(0) diff --git a/src/audio/sound_manager.h b/src/audio/sound_manager.hpp similarity index 98% rename from src/audio/sound_manager.h rename to src/audio/sound_manager.hpp index 1f53285a2..a18727e8d 100644 --- a/src/audio/sound_manager.h +++ b/src/audio/sound_manager.hpp @@ -1,7 +1,7 @@ #ifndef __SOUND_MANAGER_H__ #define __SOUND_MANAGER_H__ -#include "math/vector.h" +#include "math/vector.hpp" #include #include #include diff --git a/src/audio/sound_source.cpp b/src/audio/sound_source.cpp index b0ebdc8e2..399f3a3f7 100644 --- a/src/audio/sound_source.cpp +++ b/src/audio/sound_source.cpp @@ -1,7 +1,7 @@ #include -#include "sound_source.h" -#include "sound_manager.h" +#include "sound_source.hpp" +#include "sound_manager.hpp" SoundSource::SoundSource() { diff --git a/src/audio/sound_source.h b/src/audio/sound_source.hpp similarity index 94% rename from src/audio/sound_source.h rename to src/audio/sound_source.hpp index 65797ca4d..4860eaec9 100644 --- a/src/audio/sound_source.h +++ b/src/audio/sound_source.hpp @@ -2,7 +2,7 @@ #define __SOUND_SOURCE_H__ #include -#include "math/vector.h" +#include "math/vector.hpp" class SoundSource { diff --git a/src/audio/stream_sound_source.cpp b/src/audio/stream_sound_source.cpp index d282c4dbf..88e67c015 100644 --- a/src/audio/stream_sound_source.cpp +++ b/src/audio/stream_sound_source.cpp @@ -1,8 +1,8 @@ #include -#include "stream_sound_source.h" -#include "sound_manager.h" -#include "sound_file.h" +#include "stream_sound_source.hpp" +#include "sound_manager.hpp" +#include "sound_file.hpp" StreamSoundSource::StreamSoundSource(SoundFile* file) { diff --git a/src/audio/stream_sound_source.h b/src/audio/stream_sound_source.hpp similarity index 95% rename from src/audio/stream_sound_source.h rename to src/audio/stream_sound_source.hpp index b5002f234..5fe4e462e 100644 --- a/src/audio/stream_sound_source.h +++ b/src/audio/stream_sound_source.hpp @@ -2,7 +2,7 @@ #define __STREAM_SOUND_SOURCE_H__ #include -#include "sound_source.h" +#include "sound_source.hpp" class SoundFile; diff --git a/src/badguy/badguy.cpp b/src/badguy/badguy.cpp index 3a4ae694c..8af388562 100644 --- a/src/badguy/badguy.cpp +++ b/src/badguy/badguy.cpp @@ -19,9 +19,9 @@ // 02111-1307, USA. #include -#include "badguy.h" -#include "object/camera.h" -#include "statistics.h" +#include "badguy.hpp" +#include "object/camera.hpp" +#include "statistics.hpp" static const float SQUISH_TIME = 2; static const float X_OFFSCREEN_DISTANCE = 1600; diff --git a/src/badguy/badguy.h b/src/badguy/badguy.hpp similarity index 89% rename from src/badguy/badguy.h rename to src/badguy/badguy.hpp index ac891a613..8b759df37 100644 --- a/src/badguy/badguy.h +++ b/src/badguy/badguy.hpp @@ -22,23 +22,23 @@ // moved them here to make it less typing when implementing new badguys #include -#include "timer.h" -#include "moving_object.h" -#include "sprite/sprite.h" -#include "physic.h" -#include "object/player.h" -#include "serializable.h" -#include "resources.h" -#include "sector.h" -#include "direction.h" -#include "object_factory.h" -#include "lisp/parser.h" -#include "lisp/lisp.h" -#include "lisp/writer.h" -#include "video/drawing_context.h" -#include "audio/sound_manager.h" -#include "audio/sound_source.h" -#include "sprite/sprite_manager.h" +#include "timer.hpp" +#include "moving_object.hpp" +#include "sprite/sprite.hpp" +#include "physic.hpp" +#include "object/player.hpp" +#include "serializable.hpp" +#include "resources.hpp" +#include "sector.hpp" +#include "direction.hpp" +#include "object_factory.hpp" +#include "lisp/parser.hpp" +#include "lisp/lisp.hpp" +#include "lisp/writer.hpp" +#include "video/drawing_context.hpp" +#include "audio/sound_manager.hpp" +#include "audio/sound_source.hpp" +#include "sprite/sprite_manager.hpp" class BadGuy : public MovingObject, public Serializable { diff --git a/src/badguy/bomb.cpp b/src/badguy/bomb.cpp index d6884a5ff..c611337e8 100644 --- a/src/badguy/bomb.cpp +++ b/src/badguy/bomb.cpp @@ -20,7 +20,7 @@ #include -#include "bomb.h" +#include "bomb.hpp" static const float TICKINGTIME = 1; static const float EXPLOSIONTIME = 1; diff --git a/src/badguy/bomb.h b/src/badguy/bomb.hpp similarity index 98% rename from src/badguy/bomb.h rename to src/badguy/bomb.hpp index 4bd322203..bc64ac54d 100644 --- a/src/badguy/bomb.h +++ b/src/badguy/bomb.hpp @@ -21,7 +21,7 @@ #ifndef __BOMB_H__ #define __BOMB_H__ -#include "badguy.h" +#include "badguy.hpp" class Bomb : public BadGuy { diff --git a/src/badguy/bouncing_snowball.cpp b/src/badguy/bouncing_snowball.cpp index e998f6803..a704a04d9 100644 --- a/src/badguy/bouncing_snowball.cpp +++ b/src/badguy/bouncing_snowball.cpp @@ -20,7 +20,7 @@ #include -#include "bouncing_snowball.h" +#include "bouncing_snowball.hpp" static const float JUMPSPEED = 450; static const float WALKSPEED = 80; diff --git a/src/badguy/bouncing_snowball.h b/src/badguy/bouncing_snowball.hpp similarity index 98% rename from src/badguy/bouncing_snowball.h rename to src/badguy/bouncing_snowball.hpp index 98e64f1d8..ae2ce4632 100644 --- a/src/badguy/bouncing_snowball.h +++ b/src/badguy/bouncing_snowball.hpp @@ -21,7 +21,7 @@ #ifndef __BOUNCING_SNOWBALL_H__ #define __BOUNCING_SNOWBALL_H__ -#include "badguy.h" +#include "badguy.hpp" class BouncingSnowball : public BadGuy { diff --git a/src/badguy/dispenser.cpp b/src/badguy/dispenser.cpp index 6f83ee7d0..41a886370 100644 --- a/src/badguy/dispenser.cpp +++ b/src/badguy/dispenser.cpp @@ -20,13 +20,13 @@ #include -#include "dispenser.h" -#include "badguy/bouncing_snowball.h" -#include "badguy/snowball.h" -#include "badguy/mrbomb.h" -#include "badguy/mriceblock.h" -#include "badguy/mrrocket.h" -#include "badguy/poisonivy.h" +#include "dispenser.hpp" +#include "badguy/bouncing_snowball.hpp" +#include "badguy/snowball.hpp" +#include "badguy/mrbomb.hpp" +#include "badguy/mriceblock.hpp" +#include "badguy/mrrocket.hpp" +#include "badguy/poisonivy.hpp" Dispenser::Dispenser(const lisp::Lisp& reader) { diff --git a/src/badguy/dispenser.h b/src/badguy/dispenser.hpp similarity index 96% rename from src/badguy/dispenser.h rename to src/badguy/dispenser.hpp index 235544491..2b4f10fc0 100644 --- a/src/badguy/dispenser.h +++ b/src/badguy/dispenser.hpp @@ -21,8 +21,8 @@ #ifndef __DISPENSER_H__ #define __DISPENSER_H__ -#include "badguy.h" -#include "timer.h" +#include "badguy.hpp" +#include "timer.hpp" class Dispenser : public BadGuy { diff --git a/src/badguy/flame.cpp b/src/badguy/flame.cpp index 0bd892bf7..f43b69a05 100644 --- a/src/badguy/flame.cpp +++ b/src/badguy/flame.cpp @@ -20,7 +20,7 @@ #include -#include "flame.h" +#include "flame.hpp" Flame::Flame(const lisp::Lisp& reader) : angle(0), radius(100), speed(2), source(0) diff --git a/src/badguy/flame.h b/src/badguy/flame.hpp similarity index 98% rename from src/badguy/flame.h rename to src/badguy/flame.hpp index 877fa9bd3..c9e7a40f9 100644 --- a/src/badguy/flame.h +++ b/src/badguy/flame.hpp @@ -21,7 +21,7 @@ #ifndef __FLAME_H__ #define __FLAME_H__ -#include "badguy.h" +#include "badguy.hpp" class Flame : public BadGuy { diff --git a/src/badguy/flyingsnowball.cpp b/src/badguy/flyingsnowball.cpp index b95e487f6..3135c6a21 100644 --- a/src/badguy/flyingsnowball.cpp +++ b/src/badguy/flyingsnowball.cpp @@ -21,7 +21,7 @@ #include #include -#include "flyingsnowball.h" +#include "flyingsnowball.hpp" static const float FLYTIME = 1.0; static const float FLYSPEED = 100.0; diff --git a/src/badguy/flyingsnowball.h b/src/badguy/flyingsnowball.hpp similarity index 98% rename from src/badguy/flyingsnowball.h rename to src/badguy/flyingsnowball.hpp index 7e1510b70..2058e21db 100644 --- a/src/badguy/flyingsnowball.h +++ b/src/badguy/flyingsnowball.hpp @@ -21,7 +21,7 @@ #ifndef __FLYINGSNOWBALL_H__ #define __FLYINGSNOWBALL_H__ -#include "badguy.h" +#include "badguy.hpp" class FlyingSnowBall : public BadGuy { diff --git a/src/badguy/jumpy.cpp b/src/badguy/jumpy.cpp index 7958c5e4b..9b2a6b770 100644 --- a/src/badguy/jumpy.cpp +++ b/src/badguy/jumpy.cpp @@ -19,7 +19,7 @@ // 02111-1307, USA. #include -#include "jumpy.h" +#include "jumpy.hpp" static const float JUMPSPEED=600; static const float JUMPY_MID_TOLERANCE=4; diff --git a/src/badguy/jumpy.h b/src/badguy/jumpy.hpp similarity index 98% rename from src/badguy/jumpy.h rename to src/badguy/jumpy.hpp index d4d6d4c6f..96360c625 100644 --- a/src/badguy/jumpy.h +++ b/src/badguy/jumpy.hpp @@ -20,7 +20,7 @@ #ifndef __JUMPY_H__ #define __JUMPY_H__ -#include "badguy.h" +#include "badguy.hpp" class Jumpy : public BadGuy { diff --git a/src/badguy/mrbomb.cpp b/src/badguy/mrbomb.cpp index a52904898..596899e60 100644 --- a/src/badguy/mrbomb.cpp +++ b/src/badguy/mrbomb.cpp @@ -20,8 +20,8 @@ #include -#include "mrbomb.h" -#include "bomb.h" +#include "mrbomb.hpp" +#include "bomb.hpp" static const float WALKSPEED = 80; diff --git a/src/badguy/mrbomb.h b/src/badguy/mrbomb.hpp similarity index 98% rename from src/badguy/mrbomb.h rename to src/badguy/mrbomb.hpp index f59a0fb63..8fa7f5aa7 100644 --- a/src/badguy/mrbomb.h +++ b/src/badguy/mrbomb.hpp @@ -21,7 +21,7 @@ #ifndef __MRBOMB_H__ #define __MRBOMB_H__ -#include "badguy.h" +#include "badguy.hpp" class MrBomb : public BadGuy { diff --git a/src/badguy/mriceblock.cpp b/src/badguy/mriceblock.cpp index 0dcd96eaa..437f56cda 100644 --- a/src/badguy/mriceblock.cpp +++ b/src/badguy/mriceblock.cpp @@ -20,8 +20,8 @@ #include -#include "mriceblock.h" -#include "object/block.h" +#include "mriceblock.hpp" +#include "object/block.hpp" static const float WALKSPEED = 80; static const float KICKSPEED = 500; diff --git a/src/badguy/mriceblock.h b/src/badguy/mriceblock.hpp similarity index 98% rename from src/badguy/mriceblock.h rename to src/badguy/mriceblock.hpp index 906b0f49c..4031e0d2c 100644 --- a/src/badguy/mriceblock.h +++ b/src/badguy/mriceblock.hpp @@ -21,7 +21,7 @@ #ifndef __MRICEBLOCK_H__ #define __MRICEBLOCK_H__ -#include "badguy.h" +#include "badguy.hpp" class MrIceBlock : public BadGuy { diff --git a/src/badguy/mrrocket.cpp b/src/badguy/mrrocket.cpp index 0a77d7f06..95a65d95a 100644 --- a/src/badguy/mrrocket.cpp +++ b/src/badguy/mrrocket.cpp @@ -20,7 +20,7 @@ #include -#include "mrrocket.h" +#include "mrrocket.hpp" static const float SPEED = 200; diff --git a/src/badguy/mrrocket.h b/src/badguy/mrrocket.hpp similarity index 94% rename from src/badguy/mrrocket.h rename to src/badguy/mrrocket.hpp index e0385a2fb..fe4658e95 100644 --- a/src/badguy/mrrocket.h +++ b/src/badguy/mrrocket.hpp @@ -21,9 +21,9 @@ #ifndef __MRROCKET_H__ #define __MRROCKET_H__ -#include "badguy.h" -#include "timer.h" -#include "rocketexplosion.h" +#include "badguy.hpp" +#include "timer.hpp" +#include "rocketexplosion.hpp" class MrRocket : public BadGuy { diff --git a/src/badguy/mrtree.cpp b/src/badguy/mrtree.cpp index ba396b136..73e2c6308 100644 --- a/src/badguy/mrtree.cpp +++ b/src/badguy/mrtree.cpp @@ -20,7 +20,7 @@ #include -#include "mrtree.h" +#include "mrtree.hpp" static const float WALKSPEED = 50; static const float WALKSPEED_SMALL = 30; diff --git a/src/badguy/mrtree.h b/src/badguy/mrtree.hpp similarity index 98% rename from src/badguy/mrtree.h rename to src/badguy/mrtree.hpp index 0fdbb3940..058e26141 100644 --- a/src/badguy/mrtree.h +++ b/src/badguy/mrtree.hpp @@ -21,7 +21,7 @@ #ifndef __MRTREE_H__ #define __MRTREE_H__ -#include "badguy.h" +#include "badguy.hpp" class MrTree : public BadGuy { diff --git a/src/badguy/nolok_01.cpp b/src/badguy/nolok_01.cpp index e88a0abe8..925e4de90 100644 --- a/src/badguy/nolok_01.cpp +++ b/src/badguy/nolok_01.cpp @@ -20,9 +20,9 @@ #include -#include "nolok_01.h" -#include "badguy/bouncing_snowball.h" -#include "trigger/door.h" +#include "nolok_01.hpp" +#include "badguy/bouncing_snowball.hpp" +#include "trigger/door.hpp" #define WALK_TIME 2.5 #define SHOOT_TIME 0.4 diff --git a/src/badguy/nolok_01.h b/src/badguy/nolok_01.hpp similarity index 96% rename from src/badguy/nolok_01.h rename to src/badguy/nolok_01.hpp index a7cdc43ea..fddb503b5 100644 --- a/src/badguy/nolok_01.h +++ b/src/badguy/nolok_01.hpp @@ -21,8 +21,8 @@ #ifndef __NOLOK01_H__ #define __NOLOK01_H__ -#include "badguy.h" -#include "timer.h" +#include "badguy.hpp" +#include "timer.hpp" class Nolok_01 : public BadGuy { diff --git a/src/badguy/poisonivy.cpp b/src/badguy/poisonivy.cpp index cb38796e8..848f5600f 100644 --- a/src/badguy/poisonivy.cpp +++ b/src/badguy/poisonivy.cpp @@ -20,7 +20,7 @@ #include -#include "poisonivy.h" +#include "poisonivy.hpp" static const float WALKSPEED = 80; diff --git a/src/badguy/poisonivy.h b/src/badguy/poisonivy.hpp similarity index 98% rename from src/badguy/poisonivy.h rename to src/badguy/poisonivy.hpp index 7d683bb0f..7a34a22aa 100644 --- a/src/badguy/poisonivy.h +++ b/src/badguy/poisonivy.hpp @@ -21,7 +21,7 @@ #ifndef __POISONIVY_H__ #define __POISONIVY_H__ -#include "badguy.h" +#include "badguy.hpp" class PoisonIvy : public BadGuy { diff --git a/src/badguy/rocketexplosion.cpp b/src/badguy/rocketexplosion.cpp index f1d79e782..e79e847d8 100644 --- a/src/badguy/rocketexplosion.cpp +++ b/src/badguy/rocketexplosion.cpp @@ -20,7 +20,7 @@ #include -#include "rocketexplosion.h" +#include "rocketexplosion.hpp" static const float EXPLOSIONTIME = 1; diff --git a/src/badguy/rocketexplosion.h b/src/badguy/rocketexplosion.hpp similarity index 98% rename from src/badguy/rocketexplosion.h rename to src/badguy/rocketexplosion.hpp index 60a3f134a..d5b7a79b8 100644 --- a/src/badguy/rocketexplosion.h +++ b/src/badguy/rocketexplosion.hpp @@ -21,7 +21,7 @@ #ifndef __BOMB_H__ #define __BOMB_H__ -#include "badguy.h" +#include "badguy.hpp" class RocketExplosion : public BadGuy { diff --git a/src/badguy/snowball.cpp b/src/badguy/snowball.cpp index 1db1eb5d7..66ac4311b 100644 --- a/src/badguy/snowball.cpp +++ b/src/badguy/snowball.cpp @@ -20,7 +20,7 @@ #include -#include "snowball.h" +#include "snowball.hpp" static const float WALKSPEED = 80; diff --git a/src/badguy/snowball.h b/src/badguy/snowball.hpp similarity index 98% rename from src/badguy/snowball.h rename to src/badguy/snowball.hpp index 46df80978..3e340340c 100644 --- a/src/badguy/snowball.h +++ b/src/badguy/snowball.hpp @@ -21,7 +21,7 @@ #ifndef __SNOWBALL_H__ #define __SNOWBALL_H__ -#include "badguy.h" +#include "badguy.hpp" class SnowBall : public BadGuy { diff --git a/src/badguy/spike.cpp b/src/badguy/spike.cpp index 0db1dfb1d..eded3f9cf 100644 --- a/src/badguy/spike.cpp +++ b/src/badguy/spike.cpp @@ -19,7 +19,7 @@ // 02111-1307, USA. #include -#include "spike.h" +#include "spike.hpp" Spike::Spike(const Vector& pos, Direction dir) { diff --git a/src/badguy/spike.h b/src/badguy/spike.hpp similarity index 98% rename from src/badguy/spike.h rename to src/badguy/spike.hpp index 2cada0736..bdfea108e 100644 --- a/src/badguy/spike.h +++ b/src/badguy/spike.hpp @@ -21,7 +21,7 @@ #ifndef __SPIKE_H__ #define __SPIKE_H__ -#include "badguy.h" +#include "badguy.hpp" class Spike : public BadGuy { diff --git a/src/badguy/spiky.cpp b/src/badguy/spiky.cpp index 7a71c3df0..04368833d 100644 --- a/src/badguy/spiky.cpp +++ b/src/badguy/spiky.cpp @@ -20,7 +20,7 @@ #include -#include "spiky.h" +#include "spiky.hpp" static const float WALKSPEED = 80; diff --git a/src/badguy/spiky.h b/src/badguy/spiky.hpp similarity index 98% rename from src/badguy/spiky.h rename to src/badguy/spiky.hpp index 981a928bb..8f679c413 100644 --- a/src/badguy/spiky.h +++ b/src/badguy/spiky.hpp @@ -21,7 +21,7 @@ #ifndef __SPIKY_H__ #define __SPIKY_H__ -#include "badguy.h" +#include "badguy.hpp" class Spiky : public BadGuy { diff --git a/src/badguy/stalactite.cpp b/src/badguy/stalactite.cpp index 82d47f22e..4b697f0e7 100644 --- a/src/badguy/stalactite.cpp +++ b/src/badguy/stalactite.cpp @@ -20,7 +20,7 @@ #include -#include "stalactite.h" +#include "stalactite.hpp" static const int SHAKE_RANGE = 40; static const float SHAKE_TIME = .8; diff --git a/src/badguy/stalactite.h b/src/badguy/stalactite.hpp similarity index 98% rename from src/badguy/stalactite.h rename to src/badguy/stalactite.hpp index f193f5407..ed221cbf0 100644 --- a/src/badguy/stalactite.h +++ b/src/badguy/stalactite.hpp @@ -21,7 +21,7 @@ #ifndef __STALACTITE_H__ #define __STALACTITE_H__ -#include "badguy.h" +#include "badguy.hpp" class Stalactite : public BadGuy { diff --git a/src/badguy/yeti.cpp b/src/badguy/yeti.cpp index 60fac3e65..fef1be337 100644 --- a/src/badguy/yeti.cpp +++ b/src/badguy/yeti.cpp @@ -22,12 +22,12 @@ #include #include #include -#include "yeti.h" -#include "object/camera.h" -#include "yeti_stalactite.h" -#include "bouncing_snowball.h" -#include "game_session.h" -#include "scripting/script_interpreter.h" +#include "yeti.hpp" +#include "object/camera.hpp" +#include "yeti_stalactite.hpp" +#include "bouncing_snowball.hpp" +#include "game_session.hpp" +#include "scripting/script_interpreter.hpp" static const float JUMP_VEL1 = 250; static const float JUMP_VEL2 = 700; diff --git a/src/badguy/yeti.h b/src/badguy/yeti.hpp similarity index 98% rename from src/badguy/yeti.h rename to src/badguy/yeti.hpp index 1f14a6b98..a66434765 100644 --- a/src/badguy/yeti.h +++ b/src/badguy/yeti.hpp @@ -20,7 +20,7 @@ #ifndef __YETI_H__ #define __YETI_H__ -#include "badguy.h" +#include "badguy.hpp" class Yeti : public BadGuy { diff --git a/src/badguy/yeti_stalactite.cpp b/src/badguy/yeti_stalactite.cpp index 0d1545bc1..52ef203bb 100644 --- a/src/badguy/yeti_stalactite.cpp +++ b/src/badguy/yeti_stalactite.cpp @@ -18,7 +18,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA // 02111-1307, USA. -#include "yeti_stalactite.h" +#include "yeti_stalactite.hpp" static const float SHAKE_TIME = .8; diff --git a/src/badguy/yeti_stalactite.h b/src/badguy/yeti_stalactite.hpp similarity index 97% rename from src/badguy/yeti_stalactite.h rename to src/badguy/yeti_stalactite.hpp index baca48ff8..1a9faa114 100644 --- a/src/badguy/yeti_stalactite.h +++ b/src/badguy/yeti_stalactite.hpp @@ -21,7 +21,7 @@ #ifndef __YETI_STALACTITE_H__ #define __YETI_STALACTITE_H__ -#include "stalactite.h" +#include "stalactite.hpp" class YetiStalactite : public Stalactite { diff --git a/src/badguy/zeekling.cpp b/src/badguy/zeekling.cpp index 7d42577e3..0b2758d06 100644 --- a/src/badguy/zeekling.cpp +++ b/src/badguy/zeekling.cpp @@ -21,7 +21,7 @@ #include #include -#include "zeekling.h" +#include "zeekling.hpp" //TODO: Make the Zeekling behave more interesting diff --git a/src/badguy/zeekling.h b/src/badguy/zeekling.hpp similarity index 98% rename from src/badguy/zeekling.h rename to src/badguy/zeekling.hpp index de2a775b0..7dc18af73 100644 --- a/src/badguy/zeekling.h +++ b/src/badguy/zeekling.hpp @@ -21,7 +21,7 @@ #ifndef __ZEEKLING_H__ #define __ZEEKLING_H__ -#include "badguy.h" +#include "badguy.hpp" class Zeekling : public BadGuy { diff --git a/src/collision.cpp b/src/collision.cpp index cce522d5d..ad87f8918 100644 --- a/src/collision.cpp +++ b/src/collision.cpp @@ -19,17 +19,17 @@ // 02111-1307, USA. #include -#include "collision.h" +#include "collision.hpp" #include #include #include #include #include -#include "math/vector.h" -#include "math/aatriangle.h" -#include "math/rect.h" -#include "collision_hit.h" +#include "math/vector.hpp" +#include "math/aatriangle.hpp" +#include "math/rect.hpp" +#include "collision_hit.hpp" static const float DELTA = .0001; diff --git a/src/collision.h b/src/collision.hpp similarity index 100% rename from src/collision.h rename to src/collision.hpp diff --git a/src/collision_grid.cpp b/src/collision_grid.cpp index 6ed8e4cc3..bf6cc9332 100644 --- a/src/collision_grid.cpp +++ b/src/collision_grid.cpp @@ -21,10 +21,10 @@ #include #include -#include "collision_grid.h" -#include "collision.h" -#include "sector.h" -#include "collision_grid_iterator.h" +#include "collision_grid.hpp" +#include "collision.hpp" +#include "sector.hpp" +#include "collision_grid_iterator.hpp" static const float DELTA = .001; diff --git a/src/collision_grid.h b/src/collision_grid.hpp similarity index 98% rename from src/collision_grid.h rename to src/collision_grid.hpp index abb2ef168..005eb7f3a 100644 --- a/src/collision_grid.h +++ b/src/collision_grid.hpp @@ -21,7 +21,7 @@ #define __COLLISION_GRID_H__ #include -#include "moving_object.h" +#include "moving_object.hpp" class CollisionGridIterator; diff --git a/src/collision_grid_iterator.h b/src/collision_grid_iterator.hpp similarity index 99% rename from src/collision_grid_iterator.h rename to src/collision_grid_iterator.hpp index 3d5666161..0f7877778 100644 --- a/src/collision_grid_iterator.h +++ b/src/collision_grid_iterator.hpp @@ -20,7 +20,7 @@ #ifndef __COLLISION_GRID_ITERATOR_H__ #define __COLLISION_GRID_ITERATOR_H__ -#include "math/rect.h" +#include "math/rect.hpp" class CollisionGrid; diff --git a/src/collision_hit.h b/src/collision_hit.hpp similarity index 98% rename from src/collision_hit.h rename to src/collision_hit.hpp index 4c4ccec5b..42c0aa62a 100644 --- a/src/collision_hit.h +++ b/src/collision_hit.hpp @@ -19,7 +19,7 @@ #ifndef SUPERTUX_COLLISION_HIT_H #define SUPERTUX_COLLISION_HIT_H -#include "math/vector.h" +#include "math/vector.hpp" /** * Used as return value for the collision functions, to indicate how the diff --git a/src/control/codecontroller.cpp b/src/control/codecontroller.cpp index 97397a211..cdee2cff3 100644 --- a/src/control/codecontroller.cpp +++ b/src/control/codecontroller.cpp @@ -20,7 +20,7 @@ #include -#include "codecontroller.h" +#include "codecontroller.hpp" CodeController::CodeController() {} diff --git a/src/control/codecontroller.h b/src/control/codecontroller.hpp similarity index 97% rename from src/control/codecontroller.h rename to src/control/codecontroller.hpp index 46b2e9ca2..687ec5ffa 100644 --- a/src/control/codecontroller.h +++ b/src/control/codecontroller.hpp @@ -21,7 +21,7 @@ #ifndef __CODECONTROLLER_H__ #define __CODECONTROLLER_H__ -#include "controller.h" +#include "controller.hpp" /** * This is a dummy controler that doesn't react to any user input but should diff --git a/src/control/controller.cpp b/src/control/controller.cpp index f6f5ecb18..73f93afed 100644 --- a/src/control/controller.cpp +++ b/src/control/controller.cpp @@ -20,7 +20,7 @@ #include -#include "controller.h" +#include "controller.hpp" extern Controller* main_controller; diff --git a/src/control/controller.h b/src/control/controller.hpp similarity index 100% rename from src/control/controller.h rename to src/control/controller.hpp diff --git a/src/control/joystickkeyboardcontroller.cpp b/src/control/joystickkeyboardcontroller.cpp index 6bebf6b3d..0fb4d9ee9 100644 --- a/src/control/joystickkeyboardcontroller.cpp +++ b/src/control/joystickkeyboardcontroller.cpp @@ -20,12 +20,12 @@ #include #include -#include "joystickkeyboardcontroller.h" -#include "gui/menu.h" -#include "gettext.h" -#include "lisp/lisp.h" -#include "lisp/list_iterator.h" -#include "game_session.h" +#include "joystickkeyboardcontroller.hpp" +#include "gui/menu.hpp" +#include "gettext.hpp" +#include "lisp/lisp.hpp" +#include "lisp/list_iterator.hpp" +#include "game_session.hpp" class JoystickKeyboardController::JoystickMenu : public Menu { diff --git a/src/control/joystickkeyboardcontroller.h b/src/control/joystickkeyboardcontroller.hpp similarity index 97% rename from src/control/joystickkeyboardcontroller.h rename to src/control/joystickkeyboardcontroller.hpp index 2a5f52757..a39f68bf0 100644 --- a/src/control/joystickkeyboardcontroller.h +++ b/src/control/joystickkeyboardcontroller.hpp @@ -21,9 +21,9 @@ #ifndef __JOYSTICKKEYBOARDCONTROLLER_H__ #define __JOYSTICKKEYBOARDCONTROLLER_H__ -#include "controller.h" -#include "lisp/lisp.h" -#include "lisp/writer.h" +#include "controller.hpp" +#include "lisp/lisp.hpp" +#include "lisp/writer.hpp" #include #include #include diff --git a/src/direction.h b/src/direction.hpp similarity index 100% rename from src/direction.h rename to src/direction.hpp diff --git a/src/file_system.cpp b/src/file_system.cpp index 8d8b811b0..4989540c4 100644 --- a/src/file_system.cpp +++ b/src/file_system.cpp @@ -1,6 +1,6 @@ #include -#include "file_system.h" +#include "file_system.hpp" #include diff --git a/src/file_system.h b/src/file_system.hpp similarity index 100% rename from src/file_system.h rename to src/file_system.hpp diff --git a/src/flip_level_transformer.cpp b/src/flip_level_transformer.cpp index 0ac481623..73fe33bef 100644 --- a/src/flip_level_transformer.cpp +++ b/src/flip_level_transformer.cpp @@ -19,13 +19,13 @@ // 02111-1307, USA. #include -#include "flip_level_transformer.h" -#include "object/tilemap.h" -#include "object/camera.h" -#include "badguy/badguy.h" -#include "sector.h" -#include "tile_manager.h" -#include "spawn_point.h" +#include "flip_level_transformer.hpp" +#include "object/tilemap.hpp" +#include "object/camera.hpp" +#include "badguy/badguy.hpp" +#include "sector.hpp" +#include "tile_manager.hpp" +#include "spawn_point.hpp" void FlipLevelTransformer::transform_sector(Sector* sector) diff --git a/src/flip_level_transformer.h b/src/flip_level_transformer.hpp similarity index 97% rename from src/flip_level_transformer.h rename to src/flip_level_transformer.hpp index 79b7b0297..cecc6512e 100644 --- a/src/flip_level_transformer.h +++ b/src/flip_level_transformer.hpp @@ -20,7 +20,7 @@ #ifndef __FLIP_LEVEL_TRANSFORMER_H__ #define __FLIP_LEVEL_TRANSFORMER_H__ -#include "level_transformer.h" +#include "level_transformer.hpp" class TileMap; class BadGuy; diff --git a/src/game_object.cpp b/src/game_object.cpp index 40d405662..c63dbf12b 100644 --- a/src/game_object.cpp +++ b/src/game_object.cpp @@ -19,8 +19,8 @@ #include -#include "game_object.h" -#include "object_remove_listener.h" +#include "game_object.hpp" +#include "object_remove_listener.hpp" GameObject::GameObject() : wants_to_die(false), remove_listeners(0), flags(0) diff --git a/src/game_object.h b/src/game_object.hpp similarity index 100% rename from src/game_object.h rename to src/game_object.hpp diff --git a/src/game_session.cpp b/src/game_session.cpp index d8e2204b4..d6d10d3f0 100644 --- a/src/game_session.cpp +++ b/src/game_session.cpp @@ -35,34 +35,34 @@ #include -#include "game_session.h" -#include "video/screen.h" -#include "audio/sound_manager.h" -#include "gui/menu.h" -#include "sector.h" -#include "level.h" -#include "tile.h" -#include "player_status.h" -#include "object/particlesystem.h" -#include "object/background.h" -#include "object/tilemap.h" -#include "object/camera.h" -#include "object/player.h" -#include "lisp/lisp.h" -#include "lisp/parser.h" -#include "resources.h" -#include "worldmap.h" -#include "misc.h" -#include "statistics.h" -#include "timer.h" -#include "object/fireworks.h" -#include "textscroller.h" -#include "control/codecontroller.h" -#include "control/joystickkeyboardcontroller.h" -#include "main.h" -#include "file_system.h" -#include "gameconfig.h" -#include "gettext.h" +#include "game_session.hpp" +#include "video/screen.hpp" +#include "audio/sound_manager.hpp" +#include "gui/menu.hpp" +#include "sector.hpp" +#include "level.hpp" +#include "tile.hpp" +#include "player_status.hpp" +#include "object/particlesystem.hpp" +#include "object/background.hpp" +#include "object/tilemap.hpp" +#include "object/camera.hpp" +#include "object/player.hpp" +#include "lisp/lisp.hpp" +#include "lisp/parser.hpp" +#include "resources.hpp" +#include "worldmap.hpp" +#include "misc.hpp" +#include "statistics.hpp" +#include "timer.hpp" +#include "object/fireworks.hpp" +#include "textscroller.hpp" +#include "control/codecontroller.hpp" +#include "control/joystickkeyboardcontroller.hpp" +#include "main.hpp" +#include "file_system.hpp" +#include "gameconfig.hpp" +#include "gettext.hpp" // the engine will be run with a logical framerate of 64fps. // We chose 64fps here because it is a power of 2, so 1/64 gives an "even" diff --git a/src/game_session.h b/src/game_session.hpp similarity index 98% rename from src/game_session.h rename to src/game_session.hpp index 9c5d381b5..114c27de6 100644 --- a/src/game_session.h +++ b/src/game_session.hpp @@ -23,9 +23,9 @@ #include #include -#include "timer.h" -#include "statistics.h" -#include "math/vector.h" +#include "timer.hpp" +#include "statistics.hpp" +#include "math/vector.hpp" /* GameLoop modes */ enum GameSessionMode { diff --git a/src/gameconfig.cpp b/src/gameconfig.cpp index b763feff2..1e753b24d 100644 --- a/src/gameconfig.cpp +++ b/src/gameconfig.cpp @@ -18,7 +18,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include -#include "gameconfig.h" +#include "gameconfig.hpp" #include #include @@ -26,12 +26,12 @@ #include #include -#include "lisp/parser.h" -#include "lisp/lisp.h" -#include "lisp/writer.h" -#include "control/joystickkeyboardcontroller.h" -#include "resources.h" -#include "main.h" +#include "lisp/parser.hpp" +#include "lisp/lisp.hpp" +#include "lisp/writer.hpp" +#include "control/joystickkeyboardcontroller.hpp" +#include "resources.hpp" +#include "main.hpp" Config* config = 0; diff --git a/src/gameconfig.h b/src/gameconfig.hpp similarity index 100% rename from src/gameconfig.h rename to src/gameconfig.hpp diff --git a/src/gettext.h b/src/gettext.hpp similarity index 97% rename from src/gettext.h rename to src/gettext.hpp index b12cdd2f7..a3353e12b 100644 --- a/src/gettext.h +++ b/src/gettext.hpp @@ -16,7 +16,7 @@ #ifndef _LIBGETTEXT_H #define _LIBGETTEXT_H -#include "tinygettext/tinygettext.h" +#include "tinygettext/tinygettext.hpp" extern TinyGetText::DictionaryManager dictionary_manager; diff --git a/src/gui/button.cpp b/src/gui/button.cpp index 2f4580a48..16d901db5 100644 --- a/src/gui/button.cpp +++ b/src/gui/button.cpp @@ -19,14 +19,14 @@ // 02111-1307, USA. #include -#include "SDL.h" +#include #include -#include "main.h" -#include "button.h" -#include "mousecursor.h" -#include "video/font.h" -#include "video/surface.h" +#include "main.hpp" +#include "button.hpp" +#include "mousecursor.hpp" +#include "video/font.hpp" +#include "video/surface.hpp" Font* Button::info_font = 0; extern SDL_Surface* screen; diff --git a/src/gui/button.h b/src/gui/button.hpp similarity index 96% rename from src/gui/button.h rename to src/gui/button.hpp index 700dbf079..230c84a6b 100644 --- a/src/gui/button.h +++ b/src/gui/button.hpp @@ -23,8 +23,8 @@ #include #include -#include "math/vector.h" -#include "video/drawing_context.h" +#include "math/vector.hpp" +#include "video/drawing_context.hpp" class Surface; diff --git a/src/gui/menu.cpp b/src/gui/menu.cpp index d70472d68..37d74c668 100644 --- a/src/gui/menu.cpp +++ b/src/gui/menu.cpp @@ -29,14 +29,14 @@ #include #include -#include "menu.h" -#include "video/screen.h" -#include "video/drawing_context.h" -#include "gettext.h" -#include "math/vector.h" -#include "main.h" -#include "resources.h" -#include "control/joystickkeyboardcontroller.h" +#include "menu.hpp" +#include "video/screen.hpp" +#include "video/drawing_context.hpp" +#include "gettext.hpp" +#include "math/vector.hpp" +#include "main.hpp" +#include "resources.hpp" +#include "control/joystickkeyboardcontroller.hpp" static const int MENU_REPEAT_INITIAL = 400; static const int MENU_REPEAT_RATE = 200; diff --git a/src/gui/menu.h b/src/gui/menu.hpp similarity index 98% rename from src/gui/menu.h rename to src/gui/menu.hpp index f3e621e76..88da10812 100644 --- a/src/gui/menu.h +++ b/src/gui/menu.hpp @@ -25,11 +25,11 @@ #include #include -#include "SDL.h" +#include -#include "video/surface.h" -#include "video/font.h" -#include "mousecursor.h" +#include "video/surface.hpp" +#include "video/font.hpp" +#include "mousecursor.hpp" bool confirm_dialog(Surface* background, std::string text); diff --git a/src/gui/mousecursor.cpp b/src/gui/mousecursor.cpp index 8b774f7a0..d2a082e20 100644 --- a/src/gui/mousecursor.cpp +++ b/src/gui/mousecursor.cpp @@ -18,9 +18,9 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include -#include "video/drawing_context.h" -#include "gui/mousecursor.h" -#include "main.h" +#include "video/drawing_context.hpp" +#include "gui/mousecursor.hpp" +#include "main.hpp" MouseCursor* MouseCursor::current_ = 0; extern SDL_Surface* screen; diff --git a/src/gui/mousecursor.h b/src/gui/mousecursor.hpp similarity index 98% rename from src/gui/mousecursor.h rename to src/gui/mousecursor.hpp index 95a63a6a0..98f03c2a7 100644 --- a/src/gui/mousecursor.h +++ b/src/gui/mousecursor.hpp @@ -21,7 +21,7 @@ #include -#include "video/surface.h" +#include "video/surface.hpp" #define MC_STATES_NB 3 diff --git a/src/level.cpp b/src/level.cpp index d6cd3c753..8f1885bfb 100644 --- a/src/level.cpp +++ b/src/level.cpp @@ -29,24 +29,24 @@ #include #include -#include "video/screen.h" -#include "lisp/parser.h" -#include "lisp/lisp.h" -#include "lisp/list_iterator.h" -#include "lisp/writer.h" -#include "level.h" -#include "physic.h" -#include "sector.h" -#include "tile.h" -#include "resources.h" -#include "file_system.h" -#include "object/gameobjs.h" -#include "object/camera.h" -#include "object/tilemap.h" -#include "object/coin.h" +#include "video/screen.hpp" +#include "lisp/parser.hpp" +#include "lisp/lisp.hpp" +#include "lisp/list_iterator.hpp" +#include "lisp/writer.hpp" +#include "level.hpp" +#include "physic.hpp" +#include "sector.hpp" +#include "tile.hpp" +#include "resources.hpp" +#include "file_system.hpp" +#include "object/gameobjs.hpp" +#include "object/camera.hpp" +#include "object/tilemap.hpp" +#include "object/coin.hpp" // test -#include "flip_level_transformer.h" +#include "flip_level_transformer.hpp" using namespace std; diff --git a/src/level.h b/src/level.hpp similarity index 100% rename from src/level.h rename to src/level.hpp diff --git a/src/level_subset.cpp b/src/level_subset.cpp index 960f7dcfa..b7d590e30 100644 --- a/src/level_subset.cpp +++ b/src/level_subset.cpp @@ -24,14 +24,14 @@ #include #include #include -#include "level.h" -#include "resources.h" -#include "file_system.h" -#include "video/surface.h" -#include "level_subset.h" -#include "lisp/parser.h" -#include "lisp/lisp.h" -#include "lisp/writer.h" +#include "level.hpp" +#include "resources.hpp" +#include "file_system.hpp" +#include "video/surface.hpp" +#include "level_subset.hpp" +#include "lisp/parser.hpp" +#include "lisp/lisp.hpp" +#include "lisp/writer.hpp" static bool has_suffix(const std::string& data, const std::string& suffix) { diff --git a/src/level_subset.h b/src/level_subset.hpp similarity index 100% rename from src/level_subset.h rename to src/level_subset.hpp diff --git a/src/level_transformer.cpp b/src/level_transformer.cpp index 4c11e402e..2893b041a 100644 --- a/src/level_transformer.cpp +++ b/src/level_transformer.cpp @@ -20,8 +20,8 @@ #include -#include "level_transformer.h" -#include "level.h" +#include "level_transformer.hpp" +#include "level.hpp" LevelTransformer::~LevelTransformer() { diff --git a/src/level_transformer.h b/src/level_transformer.hpp similarity index 100% rename from src/level_transformer.h rename to src/level_transformer.hpp diff --git a/src/lisp/lexer.cpp b/src/lisp/lexer.cpp index 7d4fbecd6..58febf6f7 100644 --- a/src/lisp/lexer.cpp +++ b/src/lisp/lexer.cpp @@ -22,7 +22,7 @@ #include #include -#include "lexer.h" +#include "lexer.hpp" namespace lisp { diff --git a/src/lisp/lexer.h b/src/lisp/lexer.hpp similarity index 100% rename from src/lisp/lexer.h rename to src/lisp/lexer.hpp diff --git a/src/lisp/lisp.cpp b/src/lisp/lisp.cpp index aa7bca963..247b3b58e 100644 --- a/src/lisp/lisp.cpp +++ b/src/lisp/lisp.cpp @@ -19,7 +19,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include -#include "lisp.h" +#include "lisp.hpp" namespace lisp { diff --git a/src/lisp/lisp.h b/src/lisp/lisp.hpp similarity index 100% rename from src/lisp/lisp.h rename to src/lisp/lisp.hpp diff --git a/src/lisp/list_iterator.cpp b/src/lisp/list_iterator.cpp index e03e0caec..cd8e375c9 100644 --- a/src/lisp/list_iterator.cpp +++ b/src/lisp/list_iterator.cpp @@ -20,7 +20,7 @@ #include -#include "list_iterator.h" +#include "list_iterator.hpp" #include namespace lisp diff --git a/src/lisp/list_iterator.h b/src/lisp/list_iterator.hpp similarity index 98% rename from src/lisp/list_iterator.h rename to src/lisp/list_iterator.hpp index 99a61070b..7cd275080 100644 --- a/src/lisp/list_iterator.h +++ b/src/lisp/list_iterator.hpp @@ -21,7 +21,7 @@ #ifndef __LISP_ITERATOR_H__ #define __LISP_ITERATOR_H__ -#include "lisp/lisp.h" +#include "lisp/lisp.hpp" namespace lisp { diff --git a/src/lisp/parser.cpp b/src/lisp/parser.cpp index 565dcc989..54af44f41 100644 --- a/src/lisp/parser.cpp +++ b/src/lisp/parser.cpp @@ -25,12 +25,10 @@ #include #include -#include "tinygettext/tinygettext.h" -#include "physfs/physfs_stream.h" -#include "resources.h" -#include "parser.h" -#include "lisp.h" -#include "file_system.h" +#include "tinygettext/tinygettext.hpp" +#include "physfs/physfs_stream.hpp" +#include "parser.hpp" +#include "lisp.hpp" namespace lisp { @@ -50,6 +48,15 @@ Parser::~Parser() delete dictionary_manager; } +static std::string dirname(std::string filename) +{ + std::string::size_type p = filename.find_last_of('/'); + if(p == std::string::npos) + return ""; + + return filename.substr(0, p+1); +} + Lisp* Parser::parse(const std::string& filename) { @@ -61,7 +68,7 @@ Parser::parse(const std::string& filename) } if(dictionary_manager) { - dictionary_manager->add_directory(FileSystem::dirname(filename)); + dictionary_manager->add_directory(dirname(filename)); dictionary = & (dictionary_manager->get_dictionary()); } diff --git a/src/lisp/parser.h b/src/lisp/parser.hpp similarity index 98% rename from src/lisp/parser.h rename to src/lisp/parser.hpp index 507fb1041..ad7791162 100644 --- a/src/lisp/parser.h +++ b/src/lisp/parser.hpp @@ -21,7 +21,7 @@ #define __LISPPARSER_H__ #include -#include "lexer.h" +#include "lexer.hpp" namespace TinyGetText { class Dictionary; diff --git a/src/lisp/writer.cpp b/src/lisp/writer.cpp index ff70ce1ad..9312ea280 100644 --- a/src/lisp/writer.cpp +++ b/src/lisp/writer.cpp @@ -21,8 +21,8 @@ #include -#include "writer.h" -#include "physfs/physfs_stream.h" +#include "writer.hpp" +#include "physfs/physfs_stream.hpp" namespace lisp { diff --git a/src/lisp/writer.h b/src/lisp/writer.hpp similarity index 100% rename from src/lisp/writer.h rename to src/lisp/writer.hpp diff --git a/src/main.cpp b/src/main.cpp index 16a9cd051..2437bedfa 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -20,7 +20,7 @@ #include #include -#include "main.h" +#include "main.hpp" #include #include @@ -38,17 +38,17 @@ #include #include -#include "gameconfig.h" -#include "resources.h" -#include "gettext.h" -#include "audio/sound_manager.h" -#include "video/surface.h" -#include "control/joystickkeyboardcontroller.h" -#include "misc.h" -#include "title.h" -#include "game_session.h" -#include "file_system.h" -#include "physfs/physfs_sdl.h" +#include "gameconfig.hpp" +#include "resources.hpp" +#include "gettext.hpp" +#include "audio/sound_manager.hpp" +#include "video/surface.hpp" +#include "control/joystickkeyboardcontroller.hpp" +#include "misc.hpp" +#include "title.hpp" +#include "game_session.hpp" +#include "file_system.hpp" +#include "physfs/physfs_sdl.hpp" SDL_Surface* screen = 0; JoystickKeyboardController* main_controller = 0; diff --git a/src/main.h b/src/main.hpp similarity index 100% rename from src/main.h rename to src/main.hpp diff --git a/src/math/aatriangle.h b/src/math/aatriangle.hpp similarity index 97% rename from src/math/aatriangle.h rename to src/math/aatriangle.hpp index 5f8537cd9..09b5d9a63 100644 --- a/src/math/aatriangle.h +++ b/src/math/aatriangle.hpp @@ -1,7 +1,7 @@ #ifndef __AATRIANGLE_H__ #define __AATRIANGLE_H__ -#include "rect.h" +#include "rect.hpp" /** * An axis aligned triangle (ie. a triangle where 2 sides are parallel to the x- diff --git a/src/math/rect.h b/src/math/rect.hpp similarity index 98% rename from src/math/rect.h rename to src/math/rect.hpp index a338054c9..03728ea40 100644 --- a/src/math/rect.h +++ b/src/math/rect.hpp @@ -2,7 +2,7 @@ #define __RECT_H__ #include -#include "vector.h" +#include "vector.hpp" /** This class represents a rectangle. * (Implementation Note) We're using upper left and lower right point instead of diff --git a/src/math/vector.cpp b/src/math/vector.cpp index 7c914b38f..d19f707a2 100644 --- a/src/math/vector.cpp +++ b/src/math/vector.cpp @@ -20,7 +20,7 @@ #include -#include "math/vector.h" +#include "math/vector.hpp" Vector Vector::unit() const { diff --git a/src/math/vector.h b/src/math/vector.hpp similarity index 100% rename from src/math/vector.h rename to src/math/vector.hpp diff --git a/src/misc.cpp b/src/misc.cpp index b66fbc8c5..ce56585ab 100644 --- a/src/misc.cpp +++ b/src/misc.cpp @@ -16,18 +16,18 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include -#include "misc.h" -#include "main.h" -#include "gameconfig.h" -#include "game_session.h" -#include "gui/menu.h" -#include "gui/button.h" -#include "audio/sound_manager.h" -#include "title.h" -#include "resources.h" -#include "worldmap.h" -#include "gettext.h" -#include "control/joystickkeyboardcontroller.h" +#include "misc.hpp" +#include "main.hpp" +#include "gameconfig.hpp" +#include "game_session.hpp" +#include "gui/menu.hpp" +#include "gui/button.hpp" +#include "audio/sound_manager.hpp" +#include "title.hpp" +#include "resources.hpp" +#include "worldmap.hpp" +#include "gettext.hpp" +#include "control/joystickkeyboardcontroller.hpp" Menu* main_menu = 0; Menu* game_menu = 0; diff --git a/src/misc.h b/src/misc.hpp similarity index 100% rename from src/misc.h rename to src/misc.hpp diff --git a/src/moving_object.cpp b/src/moving_object.cpp index acccd6d8a..513375a5c 100644 --- a/src/moving_object.cpp +++ b/src/moving_object.cpp @@ -18,7 +18,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include -#include "moving_object.h" +#include "moving_object.hpp" MovingObject::MovingObject() { diff --git a/src/moving_object.h b/src/moving_object.hpp similarity index 95% rename from src/moving_object.h rename to src/moving_object.hpp index 973595304..ddc98d413 100644 --- a/src/moving_object.h +++ b/src/moving_object.hpp @@ -19,10 +19,10 @@ #ifndef SUPERTUX_MOVING_OBJECT_H #define SUPERTUX_MOVING_OBJECT_H -#include "game_object.h" -#include "collision_hit.h" -#include "math/vector.h" -#include "math/rect.h" +#include "game_object.hpp" +#include "collision_hit.hpp" +#include "math/vector.hpp" +#include "math/rect.hpp" class Sector; class CollisionGrid; diff --git a/src/object/ambient_sound.cpp b/src/object/ambient_sound.cpp index cdb355676..68253b093 100644 --- a/src/object/ambient_sound.cpp +++ b/src/object/ambient_sound.cpp @@ -21,12 +21,12 @@ #include #include -#include "ambient_sound.h" -#include "object_factory.h" -#include "lisp/lisp.h" -#include "sector.h" -#include "audio/sound_manager.h" -#include "audio/sound_source.h" +#include "ambient_sound.hpp" +#include "object_factory.hpp" +#include "lisp/lisp.hpp" +#include "sector.hpp" +#include "audio/sound_manager.hpp" +#include "audio/sound_source.hpp" AmbientSound::AmbientSound(const lisp::Lisp& lisp) { diff --git a/src/object/ambient_sound.h b/src/object/ambient_sound.hpp similarity index 96% rename from src/object/ambient_sound.h rename to src/object/ambient_sound.hpp index 8c2807f45..03d33b5ce 100644 --- a/src/object/ambient_sound.h +++ b/src/object/ambient_sound.hpp @@ -42,10 +42,9 @@ #ifndef __AMBIENT_SOUND_H__ #define __AMBIENT_SOUND_H__ -#include "game_object.h" -#include "resources.h" -#include "player.h" -#include "SDL_mixer.h" +#include "game_object.hpp" +#include "resources.hpp" +#include "player.hpp" class SoundSource; diff --git a/src/object/background.cpp b/src/object/background.cpp index d2ef43638..4b8adc4f4 100644 --- a/src/object/background.cpp +++ b/src/object/background.cpp @@ -18,14 +18,14 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include -#include "background.h" -#include "camera.h" -#include "video/drawing_context.h" -#include "lisp/lisp.h" -#include "lisp/writer.h" -#include "object_factory.h" -#include "resources.h" -#include "main.h" +#include "background.hpp" +#include "camera.hpp" +#include "video/drawing_context.hpp" +#include "lisp/lisp.hpp" +#include "lisp/writer.hpp" +#include "object_factory.hpp" +#include "resources.hpp" +#include "main.hpp" Background::Background() : type(INVALID), layer(LAYER_BACKGROUND0), image(0) diff --git a/src/object/background.h b/src/object/background.hpp similarity index 93% rename from src/object/background.h rename to src/object/background.hpp index 30e86f175..dc7a6d6e6 100644 --- a/src/object/background.h +++ b/src/object/background.hpp @@ -19,10 +19,10 @@ #ifndef SUPERTUX_BACKGROUND_H #define SUPERTUX_BACKGROUND_H -#include "video/surface.h" -#include "video/drawing_context.h" -#include "game_object.h" -#include "serializable.h" +#include "video/surface.hpp" +#include "video/drawing_context.hpp" +#include "game_object.hpp" +#include "serializable.hpp" class DisplayManager; diff --git a/src/object/bell.cpp b/src/object/bell.cpp index e95a539f5..93980c004 100644 --- a/src/object/bell.cpp +++ b/src/object/bell.cpp @@ -19,14 +19,14 @@ // 02111-1307, USA. #include -#include "bell.h" -#include "resources.h" -#include "sprite/sprite_manager.h" -#include "video/drawing_context.h" -#include "player.h" -#include "object_factory.h" -#include "game_session.h" -#include "sector.h" +#include "bell.hpp" +#include "resources.hpp" +#include "sprite/sprite_manager.hpp" +#include "video/drawing_context.hpp" +#include "player.hpp" +#include "object_factory.hpp" +#include "game_session.hpp" +#include "sector.hpp" Bell::Bell(const lisp::Lisp& lisp) : ringing(false) diff --git a/src/object/bell.h b/src/object/bell.hpp similarity index 92% rename from src/object/bell.h rename to src/object/bell.hpp index 0521e6a09..59197236d 100644 --- a/src/object/bell.h +++ b/src/object/bell.hpp @@ -20,10 +20,10 @@ #ifndef __BELL_H__ #define __BELL_H__ -#include "lisp/lisp.h" -#include "moving_object.h" -#include "sprite/sprite.h" -#include "serializable.h" +#include "lisp/lisp.hpp" +#include "moving_object.hpp" +#include "sprite/sprite.hpp" +#include "serializable.hpp" /** * A bell: When tux touches it, it begins ringing and you will respawn at this diff --git a/src/object/block.cpp b/src/object/block.cpp index 78512ad6b..d68b02afe 100644 --- a/src/object/block.cpp +++ b/src/object/block.cpp @@ -19,29 +19,29 @@ // 02111-1307, USA. #include -#include "block.h" +#include "block.hpp" #include -#include "resources.h" -#include "player.h" -#include "sector.h" -#include "sprite/sprite.h" -#include "sprite/sprite_manager.h" -#include "video/drawing_context.h" -#include "lisp/lisp.h" -#include "gameobjs.h" -#include "specialriser.h" -#include "growup.h" -#include "flower.h" -#include "oneup.h" -#include "star.h" -#include "player_status.h" -#include "badguy/badguy.h" -#include "coin.h" -#include "object_factory.h" -#include "lisp/list_iterator.h" -#include "object_factory.h" +#include "resources.hpp" +#include "player.hpp" +#include "sector.hpp" +#include "sprite/sprite.hpp" +#include "sprite/sprite_manager.hpp" +#include "video/drawing_context.hpp" +#include "lisp/lisp.hpp" +#include "gameobjs.hpp" +#include "specialriser.hpp" +#include "growup.hpp" +#include "flower.hpp" +#include "oneup.hpp" +#include "star.hpp" +#include "player_status.hpp" +#include "badguy/badguy.hpp" +#include "coin.hpp" +#include "object_factory.hpp" +#include "lisp/list_iterator.hpp" +#include "object_factory.hpp" static const float BOUNCY_BRICK_MAX_OFFSET=8; static const float BOUNCY_BRICK_SPEED=90; diff --git a/src/object/block.h b/src/object/block.hpp similarity index 97% rename from src/object/block.h rename to src/object/block.hpp index a6f9df111..9691fe512 100644 --- a/src/object/block.h +++ b/src/object/block.hpp @@ -20,8 +20,8 @@ #ifndef __BLOCK_H__ #define __BLOCK_H__ -#include "moving_object.h" -#include "lisp/lisp.h" +#include "moving_object.hpp" +#include "lisp/lisp.hpp" class Sprite; class Player; diff --git a/src/object/bullet.cpp b/src/object/bullet.cpp index 3d1b2282f..94b20a167 100644 --- a/src/object/bullet.cpp +++ b/src/object/bullet.cpp @@ -20,13 +20,13 @@ #include #include -#include "bullet.h" -#include "resources.h" -#include "camera.h" -#include "sector.h" -#include "sprite/sprite_manager.h" -#include "badguy/badguy.h" -#include "main.h" +#include "bullet.hpp" +#include "resources.hpp" +#include "camera.hpp" +#include "sector.hpp" +#include "sprite/sprite_manager.hpp" +#include "badguy/badguy.hpp" +#include "main.hpp" static const float BULLET_XM = 300; static const float BULLET_STARTING_YM = 0; diff --git a/src/object/bullet.h b/src/object/bullet.hpp similarity index 94% rename from src/object/bullet.h rename to src/object/bullet.hpp index ea176d36a..43d4c3e94 100644 --- a/src/object/bullet.h +++ b/src/object/bullet.hpp @@ -20,9 +20,9 @@ #ifndef __BULLET_H__ #define __BULLET_H__ -#include "moving_object.h" -#include "physic.h" -#include "sprite/sprite.h" +#include "moving_object.hpp" +#include "physic.hpp" +#include "sprite/sprite.hpp" enum BulletsKind { FIRE_BULLET, diff --git a/src/object/camera.cpp b/src/object/camera.cpp index f3dee9afe..216a3b2ae 100644 --- a/src/object/camera.cpp +++ b/src/object/camera.cpp @@ -22,16 +22,16 @@ #include #include -#include "lisp/lisp.h" -#include "lisp/writer.h" -#include "lisp/list_iterator.h" -#include "camera.h" -#include "player.h" -#include "tilemap.h" -#include "game_session.h" -#include "sector.h" -#include "main.h" -#include "object_factory.h" +#include "lisp/lisp.hpp" +#include "lisp/writer.hpp" +#include "lisp/list_iterator.hpp" +#include "camera.hpp" +#include "player.hpp" +#include "tilemap.hpp" +#include "game_session.hpp" +#include "sector.hpp" +#include "main.hpp" +#include "object_factory.hpp" Camera::Camera(Sector* newsector) : sector(newsector), do_backscrolling(true), scrollchange(NONE), diff --git a/src/object/camera.h b/src/object/camera.hpp similarity index 94% rename from src/object/camera.h rename to src/object/camera.hpp index a9ece8627..5ce5db470 100644 --- a/src/object/camera.h +++ b/src/object/camera.hpp @@ -22,11 +22,11 @@ #include #include -#include "math/vector.h" -#include "game_object.h" -#include "video/drawing_context.h" -#include "serializable.h" -#include "timer.h" +#include "math/vector.hpp" +#include "game_object.hpp" +#include "video/drawing_context.hpp" +#include "serializable.hpp" +#include "timer.hpp" namespace lisp { class Lisp; diff --git a/src/object/coin.cpp b/src/object/coin.cpp index 498b56557..88c0d9ebf 100644 --- a/src/object/coin.cpp +++ b/src/object/coin.cpp @@ -20,16 +20,16 @@ #include -#include "coin.h" -#include "resources.h" -#include "video/drawing_context.h" -#include "sprite/sprite_manager.h" -#include "player.h" -#include "sector.h" -#include "player_status.h" -#include "gameobjs.h" -#include "statistics.h" -#include "object_factory.h" +#include "coin.hpp" +#include "resources.hpp" +#include "video/drawing_context.hpp" +#include "sprite/sprite_manager.hpp" +#include "player.hpp" +#include "sector.hpp" +#include "player_status.hpp" +#include "gameobjs.hpp" +#include "statistics.hpp" +#include "object_factory.hpp" Coin::Coin(const Vector& pos) { diff --git a/src/object/coin.h b/src/object/coin.hpp similarity index 95% rename from src/object/coin.h rename to src/object/coin.hpp index cdb86fc96..e4f3d9b99 100644 --- a/src/object/coin.h +++ b/src/object/coin.hpp @@ -20,8 +20,8 @@ #ifndef __COIN_H__ #define __COIN_H__ -#include "moving_object.h" -#include "lisp/lisp.h" +#include "moving_object.hpp" +#include "lisp/lisp.hpp" class Sprite; diff --git a/src/object/display_effect.cpp b/src/object/display_effect.cpp index 3268e9a28..7a254c5dc 100644 --- a/src/object/display_effect.cpp +++ b/src/object/display_effect.cpp @@ -1,9 +1,9 @@ #include -#include "display_effect.h" +#include "display_effect.hpp" #include -#include "video/drawing_context.h" -#include "main.h" +#include "video/drawing_context.hpp" +#include "main.hpp" DisplayEffect::DisplayEffect() : type(NO_FADE), fadetime(0), fading(0), black(false) diff --git a/src/object/display_effect.h b/src/object/display_effect.hpp similarity index 89% rename from src/object/display_effect.h rename to src/object/display_effect.hpp index b1753bf63..612386a4b 100644 --- a/src/object/display_effect.h +++ b/src/object/display_effect.hpp @@ -1,8 +1,8 @@ #ifndef __OBJECT_DISPLAY_EFFECT_H__ #define __OBJECT_DISPLAY_EFFECT_H__ -#include "scripting/display_effect.h" -#include "game_object.h" +#include "scripting/display_effect.hpp" +#include "game_object.hpp" class DisplayEffect : public GameObject, public Scripting::DisplayEffect { diff --git a/src/object/fireworks.cpp b/src/object/fireworks.cpp index f31cea083..62904c5b4 100644 --- a/src/object/fireworks.cpp +++ b/src/object/fireworks.cpp @@ -19,14 +19,14 @@ // 02111-1307, USA. #include -#include "fireworks.h" -#include "resources.h" -#include "sector.h" -#include "camera.h" -#include "gameobjs.h" -#include "main.h" -#include "video/drawing_context.h" -#include "audio/sound_manager.h" +#include "fireworks.hpp" +#include "resources.hpp" +#include "sector.hpp" +#include "camera.hpp" +#include "gameobjs.hpp" +#include "main.hpp" +#include "video/drawing_context.hpp" +#include "audio/sound_manager.hpp" Fireworks::Fireworks() { diff --git a/src/object/fireworks.h b/src/object/fireworks.hpp similarity index 92% rename from src/object/fireworks.h rename to src/object/fireworks.hpp index 7afd200a1..6cfde6a31 100644 --- a/src/object/fireworks.h +++ b/src/object/fireworks.hpp @@ -21,9 +21,9 @@ #ifndef __FIREWORKS_H__ #define __FIREWORKS_H__ -#include "video/drawing_context.h" -#include "game_object.h" -#include "timer.h" +#include "video/drawing_context.hpp" +#include "game_object.hpp" +#include "timer.hpp" class Fireworks : public GameObject { diff --git a/src/object/flower.cpp b/src/object/flower.cpp index 8235eb139..c71ec6947 100644 --- a/src/object/flower.cpp +++ b/src/object/flower.cpp @@ -20,13 +20,13 @@ #include #include -#include "flower.h" -#include "resources.h" -#include "camera.h" -#include "sector.h" -#include "player.h" -#include "audio/sound_manager.h" -#include "sprite/sprite_manager.h" +#include "flower.hpp" +#include "resources.hpp" +#include "camera.hpp" +#include "sector.hpp" +#include "player.hpp" +#include "audio/sound_manager.hpp" +#include "sprite/sprite_manager.hpp" Flower::Flower(Type _type) : type(_type) diff --git a/src/object/flower.h b/src/object/flower.hpp similarity index 93% rename from src/object/flower.h rename to src/object/flower.hpp index e91f38b17..fadca518a 100644 --- a/src/object/flower.h +++ b/src/object/flower.hpp @@ -20,9 +20,9 @@ #ifndef __FLOWER_H__ #define __FLOWER_H__ -#include "moving_object.h" -#include "sprite/sprite.h" -#include "physic.h" +#include "moving_object.hpp" +#include "sprite/sprite.hpp" +#include "physic.hpp" class Flower : public MovingObject { diff --git a/src/object/gameobjs.cpp b/src/object/gameobjs.cpp index 8992fa446..777db2c92 100644 --- a/src/object/gameobjs.cpp +++ b/src/object/gameobjs.cpp @@ -24,17 +24,17 @@ #include #include -#include "tile.h" -#include "tile_manager.h" -#include "game_session.h" -#include "gameobjs.h" -#include "sprite/sprite_manager.h" -#include "resources.h" -#include "sector.h" -#include "tilemap.h" -#include "video/drawing_context.h" -#include "camera.h" -#include "main.h" +#include "tile.hpp" +#include "tile_manager.hpp" +#include "game_session.hpp" +#include "gameobjs.hpp" +#include "sprite/sprite_manager.hpp" +#include "resources.hpp" +#include "sector.hpp" +#include "tilemap.hpp" +#include "video/drawing_context.hpp" +#include "camera.hpp" +#include "main.hpp" BouncyCoin::BouncyCoin(const Vector& pos) : position(pos) diff --git a/src/object/gameobjs.h b/src/object/gameobjs.hpp similarity index 94% rename from src/object/gameobjs.h rename to src/object/gameobjs.hpp index 886c5243a..4aa1fa91e 100644 --- a/src/object/gameobjs.h +++ b/src/object/gameobjs.hpp @@ -21,12 +21,12 @@ #ifndef SUPERTUX_GAMEOBJS_H #define SUPERTUX_GAMEOBJS_H -#include "video/surface.h" -#include "timer.h" -#include "physic.h" -#include "game_object.h" -#include "moving_object.h" -#include "serializable.h" +#include "video/surface.hpp" +#include "timer.hpp" +#include "physic.hpp" +#include "game_object.hpp" +#include "moving_object.hpp" +#include "serializable.hpp" /* Bounciness of distros: */ #define NO_BOUNCE 0 diff --git a/src/object/growup.cpp b/src/object/growup.cpp index aab2769e3..6f0fe5ecb 100644 --- a/src/object/growup.cpp +++ b/src/object/growup.cpp @@ -20,13 +20,13 @@ #include #include -#include "growup.h" -#include "resources.h" -#include "camera.h" -#include "sector.h" -#include "player.h" -#include "audio/sound_manager.h" -#include "sprite/sprite_manager.h" +#include "growup.hpp" +#include "resources.hpp" +#include "camera.hpp" +#include "sector.hpp" +#include "player.hpp" +#include "audio/sound_manager.hpp" +#include "sprite/sprite_manager.hpp" GrowUp::GrowUp() { diff --git a/src/object/growup.h b/src/object/growup.hpp similarity index 93% rename from src/object/growup.h rename to src/object/growup.hpp index 019d6808c..ef62aeb61 100644 --- a/src/object/growup.h +++ b/src/object/growup.hpp @@ -20,9 +20,9 @@ #ifndef __GROWUP_H__ #define __GROWUP_H__ -#include "moving_object.h" -#include "sprite/sprite.h" -#include "physic.h" +#include "moving_object.hpp" +#include "sprite/sprite.hpp" +#include "physic.hpp" class GrowUp : public MovingObject { diff --git a/src/object/infoblock.cpp b/src/object/infoblock.cpp index 55e2e3041..931ff343c 100644 --- a/src/object/infoblock.cpp +++ b/src/object/infoblock.cpp @@ -20,13 +20,13 @@ #include -#include "infoblock.h" -#include "game_session.h" -#include "resources.h" -#include "sprite/sprite_manager.h" -#include "object_factory.h" -#include "lisp/lisp.h" -#include "sector.h" +#include "infoblock.hpp" +#include "game_session.hpp" +#include "resources.hpp" +#include "sprite/sprite_manager.hpp" +#include "object_factory.hpp" +#include "lisp/lisp.hpp" +#include "sector.hpp" InfoBlock::InfoBlock(const lisp::Lisp& lisp) : Block(sprite_manager->create("infoblock")) diff --git a/src/object/infoblock.h b/src/object/infoblock.hpp similarity index 95% rename from src/object/infoblock.h rename to src/object/infoblock.hpp index d67cb8184..78d86f0dd 100644 --- a/src/object/infoblock.h +++ b/src/object/infoblock.hpp @@ -21,8 +21,8 @@ #ifndef __INFOBLOCK_H__ #define __INFOBLOCK_H__ -#include "block.h" -#include "object/ambient_sound.h" +#include "block.hpp" +#include "object/ambient_sound.hpp" class InfoBlock : public Block { diff --git a/src/object/invisible_block.cpp b/src/object/invisible_block.cpp index d92b3c230..4d28d2683 100644 --- a/src/object/invisible_block.cpp +++ b/src/object/invisible_block.cpp @@ -20,13 +20,13 @@ #include -#include "invisible_block.h" -#include "resources.h" -#include "sprite/sprite.h" -#include "sprite/sprite_manager.h" -#include "video/drawing_context.h" -#include "audio/sound_manager.h" -#include "object_factory.h" +#include "invisible_block.hpp" +#include "resources.hpp" +#include "sprite/sprite.hpp" +#include "sprite/sprite_manager.hpp" +#include "video/drawing_context.hpp" +#include "audio/sound_manager.hpp" +#include "object_factory.hpp" InvisibleBlock::InvisibleBlock(const Vector& pos) : Block(sprite_manager->create("invisibleblock")), visible(false) diff --git a/src/object/invisible_block.h b/src/object/invisible_block.hpp similarity index 98% rename from src/object/invisible_block.h rename to src/object/invisible_block.hpp index e1e496d0f..4a5695616 100644 --- a/src/object/invisible_block.h +++ b/src/object/invisible_block.hpp @@ -21,7 +21,7 @@ #ifndef __INVISIBLE_BLOCK_H__ #define __INVISIBLE_BLOCK_H__ -#include "block.h" +#include "block.hpp" class InvisibleBlock : public Block { diff --git a/src/object/level_time.cpp b/src/object/level_time.cpp index fc0ae13e7..ee123aaf8 100644 --- a/src/object/level_time.cpp +++ b/src/object/level_time.cpp @@ -1,16 +1,16 @@ #include -#include "level_time.h" +#include "level_time.hpp" #include -#include "main.h" -#include "resources.h" -#include "sector.h" -#include "gettext.h" -#include "object_factory.h" -#include "object/player.h" -#include "video/drawing_context.h" -#include "lisp/list_iterator.h" +#include "main.hpp" +#include "resources.hpp" +#include "sector.hpp" +#include "gettext.hpp" +#include "object_factory.hpp" +#include "object/player.hpp" +#include "video/drawing_context.hpp" +#include "lisp/list_iterator.hpp" /** When to alert player they're low on time! */ static const float TIME_WARNING = 20; diff --git a/src/object/level_time.h b/src/object/level_time.hpp similarity index 79% rename from src/object/level_time.h rename to src/object/level_time.hpp index 3c7e67e2f..0a6e1b3af 100644 --- a/src/object/level_time.h +++ b/src/object/level_time.hpp @@ -1,9 +1,9 @@ #ifndef __LEVELTIME_H__ #define __LEVELTIME_H__ -#include "game_object.h" -#include "timer.h" -#include "lisp/lisp.h" +#include "game_object.hpp" +#include "timer.hpp" +#include "lisp/lisp.hpp" class LevelTime : public GameObject { diff --git a/src/object/oneup.cpp b/src/object/oneup.cpp index 0d867f1cf..668bbe28a 100644 --- a/src/object/oneup.cpp +++ b/src/object/oneup.cpp @@ -20,13 +20,13 @@ #include -#include "oneup.h" -#include "resources.h" -#include "player.h" -#include "player_status.h" -#include "sector.h" -#include "sprite/sprite_manager.h" -#include "video/drawing_context.h" +#include "oneup.hpp" +#include "resources.hpp" +#include "player.hpp" +#include "player_status.hpp" +#include "sector.hpp" +#include "sprite/sprite_manager.hpp" +#include "video/drawing_context.hpp" OneUp::OneUp(const Vector& pos) { diff --git a/src/object/oneup.h b/src/object/oneup.hpp similarity index 93% rename from src/object/oneup.h rename to src/object/oneup.hpp index 846caa7d8..81ae3f166 100644 --- a/src/object/oneup.h +++ b/src/object/oneup.hpp @@ -20,9 +20,9 @@ #ifndef __ONEUP_H__ #define __ONEUP_H__ -#include "moving_object.h" -#include "sprite/sprite.h" -#include "physic.h" +#include "moving_object.hpp" +#include "sprite/sprite.hpp" +#include "physic.hpp" class OneUp : public MovingObject { diff --git a/src/object/particlesystem.cpp b/src/object/particlesystem.cpp index d930c1dc8..5edb5a4f8 100644 --- a/src/object/particlesystem.cpp +++ b/src/object/particlesystem.cpp @@ -21,13 +21,13 @@ #include #include -#include "particlesystem.h" -#include "video/drawing_context.h" -#include "lisp/parser.h" -#include "lisp/lisp.h" -#include "lisp/writer.h" -#include "resources.h" -#include "main.h" +#include "particlesystem.hpp" +#include "video/drawing_context.hpp" +#include "lisp/parser.hpp" +#include "lisp/lisp.hpp" +#include "lisp/writer.hpp" +#include "resources.hpp" +#include "main.hpp" ParticleSystem::ParticleSystem() { diff --git a/src/object/particlesystem.h b/src/object/particlesystem.hpp similarity index 96% rename from src/object/particlesystem.h rename to src/object/particlesystem.hpp index ac76deda7..4a14a6666 100644 --- a/src/object/particlesystem.h +++ b/src/object/particlesystem.hpp @@ -21,11 +21,11 @@ #include -#include "video/surface.h" -#include "game_object.h" -#include "serializable.h" -#include "sector.h" -#include "math/vector.h" +#include "video/surface.hpp" +#include "game_object.hpp" +#include "serializable.hpp" +#include "sector.hpp" +#include "math/vector.hpp" namespace lisp { class Lisp; diff --git a/src/object/particlesystem_interactive.cpp b/src/object/particlesystem_interactive.cpp index 438d852a0..b3da7341f 100644 --- a/src/object/particlesystem_interactive.cpp +++ b/src/object/particlesystem_interactive.cpp @@ -21,22 +21,22 @@ #include #include -#include "particlesystem_interactive.h" -#include "video/drawing_context.h" -#include "lisp/parser.h" -#include "lisp/lisp.h" -#include "lisp/writer.h" -#include "resources.h" -#include "main.h" +#include "particlesystem_interactive.hpp" +#include "video/drawing_context.hpp" +#include "lisp/parser.hpp" +#include "lisp/lisp.hpp" +#include "lisp/writer.hpp" +#include "resources.hpp" +#include "main.hpp" -#include "tile.h" -#include "tilemap.h" -#include "math/aatriangle.h" -#include "collision.h" -#include "collision_hit.h" -#include "object/camera.h" -#include "object/rainsplash.h" -#include "badguy/bomb.h" +#include "tile.hpp" +#include "tilemap.hpp" +#include "math/aatriangle.hpp" +#include "collision.hpp" +#include "collision_hit.hpp" +#include "object/camera.hpp" +#include "object/rainsplash.hpp" +#include "badguy/bomb.hpp" //TODO: Find a way to make rain collide with objects like bonus blocks // Add an option to set rain strength diff --git a/src/object/particlesystem_interactive.h b/src/object/particlesystem_interactive.hpp similarity index 95% rename from src/object/particlesystem_interactive.h rename to src/object/particlesystem_interactive.hpp index edbae31a6..e2910532f 100644 --- a/src/object/particlesystem_interactive.h +++ b/src/object/particlesystem_interactive.hpp @@ -21,11 +21,11 @@ #include -#include "video/surface.h" -#include "game_object.h" -#include "serializable.h" -#include "sector.h" -#include "math/vector.h" +#include "video/surface.hpp" +#include "game_object.hpp" +#include "serializable.hpp" +#include "sector.hpp" +#include "math/vector.hpp" namespace lisp { class Lisp; diff --git a/src/object/platform.cpp b/src/object/platform.cpp index 0a83e15fa..8197f6ecf 100644 --- a/src/object/platform.cpp +++ b/src/object/platform.cpp @@ -20,14 +20,14 @@ #include -#include "platform.h" -#include "video/drawing_context.h" -#include "resources.h" -#include "player.h" -#include "sprite/sprite_manager.h" -#include "lisp/lisp.h" -#include "lisp/writer.h" -#include "object_factory.h" +#include "platform.hpp" +#include "video/drawing_context.hpp" +#include "resources.hpp" +#include "player.hpp" +#include "sprite/sprite_manager.hpp" +#include "lisp/lisp.hpp" +#include "lisp/writer.hpp" +#include "object_factory.hpp" Platform::Platform(const lisp::Lisp& reader) { diff --git a/src/object/platform.h b/src/object/platform.hpp similarity index 95% rename from src/object/platform.h rename to src/object/platform.hpp index d256fd1d4..4a88dbb62 100644 --- a/src/object/platform.h +++ b/src/object/platform.hpp @@ -20,8 +20,8 @@ #ifndef __PLATFORM_H__ #define __PLATFORM_H__ -#include "moving_object.h" -#include "sprite/sprite.h" +#include "moving_object.hpp" +#include "sprite/sprite.hpp" /** * This class is the base class for platforms that tux can stand on diff --git a/src/object/player.cpp b/src/object/player.cpp index 9bf0c1333..b036e258a 100644 --- a/src/object/player.cpp +++ b/src/object/player.cpp @@ -23,24 +23,24 @@ #include #include -#include "gettext.h" -#include "sprite/sprite_manager.h" -#include "audio/sound_manager.h" -#include "player.h" -#include "tile.h" -#include "sprite/sprite.h" -#include "sector.h" -#include "resources.h" -#include "video/screen.h" -#include "statistics.h" -#include "game_session.h" -#include "object/tilemap.h" -#include "object/camera.h" -#include "object/gameobjs.h" -#include "object/portable.h" -#include "trigger/trigger_base.h" -#include "control/joystickkeyboardcontroller.h" -#include "main.h" +#include "gettext.hpp" +#include "sprite/sprite_manager.hpp" +#include "audio/sound_manager.hpp" +#include "player.hpp" +#include "tile.hpp" +#include "sprite/sprite.hpp" +#include "sector.hpp" +#include "resources.hpp" +#include "video/screen.hpp" +#include "statistics.hpp" +#include "game_session.hpp" +#include "object/tilemap.hpp" +#include "object/camera.hpp" +#include "object/gameobjs.hpp" +#include "object/portable.hpp" +#include "trigger/trigger_base.hpp" +#include "control/joystickkeyboardcontroller.hpp" +#include "main.hpp" static const int TILES_FOR_BUTTJUMP = 3; static const float SHOOTING_TIME = .150; diff --git a/src/object/player.h b/src/object/player.hpp similarity index 94% rename from src/object/player.h rename to src/object/player.hpp index 985648b95..451ed0535 100644 --- a/src/object/player.h +++ b/src/object/player.hpp @@ -20,16 +20,16 @@ #define SUPERTUX_PLAYER_H #include -#include "SDL.h" - -#include "timer.h" -#include "direction.h" -#include "video/surface.h" -#include "moving_object.h" -#include "sprite/sprite.h" -#include "physic.h" -#include "control/controller.h" -#include "player_status.h" +#include + +#include "timer.hpp" +#include "direction.hpp" +#include "video/surface.hpp" +#include "moving_object.hpp" +#include "sprite/sprite.hpp" +#include "physic.hpp" +#include "control/controller.hpp" +#include "player_status.hpp" class BadGuy; class Portable; diff --git a/src/object/portable.h b/src/object/portable.hpp similarity index 98% rename from src/object/portable.h rename to src/object/portable.hpp index bfcef3f3b..5b74e1de8 100644 --- a/src/object/portable.h +++ b/src/object/portable.hpp @@ -20,7 +20,7 @@ #ifndef __PORTABLE_H__ #define __PORTABLE_H__ -#include "moving_object.h" +#include "moving_object.hpp" /** * An object that inherits from this object is considered "portable" and can diff --git a/src/object/powerup.cpp b/src/object/powerup.cpp index 6b944e0f9..9d3ff9359 100644 --- a/src/object/powerup.cpp +++ b/src/object/powerup.cpp @@ -20,14 +20,14 @@ #include #include -#include "powerup.h" -#include "resources.h" -#include "player.h" -#include "sprite/sprite_manager.h" -#include "audio/sound_manager.h" -#include "object_factory.h" -#include "sector.h" -#include "scripting/script_interpreter.h" +#include "powerup.hpp" +#include "resources.hpp" +#include "player.hpp" +#include "sprite/sprite_manager.hpp" +#include "audio/sound_manager.hpp" +#include "object_factory.hpp" +#include "sector.hpp" +#include "scripting/script_interpreter.hpp" PowerUp::PowerUp(const lisp::Lisp& lisp) { diff --git a/src/object/powerup.h b/src/object/powerup.hpp similarity index 89% rename from src/object/powerup.h rename to src/object/powerup.hpp index 682d8bef7..99d522a6b 100644 --- a/src/object/powerup.h +++ b/src/object/powerup.hpp @@ -20,11 +20,11 @@ #ifndef __POWERUP_H__ #define __POWERUP_H__ -#include "moving_object.h" -#include "lisp/lisp.h" -#include "sprite/sprite.h" -#include "collision_hit.h" -#include "physic.h" +#include "moving_object.hpp" +#include "lisp/lisp.hpp" +#include "sprite/sprite.hpp" +#include "collision_hit.hpp" +#include "physic.hpp" class PowerUp : public MovingObject { diff --git a/src/object/rainsplash.cpp b/src/object/rainsplash.cpp index 5864042c2..2bd2cc9ab 100644 --- a/src/object/rainsplash.cpp +++ b/src/object/rainsplash.cpp @@ -14,8 +14,8 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA // 02111-1307, USA. -#include "rainsplash.h" -#include "sector.h" +#include "rainsplash.hpp" +#include "sector.hpp" RainSplash::RainSplash(Vector pos, bool vertical) { diff --git a/src/object/rainsplash.h b/src/object/rainsplash.hpp similarity index 86% rename from src/object/rainsplash.h rename to src/object/rainsplash.hpp index 489d5230f..9a61b5653 100644 --- a/src/object/rainsplash.h +++ b/src/object/rainsplash.hpp @@ -19,12 +19,12 @@ #define __RAINSPLASH_H__ -#include "game_object.h" -#include "resources.h" -#include "player.h" -#include "sprite/sprite.h" -#include "sprite/sprite_manager.h" -#include "video/drawing_context.h" +#include "game_object.hpp" +#include "resources.hpp" +#include "player.hpp" +#include "sprite/sprite.hpp" +#include "sprite/sprite_manager.hpp" +#include "video/drawing_context.hpp" class RainSplash : public GameObject { diff --git a/src/object/rock.cpp b/src/object/rock.cpp index f53ea2115..0600b11c7 100644 --- a/src/object/rock.cpp +++ b/src/object/rock.cpp @@ -19,13 +19,13 @@ // 02111-1307, USA. #include -#include "rock.h" -#include "sprite/sprite.h" -#include "sprite/sprite_manager.h" -#include "lisp/writer.h" -#include "video/drawing_context.h" -#include "resources.h" -#include "object_factory.h" +#include "rock.hpp" +#include "sprite/sprite.hpp" +#include "sprite/sprite_manager.hpp" +#include "lisp/writer.hpp" +#include "video/drawing_context.hpp" +#include "resources.hpp" +#include "object_factory.hpp" Rock::Rock(const lisp::Lisp& reader) { diff --git a/src/object/rock.h b/src/object/rock.hpp similarity index 91% rename from src/object/rock.h rename to src/object/rock.hpp index 5f8e4a22e..28be0e6c9 100644 --- a/src/object/rock.h +++ b/src/object/rock.hpp @@ -21,11 +21,11 @@ #ifndef __ROCK_H__ #define __ROCK_H__ -#include "moving_object.h" -#include "physic.h" -#include "lisp/lisp.h" -#include "portable.h" -#include "serializable.h" +#include "moving_object.hpp" +#include "physic.hpp" +#include "lisp/lisp.hpp" +#include "portable.hpp" +#include "serializable.hpp" class Sprite; diff --git a/src/object/scripted_object.cpp b/src/object/scripted_object.cpp index cc3777476..6293881a3 100644 --- a/src/object/scripted_object.cpp +++ b/src/object/scripted_object.cpp @@ -2,12 +2,12 @@ #include -#include "scripted_object.h" -#include "video/drawing_context.h" -#include "sprite/sprite_manager.h" -#include "resources.h" -#include "object_factory.h" -#include "math/vector.h" +#include "scripted_object.hpp" +#include "video/drawing_context.hpp" +#include "sprite/sprite_manager.hpp" +#include "resources.hpp" +#include "object_factory.hpp" +#include "math/vector.hpp" ScriptedObject::ScriptedObject(const lisp::Lisp& lisp) : solid(true), physic_enabled(true), visible(true), new_vel_set(false) diff --git a/src/object/scripted_object.h b/src/object/scripted_object.hpp similarity index 86% rename from src/object/scripted_object.h rename to src/object/scripted_object.hpp index 70b4dc2dc..507466ad4 100644 --- a/src/object/scripted_object.h +++ b/src/object/scripted_object.hpp @@ -2,11 +2,11 @@ #define __SCRIPTED_OBJECT_H__ #include -#include "physic.h" -#include "sprite/sprite.h" -#include "lisp/lisp.h" -#include "moving_object.h" -#include "scripting/scripted_object.h" +#include "physic.hpp" +#include "sprite/sprite.hpp" +#include "lisp/lisp.hpp" +#include "moving_object.hpp" +#include "scripting/scripted_object.hpp" class ScriptedObject : public MovingObject, public Scripting::ScriptedObject { diff --git a/src/object/specialriser.cpp b/src/object/specialriser.cpp index efcf59e3d..e15b77e77 100644 --- a/src/object/specialriser.cpp +++ b/src/object/specialriser.cpp @@ -20,11 +20,11 @@ #include #include -#include "specialriser.h" -#include "resources.h" -#include "camera.h" -#include "sector.h" -#include "sprite/sprite_manager.h" +#include "specialriser.hpp" +#include "resources.hpp" +#include "camera.hpp" +#include "sector.hpp" +#include "sprite/sprite_manager.hpp" SpecialRiser::SpecialRiser(Vector pos, MovingObject* _child) : child(_child) diff --git a/src/object/specialriser.h b/src/object/specialriser.hpp similarity index 97% rename from src/object/specialriser.h rename to src/object/specialriser.hpp index 89f9904e6..41a364718 100644 --- a/src/object/specialriser.h +++ b/src/object/specialriser.hpp @@ -20,7 +20,7 @@ #ifndef __SPECIALRISE_H__ #define __SPECIALRISE_H__ -#include "moving_object.h" +#include "moving_object.hpp" /** * special object that contains another object and slowly rises it out of a diff --git a/src/object/star.cpp b/src/object/star.cpp index 0b7ea7e6d..a504e4052 100644 --- a/src/object/star.cpp +++ b/src/object/star.cpp @@ -20,12 +20,12 @@ #include -#include "star.h" -#include "resources.h" -#include "player.h" -#include "player_status.h" -#include "sprite/sprite_manager.h" -#include "video/drawing_context.h" +#include "star.hpp" +#include "resources.hpp" +#include "player.hpp" +#include "player_status.hpp" +#include "sprite/sprite_manager.hpp" +#include "video/drawing_context.hpp" static const float INITIALJUMP = 400; static const float SPEED = 150; diff --git a/src/object/star.h b/src/object/star.hpp similarity index 93% rename from src/object/star.h rename to src/object/star.hpp index 0e5fe7556..a1a24c076 100644 --- a/src/object/star.h +++ b/src/object/star.hpp @@ -20,9 +20,9 @@ #ifndef __STAR_H__ #define __STAR_H__ -#include "moving_object.h" -#include "sprite/sprite.h" -#include "physic.h" +#include "moving_object.hpp" +#include "sprite/sprite.hpp" +#include "physic.hpp" class Star : public MovingObject { diff --git a/src/object/text_object.cpp b/src/object/text_object.cpp index 7ad34c474..706b2fb17 100644 --- a/src/object/text_object.cpp +++ b/src/object/text_object.cpp @@ -1,8 +1,8 @@ #include -#include "text_object.h" -#include "resources.h" -#include "video/drawing_context.h" +#include "text_object.hpp" +#include "resources.hpp" +#include "video/drawing_context.hpp" TextObject::TextObject() : fading(0), fadetime(0), visible(false) diff --git a/src/object/text_object.h b/src/object/text_object.hpp similarity index 91% rename from src/object/text_object.h rename to src/object/text_object.hpp index 0bc3e7e34..352696df7 100644 --- a/src/object/text_object.h +++ b/src/object/text_object.hpp @@ -1,8 +1,8 @@ #ifndef __TEXTOBJECT_H__ #define __TEXTOBJECT_H__ -#include "game_object.h" -#include "scripting/text.h" +#include "game_object.hpp" +#include "scripting/text.hpp" class Font; diff --git a/src/object/tilemap.cpp b/src/object/tilemap.cpp index 15c61256b..d37ae5c32 100644 --- a/src/object/tilemap.cpp +++ b/src/object/tilemap.cpp @@ -24,16 +24,16 @@ #include #include -#include "tilemap.h" -#include "video/drawing_context.h" -#include "level.h" -#include "tile.h" -#include "resources.h" -#include "tile_manager.h" -#include "lisp/lisp.h" -#include "lisp/writer.h" -#include "object_factory.h" -#include "main.h" +#include "tilemap.hpp" +#include "video/drawing_context.hpp" +#include "level.hpp" +#include "tile.hpp" +#include "resources.hpp" +#include "tile_manager.hpp" +#include "lisp/lisp.hpp" +#include "lisp/writer.hpp" +#include "object_factory.hpp" +#include "main.hpp" TileMap::TileMap() : solid(false), speed(1), width(0), height(0), layer(LAYER_TILES), diff --git a/src/object/tilemap.h b/src/object/tilemap.hpp similarity index 96% rename from src/object/tilemap.h rename to src/object/tilemap.hpp index 6aa44ad4b..dcd74788d 100644 --- a/src/object/tilemap.h +++ b/src/object/tilemap.hpp @@ -22,9 +22,9 @@ #include #include -#include "game_object.h" -#include "serializable.h" -#include "math/vector.h" +#include "game_object.hpp" +#include "serializable.hpp" +#include "math/vector.hpp" namespace lisp { class Lisp; diff --git a/src/object/unstable_tile.cpp b/src/object/unstable_tile.cpp index 38f938627..08341c49e 100644 --- a/src/object/unstable_tile.cpp +++ b/src/object/unstable_tile.cpp @@ -20,14 +20,14 @@ #include -#include "unstable_tile.h" -#include "lisp/lisp.h" -#include "object_factory.h" -#include "player.h" -#include "sector.h" -#include "resources.h" -#include "sprite/sprite_manager.h" -#include "sprite/sprite.h" +#include "unstable_tile.hpp" +#include "lisp/lisp.hpp" +#include "object_factory.hpp" +#include "player.hpp" +#include "sector.hpp" +#include "resources.hpp" +#include "sprite/sprite_manager.hpp" +#include "sprite/sprite.hpp" static const float CRACKTIME = 0.3; static const float FALLTIME = 0.8; diff --git a/src/object/unstable_tile.h b/src/object/unstable_tile.hpp similarity index 93% rename from src/object/unstable_tile.h rename to src/object/unstable_tile.hpp index 939eda57e..aec3e0e6a 100644 --- a/src/object/unstable_tile.h +++ b/src/object/unstable_tile.hpp @@ -20,10 +20,10 @@ #ifndef __UNSTABLE_TILE_H__ #define __UNSTABLE_TILE_H__ -#include "moving_object.h" -#include "lisp/lisp.h" -#include "physic.h" -#include "timer.h" +#include "moving_object.hpp" +#include "lisp/lisp.hpp" +#include "physic.hpp" +#include "timer.hpp" class Sprite; class Player; diff --git a/src/object_factory.cpp b/src/object_factory.cpp index bd93f21da..8d78c9a2b 100644 --- a/src/object_factory.cpp +++ b/src/object_factory.cpp @@ -21,9 +21,9 @@ #include #include -#include "lisp/lisp.h" -#include "lisp/parser.h" -#include "object_factory.h" +#include "lisp/lisp.hpp" +#include "lisp/parser.hpp" +#include "object_factory.hpp" Factories* object_factories = 0; diff --git a/src/object_factory.h b/src/object_factory.hpp similarity index 97% rename from src/object_factory.h rename to src/object_factory.hpp index efda690ce..6014c2ee2 100644 --- a/src/object_factory.h +++ b/src/object_factory.hpp @@ -22,9 +22,9 @@ #include #include -#include "lisp/lisp.h" -#include "game_object.h" -#include "math/vector.h" +#include "lisp/lisp.hpp" +#include "game_object.hpp" +#include "math/vector.hpp" class Factory { diff --git a/src/object_remove_listener.h b/src/object_remove_listener.hpp similarity index 100% rename from src/object_remove_listener.h rename to src/object_remove_listener.hpp diff --git a/src/physfs/physfs_sdl.cpp b/src/physfs/physfs_sdl.cpp index 4cff76d9e..6317e6ef2 100644 --- a/src/physfs/physfs_sdl.cpp +++ b/src/physfs/physfs_sdl.cpp @@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include -#include "physfs_sdl.h" +#include "physfs_sdl.hpp" #include diff --git a/src/physfs/physfs_sdl.h b/src/physfs/physfs_sdl.hpp similarity index 100% rename from src/physfs/physfs_sdl.h rename to src/physfs/physfs_sdl.hpp diff --git a/src/physfs/physfs_stream.cpp b/src/physfs/physfs_stream.cpp index c054ccf94..5494e1083 100644 --- a/src/physfs/physfs_stream.cpp +++ b/src/physfs/physfs_stream.cpp @@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include -#include "physfs_stream.h" +#include "physfs_stream.hpp" #include #include diff --git a/src/physfs/physfs_stream.h b/src/physfs/physfs_stream.hpp similarity index 100% rename from src/physfs/physfs_stream.h rename to src/physfs/physfs_stream.hpp diff --git a/src/physic.cpp b/src/physic.cpp index 39ad54e73..2a3f95cf7 100644 --- a/src/physic.cpp +++ b/src/physic.cpp @@ -19,7 +19,7 @@ // 02111-1307, USA. #include -#include "physic.h" +#include "physic.hpp" Physic::Physic() : ax(0), ay(0), vx(0), vy(0), gravity_enabled(true) diff --git a/src/physic.h b/src/physic.hpp similarity index 98% rename from src/physic.h rename to src/physic.hpp index 86114eb8c..eee215612 100644 --- a/src/physic.h +++ b/src/physic.hpp @@ -20,7 +20,7 @@ #ifndef SUPERTUX_PHYSIC_H #define SUPERTUX_PHYSIC_H -#include "math/vector.h" +#include "math/vector.hpp" /// Physics engine. /** This is a very simplistic physics engine handling accelerated and constant diff --git a/src/player_status.cpp b/src/player_status.cpp index 72b6a07c6..57acb9348 100644 --- a/src/player_status.cpp +++ b/src/player_status.cpp @@ -18,14 +18,14 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include -#include "lisp/writer.h" -#include "lisp/lisp.h" -#include "player_status.h" -#include "resources.h" -#include "gettext.h" -#include "video/drawing_context.h" -#include "audio/sound_manager.h" -#include "main.h" +#include "lisp/writer.hpp" +#include "lisp/lisp.hpp" +#include "player_status.hpp" +#include "resources.hpp" +#include "gettext.hpp" +#include "video/drawing_context.hpp" +#include "audio/sound_manager.hpp" +#include "main.hpp" static const int START_LIVES = 4; static const int MAX_LIVES = 99; diff --git a/src/player_status.h b/src/player_status.hpp similarity index 95% rename from src/player_status.h rename to src/player_status.hpp index c1bdc25e9..4ad7a6800 100644 --- a/src/player_status.h +++ b/src/player_status.hpp @@ -19,9 +19,9 @@ #ifndef SUPERTUX_PLAYERSTATUS_H #define SUPERTUX_PLAYERSTATUS_H -#include "lisp/lisp.h" -#include "timer.h" -#include "serializable.h" +#include "lisp/lisp.hpp" +#include "timer.hpp" +#include "serializable.hpp" enum BonusType { NO_BONUS, GROWUP_BONUS, FIRE_BONUS, ICE_BONUS diff --git a/src/resources.cpp b/src/resources.cpp index 1f338a1cb..ba1eedcc4 100644 --- a/src/resources.cpp +++ b/src/resources.cpp @@ -18,14 +18,14 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include -#include "sprite/sprite_manager.h" -#include "gui/menu.h" -#include "gui/button.h" -#include "resources.h" -#include "file_system.h" -#include "tile_manager.h" -#include "object/gameobjs.h" -#include "object/player.h" +#include "sprite/sprite_manager.hpp" +#include "gui/menu.hpp" +#include "gui/button.hpp" +#include "resources.hpp" +#include "file_system.hpp" +#include "tile_manager.hpp" +#include "object/gameobjs.hpp" +#include "object/player.hpp" SpriteManager* sprite_manager = 0; TileManager* tile_manager = 0; diff --git a/src/resources.h b/src/resources.hpp similarity index 100% rename from src/resources.h rename to src/resources.hpp diff --git a/src/scripting/Jamfile b/src/scripting/Jamfile index d4ab29d36..50612f02c 100644 --- a/src/scripting/Jamfile +++ b/src/scripting/Jamfile @@ -44,6 +44,6 @@ wrapper_objects = [ CompileObjects $(wrapper_sources) ] ; if $(MINISWIG) { wrapper_objects += - [ MiniSwigRule wrapper.cpp : wrapper.interface.h : supertux : --select-namespace Scripting ] ; + [ MiniSwigRule wrapper.cpp : wrapper.interface.hpp : supertux : --select-namespace Scripting ] ; } diff --git a/src/scripting/camera.cpp b/src/scripting/camera.cpp index 82c5b8755..6f6173b1b 100644 --- a/src/scripting/camera.cpp +++ b/src/scripting/camera.cpp @@ -2,7 +2,7 @@ #include #include -#include "camera.h" +#include "camera.hpp" #define NOIMPL printf("%s not implemented.\n", __PRETTY_FUNCTION__); diff --git a/src/scripting/camera.h b/src/scripting/camera.hpp similarity index 100% rename from src/scripting/camera.h rename to src/scripting/camera.hpp diff --git a/src/scripting/display_effect.h b/src/scripting/display_effect.hpp similarity index 100% rename from src/scripting/display_effect.h rename to src/scripting/display_effect.hpp diff --git a/src/scripting/functions.cpp b/src/scripting/functions.cpp index b46e6e2f6..10e5f2b14 100644 --- a/src/scripting/functions.cpp +++ b/src/scripting/functions.cpp @@ -2,12 +2,12 @@ #include #include #include -#include "textscroller.h" -#include "functions.h" -#include "script_interpreter.h" -#include "tinygettext/tinygettext.h" -#include "resources.h" -#include "gettext.h" +#include "textscroller.hpp" +#include "functions.hpp" +#include "script_interpreter.hpp" +#include "tinygettext/tinygettext.hpp" +#include "resources.hpp" +#include "gettext.hpp" namespace Scripting { diff --git a/src/scripting/functions.h b/src/scripting/functions.hpp similarity index 100% rename from src/scripting/functions.h rename to src/scripting/functions.hpp diff --git a/src/scripting/level.cpp b/src/scripting/level.cpp index ff828b41c..a66df0adf 100644 --- a/src/scripting/level.cpp +++ b/src/scripting/level.cpp @@ -2,9 +2,9 @@ #include #include -#include "level.h" -#include "game_session.h" -#include "flip_level_transformer.h" +#include "level.hpp" +#include "game_session.hpp" +#include "flip_level_transformer.hpp" namespace Scripting { diff --git a/src/scripting/level.h b/src/scripting/level.hpp similarity index 100% rename from src/scripting/level.h rename to src/scripting/level.hpp diff --git a/src/scripting/player.h b/src/scripting/player.hpp similarity index 100% rename from src/scripting/player.h rename to src/scripting/player.hpp diff --git a/src/scripting/script_interpreter.cpp b/src/scripting/script_interpreter.cpp index b027fbfd7..31613df0a 100644 --- a/src/scripting/script_interpreter.cpp +++ b/src/scripting/script_interpreter.cpp @@ -1,6 +1,6 @@ #include -#include "script_interpreter.h" +#include "script_interpreter.hpp" #include #include @@ -13,19 +13,19 @@ #include #include -#include "wrapper.h" -#include "wrapper_util.h" -#include "sector.h" -#include "file_system.h" -#include "game_session.h" -#include "resources.h" -#include "physfs/physfs_stream.h" -#include "object/text_object.h" -#include "object/scripted_object.h" -#include "object/display_effect.h" -#include "scripting/sound.h" -#include "scripting/scripted_object.h" -#include "scripting/display_effect.h" +#include "wrapper.hpp" +#include "wrapper_util.hpp" +#include "sector.hpp" +#include "file_system.hpp" +#include "game_session.hpp" +#include "resources.hpp" +#include "physfs/physfs_stream.hpp" +#include "object/text_object.hpp" +#include "object/scripted_object.hpp" +#include "object/display_effect.hpp" +#include "scripting/sound.hpp" +#include "scripting/scripted_object.hpp" +#include "scripting/display_effect.hpp" static void printfunc(HSQUIRRELVM, const char* str, ...) { diff --git a/src/scripting/script_interpreter.h b/src/scripting/script_interpreter.hpp similarity index 91% rename from src/scripting/script_interpreter.h rename to src/scripting/script_interpreter.hpp index ae318be60..3788c3038 100644 --- a/src/scripting/script_interpreter.h +++ b/src/scripting/script_interpreter.hpp @@ -3,10 +3,10 @@ #include #include -#include "timer.h" -#include "game_object.h" -#include "scripting/sound.h" -#include "scripting/level.h" +#include "timer.hpp" +#include "game_object.hpp" +#include "scripting/sound.hpp" +#include "scripting/level.hpp" class Sector; diff --git a/src/scripting/scripted_object.h b/src/scripting/scripted_object.hpp similarity index 100% rename from src/scripting/scripted_object.h rename to src/scripting/scripted_object.hpp diff --git a/src/scripting/sound.cpp b/src/scripting/sound.cpp index 3e14fd35b..bf1c1101e 100644 --- a/src/scripting/sound.cpp +++ b/src/scripting/sound.cpp @@ -2,9 +2,9 @@ #include #include -#include "sound.h" -#include "resources.h" -#include "audio/sound_manager.h" +#include "sound.hpp" +#include "resources.hpp" +#include "audio/sound_manager.hpp" namespace Scripting { diff --git a/src/scripting/sound.h b/src/scripting/sound.hpp similarity index 100% rename from src/scripting/sound.h rename to src/scripting/sound.hpp diff --git a/src/scripting/text.h b/src/scripting/text.hpp similarity index 100% rename from src/scripting/text.h rename to src/scripting/text.hpp diff --git a/src/scripting/wrapper.cpp b/src/scripting/wrapper.cpp index e750b96d3..603f3fd8d 100644 --- a/src/scripting/wrapper.cpp +++ b/src/scripting/wrapper.cpp @@ -1,6 +1,6 @@ /** * WARNING: This file is automatically generated from: - * 'src/scripting/wrapper.interface.h' + * 'src/scripting/wrapper.interface.hpp' * DO NOT CHANGE */ #include @@ -9,8 +9,8 @@ #include #include #include -#include "wrapper_util.h" -#include "wrapper.interface.h" +#include "wrapper_util.hpp" +#include "wrapper.interface.hpp" using namespace Scripting; diff --git a/src/scripting/wrapper.h b/src/scripting/wrapper.hpp similarity index 91% rename from src/scripting/wrapper.h rename to src/scripting/wrapper.hpp index b8d543968..026db1836 100644 --- a/src/scripting/wrapper.h +++ b/src/scripting/wrapper.hpp @@ -6,7 +6,7 @@ #ifndef __supertux_WRAPPER_H__ #define __supertux_WRAPPER_H__ -#include "wrapper_util.h" +#include "wrapper_util.hpp" extern WrappedFunction supertux_global_functions[]; extern WrappedClass supertux_classes[]; diff --git a/src/scripting/wrapper.interface.h b/src/scripting/wrapper.interface.h deleted file mode 100644 index 203612f09..000000000 --- a/src/scripting/wrapper.interface.h +++ /dev/null @@ -1,9 +0,0 @@ -/* This file is processes by miniswig to produce the scripting API */ -#include "display_effect.h" -#include "camera.h" -#include "level.h" -#include "scripted_object.h" -#include "sound.h" -#include "text.h" -#include "functions.h" -#include "player.h" diff --git a/src/scripting/wrapper.interface.hpp b/src/scripting/wrapper.interface.hpp new file mode 100644 index 000000000..b47c755c7 --- /dev/null +++ b/src/scripting/wrapper.interface.hpp @@ -0,0 +1,9 @@ +/* This file is processes by miniswig to produce the scripting API */ +#include "display_effect.hpp" +#include "camera.hpp" +#include "level.hpp" +#include "scripted_object.hpp" +#include "sound.hpp" +#include "text.hpp" +#include "functions.hpp" +#include "player.hpp" diff --git a/src/scripting/wrapper_util.cpp b/src/scripting/wrapper_util.cpp index 86e7c4db4..5944938eb 100644 --- a/src/scripting/wrapper_util.cpp +++ b/src/scripting/wrapper_util.cpp @@ -2,7 +2,7 @@ #include #include -#include "wrapper_util.h" +#include "wrapper_util.hpp" static void register_function(HSQUIRRELVM v, SQFUNCTION func, const char* name) { diff --git a/src/scripting/wrapper_util.h b/src/scripting/wrapper_util.hpp similarity index 100% rename from src/scripting/wrapper_util.h rename to src/scripting/wrapper_util.hpp diff --git a/src/sector.cpp b/src/sector.cpp index e9c35c171..51b8683d4 100644 --- a/src/sector.cpp +++ b/src/sector.cpp @@ -26,43 +26,43 @@ #include #include -#include "sector.h" -#include "player_status.h" -#include "object/gameobjs.h" -#include "object/camera.h" -#include "object/background.h" -#include "object/particlesystem.h" -#include "object/particlesystem_interactive.h" -#include "object/tilemap.h" -#include "lisp/parser.h" -#include "lisp/lisp.h" -#include "lisp/writer.h" -#include "lisp/list_iterator.h" -#include "tile.h" -#include "audio/sound_manager.h" -#include "game_session.h" -#include "resources.h" -#include "statistics.h" -#include "collision_grid.h" -#include "collision_grid_iterator.h" -#include "object_factory.h" -#include "collision.h" -#include "spawn_point.h" -#include "math/rect.h" -#include "math/aatriangle.h" -#include "object/coin.h" -#include "object/block.h" -#include "object/invisible_block.h" -#include "object/bullet.h" -#include "object/text_object.h" -#include "badguy/jumpy.h" -#include "badguy/spike.h" -#include "trigger/sequence_trigger.h" -#include "player_status.h" -#include "scripting/script_interpreter.h" -#include "scripting/sound.h" -#include "scripting/scripted_object.h" -#include "scripting/text.h" +#include "sector.hpp" +#include "player_status.hpp" +#include "object/gameobjs.hpp" +#include "object/camera.hpp" +#include "object/background.hpp" +#include "object/particlesystem.hpp" +#include "object/particlesystem_interactive.hpp" +#include "object/tilemap.hpp" +#include "lisp/parser.hpp" +#include "lisp/lisp.hpp" +#include "lisp/writer.hpp" +#include "lisp/list_iterator.hpp" +#include "tile.hpp" +#include "audio/sound_manager.hpp" +#include "game_session.hpp" +#include "resources.hpp" +#include "statistics.hpp" +#include "collision_grid.hpp" +#include "collision_grid_iterator.hpp" +#include "object_factory.hpp" +#include "collision.hpp" +#include "spawn_point.hpp" +#include "math/rect.hpp" +#include "math/aatriangle.hpp" +#include "object/coin.hpp" +#include "object/block.hpp" +#include "object/invisible_block.hpp" +#include "object/bullet.hpp" +#include "object/text_object.hpp" +#include "badguy/jumpy.hpp" +#include "badguy/spike.hpp" +#include "trigger/sequence_trigger.hpp" +#include "player_status.hpp" +#include "scripting/script_interpreter.hpp" +#include "scripting/sound.hpp" +#include "scripting/scripted_object.hpp" +#include "scripting/text.hpp" //#define USE_GRID diff --git a/src/sector.h b/src/sector.hpp similarity index 97% rename from src/sector.h rename to src/sector.hpp index 195d88a8d..067e453d1 100644 --- a/src/sector.h +++ b/src/sector.hpp @@ -22,9 +22,9 @@ #include #include -#include "direction.h" -#include "math/vector.h" -#include "video/drawing_context.h" +#include "direction.hpp" +#include "math/vector.hpp" +#include "video/drawing_context.hpp" namespace lisp { class Lisp; diff --git a/src/serializable.h b/src/serializable.hpp similarity index 100% rename from src/serializable.h rename to src/serializable.hpp diff --git a/src/spawn_point.cpp b/src/spawn_point.cpp index 59062322e..c0647fb49 100644 --- a/src/spawn_point.cpp +++ b/src/spawn_point.cpp @@ -2,9 +2,9 @@ #include #include -#include "spawn_point.h" -#include "lisp/lisp.h" -#include "lisp/list_iterator.h" +#include "spawn_point.hpp" +#include "lisp/lisp.hpp" +#include "lisp/list_iterator.hpp" SpawnPoint::SpawnPoint() {} diff --git a/src/spawn_point.h b/src/spawn_point.hpp similarity index 82% rename from src/spawn_point.h rename to src/spawn_point.hpp index b0602639f..207237cb9 100644 --- a/src/spawn_point.h +++ b/src/spawn_point.hpp @@ -2,8 +2,8 @@ #define __SPAWN_POINT_H__ #include -#include "math/vector.h" -#include "lisp/lisp.h" +#include "math/vector.hpp" +#include "lisp/lisp.hpp" class SpawnPoint { diff --git a/src/sprite/sprite.cpp b/src/sprite/sprite.cpp index ddc55354c..3dc91f2d2 100644 --- a/src/sprite/sprite.cpp +++ b/src/sprite/sprite.cpp @@ -23,8 +23,8 @@ #include #include -#include "sprite.h" -#include "video/drawing_context.h" +#include "sprite.hpp" +#include "video/drawing_context.hpp" Sprite::Sprite(SpriteData& newdata) : data(newdata), frame(0), animation_loops(-1) diff --git a/src/sprite/sprite.h b/src/sprite/sprite.hpp similarity index 96% rename from src/sprite/sprite.h rename to src/sprite/sprite.hpp index 16537c473..9b1dee850 100644 --- a/src/sprite/sprite.h +++ b/src/sprite/sprite.hpp @@ -25,9 +25,9 @@ #include #include -#include "video/surface.h" -#include "math/vector.h" -#include "sprite_data.h" +#include "video/surface.hpp" +#include "math/vector.hpp" +#include "sprite_data.hpp" class Sprite { diff --git a/src/sprite/sprite_data.cpp b/src/sprite/sprite_data.cpp index 69c2d2eeb..0088fb925 100644 --- a/src/sprite/sprite_data.cpp +++ b/src/sprite/sprite_data.cpp @@ -23,10 +23,10 @@ #include #include -#include "sprite_data.h" -#include "resources.h" -#include "video/drawing_context.h" -#include "lisp/list_iterator.h" +#include "sprite_data.hpp" +#include "resources.hpp" +#include "video/drawing_context.hpp" +#include "lisp/list_iterator.hpp" SpriteData::Action::Action() { diff --git a/src/sprite/sprite_data.h b/src/sprite/sprite_data.hpp similarity index 97% rename from src/sprite/sprite_data.h rename to src/sprite/sprite_data.hpp index c9fd98321..f9a87a3d2 100644 --- a/src/sprite/sprite_data.h +++ b/src/sprite/sprite_data.hpp @@ -24,8 +24,8 @@ #include #include -#include "lisp/lisp.h" -#include "video/surface.h" +#include "lisp/lisp.hpp" +#include "video/surface.hpp" class SpriteData { diff --git a/src/sprite/sprite_manager.cpp b/src/sprite/sprite_manager.cpp index 4a11b25bc..212c64ce1 100644 --- a/src/sprite/sprite_manager.cpp +++ b/src/sprite/sprite_manager.cpp @@ -22,12 +22,12 @@ #include #include -#include "sprite_manager.h" -#include "sprite_data.h" -#include "sprite.h" -#include "lisp/lisp.h" -#include "lisp/parser.h" -#include "lisp/list_iterator.h" +#include "sprite_manager.hpp" +#include "sprite_data.hpp" +#include "sprite.hpp" +#include "lisp/lisp.hpp" +#include "lisp/parser.hpp" +#include "lisp/list_iterator.hpp" SpriteManager::SpriteManager(const std::string& filename) { diff --git a/src/sprite/sprite_manager.h b/src/sprite/sprite_manager.hpp similarity index 98% rename from src/sprite/sprite_manager.h rename to src/sprite/sprite_manager.hpp index fceb9a1a5..dcdcbf936 100644 --- a/src/sprite/sprite_manager.h +++ b/src/sprite/sprite_manager.hpp @@ -22,7 +22,7 @@ #include -#include "sprite.h" +#include "sprite.hpp" class SpriteManager { diff --git a/src/statistics.cpp b/src/statistics.cpp index beff2c2d1..44c6bf027 100644 --- a/src/statistics.cpp +++ b/src/statistics.cpp @@ -19,12 +19,12 @@ #include -#include "video/drawing_context.h" -#include "gettext.h" -#include "lisp/lisp.h" -#include "resources.h" -#include "main.h" -#include "statistics.h" +#include "video/drawing_context.hpp" +#include "gettext.hpp" +#include "lisp/lisp.hpp" +#include "resources.hpp" +#include "main.hpp" +#include "statistics.hpp" Statistics global_stats; diff --git a/src/statistics.h b/src/statistics.hpp similarity index 96% rename from src/statistics.h rename to src/statistics.hpp index 430e2161e..7ae61c4fb 100644 --- a/src/statistics.h +++ b/src/statistics.hpp @@ -20,9 +20,9 @@ #ifndef SUPERTUX_STATISTICS_H #define SUPERTUX_STATISTICS_H -#include "timer.h" -#include "lisp/lisp.h" -#include "lisp/writer.h" +#include "timer.hpp" +#include "lisp/lisp.hpp" +#include "lisp/writer.hpp" class DrawingContext; diff --git a/src/textscroller.cpp b/src/textscroller.cpp index c06a26006..066997dd6 100644 --- a/src/textscroller.cpp +++ b/src/textscroller.cpp @@ -19,17 +19,17 @@ // 02111-1307, USA. #include -#include "textscroller.h" +#include "textscroller.hpp" #include -#include "resources.h" -#include "video/font.h" -#include "video/drawing_context.h" -#include "lisp/parser.h" -#include "lisp/lisp.h" -#include "audio/sound_manager.h" -#include "main.h" -#include "control/joystickkeyboardcontroller.h" +#include "resources.hpp" +#include "video/font.hpp" +#include "video/drawing_context.hpp" +#include "lisp/parser.hpp" +#include "lisp/lisp.hpp" +#include "audio/sound_manager.hpp" +#include "main.hpp" +#include "control/joystickkeyboardcontroller.hpp" static const float DEFAULT_SPEED = .02; static const float SCROLL = 60; diff --git a/src/textscroller.h b/src/textscroller.hpp similarity index 100% rename from src/textscroller.h rename to src/textscroller.hpp diff --git a/src/tile.cpp b/src/tile.cpp index 0fba4df16..118055ebc 100644 --- a/src/tile.cpp +++ b/src/tile.cpp @@ -24,12 +24,12 @@ #include #include -#include "lisp/lisp.h" -#include "tile.h" -#include "resources.h" -#include "timer.h" -#include "math/vector.h" -#include "video/drawing_context.h" +#include "lisp/lisp.hpp" +#include "tile.hpp" +#include "resources.hpp" +#include "timer.hpp" +#include "math/vector.hpp" +#include "video/drawing_context.hpp" Tile::Tile() : id(0), editor_image(0), attributes(0), data(0), anim_fps(1) diff --git a/src/tile.h b/src/tile.hpp similarity index 97% rename from src/tile.h rename to src/tile.hpp index 8a0cf8d0b..ed1196e30 100644 --- a/src/tile.h +++ b/src/tile.hpp @@ -21,9 +21,9 @@ #define TILE_H #include -#include "video/surface.h" -#include "math/rect.h" -#include "lisp/lisp.h" +#include "video/surface.hpp" +#include "math/rect.hpp" +#include "lisp/lisp.hpp" /** Tile Class diff --git a/src/tile_manager.cpp b/src/tile_manager.cpp index 7422e7c9d..5e941d0b3 100644 --- a/src/tile_manager.cpp +++ b/src/tile_manager.cpp @@ -22,13 +22,13 @@ #include #include #include -#include "video/drawing_context.h" -#include "lisp/lisp.h" -#include "lisp/parser.h" -#include "lisp/list_iterator.h" -#include "tile.h" -#include "tile_manager.h" -#include "resources.h" +#include "video/drawing_context.hpp" +#include "lisp/lisp.hpp" +#include "lisp/parser.hpp" +#include "lisp/list_iterator.hpp" +#include "tile.hpp" +#include "tile_manager.hpp" +#include "resources.hpp" TileManager::TileManager(const std::string& filename) { diff --git a/src/tile_manager.h b/src/tile_manager.hpp similarity index 99% rename from src/tile_manager.h rename to src/tile_manager.hpp index 6eb05069f..e5ab10982 100644 --- a/src/tile_manager.h +++ b/src/tile_manager.hpp @@ -27,7 +27,7 @@ #include #include #include -#include "tile.h" +#include "tile.hpp" struct TileGroup { diff --git a/src/timer.cpp b/src/timer.cpp index 273cf8e72..40be50353 100644 --- a/src/timer.cpp +++ b/src/timer.cpp @@ -20,7 +20,7 @@ #include #include -#include "timer.h" +#include "timer.hpp" float global_time = 0; diff --git a/src/timer.h b/src/timer.hpp similarity index 100% rename from src/timer.h rename to src/timer.hpp diff --git a/src/tinygettext/tinygettext.cpp b/src/tinygettext/tinygettext.cpp index d908242af..b31cf2f4b 100644 --- a/src/tinygettext/tinygettext.cpp +++ b/src/tinygettext/tinygettext.cpp @@ -25,8 +25,8 @@ #include #include -#include "tinygettext.h" -#include "physfs/physfs_stream.h" +#include "tinygettext.hpp" +#include "physfs/physfs_stream.hpp" //#define TRANSLATION_DEBUG diff --git a/src/tinygettext/tinygettext.h b/src/tinygettext/tinygettext.hpp similarity index 100% rename from src/tinygettext/tinygettext.h rename to src/tinygettext/tinygettext.hpp diff --git a/src/title.cpp b/src/title.cpp index 2f99169ea..2abc6e35f 100644 --- a/src/title.cpp +++ b/src/title.cpp @@ -33,32 +33,32 @@ #include #include -#include "title.h" -#include "video/screen.h" -#include "video/surface.h" -#include "audio/sound_manager.h" -#include "gui/menu.h" -#include "timer.h" -#include "lisp/lisp.h" -#include "lisp/parser.h" -#include "level.h" -#include "level_subset.h" -#include "game_session.h" -#include "worldmap.h" -#include "player_status.h" -#include "tile.h" -#include "sector.h" -#include "object/tilemap.h" -#include "object/camera.h" -#include "object/player.h" -#include "resources.h" -#include "gettext.h" -#include "misc.h" -#include "textscroller.h" -#include "file_system.h" -#include "control/joystickkeyboardcontroller.h" -#include "control/codecontroller.h" -#include "main.h" +#include "title.hpp" +#include "video/screen.hpp" +#include "video/surface.hpp" +#include "audio/sound_manager.hpp" +#include "gui/menu.hpp" +#include "timer.hpp" +#include "lisp/lisp.hpp" +#include "lisp/parser.hpp" +#include "level.hpp" +#include "level_subset.hpp" +#include "game_session.hpp" +#include "worldmap.hpp" +#include "player_status.hpp" +#include "tile.hpp" +#include "sector.hpp" +#include "object/tilemap.hpp" +#include "object/camera.hpp" +#include "object/player.hpp" +#include "resources.hpp" +#include "gettext.hpp" +#include "misc.hpp" +#include "textscroller.hpp" +#include "file_system.hpp" +#include "control/joystickkeyboardcontroller.hpp" +#include "control/codecontroller.hpp" +#include "main.hpp" static Surface* bkg_title; static Surface* logo; diff --git a/src/title.h b/src/title.hpp similarity index 100% rename from src/title.h rename to src/title.hpp diff --git a/src/trigger/door.cpp b/src/trigger/door.cpp index 28550c225..caaaf0a0c 100644 --- a/src/trigger/door.cpp +++ b/src/trigger/door.cpp @@ -18,15 +18,15 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include -#include "door.h" -#include "game_session.h" -#include "resources.h" -#include "object_factory.h" -#include "sprite/sprite.h" -#include "sprite/sprite_manager.h" -#include "video/drawing_context.h" -#include "lisp/lisp.h" -#include "lisp/writer.h" +#include "door.hpp" +#include "game_session.hpp" +#include "resources.hpp" +#include "object_factory.hpp" +#include "sprite/sprite.hpp" +#include "sprite/sprite_manager.hpp" +#include "video/drawing_context.hpp" +#include "lisp/lisp.hpp" +#include "lisp/writer.hpp" Door::Door(const lisp::Lisp& reader) { diff --git a/src/trigger/door.h b/src/trigger/door.hpp similarity index 91% rename from src/trigger/door.h rename to src/trigger/door.hpp index 830d3fcea..ed0fdc9b1 100644 --- a/src/trigger/door.h +++ b/src/trigger/door.hpp @@ -21,11 +21,11 @@ #include -#include "video/surface.h" -#include "sprite/sprite.h" -#include "trigger_base.h" -#include "serializable.h" -#include "timer.h" +#include "video/surface.hpp" +#include "sprite/sprite.hpp" +#include "trigger_base.hpp" +#include "serializable.hpp" +#include "timer.hpp" class Door : public TriggerBase, public Serializable { diff --git a/src/trigger/hatch.cpp b/src/trigger/hatch.cpp index 2f2910894..26286e249 100644 --- a/src/trigger/hatch.cpp +++ b/src/trigger/hatch.cpp @@ -18,15 +18,15 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include -#include "hatch.h" -#include "game_session.h" -#include "resources.h" -#include "object_factory.h" -#include "sprite/sprite.h" -#include "sprite/sprite_manager.h" -#include "video/drawing_context.h" -#include "lisp/lisp.h" -#include "lisp/writer.h" +#include "hatch.hpp" +#include "game_session.hpp" +#include "resources.hpp" +#include "object_factory.hpp" +#include "sprite/sprite.hpp" +#include "sprite/sprite_manager.hpp" +#include "video/drawing_context.hpp" +#include "lisp/lisp.hpp" +#include "lisp/writer.hpp" Hatch::Hatch(const lisp::Lisp& reader) { diff --git a/src/trigger/hatch.h b/src/trigger/hatch.hpp similarity index 91% rename from src/trigger/hatch.h rename to src/trigger/hatch.hpp index d0cc73e0d..059cda915 100644 --- a/src/trigger/hatch.h +++ b/src/trigger/hatch.hpp @@ -21,11 +21,11 @@ #include -#include "video/surface.h" -#include "sprite/sprite.h" -#include "trigger_base.h" -#include "serializable.h" -#include "timer.h" +#include "video/surface.hpp" +#include "sprite/sprite.hpp" +#include "trigger_base.hpp" +#include "serializable.hpp" +#include "timer.hpp" class Hatch : public TriggerBase, public Serializable { diff --git a/src/trigger/scripttrigger.cpp b/src/trigger/scripttrigger.cpp index 8d2a2779d..c5e93eb3f 100644 --- a/src/trigger/scripttrigger.cpp +++ b/src/trigger/scripttrigger.cpp @@ -24,13 +24,13 @@ #include #include -#include "scripttrigger.h" -#include "game_session.h" -#include "lisp/lisp.h" -#include "lisp/writer.h" -#include "object_factory.h" -#include "scripting/script_interpreter.h" -#include "sector.h" +#include "scripttrigger.hpp" +#include "game_session.hpp" +#include "lisp/lisp.hpp" +#include "lisp/writer.hpp" +#include "object_factory.hpp" +#include "scripting/script_interpreter.hpp" +#include "sector.hpp" ScriptTrigger::ScriptTrigger(const lisp::Lisp& reader) { diff --git a/src/trigger/scripttrigger.h b/src/trigger/scripttrigger.hpp similarity index 95% rename from src/trigger/scripttrigger.h rename to src/trigger/scripttrigger.hpp index 321be3142..a5ded1d9b 100644 --- a/src/trigger/scripttrigger.h +++ b/src/trigger/scripttrigger.hpp @@ -21,8 +21,8 @@ #ifndef __SCRIPTTRIGGER_H__ #define __SCRIPTTRIGGER_H__ -#include "trigger_base.h" -#include "serializable.h" +#include "trigger_base.hpp" +#include "serializable.hpp" class ScriptTrigger : public TriggerBase, public Serializable { diff --git a/src/trigger/secretarea_trigger.cpp b/src/trigger/secretarea_trigger.cpp index 3b59368d4..346b15eee 100644 --- a/src/trigger/secretarea_trigger.cpp +++ b/src/trigger/secretarea_trigger.cpp @@ -19,12 +19,12 @@ // 02111-1307, USA. #include -#include "secretarea_trigger.h" -#include "game_session.h" -#include "lisp/lisp.h" -#include "lisp/writer.h" -#include "object_factory.h" -#include "main.h" +#include "secretarea_trigger.hpp" +#include "game_session.hpp" +#include "lisp/lisp.hpp" +#include "lisp/writer.hpp" +#include "object_factory.hpp" +#include "main.hpp" static const float MESSAGE_TIME=3.5; diff --git a/src/trigger/secretarea_trigger.h b/src/trigger/secretarea_trigger.hpp similarity index 90% rename from src/trigger/secretarea_trigger.h rename to src/trigger/secretarea_trigger.hpp index 71c4d17d9..1c8f55056 100644 --- a/src/trigger/secretarea_trigger.h +++ b/src/trigger/secretarea_trigger.hpp @@ -20,11 +20,11 @@ #ifndef __SECRETAREA_TRIGGER_H__ #define __SECRETAREA_TRIGGER_H__ -#include "trigger_base.h" -#include "serializable.h" -#include "resources.h" -#include "video/drawing_context.h" -#include "timer.h" +#include "trigger_base.hpp" +#include "serializable.hpp" +#include "resources.hpp" +#include "video/drawing_context.hpp" +#include "timer.hpp" class SecretAreaTrigger : public TriggerBase, public Serializable { diff --git a/src/trigger/sequence_trigger.cpp b/src/trigger/sequence_trigger.cpp index 28c4b540f..7ef726d92 100644 --- a/src/trigger/sequence_trigger.cpp +++ b/src/trigger/sequence_trigger.cpp @@ -20,11 +20,11 @@ #include -#include "sequence_trigger.h" -#include "game_session.h" -#include "lisp/lisp.h" -#include "lisp/writer.h" -#include "object_factory.h" +#include "sequence_trigger.hpp" +#include "game_session.hpp" +#include "lisp/lisp.hpp" +#include "lisp/writer.hpp" +#include "object_factory.hpp" SequenceTrigger::SequenceTrigger(const lisp::Lisp& reader) { diff --git a/src/trigger/sequence_trigger.h b/src/trigger/sequence_trigger.hpp similarity index 95% rename from src/trigger/sequence_trigger.h rename to src/trigger/sequence_trigger.hpp index 8eb9b3b19..51246f96f 100644 --- a/src/trigger/sequence_trigger.h +++ b/src/trigger/sequence_trigger.hpp @@ -21,8 +21,8 @@ #ifndef __SEQUENCE_TRIGGER_H__ #define __SEQUENCE_TRIGGER_H__ -#include "trigger_base.h" -#include "serializable.h" +#include "trigger_base.hpp" +#include "serializable.hpp" class SequenceTrigger : public TriggerBase, public Serializable { diff --git a/src/trigger/trigger_base.cpp b/src/trigger/trigger_base.cpp index 95814a1cd..411150a3a 100644 --- a/src/trigger/trigger_base.cpp +++ b/src/trigger/trigger_base.cpp @@ -18,9 +18,9 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include -#include "trigger_base.h" -#include "video/drawing_context.h" -#include "object/player.h" +#include "trigger_base.hpp" +#include "video/drawing_context.hpp" +#include "object/player.hpp" TriggerBase::TriggerBase() : sprite(0) diff --git a/src/trigger/trigger_base.h b/src/trigger/trigger_base.hpp similarity index 94% rename from src/trigger/trigger_base.h rename to src/trigger/trigger_base.hpp index fc159c662..bc7bf02b4 100644 --- a/src/trigger/trigger_base.h +++ b/src/trigger/trigger_base.hpp @@ -19,9 +19,9 @@ #ifndef SUPERTUX_TRIGGER_BASE_H #define SUPERTUX_TRIGGER_BASE_H -#include "moving_object.h" -#include "math/rect.h" -#include "sprite/sprite.h" +#include "moving_object.hpp" +#include "math/rect.hpp" +#include "sprite/sprite.hpp" class Player; diff --git a/src/video/drawing_context.cpp b/src/video/drawing_context.cpp index 7e7aaff06..674880591 100644 --- a/src/video/drawing_context.cpp +++ b/src/video/drawing_context.cpp @@ -22,11 +22,11 @@ #include #include -#include "drawing_context.h" -#include "surface.h" -#include "font.h" -#include "main.h" -#include "gameconfig.h" +#include "drawing_context.hpp" +#include "surface.hpp" +#include "font.hpp" +#include "main.hpp" +#include "gameconfig.hpp" DrawingContext::DrawingContext(SDL_Surface* targetsurface) { diff --git a/src/video/drawing_context.h b/src/video/drawing_context.hpp similarity index 97% rename from src/video/drawing_context.h rename to src/video/drawing_context.hpp index 224ea11ae..f105ea125 100644 --- a/src/video/drawing_context.h +++ b/src/video/drawing_context.hpp @@ -26,10 +26,10 @@ #include #include -#include "math/vector.h" -#include "video/screen.h" -#include "video/surface.h" -#include "video/font.h" +#include "math/vector.hpp" +#include "video/screen.hpp" +#include "video/surface.hpp" +#include "video/font.hpp" class Surface; diff --git a/src/video/font.cpp b/src/video/font.cpp index cc45c1c62..72c2ff431 100644 --- a/src/video/font.cpp +++ b/src/video/font.cpp @@ -23,11 +23,11 @@ #include #include -#include "lisp/parser.h" -#include "lisp/lisp.h" -#include "screen.h" -#include "font.h" -#include "drawing_context.h" +#include "lisp/parser.hpp" +#include "lisp/lisp.hpp" +#include "screen.hpp" +#include "font.hpp" +#include "drawing_context.hpp" Font::Font(const std::string& file, FontType ntype, int nw, int nh, int nshadowsize) diff --git a/src/video/font.h b/src/video/font.hpp similarity index 98% rename from src/video/font.h rename to src/video/font.hpp index 3f53c3300..af6cd0b3c 100644 --- a/src/video/font.h +++ b/src/video/font.hpp @@ -23,8 +23,8 @@ #include #include -#include "video/surface.h" -#include "math/vector.h" +#include "video/surface.hpp" +#include "math/vector.hpp" enum FontAlignment { LEFT_ALLIGN, diff --git a/src/video/screen.cpp b/src/video/screen.cpp index 7ceb28ee7..42127e25a 100644 --- a/src/video/screen.cpp +++ b/src/video/screen.cpp @@ -35,11 +35,11 @@ #include #endif -#include "gameconfig.h" -#include "screen.h" -#include "main.h" -#include "video/drawing_context.h" -#include "math/vector.h" +#include "gameconfig.hpp" +#include "screen.hpp" +#include "main.hpp" +#include "video/drawing_context.hpp" +#include "math/vector.hpp" static const float LOOP_DELAY = 20.0; extern SDL_Surface* screen; diff --git a/src/video/screen.h b/src/video/screen.hpp similarity index 98% rename from src/video/screen.h rename to src/video/screen.hpp index 48c5180dd..2dd824a92 100644 --- a/src/video/screen.h +++ b/src/video/screen.hpp @@ -24,7 +24,7 @@ #include #include -#include "math/vector.h" +#include "math/vector.hpp" /** Stores 8bit RGBA values. */ class Color diff --git a/src/video/surface.cpp b/src/video/surface.cpp index a650b4fe4..1446a03ae 100644 --- a/src/video/surface.cpp +++ b/src/video/surface.cpp @@ -28,10 +28,10 @@ #include #include -#include "gameconfig.h" -#include "physfs/physfs_sdl.h" -#include "video/surface.h" -#include "video/screen.h" +#include "gameconfig.hpp" +#include "physfs/physfs_sdl.hpp" +#include "video/surface.hpp" +#include "video/screen.hpp" Surface::Surfaces Surface::surfaces; diff --git a/src/video/surface.h b/src/video/surface.hpp similarity index 99% rename from src/video/surface.h rename to src/video/surface.hpp index b7adb5f7e..d2cae0c15 100644 --- a/src/video/surface.h +++ b/src/video/surface.hpp @@ -26,8 +26,8 @@ #include #include -#include "math/vector.h" -#include "video/screen.h" +#include "math/vector.hpp" +#include "video/screen.hpp" void apply_filter_to_surface(SDL_Surface *surface, int filter, int value); SDL_Surface* sdl_surface_from_sdl_surface(SDL_Surface* sdl_surf, bool use_alpha); diff --git a/src/worldmap.cpp b/src/worldmap.cpp index 9e5c0eeaa..9ef7b6d3e 100644 --- a/src/worldmap.cpp +++ b/src/worldmap.cpp @@ -26,32 +26,32 @@ #include #include -#include "gettext.h" -#include "video/surface.h" -#include "video/screen.h" -#include "video/drawing_context.h" -#include "sprite/sprite_manager.h" -#include "audio/sound_manager.h" -#include "lisp/parser.h" -#include "lisp/lisp.h" -#include "lisp/list_iterator.h" -#include "lisp/writer.h" -#include "game_session.h" -#include "sector.h" -#include "worldmap.h" -#include "resources.h" -#include "misc.h" -#include "player_status.h" -#include "textscroller.h" -#include "main.h" -#include "spawn_point.h" -#include "file_system.h" -#include "gui/menu.h" -#include "gui/mousecursor.h" -#include "control/joystickkeyboardcontroller.h" -#include "object/background.h" -#include "object/tilemap.h" -#include "scripting/script_interpreter.h" +#include "gettext.hpp" +#include "video/surface.hpp" +#include "video/screen.hpp" +#include "video/drawing_context.hpp" +#include "sprite/sprite_manager.hpp" +#include "audio/sound_manager.hpp" +#include "lisp/parser.hpp" +#include "lisp/lisp.hpp" +#include "lisp/list_iterator.hpp" +#include "lisp/writer.hpp" +#include "game_session.hpp" +#include "sector.hpp" +#include "worldmap.hpp" +#include "resources.hpp" +#include "misc.hpp" +#include "player_status.hpp" +#include "textscroller.hpp" +#include "main.hpp" +#include "spawn_point.hpp" +#include "file_system.hpp" +#include "gui/menu.hpp" +#include "gui/mousecursor.hpp" +#include "control/joystickkeyboardcontroller.hpp" +#include "object/background.hpp" +#include "object/tilemap.hpp" +#include "scripting/script_interpreter.hpp" Menu* worldmap_menu = 0; diff --git a/src/worldmap.h b/src/worldmap.hpp similarity index 96% rename from src/worldmap.h rename to src/worldmap.hpp index 0ac6e3e90..a6a1c6655 100644 --- a/src/worldmap.h +++ b/src/worldmap.hpp @@ -22,14 +22,14 @@ #include #include -#include "math/vector.h" -#include "video/screen.h" -#include "lisp/lisp.h" -#include "control/controller.h" -#include "statistics.h" -#include "timer.h" -#include "tile_manager.h" -#include "game_object.h" +#include "math/vector.hpp" +#include "video/screen.hpp" +#include "lisp/lisp.hpp" +#include "control/controller.hpp" +#include "statistics.hpp" +#include "timer.hpp" +#include "tile_manager.hpp" +#include "game_object.hpp" class Sprite; class Menu; diff --git a/tools/miniswig/create_wrapper.cpp b/tools/miniswig/create_wrapper.cpp index 6956ced67..330792d2a 100644 --- a/tools/miniswig/create_wrapper.cpp +++ b/tools/miniswig/create_wrapper.cpp @@ -20,7 +20,7 @@ WrapperCreator::create_wrapper(Namespace* ns) << "#ifndef __" << modulename << "_WRAPPER_H__\n" << "#define __" << modulename << "_WRAPPER_H__\n" << "\n" - << "#include \"wrapper_util.h\"\n" + << "#include \"wrapper_util.hpp\"\n" << "\n" << "extern WrappedFunction " << modulename << "_global_functions[];\n" << "extern WrappedClass " << modulename << "_classes[];\n" @@ -40,8 +40,8 @@ WrapperCreator::create_wrapper(Namespace* ns) << "#include \n" << "#include \n" << "#include \n" - << "#include \"wrapper_util.h\"\n" - << "#include \"wrapper.interface.h\"\n" + << "#include \"wrapper_util.hpp\"\n" + << "#include \"wrapper.interface.hpp\"\n" << "\n"; if(selected_namespace != "") { out << "using namespace " << selected_namespace << ";\n"; -- 2.11.0