openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Split up files so that the scenario editor will build

Browse Source 
- cCreature split into seperate file-pair from cMonster/cTownperson
- fileio.cpp split into general, party, and scenario sections
- classes.h file deleted
This commit is contained in:
Celtic Minstrel
2015-01-24 21:29:34 -05:00
parent 7f8f18a5fb
commit 99bb11dd3b
64 changed files with 1423 additions and 1335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/BoE.xcodeproj/project.pbxproj
View File

@@ -117,14 +117,14 @@
913D005C0F9FEEC300184C18 /* porting.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 913D005A0F9FEEC200184C18 /* porting.cpp */; };
913D005D0F9FEEC300184C18 /* porting.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 913D005A0F9FEEC200184C18 /* porting.cpp */; };
913D05B60FA1E9E300184C18 /* party.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 913D05B50FA1E9E300184C18 /* party.cpp */; };
913D05B70FA1E9E300184C18 /* party.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 913D05B50FA1E9E300184C18 /* party.cpp */; };
913D05B80FA1E9E300184C18 /* party.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 913D05B50FA1E9E300184C18 /* party.cpp */; };
913D05BC0FA1EA0A00184C18 /* pc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 913D05BB0FA1EA0A00184C18 /* pc.cpp */; };
913D05BD0FA1EA0A00184C18 /* pc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 913D05BB0FA1EA0A00184C18 /* pc.cpp */; };
913D05BE0FA1EA0A00184C18 /* pc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 913D05BB0FA1EA0A00184C18 /* pc.cpp */; };
913D6C050FC57A8E00E12527 /* boeresources.icns in Resources */ = {isa = PBXBuildFile; fileRef = 913D6C040FC57A8E00E12527 /* boeresources.icns */; };
914698F81A73434400F20F5E /* shop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91FDB5791A4E774E00DE5983 /* shop.cpp */; };
914698FC1A74216F00F20F5E /* living.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 914698FB1A7362D900F20F5E /* living.cpp */; };
914699001A747C6500F20F5E /* creature.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 914698FE1A747C4500F20F5E /* creature.cpp */; };
914699011A747C6600F20F5E /* creature.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 914698FE1A747C4500F20F5E /* creature.cpp */; };
914701A718F62ABF008A6DC9 /* dungeon.ttf in Copy Fonts */ = {isa = PBXBuildFile; fileRef = 914701A418F629D4008A6DC9 /* dungeon.ttf */; };
914701A818F62AC0008A6DC9 /* maidenword.ttf in Copy Fonts */ = {isa = PBXBuildFile; fileRef = 914701A518F629D4008A6DC9 /* maidenword.ttf */; };
914B2AA318E7E507007B6799 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 914B2AA118E7E500007B6799 /* Cocoa.framework */; };
@@ -193,9 +193,7 @@
91AC60AA0FA26C1B00EEAE67 /* tmpltown.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91AC60A70FA26C1B00EEAE67 /* tmpltown.cpp */; };
91AC61C60FA2729900EEAE67 /* universe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91AC61C50FA2729900EEAE67 /* universe.cpp */; };
91AC620B0FA2853700EEAE67 /* creatlist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91AC620A0FA2853700EEAE67 /* creatlist.cpp */; };
91AC620C0FA2853700EEAE67 /* creatlist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91AC620A0FA2853700EEAE67 /* creatlist.cpp */; };
91AC620D0FA2853700EEAE67 /* creatlist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91AC620A0FA2853700EEAE67 /* creatlist.cpp */; };
91AC65520FA3441B00EEAE67 /* universe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91AC61C50FA2729900EEAE67 /* universe.cpp */; };
91AC65AD0FA34AC600EEAE67 /* universe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91AC61C50FA2729900EEAE67 /* universe.cpp */; };
91ACCE6418FFB61A00FAEF8B /* bladbase.exs in Copy Base Scenarios */ = {isa = PBXBuildFile; fileRef = 91B3EF250F969CE300BF5B67 /* bladbase.exs */; };
91ACCE7619002E5F00FAEF8B /* sfml-audio.framework in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8DD18F87F3700E3EA15 /* sfml-audio.framework */; };
@@ -246,6 +244,12 @@
91C749B81A2D6670008E0E10 /* strings in Copy Strings */ = {isa = PBXBuildFile; fileRef = 91C749B71A2D6432008E0E10 /* strings */; };
91C749BA1A2D670D008E0E10 /* dialogs in Copy Dialog Definitions */ = {isa = PBXBuildFile; fileRef = 91C749B91A2D66F7008E0E10 /* dialogs */; };
91D634560F8FD77800674AB3 /* BoE.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2B8F435C0C0973680012E4A8 /* BoE.icns */; };
91E30F2B1A74819C0057C54A /* fileio_party.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91E30F2A1A74819B0057C54A /* fileio_party.cpp */; };
91E30F2C1A74819D0057C54A /* fileio_party.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91E30F2A1A74819B0057C54A /* fileio_party.cpp */; };
91E30F2E1A7481C40057C54A /* fileio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91E30F2D1A7481C20057C54A /* fileio.cpp */; };
91E30F2F1A7481C50057C54A /* fileio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91E30F2D1A7481C20057C54A /* fileio.cpp */; };
91E30F301A7481C50057C54A /* fileio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91E30F2D1A7481C20057C54A /* fileio.cpp */; };
91E30F311A748ABA0057C54A /* fileio_scen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91E5C7A60F9F615400C21460 /* fileio_scen.cpp */; };
91E5C1F30F9E489B00C21460 /* graphtool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91B3F10A0F9779C300BF5B67 /* graphtool.cpp */; };
91E5C1F40F9E489B00C21460 /* soundtool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91B3F10F0F9779D000BF5B67 /* soundtool.cpp */; };
91E5C1F50F9E489B00C21460 /* mathutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91B3F11E0F97801F00BF5B67 /* mathutil.cpp */; };
@@ -261,9 +265,8 @@
91E5C79E0F9F60FA00C21460 /* outdoors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91E5C79D0F9F60FA00C21460 /* outdoors.cpp */; };
91E5C79F0F9F60FA00C21460 /* outdoors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91E5C79D0F9F60FA00C21460 /* outdoors.cpp */; };
91E5C7A00F9F60FA00C21460 /* outdoors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91E5C79D0F9F60FA00C21460 /* outdoors.cpp */; };
91E5C7A70F9F615400C21460 /* fileio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91E5C7A60F9F615400C21460 /* fileio.cpp */; };
91E5C7A80F9F615400C21460 /* fileio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91E5C7A60F9F615400C21460 /* fileio.cpp */; };
91E5C7A90F9F615400C21460 /* fileio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91E5C7A60F9F615400C21460 /* fileio.cpp */; };
91E5C7A70F9F615400C21460 /* fileio_scen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91E5C7A60F9F615400C21460 /* fileio_scen.cpp */; };
91E5C7A80F9F615400C21460 /* fileio_scen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91E5C7A60F9F615400C21460 /* fileio_scen.cpp */; };
91E5C7B80F9F619D00C21460 /* talking.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91E5C7B70F9F619D00C21460 /* talking.cpp */; };
91E5C7B90F9F619D00C21460 /* talking.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91E5C7B70F9F619D00C21460 /* talking.cpp */; };
91E5C7BA0F9F619D00C21460 /* talking.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91E5C7B70F9F619D00C21460 /* talking.cpp */; };
@@ -584,6 +587,8 @@
913FB40A1A5C90840067B9D2 /* pictypes.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = pictypes.hpp; sourceTree = "<group>"; };
914698FA1A7362C200F20F5E /* living.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = living.hpp; sourceTree = "<group>"; };
914698FB1A7362D900F20F5E /* living.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = living.cpp; sourceTree = "<group>"; };
914698FD1A747BED00F20F5E /* creature.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = creature.hpp; sourceTree = "<group>"; };
914698FE1A747C4500F20F5E /* creature.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = creature.cpp; sourceTree = "<group>"; };
914701A418F629D4008A6DC9 /* dungeon.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = dungeon.ttf; sourceTree = "<group>"; };
914701A518F629D4008A6DC9 /* maidenword.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = maidenword.ttf; sourceTree = "<group>"; };
914701A918F64A85008A6DC9 /* dialog.xsd */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = dialog.xsd; path = schemas/dialog.xsd; sourceTree = "<group>"; };
@@ -625,7 +630,6 @@
91AC607F0FA26A3B00EEAE67 /* regtown.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = regtown.cpp; sourceTree = "<group>"; };
91AC60A60FA26C1B00EEAE67 /* tmpltown.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tmpltown.h; sourceTree = "<group>"; };
91AC60A70FA26C1B00EEAE67 /* tmpltown.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tmpltown.cpp; sourceTree = "<group>"; };
91AC61300FA270B300EEAE67 /* classes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = classes.h; sourceTree = SOURCE_ROOT; };
91AC61C40FA2729900EEAE67 /* universe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = universe.h; sourceTree = "<group>"; };
91AC61C50FA2729900EEAE67 /* universe.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = universe.cpp; sourceTree = "<group>"; };
91AC62090FA2853700EEAE67 /* creatlist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = creatlist.h; sourceTree = "<group>"; };
@@ -686,13 +690,15 @@
91D635AD0F90E7B500674AB3 /* valleydy.meg */ = {isa = PBXFileReference; lastKnownFileType = file; path = valleydy.meg; sourceTree = "<group>"; };
91D635AE0F90E7B500674AB3 /* zakhazi.exs */ = {isa = PBXFileReference; lastKnownFileType = file; path = zakhazi.exs; sourceTree = "<group>"; };
91D635AF0F90E7B500674AB3 /* zakhazi.meg */ = {isa = PBXFileReference; lastKnownFileType = file; path = zakhazi.meg; sourceTree = "<group>"; };
91E30F2A1A74819B0057C54A /* fileio_party.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fileio_party.cpp; sourceTree = "<group>"; };
91E30F2D1A7481C20057C54A /* fileio.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fileio.cpp; sourceTree = "<group>"; };
91E5C5A10F9EACE200C21460 /* oldstructs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = oldstructs.h; path = ../oldstructs.h; sourceTree = "<group>"; };
91E5C7970F9F60EC00C21460 /* town.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = town.h; sourceTree = "<group>"; };
91E5C7980F9F60EC00C21460 /* town.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = town.cpp; sourceTree = "<group>"; };
91E5C79C0F9F60FA00C21460 /* outdoors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = outdoors.h; sourceTree = "<group>"; };
91E5C79D0F9F60FA00C21460 /* outdoors.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = outdoors.cpp; sourceTree = "<group>"; };
91E5C7A50F9F615400C21460 /* fileio.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = fileio.hpp; sourceTree = "<group>"; };
91E5C7A60F9F615400C21460 /* fileio.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fileio.cpp; sourceTree = "<group>"; };
91E5C7A60F9F615400C21460 /* fileio_scen.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fileio_scen.cpp; sourceTree = "<group>"; };
91E5C7B60F9F619D00C21460 /* talking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = talking.h; sourceTree = "<group>"; };
91E5C7B70F9F619D00C21460 /* talking.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = talking.cpp; sourceTree = "<group>"; };
91EC480E18FBAA8700BB1E86 /* prefs.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = prefs.hpp; sourceTree = "<group>"; };
@@ -855,7 +861,6 @@
children = (
913D03330FA0FFE800184C18 /* headers */,
913D03320FA0FFE700184C18 /* src */,
91AC61300FA270B300EEAE67 /* classes.h */,
91E5C5A10F9EACE200C21460 /* oldstructs.h */,
915325161A2E1DA8000A9A1C /* oldstructs.cpp */,
);
@@ -875,6 +880,7 @@
isa = PBXGroup;
children = (
91AC620A0FA2853700EEAE67 /* creatlist.cpp */,
914698FE1A747C4500F20F5E /* creature.cpp */,
91279D3D0F9D1D6A007B0D52 /* item.cpp */,
914698FB1A7362D900F20F5E /* living.cpp */,
91279BE10F9D0F73007B0D52 /* location.cpp */,
@@ -901,6 +907,7 @@
isa = PBXGroup;
children = (
91AC62090FA2853700EEAE67 /* creatlist.h */,
914698FD1A747BED00F20F5E /* creature.hpp */,
91279D3C0F9D1D6A007B0D52 /* item.h */,
914698FA1A7362C200F20F5E /* living.hpp */,
91279BE00F9D0F73007B0D52 /* location.h */,
@@ -928,7 +935,9 @@
isa = PBXGroup;
children = (
91C688E70FD702B9000F6D01 /* cursors.mac.mm */,
91E5C7A60F9F615400C21460 /* fileio.cpp */,
91E30F2D1A7481C20057C54A /* fileio.cpp */,
91E30F2A1A74819B0057C54A /* fileio_party.cpp */,
91E5C7A60F9F615400C21460 /* fileio_scen.cpp */,
91B3F10A0F9779C300BF5B67 /* graphtool.cpp */,
91B3F11E0F97801F00BF5B67 /* mathutil.cpp */,
915E09081A316D89008BDF00 /* map_parse.cpp */,
@@ -1458,7 +1467,7 @@
91279D3E0F9D1D6A007B0D52 /* item.cpp in Sources */,
91E5C79B0F9F60EC00C21460 /* town.cpp in Sources */,
91E5C79F0F9F60FA00C21460 /* outdoors.cpp in Sources */,
91E5C7A80F9F615400C21460 /* fileio.cpp in Sources */,
91E5C7A80F9F615400C21460 /* fileio_scen.cpp in Sources */,
91E5C7B90F9F619D00C21460 /* talking.cpp in Sources */,
913D005B0F9FEEC300184C18 /* porting.cpp in Sources */,
913D05B60FA1E9E300184C18 /* party.cpp in Sources */,
@@ -1496,6 +1505,9 @@
9179A4671A48683100FEF872 /* stack.cpp in Sources */,
91FDB57B1A4E77CA00DE5983 /* shop.cpp in Sources */,
914698FC1A74216F00F20F5E /* living.cpp in Sources */,
914699011A747C6600F20F5E /* creature.cpp in Sources */,
91E30F2B1A74819C0057C54A /* fileio_party.cpp in Sources */,
91E30F2E1A7481C40057C54A /* fileio.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1519,7 +1531,6 @@
91279D3F0F9D1D6A007B0D52 /* item.cpp in Sources */,
91E5C79A0F9F60EC00C21460 /* town.cpp in Sources */,
91E5C7A00F9F60FA00C21460 /* outdoors.cpp in Sources */,
91E5C7A90F9F615400C21460 /* fileio.cpp in Sources */,
91E5C7BA0F9F619D00C21460 /* talking.cpp in Sources */,
913D005D0F9FEEC300184C18 /* porting.cpp in Sources */,
913D05B80FA1E9E300184C18 /* party.cpp in Sources */,
@@ -1553,6 +1564,10 @@
9179A4661A48683100FEF872 /* stack.cpp in Sources */,
91222FC11A72366D008413A5 /* spell.cpp in Sources */,
914698F81A73434400F20F5E /* shop.cpp in Sources */,
914699001A747C6500F20F5E /* creature.cpp in Sources */,
91E30F2C1A74819D0057C54A /* fileio_party.cpp in Sources */,
91E30F2F1A7481C50057C54A /* fileio.cpp in Sources */,
91E30F311A748ABA0057C54A /* fileio_scen.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1580,15 +1595,11 @@
91279D400F9D1D6A007B0D52 /* item.cpp in Sources */,
91E5C7990F9F60EC00C21460 /* town.cpp in Sources */,
91E5C79E0F9F60FA00C21460 /* outdoors.cpp in Sources */,
91E5C7A70F9F615400C21460 /* fileio.cpp in Sources */,
91E5C7A70F9F615400C21460 /* fileio_scen.cpp in Sources */,
91E5C7B80F9F619D00C21460 /* talking.cpp in Sources */,
913D005C0F9FEEC300184C18 /* porting.cpp in Sources */,
913D05B70FA1E9E300184C18 /* party.cpp in Sources */,
913D05BD0FA1EA0A00184C18 /* pc.cpp in Sources */,
91AC60810FA26A3B00EEAE67 /* regtown.cpp in Sources */,
91AC60A90FA26C1B00EEAE67 /* tmpltown.cpp in Sources */,
91AC620C0FA2853700EEAE67 /* creatlist.cpp in Sources */,
91AC65520FA3441B00EEAE67 /* universe.cpp in Sources */,
91C1FCA60FCB6F7000EBAA65 /* button.cpp in Sources */,
91C1FCA70FCB6F7100EBAA65 /* control.cpp in Sources */,
91C1FCA80FCB6F7100EBAA65 /* dialog.cpp in Sources */,
@@ -1615,6 +1626,7 @@
9179A4651A48683100FEF872 /* stack.cpp in Sources */,
91FDB57C1A4E77CA00DE5983 /* shop.cpp in Sources */,
919086E01A65CA300071F7A0 /* tinyprint.cpp in Sources */,
91E30F301A7481C50057C54A /* fileio.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};