diff --git a/src/BoE.vsproj/Common/Common.vcxproj b/src/BoE.vsproj/Common/Common.vcxproj index 4af955b4..80473c5d 100644 --- a/src/BoE.vsproj/Common/Common.vcxproj +++ b/src/BoE.vsproj/Common/Common.vcxproj @@ -47,22 +47,22 @@ - - - + + + - - + + - + - + - + diff --git a/src/BoE.vsproj/Common/Common.vcxproj.filters b/src/BoE.vsproj/Common/Common.vcxproj.filters index f81dfe61..9710eeeb 100644 --- a/src/BoE.vsproj/Common/Common.vcxproj.filters +++ b/src/BoE.vsproj/Common/Common.vcxproj.filters @@ -145,28 +145,28 @@ DialogXML\Header Files - + Tools\Header Files - + Tools\Header Files - + Tools\Header Files Tools\Header Files - + Tools\Header Files - + Tools\Header Files Tools\Header Files - + Tools\Header Files @@ -175,13 +175,13 @@ Tools\Header Files - + Tools\Header Files Tools\Header Files - + Tools\Header Files diff --git a/src/BoE.xcodeproj/project.pbxproj b/src/BoE.xcodeproj/project.pbxproj index bfab57b4..2f4da9d7 100644 --- a/src/BoE.xcodeproj/project.pbxproj +++ b/src/BoE.xcodeproj/project.pbxproj @@ -570,7 +570,7 @@ 912DFE8918E24B4C00B00D75 /* resmgr.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = resmgr.hpp; sourceTree = ""; }; 912DFE8A18E24B4C00B00D75 /* restypes.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = restypes.hpp; sourceTree = ""; }; 912DFE8E18E2872300B00D75 /* boe.menus.mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = boe.menus.mac.mm; sourceTree = ""; }; - 913D00590F9FEEC200184C18 /* porting.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = porting.h; sourceTree = ""; }; + 913D00590F9FEEC200184C18 /* porting.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = porting.hpp; sourceTree = ""; }; 913D005A0F9FEEC200184C18 /* porting.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = porting.cpp; sourceTree = ""; }; 913D05B40FA1E9E200184C18 /* party.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = party.h; sourceTree = ""; }; 913D05B50FA1E9E300184C18 /* party.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = party.cpp; sourceTree = ""; }; @@ -599,11 +599,11 @@ 9179A4621A47D4E200FEF872 /* vector2d.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = vector2d.hpp; sourceTree = ""; }; 9179A4631A4867E200FEF872 /* stack.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = stack.hpp; sourceTree = ""; }; 9179A4641A48681800FEF872 /* stack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stack.cpp; sourceTree = ""; }; - 917B573F100B956C0096C978 /* undo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = undo.h; sourceTree = ""; }; + 917B573F100B956C0096C978 /* undo.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = undo.hpp; sourceTree = ""; }; 918D59A718EA513900735B66 /* dialog.keys.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = dialog.keys.hpp; sourceTree = ""; }; 919145FB18E3A32F005CF3A4 /* boe.appleevents.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = boe.appleevents.mm; sourceTree = ""; }; 919145FD18E3C750005CF3A4 /* scrollbar.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = scrollbar.hpp; sourceTree = ""; }; - 919145FE18E63B41005CF3A4 /* winutil.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = winutil.h; sourceTree = ""; }; + 919145FE18E63B41005CF3A4 /* winutil.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = winutil.hpp; sourceTree = ""; }; 919145FF18E63B70005CF3A4 /* winutil.mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = winutil.mac.mm; sourceTree = ""; }; 9191460018E63D8E005CF3A4 /* scrollbar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scrollbar.cpp; sourceTree = ""; }; 9191460118E6591F005CF3A4 /* boe.menus.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = boe.menus.h; sourceTree = ""; }; @@ -657,18 +657,18 @@ 91B3EF180F969C2200BF5B67 /* Blades of Exile Character Editor.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Blades of Exile Character Editor.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 91B3EF250F969CE300BF5B67 /* bladbase.exs */ = {isa = PBXFileReference; lastKnownFileType = file; name = bladbase.exs; path = "../rsrc/Blades of Exile Bases/bladbase.exs"; sourceTree = ""; }; 91B3EF3F0F969F0000BF5B67 /* BoE Scenario Editor.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "BoE Scenario Editor.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - 91B3F1090F9779C300BF5B67 /* graphtool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = graphtool.h; sourceTree = ""; }; + 91B3F1090F9779C300BF5B67 /* graphtool.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = graphtool.hpp; sourceTree = ""; }; 91B3F10A0F9779C300BF5B67 /* graphtool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = graphtool.cpp; sourceTree = ""; }; - 91B3F10E0F9779D000BF5B67 /* soundtool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = soundtool.h; sourceTree = ""; }; + 91B3F10E0F9779D000BF5B67 /* soundtool.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = soundtool.hpp; sourceTree = ""; }; 91B3F10F0F9779D000BF5B67 /* soundtool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = soundtool.cpp; sourceTree = ""; }; - 91B3F11D0F97801F00BF5B67 /* mathutil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mathutil.h; sourceTree = ""; }; + 91B3F11D0F97801F00BF5B67 /* mathutil.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mathutil.hpp; sourceTree = ""; }; 91B3F11E0F97801F00BF5B67 /* mathutil.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mathutil.cpp; sourceTree = ""; }; 91BFA3D61901B024001686E4 /* mask.vert */ = {isa = PBXFileReference; explicitFileType = sourcecode.glsl; fileEncoding = 4; path = mask.vert; sourceTree = ""; }; 91BFA3D81902AD78001686E4 /* tarball.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tarball.cpp; sourceTree = ""; }; 91BFA3D91902ADD5001686E4 /* tarball.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = tarball.hpp; sourceTree = ""; }; 91BFA3DE19033E01001686E4 /* gzstream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gzstream.cpp; sourceTree = ""; }; 91BFA3DF19033E01001686E4 /* gzstream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gzstream.h; sourceTree = ""; }; - 91C688E60FD702B9000F6D01 /* cursors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cursors.h; sourceTree = ""; }; + 91C688E60FD702B9000F6D01 /* cursors.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = cursors.hpp; sourceTree = ""; }; 91C688E70FD702B9000F6D01 /* cursors.mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = cursors.mac.mm; sourceTree = ""; }; 91C749B71A2D6432008E0E10 /* strings */ = {isa = PBXFileReference; lastKnownFileType = folder; path = strings; sourceTree = ""; }; 91C749B91A2D66F7008E0E10 /* dialogs */ = {isa = PBXFileReference; lastKnownFileType = folder; path = dialogs; sourceTree = ""; }; @@ -683,7 +683,7 @@ 91E5C7980F9F60EC00C21460 /* town.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = town.cpp; sourceTree = ""; }; 91E5C79C0F9F60FA00C21460 /* outdoors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = outdoors.h; sourceTree = ""; }; 91E5C79D0F9F60FA00C21460 /* outdoors.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = outdoors.cpp; sourceTree = ""; }; - 91E5C7A50F9F615400C21460 /* fileio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fileio.h; sourceTree = ""; }; + 91E5C7A50F9F615400C21460 /* fileio.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = fileio.hpp; sourceTree = ""; }; 91E5C7A60F9F615400C21460 /* fileio.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fileio.cpp; sourceTree = ""; }; 91E5C7B60F9F619D00C21460 /* talking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = talking.h; sourceTree = ""; }; 91E5C7B70F9F619D00C21460 /* talking.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = talking.cpp; sourceTree = ""; }; @@ -937,19 +937,19 @@ 913D03350FA1000200184C18 /* headers */ = { isa = PBXGroup; children = ( - 91C688E60FD702B9000F6D01 /* cursors.h */, - 91E5C7A50F9F615400C21460 /* fileio.h */, - 91B3F1090F9779C300BF5B67 /* graphtool.h */, + 91C688E60FD702B9000F6D01 /* cursors.hpp */, + 91E5C7A50F9F615400C21460 /* fileio.hpp */, + 91B3F1090F9779C300BF5B67 /* graphtool.hpp */, 915E09071A316D6A008BDF00 /* map_parse.hpp */, - 91B3F11D0F97801F00BF5B67 /* mathutil.h */, - 913D00590F9FEEC200184C18 /* porting.h */, + 91B3F11D0F97801F00BF5B67 /* mathutil.hpp */, + 913D00590F9FEEC200184C18 /* porting.hpp */, 91EC480E18FBAA8700BB1E86 /* prefs.hpp */, - 91B3F10E0F9779D000BF5B67 /* soundtool.h */, + 91B3F10E0F9779D000BF5B67 /* soundtool.hpp */, 91BFA3D91902ADD5001686E4 /* tarball.hpp */, 9179A4621A47D4E200FEF872 /* vector2d.hpp */, 91F06E8F1A2EBEE70038E902 /* special_parse.hpp */, - 917B573F100B956C0096C978 /* undo.h */, - 919145FE18E63B41005CF3A4 /* winutil.h */, + 917B573F100B956C0096C978 /* undo.hpp */, + 919145FE18E63B41005CF3A4 /* winutil.hpp */, ); name = headers; sourceTree = ""; diff --git a/src/boe.actions.cpp b/src/boe.actions.cpp index f5600e34..4cb415fb 100644 --- a/src/boe.actions.cpp +++ b/src/boe.actions.cpp @@ -22,18 +22,18 @@ #include "boe.newgraph.h" #include "boe.combat.h" #include "boe.items.h" -#include "soundtool.h" +#include "soundtool.hpp" #include "boe.infodlg.h" #include "boe.itemdata.h" #include "boe.main.h" -#include "mathutil.h" -#include "fileio.h" +#include "mathutil.hpp" +#include "fileio.hpp" #include "dlogutil.hpp" #include "dialog.hpp" #include "scrollbar.hpp" #include "boe.menus.h" -#include "winutil.h" -#include "cursors.h" +#include "winutil.hpp" +#include "cursors.hpp" #include "spell.hpp" #include "shop.hpp" diff --git a/src/boe.appleevents.mm b/src/boe.appleevents.mm index cceedb55..406ae4e8 100644 --- a/src/boe.appleevents.mm +++ b/src/boe.appleevents.mm @@ -9,7 +9,7 @@ #include #include #include -#include "fileio.h" +#include "fileio.hpp" #include "boe.global.h" #include "dlogutil.hpp" #include "universe.h" diff --git a/src/boe.combat.cpp b/src/boe.combat.cpp index ce4aa12b..3a6f4a58 100644 --- a/src/boe.combat.cpp +++ b/src/boe.combat.cpp @@ -15,12 +15,12 @@ #include "boe.items.h" #include "boe.party.h" #include "boe.combat.h" -#include "soundtool.h" +#include "soundtool.hpp" #include "boe.town.h" #include "boe.specials.h" #include "boe.graphutil.h" #include "boe.main.h" -#include "mathutil.h" +#include "mathutil.hpp" #include "dlogutil.hpp" #include "boe.menus.h" #include "spell.hpp" diff --git a/src/boe.dlgutil.cpp b/src/boe.dlgutil.cpp index da4f3c31..13559956 100644 --- a/src/boe.dlgutil.cpp +++ b/src/boe.dlgutil.cpp @@ -19,15 +19,15 @@ #include "boe.townspec.h" #include "boe.main.h" #include "boe.items.h" -#include "soundtool.h" +#include "soundtool.hpp" #include #include "boe.newgraph.h" #include "boe.infodlg.h" -#include "graphtool.h" -#include "mathutil.h" +#include "graphtool.hpp" +#include "mathutil.hpp" #include "dlogutil.hpp" -#include "winutil.h" -#include "fileio.h" +#include "winutil.hpp" +#include "fileio.hpp" #include "restypes.hpp" #include "scrollbar.hpp" #include "button.hpp" diff --git a/src/boe.fileio.cpp b/src/boe.fileio.cpp index 3caee26d..0b0f8c5d 100644 --- a/src/boe.fileio.cpp +++ b/src/boe.fileio.cpp @@ -16,12 +16,11 @@ #include "boe.dlgutil.h" #include "boe.infodlg.h" #include "boe.graphutil.h" -#include "graphtool.h" -#include "soundtool.h" -#include "mathutil.h" +#include "graphtool.hpp" +#include "soundtool.hpp" +#include "mathutil.hpp" #include "dlogutil.hpp" -#include "fileio.h" -#include "porting.h" // only needed for one little flip_short call, though... +#include "fileio.hpp" #include #include "restypes.hpp" diff --git a/src/boe.graphics.cpp b/src/boe.graphics.cpp index 72df048c..349dcb7f 100644 --- a/src/boe.graphics.cpp +++ b/src/boe.graphics.cpp @@ -13,9 +13,9 @@ #include "boe.monster.h" #include "boe.locutils.h" #include "boe.text.h" -#include "graphtool.h" -#include "soundtool.h" -#include "mathutil.h" +#include "graphtool.hpp" +#include "soundtool.hpp" +#include "mathutil.hpp" #include "boe.party.h" #include "boe.town.h" @@ -27,7 +27,7 @@ #include "restypes.hpp" #include "boe.menus.h" -#include "winutil.h" +#include "winutil.hpp" extern sf::RenderWindow mainPtr; extern short stat_window; diff --git a/src/boe.graphutil.cpp b/src/boe.graphutil.cpp index 07efdb42..7df6c742 100644 --- a/src/boe.graphutil.cpp +++ b/src/boe.graphutil.cpp @@ -16,9 +16,9 @@ #include "boe.infodlg.h" #include "boe.monster.h" #include "boe.specials.h" -#include "soundtool.h" -#include "graphtool.h" -#include "mathutil.h" +#include "soundtool.hpp" +#include "graphtool.hpp" +#include "mathutil.hpp" #include "dlogutil.hpp" extern sf::RenderWindow mainPtr; diff --git a/src/boe.infodlg.cpp b/src/boe.infodlg.cpp index 0fd28fac..68eb374c 100644 --- a/src/boe.infodlg.cpp +++ b/src/boe.infodlg.cpp @@ -16,13 +16,13 @@ #include "boe.party.h" #include "boe.locutils.h" #include "boe.text.h" -#include "soundtool.h" +#include "soundtool.hpp" #include "boe.infodlg.h" #include "boe.fileio.h" #include "boe.main.h" -#include "mathutil.h" +#include "mathutil.hpp" #include "dlogutil.hpp" -#include "fileio.h" +#include "fileio.hpp" #include "restypes.hpp" #include #include "prefs.hpp" diff --git a/src/boe.itemdata.cpp b/src/boe.itemdata.cpp index cca5fd76..67f64825 100644 --- a/src/boe.itemdata.cpp +++ b/src/boe.itemdata.cpp @@ -8,7 +8,7 @@ #include "classes.h" #include "boe.itemdata.h" -#include "mathutil.h" +#include "mathutil.hpp" //extern piles_of_stuff_dumping_type *data_store; //item_record_type convert_item (short_item_record_type s_item); diff --git a/src/boe.items.cpp b/src/boe.items.cpp index abdc20f8..e5605407 100644 --- a/src/boe.items.cpp +++ b/src/boe.items.cpp @@ -17,17 +17,17 @@ #include "boe.newgraph.h" #include "boe.itemdata.h" #include "boe.infodlg.h" -#include "soundtool.h" +#include "soundtool.hpp" #include "boe.monster.h" #include "boe.main.h" -#include "graphtool.h" -#include "mathutil.h" +#include "graphtool.hpp" +#include "mathutil.hpp" #include "dlogutil.hpp" #include "restypes.hpp" #include "message.hpp" #include #include -#include "winutil.h" +#include "winutil.hpp" extern short stat_window,which_combat_type,current_pc; extern eGameMode overall_mode; diff --git a/src/boe.locutils.cpp b/src/boe.locutils.cpp index ed3eaf39..83f716b2 100644 --- a/src/boe.locutils.cpp +++ b/src/boe.locutils.cpp @@ -1,7 +1,7 @@ //#include "item.h" -#include "mathutil.h" +#include "mathutil.hpp" #include "boe.global.h" #include "classes.h" diff --git a/src/boe.main.cpp b/src/boe.main.cpp index 2098f5c0..b9e473cc 100644 --- a/src/boe.main.cpp +++ b/src/boe.main.cpp @@ -19,15 +19,15 @@ #include "boe.dlgutil.h" #include "boe.infodlg.h" #include "boe.main.h" -#include "winutil.h" -#include "soundtool.h" -#include "graphtool.h" -#include "mathutil.h" -#include "fileio.h" +#include "winutil.hpp" +#include "soundtool.hpp" +#include "graphtool.hpp" +#include "mathutil.hpp" +#include "fileio.hpp" #include "dlogutil.hpp" #include "scrollbar.hpp" #include "boe.menus.h" -#include "cursors.h" +#include "cursors.hpp" #include "prefs.hpp" extern cursor_type arrow_curs[3][3]; diff --git a/src/boe.monster.cpp b/src/boe.monster.cpp index a9120b1e..f5129d05 100644 --- a/src/boe.monster.cpp +++ b/src/boe.monster.cpp @@ -11,12 +11,12 @@ #include "boe.text.h" #include "boe.specials.h" #include "boe.items.h" -#include "soundtool.h" +#include "soundtool.hpp" #include "boe.graphics.h" #include "boe.newgraph.h" #include "boe.main.h" -#include "mathutil.h" -#include "graphtool.h" +#include "mathutil.hpp" +#include "graphtool.hpp" //extern current_town_type univ.town; //extern party_record_type party; diff --git a/src/boe.newgraph.cpp b/src/boe.newgraph.cpp index 32d21996..9e7b246f 100644 --- a/src/boe.newgraph.cpp +++ b/src/boe.newgraph.cpp @@ -16,9 +16,9 @@ #include "boe.itemdata.h" #include "boe.locutils.h" #include "boe.text.h" -#include "soundtool.h" -#include "mathutil.h" -#include "graphtool.h" +#include "soundtool.hpp" +#include "mathutil.hpp" +#include "graphtool.hpp" #include "scrollbar.hpp" #include #include "location.h" diff --git a/src/boe.party.cpp b/src/boe.party.cpp index 6a582ab5..07bbf315 100644 --- a/src/boe.party.cpp +++ b/src/boe.party.cpp @@ -24,13 +24,13 @@ #include "boe.combat.h" #include "boe.locutils.h" #include "boe.text.h" -#include "soundtool.h" +#include "soundtool.hpp" #include "boe.main.h" -#include "graphtool.h" -#include "mathutil.h" +#include "graphtool.hpp" +#include "mathutil.hpp" #include "dlogutil.hpp" -#include "winutil.h" -#include "fileio.h" +#include "winutil.hpp" +#include "fileio.hpp" #include "boe.menus.h" #include "restypes.hpp" #include diff --git a/src/boe.specials.cpp b/src/boe.specials.cpp index 72596c53..9f10ddfd 100644 --- a/src/boe.specials.cpp +++ b/src/boe.specials.cpp @@ -18,17 +18,17 @@ #include "boe.monster.h" #include "boe.locutils.h" #include "boe.actions.h" -#include "soundtool.h" +#include "soundtool.hpp" #include "boe.townspec.h" #include "boe.graphics.h" #include "boe.fileio.h" #include "boe.specials.h" #include "boe.newgraph.h" #include "boe.dlgutil.h" -#include "mathutil.h" +#include "mathutil.hpp" #include "boe.main.h" #include "dlogutil.hpp" -#include "fileio.h" +#include "fileio.hpp" #include extern sf::RenderWindow mainPtr; diff --git a/src/boe.startup.cpp b/src/boe.startup.cpp index d3f944ae..d7f857aa 100644 --- a/src/boe.startup.cpp +++ b/src/boe.startup.cpp @@ -15,12 +15,12 @@ #include "boe.party.h" #include "boe.startup.h" #include "boe.party.h" -#include "soundtool.h" -#include "fileio.h" +#include "soundtool.hpp" +#include "fileio.hpp" #include "dlogutil.hpp" -#include "winutil.h" +#include "winutil.hpp" #include "boe.menus.h" -#include "mathutil.h" +#include "mathutil.hpp" #include using std::vector; diff --git a/src/boe.text.cpp b/src/boe.text.cpp index 286d01f8..f36fd833 100644 --- a/src/boe.text.cpp +++ b/src/boe.text.cpp @@ -10,8 +10,8 @@ #include "classes.h" #include "boe.text.h" #include "boe.locutils.h" -#include "mathutil.h" -#include "graphtool.h" +#include "mathutil.hpp" +#include "graphtool.hpp" //#include "soundtool.h" #include "scrollbar.hpp" #include "restypes.hpp" diff --git a/src/boe.town.cpp b/src/boe.town.cpp index c7d22674..c6f8750e 100644 --- a/src/boe.town.cpp +++ b/src/boe.town.cpp @@ -19,16 +19,16 @@ #include "boe.combat.h" #include "boe.party.h" #include "boe.text.h" -#include "soundtool.h" +#include "soundtool.hpp" #include "boe.locutils.h" #include "boe.specials.h" #include "boe.infodlg.h" -#include "mathutil.h" +#include "mathutil.hpp" #include "boe.main.h" -#include "graphtool.h" +#include "graphtool.hpp" #include "dlogutil.hpp" -#include "fileio.h" -#include "winutil.h" +#include "fileio.hpp" +#include "winutil.hpp" //extern current_town_type univ.town; //extern party_record_type party; diff --git a/src/boe.townspec.cpp b/src/boe.townspec.cpp index 75a26340..ce3ce41b 100644 --- a/src/boe.townspec.cpp +++ b/src/boe.townspec.cpp @@ -15,10 +15,10 @@ #include "boe.text.h" #include "boe.itemdata.h" #include "boe.townspec.h" -#include "soundtool.h" -#include "mathutil.h" +#include "soundtool.hpp" +#include "mathutil.hpp" #include "dlogutil.hpp" -#include "winutil.h" +#include "winutil.hpp" extern eGameMode overall_mode; //extern party_record_type univ.party; diff --git a/src/classes/location.cpp b/src/classes/location.cpp index 52878f76..fdcec155 100644 --- a/src/classes/location.cpp +++ b/src/classes/location.cpp @@ -7,7 +7,7 @@ */ #include "location.h" -#include "mathutil.h" +#include "mathutil.hpp" bool operator == (location p1,location p2){ if((p1.x == p2.x) & (p1.y == p2.y)) diff --git a/src/classes/monster.cpp b/src/classes/monster.cpp index 27d11df8..d8898c64 100644 --- a/src/classes/monster.cpp +++ b/src/classes/monster.cpp @@ -14,7 +14,7 @@ #include "classes.h" #include "oldstructs.h" -#include "fileio.h" +#include "fileio.hpp" void cMonster::append(legacy::monster_record_type& old){ level = old.level; diff --git a/src/classes/monster.h b/src/classes/monster.h index 84926bec..e9752aeb 100644 --- a/src/classes/monster.h +++ b/src/classes/monster.h @@ -13,9 +13,9 @@ #include #include -#include "soundtool.h" +#include "soundtool.hpp" #include "simpletypes.h" -#include "graphtool.h" +#include "graphtool.hpp" namespace legacy { struct monster_record_type; diff --git a/src/classes/party.cpp b/src/classes/party.cpp index 3387dd39..b4c3b4c4 100644 --- a/src/classes/party.cpp +++ b/src/classes/party.cpp @@ -15,7 +15,7 @@ #include "dlogutil.hpp" #include "classes.h" #include "oldstructs.h" -#include "fileio.h" +#include "fileio.hpp" cParty::cParty(cUniverse& univ, long party_preset) : univ(univ) { gold = 200; diff --git a/src/classes/regtown.cpp b/src/classes/regtown.cpp index b55845eb..5a711d68 100644 --- a/src/classes/regtown.cpp +++ b/src/classes/regtown.cpp @@ -14,7 +14,7 @@ #include "dlogutil.hpp" #include "classes.h" #include "oldstructs.h" -#include "fileio.h" +#include "fileio.hpp" void cTinyTown::append(legacy::tiny_tr_type& old, int town_num){ int i,j; diff --git a/src/classes/shop.cpp b/src/classes/shop.cpp index d7642841..308682db 100644 --- a/src/classes/shop.cpp +++ b/src/classes/shop.cpp @@ -8,8 +8,8 @@ #include "shop.hpp" #include -#include "mathutil.h" -#include "graphtool.h" // for get_str +#include "mathutil.hpp" +#include "graphtool.hpp" // for get_str static long cost_mult[7] = {5,7,10,13,16,20,25}; diff --git a/src/classes/spell.cpp b/src/classes/spell.cpp index 7749c6d7..de218797 100644 --- a/src/classes/spell.cpp +++ b/src/classes/spell.cpp @@ -7,7 +7,7 @@ // #include "spell.hpp" -#include "graphtool.h" // for get_str +#include "graphtool.hpp" // for get_str std::map cSpell::dictionary; diff --git a/src/classes/terrain.h b/src/classes/terrain.h index 7b0c3ac2..29ffe06b 100644 --- a/src/classes/terrain.h +++ b/src/classes/terrain.h @@ -13,7 +13,8 @@ #include #include "simpletypes.h" -#include "graphtool.h" // for pic_num_t +#include "pictypes.hpp" +#include "location.h" namespace legacy { struct terrain_type_type; }; diff --git a/src/classes/universe.cpp b/src/classes/universe.cpp index e4d80afc..95c24b97 100644 --- a/src/classes/universe.cpp +++ b/src/classes/universe.cpp @@ -13,8 +13,8 @@ #include "classes.h" #include "oldstructs.h" -#include "mathutil.h" -#include "fileio.h" +#include "mathutil.hpp" +#include "fileio.hpp" void cCurOut::append(legacy::out_info_type& old){ for(int i = 0; i < 96; i++) diff --git a/src/dialogxml/button.cpp b/src/dialogxml/button.cpp index 250030af..904d81ad 100644 --- a/src/dialogxml/button.cpp +++ b/src/dialogxml/button.cpp @@ -13,7 +13,7 @@ #include #include "dialog.hpp" -#include "graphtool.h" +#include "graphtool.hpp" #include #include diff --git a/src/dialogxml/button.hpp b/src/dialogxml/button.hpp index 7572c827..e6ee1dc2 100644 --- a/src/dialogxml/button.hpp +++ b/src/dialogxml/button.hpp @@ -18,7 +18,7 @@ #include #include #include "control.hpp" -#include "graphtool.h" // for eFont +#include "graphtool.hpp" // for eFont /// A button type. enum eBtnType { // w x h diff --git a/src/dialogxml/control.cpp b/src/dialogxml/control.cpp index eec140bc..595e8612 100644 --- a/src/dialogxml/control.cpp +++ b/src/dialogxml/control.cpp @@ -9,11 +9,11 @@ #include "control.hpp" #include #include "dialog.hpp" -#include "soundtool.h" +#include "soundtool.hpp" #include "button.hpp" -#include "graphtool.h" +#include "graphtool.hpp" #include "restypes.hpp" -#include "mathutil.h" +#include "mathutil.hpp" extern bool play_sounds; diff --git a/src/dialogxml/dialog.cpp b/src/dialogxml/dialog.cpp index 2ed94618..98edbbc5 100644 --- a/src/dialogxml/dialog.cpp +++ b/src/dialogxml/dialog.cpp @@ -10,8 +10,8 @@ #include #include #include "dialog.hpp" -#include "graphtool.h" -#include "soundtool.h" +#include "graphtool.hpp" +#include "soundtool.hpp" using namespace std; using namespace ticpp; #include "pict.hpp" @@ -20,9 +20,9 @@ using namespace ticpp; #include "message.hpp" #include "scrollbar.hpp" #include "stack.hpp" -#include "winutil.h" -#include "mathutil.h" -#include "cursors.h" +#include "winutil.hpp" +#include "mathutil.hpp" +#include "cursors.hpp" // TODO: Would be nice if I could avoid depending on mainPtr extern sf::RenderWindow mainPtr; diff --git a/src/dialogxml/dlogutil.cpp b/src/dialogxml/dlogutil.cpp index 8147a5cf..ddf1593a 100644 --- a/src/dialogxml/dlogutil.cpp +++ b/src/dialogxml/dlogutil.cpp @@ -14,7 +14,7 @@ #include #include "dialog.hpp" #include "dlogutil.hpp" -#include "mathutil.h" +#include "mathutil.hpp" #include #include "message.hpp" diff --git a/src/dialogxml/dlogutil.hpp b/src/dialogxml/dlogutil.hpp index 81d015bc..84ffd8d3 100644 --- a/src/dialogxml/dlogutil.hpp +++ b/src/dialogxml/dlogutil.hpp @@ -16,8 +16,8 @@ #include #include #include -#include "graphtool.h" // for pic_num_t -#include "soundtool.h" // for snd_num_t +#include "pictypes.hpp" +#include "soundtool.hpp" // for snd_num_t #include "pict.hpp" #include "dialog.hpp" #include "button.hpp" diff --git a/src/dialogxml/field.cpp b/src/dialogxml/field.cpp index bbce86f6..9ea64427 100644 --- a/src/dialogxml/field.cpp +++ b/src/dialogxml/field.cpp @@ -13,9 +13,9 @@ #include #include "dialog.hpp" #include "dlogutil.hpp" -#include "graphtool.h" -#include "winutil.h" -#include "cursors.h" +#include "graphtool.hpp" +#include "winutil.hpp" +#include "cursors.hpp" void cTextField::attachClickHandler(click_callback_t) throw(xHandlerNotSupported){ throw xHandlerNotSupported(false); diff --git a/src/dialogxml/field.hpp b/src/dialogxml/field.hpp index 33fb1120..0d207c14 100644 --- a/src/dialogxml/field.hpp +++ b/src/dialogxml/field.hpp @@ -14,7 +14,7 @@ #include #include "control.hpp" -#include "graphtool.h" +#include "graphtool.hpp" /// The field's expected input type. enum eFldType { diff --git a/src/dialogxml/message.cpp b/src/dialogxml/message.cpp index 188ecf23..bc178df1 100644 --- a/src/dialogxml/message.cpp +++ b/src/dialogxml/message.cpp @@ -7,8 +7,8 @@ */ #include "message.hpp" -#include "graphtool.h" -#include "mathutil.h" +#include "graphtool.hpp" +#include "mathutil.hpp" #include "dialog.hpp" extern sf::Texture bg_gworld; diff --git a/src/dialogxml/message.hpp b/src/dialogxml/message.hpp index ff61d461..09ed29b6 100644 --- a/src/dialogxml/message.hpp +++ b/src/dialogxml/message.hpp @@ -16,7 +16,7 @@ #include #include "control.hpp" -#include "graphtool.h" // for eFont +#include "graphtool.hpp" // for eFont /// A simple static text message. /// This class can also create a frame for grouping controls or a clickable area. diff --git a/src/dialogxml/pict.cpp b/src/dialogxml/pict.cpp index de297b97..da5d87c0 100644 --- a/src/dialogxml/pict.cpp +++ b/src/dialogxml/pict.cpp @@ -11,7 +11,7 @@ #include #include -#include "graphtool.h" +#include "graphtool.hpp" #include "dialog.hpp" #include "restypes.hpp" diff --git a/src/dialogxml/pict.hpp b/src/dialogxml/pict.hpp index 7e16a729..2b043883 100644 --- a/src/dialogxml/pict.hpp +++ b/src/dialogxml/pict.hpp @@ -16,7 +16,6 @@ #include #include -#include "graphtool.h" // for pic_num_t #include "control.hpp" #include "pictypes.hpp" diff --git a/src/dialogxml/scrollbar.cpp b/src/dialogxml/scrollbar.cpp index 13fe19ab..2e1a7869 100644 --- a/src/dialogxml/scrollbar.cpp +++ b/src/dialogxml/scrollbar.cpp @@ -8,8 +8,8 @@ #include "scrollbar.hpp" #include "restypes.hpp" -#include "graphtool.h" -#include "mathutil.h" +#include "graphtool.hpp" +#include "mathutil.hpp" sf::Texture cScrollbar::scroll_gw; tessel_ref_t cScrollbar::bar_tessel[2]; diff --git a/src/dialogxml/scrollbar.hpp b/src/dialogxml/scrollbar.hpp index 86ade382..93792dd9 100644 --- a/src/dialogxml/scrollbar.hpp +++ b/src/dialogxml/scrollbar.hpp @@ -13,7 +13,7 @@ /// Scrollbar-related classes and types. #include "control.hpp" -#include "graphtool.h" +#include "graphtool.hpp" /// A simple vertical scrollbar. /// This has no coupling with scrollable data; that must be handled externally by diff --git a/src/pcedit/pc.action.cpp b/src/pcedit/pc.action.cpp index ebe534ce..788a64db 100644 --- a/src/pcedit/pc.action.cpp +++ b/src/pcedit/pc.action.cpp @@ -7,9 +7,9 @@ #include "pc.editors.h" #include "pc.fileio.h" #include "pc.action.h" -#include "graphtool.h" -#include "soundtool.h" -#include "mathutil.h" +#include "graphtool.hpp" +#include "soundtool.hpp" +#include "mathutil.hpp" #include "dlogutil.hpp" #include diff --git a/src/pcedit/pc.editors.cpp b/src/pcedit/pc.editors.cpp index 86363ab7..52b71267 100644 --- a/src/pcedit/pc.editors.cpp +++ b/src/pcedit/pc.editors.cpp @@ -3,12 +3,12 @@ #include "pc.global.h" #include "classes.h" #include "pc.editors.h" -#include "graphtool.h" +#include "graphtool.hpp" #include "dialog.hpp" #include "control.hpp" #include "button.hpp" #include "dlogutil.hpp" -#include "winutil.h" +#include "winutil.hpp" #include /* diff --git a/src/pcedit/pc.fileio.cpp b/src/pcedit/pc.fileio.cpp index b5cdf539..e89292fc 100644 --- a/src/pcedit/pc.fileio.cpp +++ b/src/pcedit/pc.fileio.cpp @@ -6,13 +6,13 @@ #include "classes.h" #include "pc.fileio.h" #include "pc.graphics.h" -#include "graphtool.h" -#include "soundtool.h" +#include "graphtool.hpp" +#include "soundtool.hpp" #include "pc.editors.h" -#include "mathutil.h" +#include "mathutil.hpp" #include "dlogutil.hpp" #include "restypes.hpp" -#include "fileio.h" +#include "fileio.hpp" #define DONE_BUTTON_ITEM 1 diff --git a/src/pcedit/pc.graphics.cpp b/src/pcedit/pc.graphics.cpp index 5eaf267f..b78faffa 100644 --- a/src/pcedit/pc.graphics.cpp +++ b/src/pcedit/pc.graphics.cpp @@ -1,16 +1,16 @@ -//#include + #include #include "pc.global.h" #include "classes.h" #include "pc.graphics.h" #include "pc.editors.h" #include "pc.action.h" -#include "soundtool.h" -#include "graphtool.h" +#include "soundtool.hpp" +#include "graphtool.hpp" #include "dlogutil.hpp" #include "restypes.hpp" #include "message.hpp" -#include "mathutil.h" +#include "mathutil.hpp" extern cUniverse univ; diff --git a/src/pcedit/pc.main.cpp b/src/pcedit/pc.main.cpp index 2a755569..2e8c6ed4 100644 --- a/src/pcedit/pc.main.cpp +++ b/src/pcedit/pc.main.cpp @@ -8,14 +8,14 @@ #include "pc.editors.h" #include "pc.action.h" #include "pc.fileio.h" -#include "soundtool.h" -#include "graphtool.h" +#include "soundtool.hpp" +#include "graphtool.hpp" #include "boe.consts.h" #include "dlogutil.hpp" -#include "fileio.h" +#include "fileio.hpp" #include "pc.menus.h" -#include "winutil.h" -#include "cursors.h" +#include "winutil.hpp" +#include "cursors.hpp" cUniverse univ; diff --git a/src/scenedit/scen.actions.cpp b/src/scenedit/scen.actions.cpp index 15ad7318..67893fb0 100644 --- a/src/scenedit/scen.actions.cpp +++ b/src/scenedit/scen.actions.cpp @@ -3,20 +3,19 @@ #include #include "scen.global.h" #include "classes.h" -#include "graphtool.h" +#include "graphtool.hpp" #include "scen.graphics.h" #include "scen.actions.h" -#include "soundtool.h" +#include "soundtool.hpp" #include "scen.core.h" #include "scen.fileio.h" #include "scen.keydlgs.h" #include "scen.townout.h" #include "scen.menus.h" -#include "mathutil.h" -#include "fileio.h" -//#include "scen.locutils.h" -#include "winutil.h" -#include "cursors.h" +#include "mathutil.hpp" +#include "fileio.hpp" +#include "winutil.hpp" +#include "cursors.hpp" #include "scrollbar.hpp" #include "dlogutil.hpp" diff --git a/src/scenedit/scen.btnmg.cpp b/src/scenedit/scen.btnmg.cpp index 6ba4bffe..d4385758 100644 --- a/src/scenedit/scen.btnmg.cpp +++ b/src/scenedit/scen.btnmg.cpp @@ -4,7 +4,7 @@ #include "scen.global.h" #include "classes.h" -#include "graphtool.h" +#include "graphtool.hpp" #include "scen.graphics.h" #include #include "scen.btnmg.h" diff --git a/src/scenedit/scen.core.cpp b/src/scenedit/scen.core.cpp index 98f2c6b2..4fc1d31c 100644 --- a/src/scenedit/scen.core.cpp +++ b/src/scenedit/scen.core.cpp @@ -4,7 +4,7 @@ #include #include "scen.global.h" #include "classes.h" -#include "graphtool.h" +#include "graphtool.hpp" #include "scen.graphics.h" //#include "itemlist.h" #include "scen.core.h" @@ -15,7 +15,7 @@ #include "scen.menus.h" #include "dialog.hpp" #include "dlogutil.hpp" -#include "fileio.h" +#include "fileio.hpp" #include "field.hpp" #include "restypes.hpp" diff --git a/src/scenedit/scen.fileio.cpp b/src/scenedit/scen.fileio.cpp index c3c3f567..08af2dba 100644 --- a/src/scenedit/scen.fileio.cpp +++ b/src/scenedit/scen.fileio.cpp @@ -4,12 +4,12 @@ #include #include "scen.fileio.h" #include "scen.keydlgs.h" -#include "graphtool.h" +#include "graphtool.hpp" #include "scen.core.h" -#include "soundtool.h" -#include "mathutil.h" +#include "soundtool.hpp" +#include "mathutil.hpp" #include "oldstructs.h" -#include "fileio.h" +#include "fileio.hpp" #include "dlogutil.hpp" #include diff --git a/src/scenedit/scen.graphics.cpp b/src/scenedit/scen.graphics.cpp index cdd9ceb1..4deeeed5 100644 --- a/src/scenedit/scen.graphics.cpp +++ b/src/scenedit/scen.graphics.cpp @@ -4,12 +4,12 @@ #include #include "scen.global.h" #include "classes.h" -#include "graphtool.h" +#include "graphtool.hpp" #include "scen.graphics.h" #include #include "scen.keydlgs.h" -#include "soundtool.h" -#include "mathutil.h" +#include "soundtool.hpp" +#include "mathutil.hpp" #include "boe.consts.h" // TODO: Put these constants in a global file #include "dialog.hpp" diff --git a/src/scenedit/scen.keydlgs.cpp b/src/scenedit/scen.keydlgs.cpp index d70a764b..5519f163 100644 --- a/src/scenedit/scen.keydlgs.cpp +++ b/src/scenedit/scen.keydlgs.cpp @@ -5,7 +5,7 @@ #include #include "scen.global.h" #include "classes.h" -#include "graphtool.h" +#include "graphtool.hpp" #include "scen.graphics.h" #include "scen.keydlgs.h" #include "scen.core.h" diff --git a/src/scenedit/scen.main.cpp b/src/scenedit/scen.main.cpp index cb7e1508..a3b91e98 100644 --- a/src/scenedit/scen.main.cpp +++ b/src/scenedit/scen.main.cpp @@ -4,20 +4,20 @@ #include "scen.global.h" #include "classes.h" -#include "graphtool.h" +#include "graphtool.hpp" #include "scen.graphics.h" #include "scen.actions.h" #include "scen.fileio.h" #include "scen.btnmg.h" -#include "soundtool.h" +#include "soundtool.hpp" #include "scen.townout.h" #include "scen.core.h" #include "scen.keydlgs.h" -#include "mathutil.h" -#include "fileio.h" +#include "mathutil.hpp" +#include "fileio.hpp" #include "scrollbar.hpp" -#include "winutil.h" -#include "cursors.h" +#include "winutil.hpp" +#include "cursors.hpp" #include "dlogutil.hpp" #include "scen.menus.h" diff --git a/src/scenedit/scen.menus.mac.mm b/src/scenedit/scen.menus.mac.mm index 7cb899a3..1eff0ef7 100644 --- a/src/scenedit/scen.menus.mac.mm +++ b/src/scenedit/scen.menus.mac.mm @@ -9,7 +9,7 @@ #include "scen.menus.h" #include #include "scenario.h" -#include "winutil.h" +#include "winutil.hpp" using MenuHandle = NSMenu*; MenuHandle menu_bar_handle; diff --git a/src/scenedit/scen.townout.cpp b/src/scenedit/scen.townout.cpp index da08ae1a..b2ebde40 100644 --- a/src/scenedit/scen.townout.cpp +++ b/src/scenedit/scen.townout.cpp @@ -4,18 +4,18 @@ #include #include "scen.global.h" #include "classes.h" -#include "graphtool.h" +#include "graphtool.hpp" #include "scen.graphics.h" #include "scen.townout.h" #include "scen.keydlgs.h" #include "scen.fileio.h" #include "scen.core.h" -#include "mathutil.h" +#include "mathutil.hpp" #include "button.hpp" #include "dlogutil.hpp" -#include "winutil.h" +#include "winutil.hpp" #include "stack.hpp" -#include "fileio.h" +#include "fileio.hpp" extern short cen_x, cen_y, overall_mode;//,user_given_password; extern bool mouse_button_held,editing_town; diff --git a/src/tools/cursors.h b/src/tools/cursors.hpp similarity index 100% rename from src/tools/cursors.h rename to src/tools/cursors.hpp diff --git a/src/tools/cursors.mac.mm b/src/tools/cursors.mac.mm index 483b23f9..2b762d75 100644 --- a/src/tools/cursors.mac.mm +++ b/src/tools/cursors.mac.mm @@ -6,7 +6,7 @@ // Wrappers for NSCursor, based on an Apple example // -#include "cursors.h" +#include "cursors.hpp" #include #include #include "restypes.hpp" diff --git a/src/tools/cursors.win.cpp b/src/tools/cursors.win.cpp index f1d49db6..b031b115 100644 --- a/src/tools/cursors.win.cpp +++ b/src/tools/cursors.win.cpp @@ -1,5 +1,5 @@ -#include "cursors.h" +#include "cursors.hpp" #include #include #include diff --git a/src/tools/fileio.cpp b/src/tools/fileio.cpp index bd03f1f1..06ca003a 100644 --- a/src/tools/fileio.cpp +++ b/src/tools/fileio.cpp @@ -6,7 +6,7 @@ * */ -#include "fileio.h" +#include "fileio.hpp" #include #include @@ -16,13 +16,13 @@ #include "classes.h" #include "map_parse.hpp" -#include "graphtool.h" -#include "mathutil.h" +#include "graphtool.hpp" +#include "mathutil.hpp" -#include "porting.h" +#include "porting.hpp" #include "restypes.hpp" #include "tarball.hpp" -#include "cursors.h" +#include "cursors.hpp" bool cur_scen_is_mac = true, mac_is_intel; extern sf::Texture items_gworld,tiny_obj_gworld,fields_gworld,roads_gworld,boom_gworld,missiles_gworld; diff --git a/src/tools/fileio.h b/src/tools/fileio.hpp similarity index 100% rename from src/tools/fileio.h rename to src/tools/fileio.hpp diff --git a/src/tools/graphtool.cpp b/src/tools/graphtool.cpp index 3398b9f6..d4f1173c 100644 --- a/src/tools/graphtool.cpp +++ b/src/tools/graphtool.cpp @@ -7,7 +7,7 @@ */ #define GRAPHTOOL_CPP -#include "graphtool.h" +#include "graphtool.hpp" #ifdef __APPLE__ #include @@ -25,8 +25,8 @@ #include #include "restypes.hpp" -#include "mathutil.h" -#include "fileio.h" +#include "mathutil.hpp" +#include "fileio.hpp" using boost::math::constants::pi; diff --git a/src/tools/graphtool.h b/src/tools/graphtool.hpp similarity index 100% rename from src/tools/graphtool.h rename to src/tools/graphtool.hpp diff --git a/src/tools/mathutil.cpp b/src/tools/mathutil.cpp index adcd212d..de2916da 100644 --- a/src/tools/mathutil.cpp +++ b/src/tools/mathutil.cpp @@ -7,7 +7,7 @@ */ #include -#include "mathutil.h" +#include "mathutil.hpp" short get_ran (short times,short min,short max){ long int store; diff --git a/src/tools/mathutil.h b/src/tools/mathutil.hpp similarity index 100% rename from src/tools/mathutil.h rename to src/tools/mathutil.hpp diff --git a/src/tools/porting.cpp b/src/tools/porting.cpp index 676468a6..e1e49a7a 100644 --- a/src/tools/porting.cpp +++ b/src/tools/porting.cpp @@ -6,7 +6,7 @@ * */ -#include "porting.h" +#include "porting.hpp" extern bool cur_scen_is_mac, mac_is_intel; diff --git a/src/tools/porting.h b/src/tools/porting.hpp similarity index 100% rename from src/tools/porting.h rename to src/tools/porting.hpp diff --git a/src/tools/qdpict.cpp b/src/tools/qdpict.cpp index 8ba0e3d6..b7c04312 100644 --- a/src/tools/qdpict.cpp +++ b/src/tools/qdpict.cpp @@ -17,7 +17,7 @@ #include #include "dlogutil.hpp" -#include "porting.h" +#include "porting.hpp" #include "location.h" static int16_t extract_word(char* ptr) { diff --git a/src/tools/resmgr/restypes.hpp b/src/tools/resmgr/restypes.hpp index 65f1891e..218dc7b5 100644 --- a/src/tools/resmgr/restypes.hpp +++ b/src/tools/resmgr/restypes.hpp @@ -19,7 +19,7 @@ #include #include #include -#include "cursors.h" +#include "cursors.hpp" #include "location.h" using ImageRsrc = sf::Image; diff --git a/src/tools/soundtool.cpp b/src/tools/soundtool.cpp index 4f606bc3..654af155 100644 --- a/src/tools/soundtool.cpp +++ b/src/tools/soundtool.cpp @@ -5,7 +5,7 @@ * Created by Celtic Minstrel on 16/04/09. * */ -#include "soundtool.h" +#include "soundtool.hpp" #include #include @@ -15,7 +15,7 @@ #include #include "restypes.hpp" -#include "mathutil.h" +#include "mathutil.hpp" std::shared_ptr sound_handles[NUM_SOUNDS]; sf::Sound chan[4]; diff --git a/src/tools/soundtool.h b/src/tools/soundtool.hpp similarity index 100% rename from src/tools/soundtool.h rename to src/tools/soundtool.hpp diff --git a/src/tools/undo.cpp b/src/tools/undo.cpp index 73222ad1..56c81237 100644 --- a/src/tools/undo.cpp +++ b/src/tools/undo.cpp @@ -6,7 +6,7 @@ * */ -#include "undo.h" +#include "undo.hpp" cUndoList::cUndoList(){ lastSave = cur = theList.begin(); diff --git a/src/tools/undo.h b/src/tools/undo.hpp similarity index 100% rename from src/tools/undo.h rename to src/tools/undo.hpp diff --git a/src/tools/winutil.h b/src/tools/winutil.hpp similarity index 100% rename from src/tools/winutil.h rename to src/tools/winutil.hpp diff --git a/src/tools/winutil.mac.mm b/src/tools/winutil.mac.mm index d3198104..f8602d02 100644 --- a/src/tools/winutil.mac.mm +++ b/src/tools/winutil.mac.mm @@ -6,7 +6,7 @@ // // -#include "winutil.h" +#include "winutil.hpp" #include #include diff --git a/src/tools/winutil.win.cpp b/src/tools/winutil.win.cpp index 714844c1..0fb5d408 100644 --- a/src/tools/winutil.win.cpp +++ b/src/tools/winutil.win.cpp @@ -1,5 +1,5 @@ -#include "winutil.h" +#include "winutil.hpp" #include #include #include